Welcome, Guest! Log In | Create Account

SourceForge.net > Projects > FlameRobin > Mail > Archive

FlameRobin

Email Archive: flamerobin-checkins (read-only)

2006:	_Jan	_Feb (76)	_Mar (80)	_Apr (139)	_May (62)	_Jun (18)	_Jul (16)	_Aug (23)	_Sep (12)	_Oct (9)	_Nov (27)	_Dec
2007:	_Jan (5)	_Feb (4)	_Mar (4)	_Apr	_May (34)	_Jun (33)	_Jul (12)	_Aug (26)	_Sep (27)	_Oct (110)	_Nov (55)	_Dec (37)
2008:	_Jan (15)	_Feb (18)	_Mar (26)	_Apr (21)	_May (5)	_Jun (8)	_Jul (22)	_Aug (5)	_Sep (17)	_Oct (27)	_Nov (39)	_Dec (16)
2009:	_Jan (3)	_Feb	_Mar (6)	_Apr (9)	_May (3)	_Jun (5)	_Jul (2)	_Aug (4)	_Sep (6)	_Oct (2)	_Nov	_Dec
2010:	_Jan (1)	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec

[Flamerobin-checkins] SF.net SVN: flamerobin:[1729] trunk/flamerobin/src/gui

From: <mghie@us...> - 2008-08-21 09:24

Revision: 1729
http://flamerobin.svn.sourceforge.net/flamerobin/?rev=1729&view=rev
Author: mghie
Date: 2008-08-21 09:24:37 +0000 (Thu, 21 Aug 2008)

Log Message:
-----------
Bug fix for wrong layout of ExecuteSqlFrame that was created maximized

Modified Paths:
--------------
trunk/flamerobin/src/gui/BaseFrame.cpp
trunk/flamerobin/src/gui/ExecuteSql.cpp

Modified: trunk/flamerobin/src/gui/BaseFrame.cpp
===================================================================
--- trunk/flamerobin/src/gui/BaseFrame.cpp 2008-07-25 08:42:01 UTC (rev 1728)
+++ trunk/flamerobin/src/gui/BaseFrame.cpp 2008-08-21 09:24:37 UTC (rev 1729)
@@ -76,10 +76,10 @@ /> void BaseFrame::readConfigSettings()
{
// load position and size from config; it values are not set, they will be untouched
- wxRect r = getDefaultRect();
+ wxRect r = getDefaultRect();
bool enabled = false;
bool maximized = false;
- if (config().getValue(wxT("FrameStorage"), enabled) && enabled)
+ if (config().getValue(wxT("FrameStorage"), enabled) && enabled)
{
wxString itemPrefix = getStorageName();
if (!itemPrefix.empty())

Modified: trunk/flamerobin/src/gui/ExecuteSql.cpp
===================================================================
--- trunk/flamerobin/src/gui/ExecuteSql.cpp 2008-07-25 08:42:01 UTC (rev 1728)
+++ trunk/flamerobin/src/gui/ExecuteSql.cpp 2008-08-21 09:24:37 UTC (rev 1729)
@@ -44,8 +44,12 @@ /> ExecuteSqlFrame* showSql(wxWindow* parent, const wxString& title,
Database *database, const wxString &sql)
{
- ExecuteSqlFrame *eff = new ExecuteSqlFrame(parent, -1, title, database);
+ ExecuteSqlFrame* eff = new ExecuteSqlFrame(parent, -1, title, database);
eff->Show();
+ // bug reported 2008-08-19 by Valdir Marcos: status bar position wrong
+ // when ExecuteSqlFrame is created in maximized state
+ if (eff->IsMaximized())
+ eff->SendSizeEvent();
eff->setSql(sql);
return eff;
}

[Flamerobin-checkins] SF.net SVN: flamerobin:[1732] trunk/flamerobin/src/gui

From: <mghie@us...> - 2008-08-29 20:25

[Flamerobin-checkins] SF.net SVN: flamerobin:[1733] trunk/flamerobin/src/gui

From: <mghie@us...> - 2008-08-29 20:41

[Flamerobin-checkins] SF.net SVN: flamerobin:[1762] trunk/flamerobin/src/gui

From: <mghie@us...> - 2008-10-19 16:54

[Flamerobin-checkins] SF.net SVN: flamerobin:[1764] trunk/flamerobin/src/gui

From: <mghie@us...> - 2008-10-20 22:00

[Flamerobin-checkins] SF.net SVN: flamerobin:[1768] trunk/flamerobin/src/gui

From: <mghie@us...> - 2008-10-21 21:41

[Flamerobin-checkins] SF.net SVN: flamerobin:[1770] trunk/flamerobin/src/gui

From: <mghie@us...> - 2008-10-29 09:06

[Flamerobin-checkins] SF.net SVN: flamerobin:[1773] trunk/flamerobin/src/gui

From: <mghie@us...> - 2008-10-29 20:05

Revision: 1773
http://flamerobin.svn.sourceforge.net/flamerobin/?rev=1773&view=rev
Author: mghie
Date: 2008-10-29 20:05:06 +0000 (Wed, 29 Oct 2008)

Log Message:
-----------
* Set correct view mode after splitter window is unsplit in a way that the currently focused control gets hidden

Modified Paths:
--------------
trunk/flamerobin/src/gui/ExecuteSqlFrame.cpp
trunk/flamerobin/src/gui/ExecuteSqlFrame.h

Modified: trunk/flamerobin/src/gui/ExecuteSqlFrame.cpp
===================================================================
--- trunk/flamerobin/src/gui/ExecuteSqlFrame.cpp 2008-10-29 13:47:15 UTC (rev 1772)
+++ trunk/flamerobin/src/gui/ExecuteSqlFrame.cpp 2008-10-29 20:05:06 UTC (rev 1773)
@@ -801,6 +801,7 @@ /> EVT_STC_CHARADDED(ExecuteSqlFrame::ID_stc_sql, ExecuteSqlFrame::OnSqlEditCharAdded)
EVT_STC_CHANGE(ExecuteSqlFrame::ID_stc_sql, ExecuteSqlFrame::OnSqlEditChanged)
EVT_STC_START_DRAG(ExecuteSqlFrame::ID_stc_sql, ExecuteSqlFrame::OnSqlEditStartDrag)
+ EVT_SPLITTER_UNSPLIT(wxID_ANY, ExecuteSqlFrame::OnSplitterUnsplit)
EVT_CHAR_HOOK(ExecuteSqlFrame::OnKeyDown)
EVT_CHILD_FOCUS(ExecuteSqlFrame::OnChildFocus)
EVT_CLOSE(ExecuteSqlFrame::OnClose)
@@ -2381,6 +2382,19 @@ /> execute(sstm.getStatement(), wxEmptyString);
}
//-----------------------------------------------------------------------------
+void ExecuteSqlFrame::OnSplitterUnsplit(wxSplitterEvent& WXUNUSED(event))
+{
+ if (splitter_window_1->GetWindow1() == styled_text_ctrl_sql)
+ setViewMode(vmEditor);
+ else if (splitter_window_1->GetWindow1() == notebook_1)
+ {
+ if (notebook_1->GetSelection() == 0)
+ setViewMode(vmLogCtrl);
+ else
+ setViewMode(vmGrid);
+ }
+}
+//-----------------------------------------------------------------------------
void ExecuteSqlFrame::update()
{
if (!databaseM->isConnected())

Modified: trunk/flamerobin/src/gui/ExecuteSqlFrame.h
===================================================================
--- trunk/flamerobin/src/gui/ExecuteSqlFrame.h 2008-10-29 13:47:15 UTC (rev 1772)
+++ trunk/flamerobin/src/gui/ExecuteSqlFrame.h 2008-10-29 20:05:06 UTC (rev 1773)
@@ -139,6 +139,7 @@ /> void OnGridRowCountChanged(wxCommandEvent& event);
void OnGridStatementExecuted(wxCommandEvent& event);
void OnGridLabelLeftDClick(wxGridEvent& event);
+ void OnSplitterUnsplit(wxSplitterEvent& event);
void OnIdle(wxIdleEvent& event);

// menu events

[Flamerobin-checkins] SF.net SVN: flamerobin:[1778] trunk/flamerobin/src/gui

From: <mghie@us...> - 2008-11-01 16:51

Revision: 1778
http://flamerobin.svn.sourceforge.net/flamerobin/?rev=1778&view=rev
Author: mghie
Date: 2008-11-01 16:50:56 +0000 (Sat, 01 Nov 2008)

Log Message:
-----------
* Try to improve sql editor speed on Mac OS X by not calling wxStatusBar::SetStatusText() from the wxStyledTextEvent handler

Modified Paths:
--------------
trunk/flamerobin/src/gui/ExecuteSqlFrame.cpp
trunk/flamerobin/src/gui/ExecuteSqlFrame.h

Modified: trunk/flamerobin/src/gui/ExecuteSqlFrame.cpp
===================================================================
--- trunk/flamerobin/src/gui/ExecuteSqlFrame.cpp 2008-10-31 19:27:11 UTC (rev 1777)
+++ trunk/flamerobin/src/gui/ExecuteSqlFrame.cpp 2008-11-01 16:50:56 UTC (rev 1778)
@@ -505,6 +505,7 @@ /> Observer(), databaseM(db)
{
loadingM = true;
+ updateEditorCaretPosM = true;

CommandManager cm;
buildToolbar(cm);
@@ -900,12 +901,17 @@ /> return;

// print x:y coordinates in status bar
- int p = styled_text_ctrl_sql->GetCurrentPos();
+ updateEditorCaretPosM = true;
+ // mghie: do not update the statusbar from here, because that slows
+ // everything down a lot on Mac OS X
+/*
int row = styled_text_ctrl_sql->GetCurrentLine();
int col = p - styled_text_ctrl_sql->PositionFromLine(row);
statusbar_1->SetStatusText(wxString::Format(wxT("%d : %d"), row+1, col+1), 2);
+*/

// check for braces, and highlight
+ int p = styled_text_ctrl_sql->GetCurrentPos();
int c1 = styled_text_ctrl_sql->GetCharAt(p);
int c2 = (p > 1 ? styled_text_ctrl_sql->GetCharAt(p-1) : 0);

@@ -1229,6 +1235,16 @@ /> {
if (doUpdateFocusedControlM)
updateViewMode();
+ if (updateEditorCaretPosM)
+ {
+ updateEditorCaretPosM = false;
+
+ int p = styled_text_ctrl_sql->GetCurrentPos();
+ int row = styled_text_ctrl_sql->GetCurrentLine();
+ int col = p - styled_text_ctrl_sql->PositionFromLine(row);
+ statusbar_1->SetStatusText(wxString::Format(wxT("%d : %d"),
+ row + 1, col + 1), 2);
+ }
event.Skip();
}
//-----------------------------------------------------------------------------

Modified: trunk/flamerobin/src/gui/ExecuteSqlFrame.h
===================================================================
--- trunk/flamerobin/src/gui/ExecuteSqlFrame.h 2008-10-31 19:27:11 UTC (rev 1777)
+++ trunk/flamerobin/src/gui/ExecuteSqlFrame.h 2008-11-01 16:50:56 UTC (rev 1778)
@@ -132,6 +132,8 @@ /> void setViewMode(bool splitView, ViewMode mode);
void updateViewMode();

+ bool updateEditorCaretPosM;
+
// events
void OnChildFocus(wxChildFocusEvent& event);
void OnClose(wxCloseEvent& event);

[Flamerobin-checkins] SF.net SVN: flamerobin:[1780] trunk/flamerobin/src/gui

From: <mghie@us...> - 2008-11-05 20:42

[Flamerobin-checkins] SF.net SVN: flamerobin:[1787] trunk/flamerobin/src/gui

From: <babuskov@us...> - 2008-11-07 20:35

Revision: 1787
http://flamerobin.svn.sourceforge.net/flamerobin/?rev=1787&view=rev
Author: babuskov
Date: 2008-11-07 20:35:31 +0000 (Fri, 07 Nov 2008)

Log Message:
-----------
Highlight the search terms in DDL when searching objects by DDL content

Modified Paths:
--------------
trunk/flamerobin/src/gui/AdvancedSearchFrame.cpp
trunk/flamerobin/src/gui/AdvancedSearchFrame.h

Modified: trunk/flamerobin/src/gui/AdvancedSearchFrame.cpp
===================================================================
--- trunk/flamerobin/src/gui/AdvancedSearchFrame.cpp 2008-11-07 20:33:32 UTC (rev 1786)
+++ trunk/flamerobin/src/gui/AdvancedSearchFrame.cpp 2008-11-07 20:35:31 UTC (rev 1787)
@@ -37,6 +37,8 @@ />
#include <set>

+#include <wx/stc/stc.h>
+
#include "frutils.h"
#include "gui/AdvancedSearchFrame.h"
#include "gui/ContextMenuMetadataItemVisitor.h"
@@ -233,9 +235,16 @@ /> bottom_splitter_panel = new wxPanel(splitter1, wxID_ANY, wxDefaultPosition,
wxDefaultSize, wxTAB_TRAVERSAL);
wxBoxSizer *bottom_splitter_sizer = new wxBoxSizer(wxVERTICAL);
- stc_ddl = new wxTextCtrl(bottom_splitter_panel, wxID_ANY,
- _("DDL for selected objects"), wxDefaultPosition, wxDefaultSize,
- wxTE_MULTILINE|wxTE_WORDWRAP);
+ stc_ddl = new wxStyledTextCtrl(bottom_splitter_panel, wxID_ANY,
+ wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER);
+ stc_ddl->SetWrapMode(wxSTC_WRAP_WORD);
+ stc_ddl->SetMarginWidth(1, 0); // turn off the folding margin
+ stc_ddl->StyleSetForeground(1, *wxWHITE);
+ stc_ddl->StyleSetBackground(1, *wxBLUE);
+ stc_ddl->StyleSetForeground(2, *wxWHITE);
+ stc_ddl->StyleSetBackground(2, *wxRED);
+ stc_ddl->SetText(_("DDL for selected objects"));
+
bottom_splitter_sizer->Add(stc_ddl, 1, wxEXPAND, 0);
bottom_splitter_panel->SetSizer(bottom_splitter_sizer);
splitter1->SplitHorizontally(top_splitter_panel,bottom_splitter_panel,0);
@@ -437,7 +446,27 @@ /> {
CreateDDLVisitor cdv;
m->acceptVisitor(&cdv);
- stc_ddl->SetValue(cdv.getSql());
+ wxString sql(cdv.getSql());
+ stc_ddl->SetText(sql);
+ sql.MakeUpper();
+ // highlight the found text
+ int color = 0; // alternate red and blue color for different words
+ for (CriteriaCollection::const_iterator ci =
+ searchCriteriaM.lower_bound(CriteriaItem::ctDDL); ci !=
+ searchCriteriaM.upper_bound(CriteriaItem::ctDDL); ++ci, ++color)
+ {
+ int len = (*ci).second.value.Length() - 2;
+ wxString sfind((*ci).second.value.Mid(1, len));
+ int p = -1;
+ while (true)
+ {
+ p = sql.find(sfind, p+1);
+ if (p == wxString::npos)
+ break;
+ stc_ddl->StartStyling(p, 255);
+ stc_ddl->SetStyling(len, 1+color%2);
+ }
+ }
}
MainFrame *mf = dynamic_cast<MainFrame *>(GetParent());
if (mf)

Modified: trunk/flamerobin/src/gui/AdvancedSearchFrame.h
===================================================================
--- trunk/flamerobin/src/gui/AdvancedSearchFrame.h 2008-11-07 20:33:32 UTC (rev 1786)
+++ trunk/flamerobin/src/gui/AdvancedSearchFrame.h 2008-11-07 20:35:31 UTC (rev 1787)
@@ -66,6 +66,7 @@ /> class MetadataItem;
class AdjustableListCtrl; // declaration in cpp file
class MainFrame;
+class wxStyledTextCtrl;
//-----------------------------------------------------------------------------
class AdvancedSearchFrame : public BaseFrame, public Observer
{
@@ -113,7 +114,7 @@ /> wxPanel *top_splitter_panel;
AdjustableListCtrl *listctrl_results;
wxPanel *bottom_splitter_panel;
- wxTextCtrl *stc_ddl;
+ wxStyledTextCtrl *stc_ddl;

public:
AdvancedSearchFrame(MainFrame *parent);

[Flamerobin-checkins] SF.net SVN: flamerobin:[1802] trunk/flamerobin/src/gui

From: <mghie@us...> - 2008-11-15 13:38

[Flamerobin-checkins] SF.net SVN: flamerobin:[1804] trunk/flamerobin/src/gui

From: <mghie@us...> - 2008-11-15 19:02

[Flamerobin-checkins] SF.net SVN: flamerobin:[1805] trunk/flamerobin/src/gui

From: <mghie@us...> - 2008-11-15 22:02

[Flamerobin-checkins] SF.net SVN: flamerobin:[1834] trunk/flamerobin/src/gui

From: <babuskov@us...> - 2009-01-28 20:38

[Flamerobin-checkins] SF.net SVN: flamerobin:[1835] trunk/flamerobin/src/gui

From: <babuskov@us...> - 2009-01-29 18:41

[Flamerobin-checkins] SF.net SVN: flamerobin:[1849] trunk/flamerobin/src/gui

From: <mghie@us...> - 2009-04-14 18:59

[Flamerobin-checkins] SF.net SVN: flamerobin:[1854] trunk/flamerobin/src/gui

From: <babuskov@us...> - 2009-05-26 16:19

[Flamerobin-checkins] SF.net SVN: flamerobin:[1857] trunk/flamerobin/src/gui

From: <babuskov@us...> - 2009-06-08 15:03

[Flamerobin-checkins] SF.net SVN: flamerobin:[1858] trunk/flamerobin/src/gui

From: <mghie@us...> - 2009-06-08 16:54

[Flamerobin-checkins] SF.net SVN: flamerobin:[1863] trunk/flamerobin/src/gui

From: <babuskov@us...> - 2009-08-29 13:06

[Flamerobin-checkins] SF.net SVN: flamerobin:[1865] trunk/flamerobin/src/gui

From: <babuskov@us...> - 2009-08-30 15:38

[Flamerobin-checkins] SF.net SVN: flamerobin:[1869] trunk/flamerobin/src/gui

From: <mghie@us...> - 2009-09-23 08:31

Revision: 1869
http://flamerobin.svn.sourceforge.net/flamerobin/?rev=1869&view=rev
Author: mghie
Date: 2009-09-23 08:31:44 +0000 (Wed, 23 Sep 2009)

Log Message:
-----------
* Fix for memory leak (dynamically allocated wxTimer instance wasn't freed)

Modified Paths:
--------------
trunk/flamerobin/src/gui/ExecuteSqlFrame.cpp
trunk/flamerobin/src/gui/ExecuteSqlFrame.h

Modified: trunk/flamerobin/src/gui/ExecuteSqlFrame.cpp
===================================================================
--- trunk/flamerobin/src/gui/ExecuteSqlFrame.cpp 2009-09-23 08:28:47 UTC (rev 1868)
+++ trunk/flamerobin/src/gui/ExecuteSqlFrame.cpp 2009-09-23 08:31:44 UTC (rev 1869)
@@ -508,7 +508,8 @@ /> wxString title,
Database *db, const wxPoint& pos, const wxSize& size, long style)
: BaseFrame(wxTheApp->GetTopWindow(), id, title, pos, size, style),
- Observer(), databaseM(db)
+ Observer(), databaseM(db),
+ timerBlobEditorM(this, TIMER_ID_UPDATE_BLOB)
{
loadingM = true;
updateEditorCaretPosM = true;
@@ -544,8 +545,7 @@ />
statusbar_1 = CreateStatusBar(4);
SetStatusBarPane(-1);
-
- timerBlobEditorM = new wxTimer(this, TIMER_ID_UPDATE_BLOB);
+
editBlobDlgM = 0;

set_properties();
@@ -2625,9 +2625,9 @@ /> // - the blob-dialog is created and visible AND
// - a different col/row is selected
if ((editBlobDlgM) && (editBlobDlgM->IsShown()) &&
- ((event.GetCol() != grid_data->GetGridCursorCol()) ||
- (event.GetRow() != grid_data->GetGridCursorRow())))
- timerBlobEditorM->Start(500,true);
+ ((event.GetCol() != grid_data->GetGridCursorCol()) ||
+ (event.GetRow() != grid_data->GetGridCursorRow())))
+ timerBlobEditorM.Start(500, true);
}
//-----------------------------------------------------------------------------
void ExecuteSqlFrame::OnGridRowCountChanged(wxCommandEvent& event)

Modified: trunk/flamerobin/src/gui/ExecuteSqlFrame.h
===================================================================
--- trunk/flamerobin/src/gui/ExecuteSqlFrame.h 2009-09-23 08:28:47 UTC (rev 1868)
+++ trunk/flamerobin/src/gui/ExecuteSqlFrame.h 2009-09-23 08:31:44 UTC (rev 1869)
@@ -143,7 +143,7 @@ /> enum {
TIMER_ID_UPDATE_BLOB = 1
};
- wxTimer* timerBlobEditorM;
+ wxTimer timerBlobEditorM;
// blob-editor dialog
EditBlobDialog* editBlobDlgM;
// blob-editor event

[Flamerobin-checkins] SF.net SVN: flamerobin:[1870] trunk/flamerobin/src/gui

From: <mghie@us...> - 2009-09-23 09:44

Revision: 1870
http://flamerobin.svn.sourceforge.net/flamerobin/?rev=1870&view=rev
Author: mghie
Date: 2009-09-23 09:43:57 +0000 (Wed, 23 Sep 2009)

Log Message:
-----------
* close button added (ESC now closes the dialog)
* mnemonics (underlined chars for keyboard activation) for all controls added

Modified Paths:
--------------
trunk/flamerobin/src/gui/FindDialog.cpp
trunk/flamerobin/src/gui/FindDialog.h

Modified: trunk/flamerobin/src/gui/FindDialog.cpp
===================================================================
--- trunk/flamerobin/src/gui/FindDialog.cpp 2009-09-23 08:31:44 UTC (rev 1869)
+++ trunk/flamerobin/src/gui/FindDialog.cpp 2009-09-23 09:43:57 UTC (rev 1870)
@@ -301,33 +301,37 @@ /> if (allowedFlags)
flags = *allowedFlags; // copy settings

- label_find = new wxStaticText(getControlsPanel(), -1, _("Find:"));
+ label_find = new wxStaticText(getControlsPanel(), -1, _("Fi&nd:"));
text_ctrl_find = new wxTextCtrl(getControlsPanel(), -1);
- label_replace = new wxStaticText(getControlsPanel(), -1, _("Replace with:"));
+ label_replace = new wxStaticText(getControlsPanel(), -1, _("Re&place with:"));
text_ctrl_replace = new wxTextCtrl(getControlsPanel(), -1);

checkbox_wholeword = checkbox_matchcase = checkbox_regexp = checkbox_convertbs = checkbox_wrap = checkbox_fromtop = 0;
if (flags.has(se::WHOLE_WORD))
- checkbox_wholeword = new wxCheckBox(getControlsPanel(), -1, _("Whole word only"));
+ checkbox_wholeword = new wxCheckBox(getControlsPanel(), -1, _("Whole &word only"));
if (flags.has(se::MATCH_CASE))
- checkbox_matchcase = new wxCheckBox(getControlsPanel(), -1, _("Match case"));
+ checkbox_matchcase = new wxCheckBox(getControlsPanel(), -1, _("&Match case"));
if (flags.has(se::REGULAR_EXPRESSION))
- checkbox_regexp = new wxCheckBox(getControlsPanel(), -1, _("Regular exssion"));
+ checkbox_regexp = new wxCheckBox(getControlsPanel(), -1, _("Regular e&xssion"));
if (flags.has(se::CONVERT_BACKSLASH))
- checkbox_convertbs = new wxCheckBox(getControlsPanel(), -1, _("Convert backslashes"));
+ checkbox_convertbs = new wxCheckBox(getControlsPanel(), -1, _("Convert &backslashes"));
if (flags.has(se::WRAP))
- checkbox_wrap = new wxCheckBox(getControlsPanel(), -1, _("Wrap around"));
+ checkbox_wrap = new wxCheckBox(getControlsPanel(), -1, _("Wrap ar&ound"));
if (flags.has(se::FROM_TOP))
- checkbox_fromtop = new wxCheckBox(getControlsPanel(), -1, _("Start search from top"));
+ checkbox_fromtop = new wxCheckBox(getControlsPanel(), -1, _("Start search from &top"));

- button_find = new wxButton(getControlsPanel(), wxID_FIND, _("Find"));
- button_replace = new wxButton(getControlsPanel(), wxID_REPLACE, _("Replace"));
- button_replace_all = new wxButton(getControlsPanel(), wxID_REPLACE_ALL, _("Replace all"));
- button_replace_in_selection = new wxButton(getControlsPanel(), ID_button_replace_in_selection, _("In selection"));
+ button_find = new wxButton(getControlsPanel(), wxID_FIND, _("&Find"));
+ button_replace = new wxButton(getControlsPanel(), wxID_REPLACE,
+ _("&Replace"));
+ button_replace_all = new wxButton(getControlsPanel(), wxID_REPLACE_ALL,
+ _("Replace &all"));
+ button_replace_in_selection = new wxButton(getControlsPanel(),
+ ID_button_replace_in_selection, _("In &selection"));
+ button_close = new wxButton(getControlsPanel(), wxID_CANCEL, _("&Close"));

do_layout();
+ button_find->SetDefault();
text_ctrl_find->SetFocus();
- button_find->SetDefault();
}
//-----------------------------------------------------------------------------
void FindDialog::do_layout()
@@ -367,6 +371,8 @@ /> sizerButtons->Add(button_replace_all);
sizerButtons->Add(styleguide().getBetweenButtonsMargin(wxHORIZONTAL), 0);
sizerButtons->Add(button_replace_in_selection);
+ sizerButtons->Add(styleguide().getBetweenButtonsMargin(wxHORIZONTAL), 0);
+ sizerButtons->Add(button_close);

wxBoxSizer* sizerControls = new wxBoxSizer(wxVERTICAL);
sizerControls->Add(sizerEdits, 1, wxEXPAND);

Modified: trunk/flamerobin/src/gui/FindDialog.h
===================================================================
--- trunk/flamerobin/src/gui/FindDialog.h 2009-09-23 08:31:44 UTC (rev 1869)
+++ trunk/flamerobin/src/gui/FindDialog.h 2009-09-23 09:43:57 UTC (rev 1870)
@@ -110,6 +110,7 @@ /> wxButton *button_replace;
wxButton *button_replace_all;
wxButton *button_replace_in_selection;
+ wxButton *button_close;

public:
enum { ID_button_replace_in_selection = 101 };

[Flamerobin-checkins] SF.net SVN: flamerobin:[1873] trunk/flamerobin/src/gui

From: <mghie@us...> - 2009-10-05 13:10

Next Messages

FlameRobin

Email Archive: flamerobin-checkins (read-only)

About SourceForge

Find Software

Develop Software

Community

Help