[pgadmin-hackers] CVS Commit by dpage: The password text field in the Add Server dialog
Log Message:
---
The password text field in the Add Server dialog lacks the password style option, so
the password is displayed in the clear when typed in.
Ivan Nejgebauer [EMAIL PROTECTED]
Modified Files:
--
pgadmin3/src/ui/common:
dlgServer.xrc (r1.3 - r1.4)
xrcDialogs.cpp (r1.41 - r1.42)
Index: dlgServer.xrc
===
RCS file: /projects/pgadmin3/src/ui/common/dlgServer.xrc,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lsrc/ui/common/dlgServer.xrc -Lsrc/ui/common/dlgServer.xrc -u -w -r1.3 -r1.4
--- src/ui/common/dlgServer.xrc
+++ src/ui/common/dlgServer.xrc
@@ -82,6 +82,7 @@
/object
object class=wxTextCtrl name=txtPassword
pos70,110d/pos
+stylewxTE_PASSWORD/style
size135,-1d/size
/object
/object
Index: xrcDialogs.cpp
===
RCS file: /projects/pgadmin3/src/ui/common/xrcDialogs.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -Lsrc/ui/common/xrcDialogs.cpp -Lsrc/ui/common/xrcDialogs.cpp -u -w -r1.41 -r1.42
--- src/ui/common/xrcDialogs.cpp
+++ src/ui/common/xrcDialogs.cpp
@@ -4345,7 +4345,7 @@
32,32,32,32,60,115,116,121,108,101,47,62,10,32,32,60,47,111,98,106,101,
99,116,62,10,60,47,114,101,115,111,117,114,99,101,62,10};
-static size_t xml_res_size_21 = 3626;
+static size_t xml_res_size_21 = 3667;
static unsigned char xml_res_file_21[] = {
60,63,120,109,108,32,118,101,114,115,105,111,110,61,34,49,46,48,34,32,101,
110,99,111,100,105,110,103,61,34,85,84,70,45,56,34,63,62,10,60,114,101,
@@ -4483,38 +4483,40 @@
61,34,119,120,84,101,120,116,67,116,114,108,34,32,110,97,109,101,61,34,
116,120,116,80,97,115,115,119,111,114,100,34,62,10,32,32,32,32,32,32,32,
32,32,32,32,32,60,112,111,115,62,55,48,44,49,49,48,100,60,47,112,111,115,
-62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,115,105,122,101,62,49,51,53,
-44,45,49,100,60,47,115,105,122,101,62,10,32,32,32,32,32,32,32,32,32,32,
-60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,60,47,111,98,
-106,101,99,116,62,10,32,32,32,32,32,32,32,32,60,115,101,108,101,99,116,
-101,100,62,49,60,47,115,101,108,101,99,116,101,100,62,10,32,32,32,32,32,
-32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,60,112,111,115,62,
-50,44,50,100,60,47,112,111,115,62,10,32,32,32,32,32,32,60,115,105,122,101,
-62,50,49,52,44,49,52,53,100,60,47,115,105,122,101,62,10,32,32,32,32,60,
-47,111,98,106,101,99,116,62,10,32,32,32,32,60,111,98,106,101,99,116,32,
-99,108,97,115,115,61,34,119,120,66,117,116,116,111,110,34,32,110,97,109,
-101,61,34,98,116,110,72,101,108,112,34,62,10,32,32,32,32,32,32,60,108,97,
-98,101,108,62,72,101,108,112,60,47,108,97,98,101,108,62,10,32,32,32,32,
-32,32,60,112,111,115,62,50,44,49,53,48,100,60,47,112,111,115,62,10,32,32,
-32,32,32,32,60,115,105,122,101,62,53,48,44,45,49,100,60,47,115,105,122,
-101,62,10,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,60,
-111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,66,117,116,116,
-111,110,34,32,110,97,109,101,61,34,98,116,110,79,75,34,62,10,32,32,32,32,
-32,32,60,108,97,98,101,108,62,79,75,60,47,108,97,98,101,108,62,10,32,32,
-32,32,32,32,60,100,101,102,97,117,108,116,62,49,60,47,100,101,102,97,117,
-108,116,62,10,32,32,32,32,32,32,60,112,111,115,62,49,49,51,44,49,53,48,
-100,60,47,112,111,115,62,10,32,32,32,32,32,32,60,115,105,122,101,62,53,
-48,44,45,49,100,60,47,115,105,122,101,62,10,32,32,32,32,60,47,111,98,106,
+62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,115,116,121,108,101,62,119,
+120,84,69,95,80,65,83,83,87,79,82,68,60,47,115,116,121,108,101,62,10,32,
+32,32,32,32,32,32,32,32,32,32,32,60,115,105,122,101,62,49,51,53,44,45,49,
+100,60,47,115,105,122,101,62,10,32,32,32,32,32,32,32,32,32,32,60,47,111,
+98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,
+116,62,10,32,32,32,32,32,32,32,32,60,115,101,108,101,99,116,101,100,62,
+49,60,47,115,101,108,101,99,116,101,100,62,10,32,32,32,32,32,32,60,47,111,
+98,106,101,99,116,62,10,32,32,32,32,32,32,60,112,111,115,62,50,44,50,100,
+60,47,112,111,115,62,10,32,32,32,32,32,32,60,115,105,122,101,62,50,49,52,
+44,49,52,53,100,60,47,115,105,122,101,62,10,32,32,32,32,60,47,111,98,106,
101,99,116,62,10,32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,
115,61,34,119,120,66,117,116,116,111,110,34,32,110,97,109,101,61,34,98,
-116,110,67,97,110,99,101,108,34,62,10,32,32,32,32,32,32,60,108,97,98,101,
-108,62,67,97,110,99,101,108,60,47,108,97,98,101,108,62,10,32,32,32,32,32,
-32,60,112,111,115,62,49,54,54,44,49,53,48,100,60,47,112,111,115,62,10,32,
-32,32,32,32,32,60,115,105,122,101,62,53,48,44,45,49,100,60,47,115,105,122,
-101,62,10,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,60,
-115,105,122,101,62,50,49,56,44,49,54,56,100,60,47,115,105,122,101,62,10,
-32,32,32,32,60,115,116,121,108,101,47,62,10,32,32,60,47,111,98,106,101,
[pgadmin-hackers] CVS Commit by dpage: The password text field in the Add Server dialog
Log Message: --- The password text field in the Add Server dialog lacks the password style option, so the password is displayed in the clear when typed in. Ivan Nejgebauer [EMAIL PROTECTED] Modified Files: -- pgadmin3/src/ui/common: xrcDialogs.cpp (r1.42 - r1.43) Index: xrcDialogs.cpp === RCS file: /projects/pgadmin3/src/ui/common/xrcDialogs.cpp,v retrieving revision 1.42 retrieving revision 1.43 diff -Lsrc/ui/common/xrcDialogs.cpp -Lsrc/ui/common/xrcDialogs.cpp -u -w -r1.42 -r1.43 --- src/ui/common/xrcDialogs.cpp +++ src/ui/common/xrcDialogs.cpp @@ -6947,10 +6947,10 @@ 32,60,112,111,115,62,53,44,53,100,60,47,112,111,115,62,10,32,32,32,32,32, 32,32,32,32,32,32,32,32,32,32,32,60,115,105,122,101,62,49,56,48,44,45,49, 100,60,47,115,105,122,101,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,60,100,105,109,101,110,115,105,111,110,62,49,60,47,100,105,109, +32,32,32,60,100,105,109,101,110,115,105,111,110,62,51,60,47,100,105,109, 101,110,115,105,111,110,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32, 32,32,60,115,116,121,108,101,62,119,120,82,65,95,83,80,69,67,73,70,89,95, -82,79,87,83,60,47,115,116,121,108,101,62,10,32,32,32,32,32,32,32,32,32, +67,79,76,83,60,47,115,116,121,108,101,62,10,32,32,32,32,32,32,32,32,32, 32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32, 32,32,32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119, 120,83,116,97,116,105,99,66,111,120,34,32,110,97,109,101,61,34,115,98,120, ---(end of broadcast)--- TIP 7: don't forget to increase your free space map settings
Re: [pgadmin-hackers] [pgadmin-support] Patch: view data for tables/views on double
Ivan Nejgebauer wrote: First of all, this is certainly hackers stuff, please post on pgadmin-hackers! The attached patch a) defines a double click handler for the list in the properties pane, so that a double click on an item You're right, doubleclick is missing on the property pane. in the list launches the properties editor for the item (or the data view if the item is a table or a view); and b) modifies the tree view double click handler so that a double click on a table or a view launches the data view for the corresponding table/view. This isn't acceptable like this, because it introduces different behaviour between clicking on a properties item and a tree item. Both must behave identically. Actually, not only double click is missing, but also right mouse click. Rationale for different behavior with tables/views: This is reasonable, but before that some prerequisites have to be met: - the default action should be visible to the user, preferrably displayed bold in the context menu. - the default action might differ from user to user. For sure, an unconditional View Data on a table is a bad idea. I already hear those guys yelling double clicking on a 100 million row table... Regards, Andreas ---(end of broadcast)--- TIP 9: the planner will ignore your desire to choose an index scan if your joining column's datatypes do not match
[pgadmin-hackers] CVS Commit by dpage: Updated todo.
Log Message: --- Updated todo. Modified Files: -- pgadmin3: CHANGELOG.txt (r1.133 - r1.134) Index: CHANGELOG.txt === RCS file: /projects/pgadmin3/CHANGELOG.txt,v retrieving revision 1.133 retrieving revision 1.134 diff -LCHANGELOG.txt -LCHANGELOG.txt -u -w -r1.133 -r1.134 --- CHANGELOG.txt +++ CHANGELOG.txt @@ -17,6 +17,7 @@ /ul br ul +li2004-09-16 DP 1.2B2 mask passwords on dlgServer [Ivan Nejgebauer] li2004-09-15 DP 1.2B2 fix function return type quoting li2004-09-10 AP 1.2B2 fix GrantWizard for sequence and view li2004-09-10 AP 1.2B2 fix type quoting ---(end of broadcast)--- TIP 9: the planner will ignore your desire to choose an index scan if your joining column's datatypes do not match
[pgadmin-hackers] CVS Commit by andreas: preliminary workaround for gtk FindFocus
Log Message:
---
preliminary workaround for gtk FindFocus returning NULL
Modified Files:
--
pgadmin3/src/ui:
frmMain.cpp (r1.107 - r1.108)
Index: frmMain.cpp
===
RCS file: /projects/pgadmin3/src/ui/frmMain.cpp,v
retrieving revision 1.107
retrieving revision 1.108
diff -Lsrc/ui/frmMain.cpp -Lsrc/ui/frmMain.cpp -u -w -r1.107 -r1.108
--- src/ui/frmMain.cpp
+++ src/ui/frmMain.cpp
@@ -509,6 +509,8 @@
if (data-IsCollection())
{
wxWindow *win=wxWindow::FindFocus();
+if (!win)
+return data;
if (win == listViews)
{
if (listViews-GetSelection())
---(end of broadcast)---
TIP 8: explain analyze is your friend
[pgadmin-hackers] CVS Commit by andreas: rewrite of properties actions
Log Message: --- rewrite of properties actions Modified Files: -- pgadmin3: CHANGELOG.txt (r1.134 - r1.135) Index: CHANGELOG.txt === RCS file: /projects/pgadmin3/CHANGELOG.txt,v retrieving revision 1.134 retrieving revision 1.135 diff -LCHANGELOG.txt -LCHANGELOG.txt -u -w -r1.134 -r1.135 --- CHANGELOG.txt +++ CHANGELOG.txt @@ -17,6 +17,7 @@ /ul br ul +li2004-09-16 AP 1.2B2 rewrite of properties actions li2004-09-16 DP 1.2B2 mask passwords on dlgServer [Ivan Nejgebauer] li2004-09-15 DP 1.2B2 fix function return type quoting li2004-09-10 AP 1.2B2 fix GrantWizard for sequence and view ---(end of broadcast)--- TIP 3: if posting/reading through Usenet, please send an appropriate subscribe-nomail command to [EMAIL PROTECTED] so that your message can get through to the mailing list cleanly
[pgadmin-hackers] CVS Commit by andreas: rewrite of properties actions
Log Message:
---
rewrite of properties actions
Modified Files:
--
pgadmin3/src/include:
frmMain.h (r1.53 - r1.54)
pgadmin3/src/ui:
events.cpp (r1.114 - r1.115)
frmMain.cpp (r1.108 - r1.109)
Index: frmMain.h
===
RCS file: /projects/pgadmin3/src/include/frmMain.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -Lsrc/include/frmMain.h -Lsrc/include/frmMain.h -u -w -r1.53 -r1.54
--- src/include/frmMain.h
+++ src/include/frmMain.h
@@ -46,11 +46,11 @@
void SetStatusText(const wxString msg);
void SetButtons(pgObject *obj=0);
-void SetDatabase(pgDatabase *newDatabase) { m_database = newDatabase; }
void execSelChange(wxTreeItemId item, bool currentNode);
void Refresh(pgObject *data);
void RemoveFrame(wxWindow *frame);
+void SetDatabase(pgDatabase *newDatabase) { m_database = newDatabase; }
wxImageList *GetImageList() { return images; }
wxTreeCtrl *GetBrowser() { return browser; }
@@ -62,7 +62,6 @@
private:
windowList frames;
- pgDatabase *m_database;
wxTreeCtrl *browser;
ctlListView *properties;
ctlListView *statistics;
@@ -81,6 +80,10 @@
wxString timermsg;
long msgLevel;
+wxTreeItemId denyCollapseItem;
+pgObject *currentObject;
+pgDatabase *m_database;
+
void OnKeyDown(wxKeyEvent event);
void OnAbout(wxCommandEvent event);
void OnContents(wxCommandEvent event);
@@ -110,6 +113,8 @@
void OnPageChange(wxNotebookEvent event);
void OnPropSelChanged(wxListEvent event);
+void OnPropSelActivated(wxListEvent event);
+void OnPropRightClick(wxListEvent event);
void OnTreeSelChanged(wxTreeEvent event);
void OnTreeKeyDown(wxTreeEvent event);
void OnConnect(wxCommandEvent ev);
@@ -132,7 +137,7 @@
void OnCheckAlive(wxCommandEvent event);
bool dropSingleObject(pgObject *data, bool updateFinal);
-void doPopup(wxPoint point, pgObject *object);
+void doPopup(wxWindow *win, wxPoint point, pgObject *object);
void appendIfEnabled(int id);
bool checkAlive();
void setDisplay(pgObject *data, ctlListView *props=0, ctlSQLBox *sqlbox=0);
@@ -140,8 +145,6 @@
void RetrieveServers();
int ReconnectServer(pgServer *server);
wxTreeItemId RestoreEnvironment(pgServer *server);
-wxTreeItemId denyCollapseItem;
-pgObject *GetSelectedObject();
DECLARE_EVENT_TABLE()
};
Index: events.cpp
===
RCS file: /projects/pgadmin3/src/ui/events.cpp,v
retrieving revision 1.114
retrieving revision 1.115
diff -Lsrc/ui/events.cpp -Lsrc/ui/events.cpp -u -w -r1.114 -r1.115
--- src/ui/events.cpp
+++ src/ui/events.cpp
@@ -122,6 +122,8 @@
EVT_MENU(MNU_CONTEXTMENU, frmMain::OnContextMenu)
EVT_NOTEBOOK_PAGE_CHANGED(CTL_NOTEBOOK, frmMain::OnPageChange)
EVT_LIST_ITEM_SELECTED(CTL_PROPVIEW,frmMain::OnPropSelChanged)
+EVT_LIST_ITEM_ACTIVATED(CTL_PROPVIEW, frmMain::OnPropSelActivated)
+EVT_LIST_ITEM_RIGHT_CLICK(CTL_PROPVIEW, frmMain::OnPropRightClick)
EVT_TREE_SEL_CHANGED(CTL_BROWSER, frmMain::OnTreeSelChanged)
EVT_TREE_ITEM_EXPANDING(CTL_BROWSER,frmMain::OnExpand)
EVT_TREE_ITEM_COLLAPSING(CTL_BROWSER, frmMain::OnCollapse)
@@ -229,9 +231,9 @@
void frmMain::OnStartService(wxCommandEvent WXUNUSED(event))
{
-pgServer *server= (pgServer*)GetSelectedObject();
-if (server server-GetType() == PG_SERVER)
+if (currentObject currentObject-GetType() == PG_SERVER)
{
+pgServer *server= (pgServer*)currentObject;
StartMsg(_(Starting service));
bool rc = server-StartService();
if (rc)
@@ -243,9 +245,9 @@
void frmMain::OnStopService(wxCommandEvent WXUNUSED(event))
{
-pgServer *server= (pgServer*)GetSelectedObject();
-if (server server-GetType() == PG_SERVER)
+if (currentObject currentObject-GetType() == PG_SERVER)
{
+pgServer *server= (pgServer*)currentObject;
wxMessageDialog msg(this, _(Are you sure you wish shutdown this
server?),
_(Stop service), wxYES_NO | wxICON_QUESTION);
if (msg.ShowModal() != wxID_YES)
@@ -297,9 +299,8 @@
{
wxString page;
-pgObject *obj = GetSelectedObject();
-if (obj)
-page=obj-GetHelpPage(true);
+if (currentObject)
+page=currentObject-GetHelpPage(true);
if (page.IsEmpty())
page = wxT(sql-commands);
@@ -346,11 +347,10 @@
void frmMain::OnStatus(wxCommandEvent event)
{
-pgObject *data = GetSelectedObject();
-if (!data)
+if (!currentObject)
return;
-pgServer *server=data-GetServer();
+pgServer *server=currentObject-GetServer();
if (!server)
return;
@@ -369,13 +369,13 @@
void frmMain::OnCount(wxCommandEvent event)
{
-pgObject *data = GetSelectedObject();
-if
[pgadmin-hackers] CVS Commit by andreas: wxID_xxx IDs to enable GTK wxStockButtons fix
Log Message: --- wxID_xxx IDs to enable GTK wxStockButtons fix Modified Files: -- pgadmin3/src: pgAdmin3.cpp (r1.101 - r1.102) pgAdmin3.dsp (r1.111 - r1.112) pgadmin3/src/ui: dlgClasses.cpp (r1.10 - r1.11) dlgConnect.cpp (r1.2 - r1.3) dlgDatabase.cpp (r1.31 - r1.32) dlgEditGridOptions.cpp (r1.21 - r1.22) dlgFunction.cpp (r1.41 - r1.42) dlgProperty.cpp (r1.93 - r1.94) dlgServer.cpp (r1.8 - r1.9) dlgType.cpp (r1.25 - r1.26) dlgUser.cpp (r1.32 - r1.33) frmExport.cpp (r1.12 - r1.13) frmOptions.cpp (r1.45 - r1.46) frmPassword.cpp (r1.17 - r1.18) frmRestore.cpp (r1.10 - r1.11) Index: pgAdmin3.cpp === RCS file: /projects/pgadmin3/src/pgAdmin3.cpp,v retrieving revision 1.101 retrieving revision 1.102 diff -Lsrc/pgAdmin3.cpp -Lsrc/pgAdmin3.cpp -u -w -r1.101 -r1.102 --- src/pgAdmin3.cpp +++ src/pgAdmin3.cpp @@ -341,6 +341,16 @@ wxXmlResource::Get()-AddHandler(new ctlSQLBoxXmlHandler); wxXmlResource::Get()-AddHandler(new ctlComboBoxXmlHandler); +#define chkXRC(id) XRCID(#id) == id +wxASSERT_MSG( +chkXRC(wxID_OK) +chkXRC(wxID_CANCEL) +chkXRC(wxID_HELP) +chkXRC(wxID_APPLY) +chkXRC(wxID_ADD) +chkXRC(wxID_REMOVE), wxT(XRC ID not correctly assigned.)); +// if this assert fires, some event table uses XRCID(...) instead of wxID_... directly + // examine libpq version libpqVersion=7.3; Index: pgAdmin3.dsp === RCS file: /projects/pgadmin3/src/pgAdmin3.dsp,v retrieving revision 1.111 retrieving revision 1.112 diff -Lsrc/pgAdmin3.dsp -Lsrc/pgAdmin3.dsp -u -w -r1.111 -r1.112 --- src/pgAdmin3.dsp +++ src/pgAdmin3.dsp @@ -45,7 +45,8 @@ # PROP Target_Dir # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I include/ /I c:/wxWindows_2.5/include /I c:/wxWindows_2.5/contrib/include /I c:/wxWindows_2.5/lib/mswd /I c:/postgresql/include /D WIN32 /D _DEBUG /D _WINDOWS /D __WINDOWS__ /D __WXMSW__ /D DEBUG=1 /D __WXDEBUG__ /D __WIN95__ /D __WIN32__ /D WINVER=0x0400 /D STRICT /D wxUSE_UNICODE=1 /D _UNICODE /D UNICODE /FAcs /FR /FD /c # SUBTRACT BASE CPP /YX /Yc /Yu -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I c:/wxWidgets/include /I c:/wxWidgets/contrib/include /I c:/postgresql/include /I include/ /I agent/include /D WIN32 /D _DEBUG /D _WINDOWS /D __WINDOWS__ /D __WXMSW__ /D DEBUG=1 /D __WXDEBUG__ /D __WIN95__ /D __WIN32__ /D WINVER=0x0400 /D STRICT /D wxUSE_UNICODE=1 /D _UNICODE /D UNICODE /D SSL /FAcs /FR /Yupgadmin3.h /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I c:/wxWidgets/include /I c:/wxWidgets/contrib/include /I c:/postgresql/include /I include/ /I agent/include /D WIN32 /D _DEBUG /D _WINDOWS /D __WINDOWS__ /D __WXMSW__ /D DEBUG=1 /D __WXDEBUG__ /D __WIN95__ /D __WIN32__ /D WINVER=0x0400 /D STRICT /D wxUSE_UNICODE=1 /D _UNICODE /D UNICODE /D SSL /FAcs /Yupgadmin3.h /FD /c +# SUBTRACT CPP /Fr # ADD BASE MTL /nologo /D _DEBUG /mktyplib203 /o NUL /win32 # ADD MTL /nologo /D _DEBUG /mktyplib203 /o NUL /win32 # ADD BASE RSC /l 0x809 /i c:/wxWindows_2.5/include /i c:/wxWindows_2.5/contrib/include /d _DEBUG Index: dlgDatabase.cpp === RCS file: /projects/pgadmin3/src/ui/dlgDatabase.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -Lsrc/ui/dlgDatabase.cpp -Lsrc/ui/dlgDatabase.cpp -u -w -r1.31 -r1.32 --- src/ui/dlgDatabase.cpp +++ src/ui/dlgDatabase.cpp @@ -43,8 +43,8 @@ EVT_TEXT(XRCID(cbTablespace), dlgProperty::OnChange) EVT_TEXT(XRCID(cbEncoding), dlgProperty::OnChange) EVT_LIST_ITEM_SELECTED(XRCID(lstVariables), dlgDatabase::OnVarSelChange) -EVT_BUTTON(XRCID(wxID_ADD), dlgDatabase::OnVarAdd) -EVT_BUTTON(XRCID(wxID_REMOVE),dlgDatabase::OnVarRemove) +EVT_BUTTON(wxID_ADD,dlgDatabase::OnVarAdd) +EVT_BUTTON(wxID_REMOVE, dlgDatabase::OnVarRemove) EVT_TEXT(XRCID(cbVarname),dlgDatabase::OnVarnameSelChange) END_EVENT_TABLE(); Index: dlgClasses.cpp === RCS file: /projects/pgadmin3/src/ui/dlgClasses.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -Lsrc/ui/dlgClasses.cpp -Lsrc/ui/dlgClasses.cpp -u -w -r1.10 -r1.11 --- src/ui/dlgClasses.cpp +++ src/ui/dlgClasses.cpp @@ -25,7 +25,7 @@ BEGIN_EVENT_TABLE(pgDialog, wxDialog) -EVT_BUTTON (XRCID(wxID_CANCEL), pgDialog::OnCancel) +EVT_BUTTON (wxID_CANCEL,pgDialog::OnCancel) EVT_CLOSE( pgDialog::OnClose) END_EVENT_TABLE() @@ -110,7 +110,7 @@ BEGIN_EVENT_TABLE(DialogWithHelp, pgDialog) EVT_MENU(MNU_HELP,
[pgadmin-hackers] CVS Commit by andreas: wxID_xxx IDs to enable GTK wxStockButtons fix
Log Message:
---
wxID_xxx IDs to enable GTK wxStockButtons fix
Modified Files:
--
pgadmin3/src:
pgAdmin3.cpp (r1.102 - r1.103)
pgadmin3/src/ui:
frmStatus.cpp (r1.42 - r1.43)
pgadmin3/src/ui/common:
frmAddTableView.xrc (r1.4 - r1.5)
frmStatus.xrc (r1.14 - r1.15)
Index: pgAdmin3.cpp
===
RCS file: /projects/pgadmin3/src/pgAdmin3.cpp,v
retrieving revision 1.102
retrieving revision 1.103
diff -Lsrc/pgAdmin3.cpp -Lsrc/pgAdmin3.cpp -u -w -r1.102 -r1.103
--- src/pgAdmin3.cpp
+++ src/pgAdmin3.cpp
@@ -348,7 +348,10 @@
chkXRC(wxID_HELP)
chkXRC(wxID_APPLY)
chkXRC(wxID_ADD)
-chkXRC(wxID_REMOVE), wxT(XRC ID not correctly assigned.));
+chkXRC(wxID_REMOVE)
+chkXRC(wxID_REFRESH)
+chkXRC(wxID_CLOSE),
+wxT(XRC ID not correctly assigned.));
// if this assert fires, some event table uses XRCID(...) instead of wxID_...
directly
Index: frmStatus.cpp
===
RCS file: /projects/pgadmin3/src/ui/frmStatus.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -Lsrc/ui/frmStatus.cpp -Lsrc/ui/frmStatus.cpp -u -w -r1.42 -r1.43
--- src/ui/frmStatus.cpp
+++ src/ui/frmStatus.cpp
@@ -26,8 +26,8 @@
#define TIMER_ID 333
BEGIN_EVENT_TABLE(frmStatus, pgDialog)
-EVT_BUTTON(XRCID(btnRefresh),
frmStatus::OnRefresh)
-EVT_BUTTON(XRCID(btnClose),
frmStatus::OnCloseBtn)
+EVT_BUTTON(wxID_REFRESH, frmStatus::OnRefresh)
+EVT_BUTTON(wxID_CLOSE,
frmStatus::OnCloseBtn)
EVT_BUTTON(XRCID(btnCancelSt), frmStatus::OnCancelBtn)
EVT_BUTTON(XRCID(btnTerminateSt),
frmStatus::OnTerminateBtn)
EVT_BUTTON(XRCID(btnCancelLk), frmStatus::OnCancelBtn)
@@ -192,7 +192,7 @@
void frmStatus::OnNotebookPageChanged(wxNotebookEvent event)
{
if (!loaded) return;
- wxCommandEvent buttonEvent(wxEVT_COMMAND_BUTTON_CLICKED, XRCID(btnRefresh));
+ wxCommandEvent buttonEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_REFRESH);
AddPendingEvent(buttonEvent);
// Disable the buttons. They'll get re-enabled if a suitable item is selected.
Index: frmStatus.xrc
===
RCS file: /projects/pgadmin3/src/ui/common/frmStatus.xrc,v
retrieving revision 1.14
retrieving revision 1.15
diff -Lsrc/ui/common/frmStatus.xrc -Lsrc/ui/common/frmStatus.xrc -u -w -r1.14 -r1.15
--- src/ui/common/frmStatus.xrc
+++ src/ui/common/frmStatus.xrc
@@ -163,7 +163,7 @@
flagwxEXPAND|wxGROW|wxALIGN_CENTRE/flag
/object
object class=sizeritem
-object class=wxButton name=btnRefresh
+object class=wxButton name=wxID_REFRESH
labelRefresh/label
default1/default
pos283,4d/pos
@@ -173,7 +173,7 @@
border5/border
/object
object class=sizeritem
-object class=wxButton name=btnClose
+object class=wxButton name=wxID_CLOSE
labelClose/label
pos342,4d/pos
size53,-1d/size
Index: frmAddTableView.xrc
===
RCS file: /projects/pgadmin3/src/ui/common/frmAddTableView.xrc,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lsrc/ui/common/frmAddTableView.xrc -Lsrc/ui/common/frmAddTableView.xrc -u -w
-r1.4 -r1.5
--- src/ui/common/frmAddTableView.xrc
+++ src/ui/common/frmAddTableView.xrc
@@ -10,7 +10,7 @@
pos10,10/pos
size280,240/size
/object
-object class=wxButton name=btnClose
+object class=wxButton name=wxID_CLOSE
labelamp;Close/label
pos214,265/pos
size75,25/size
---(end of broadcast)---
TIP 9: the planner will ignore your desire to choose an index scan if your
joining column's datatypes do not match
[pgadmin-hackers] CVS Commit by andreas: wxID_xxx IDs to enable GTK wxStockButtons fix
Log Message:
---
wxID_xxx IDs to enable GTK wxStockButtons fix
Modified Files:
--
pgadmin3/src:
pgAdmin3.cpp (r1.103 - r1.104)
pgadmin3/src/include:
frmStatus.h (r1.16 - r1.17)
pgadmin3/src/ui:
frmStatus.cpp (r1.43 - r1.44)
Index: pgAdmin3.cpp
===
RCS file: /projects/pgadmin3/src/pgAdmin3.cpp,v
retrieving revision 1.103
retrieving revision 1.104
diff -Lsrc/pgAdmin3.cpp -Lsrc/pgAdmin3.cpp -u -w -r1.103 -r1.104
--- src/pgAdmin3.cpp
+++ src/pgAdmin3.cpp
@@ -348,6 +348,7 @@
chkXRC(wxID_HELP)
chkXRC(wxID_APPLY)
chkXRC(wxID_ADD)
+chkXRC(wxID_STOP)
chkXRC(wxID_REMOVE)
chkXRC(wxID_REFRESH)
chkXRC(wxID_CLOSE),
Index: frmStatus.h
===
RCS file: /projects/pgadmin3/src/include/frmStatus.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -Lsrc/include/frmStatus.h -Lsrc/include/frmStatus.h -u -w -r1.16 -r1.17
--- src/include/frmStatus.h
+++ src/include/frmStatus.h
@@ -60,6 +60,8 @@
frmMain *mainForm;
wxStatusBar *statusBar;
+wxButton *btnCancelSt, *btnTerminateSt,*btnCancelLk, *btnTerminateLk;
+
wxString logFormat;
bool logHasTimestamp, logFormatKnown;
int logFmtPos;
Index: frmStatus.cpp
===
RCS file: /projects/pgadmin3/src/ui/frmStatus.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -Lsrc/ui/frmStatus.cpp -Lsrc/ui/frmStatus.cpp -u -w -r1.43 -r1.44
--- src/ui/frmStatus.cpp
+++ src/ui/frmStatus.cpp
@@ -28,10 +28,8 @@
BEGIN_EVENT_TABLE(frmStatus, pgDialog)
EVT_BUTTON(wxID_REFRESH, frmStatus::OnRefresh)
EVT_BUTTON(wxID_CLOSE,
frmStatus::OnCloseBtn)
-EVT_BUTTON(XRCID(btnCancelSt), frmStatus::OnCancelBtn)
-EVT_BUTTON(XRCID(btnTerminateSt),
frmStatus::OnTerminateBtn)
-EVT_BUTTON(XRCID(btnCancelLk), frmStatus::OnCancelBtn)
-EVT_BUTTON(XRCID(btnTerminateLk),
frmStatus::OnTerminateBtn)
+EVT_BUTTON(wxID_CANCEL,frmStatus::OnCancelBtn)
+EVT_BUTTON(wxID_STOP,
frmStatus::OnTerminateBtn)
EVT_CLOSE(
frmStatus::OnClose)
EVT_SPINCTRL(XRCID(spnRefreshRate),
frmStatus::OnRateChangeSpin)
EVT_TEXT(XRCID(spnRefreshRate),
frmStatus::OnRateChange)
@@ -51,10 +49,6 @@
#define logList CTRL_LISTVIEW(lstLog)
#define spnRefreshRate CTRL_SPIN(spnRefreshRate)
#define nbStatus CTRL_NOTEBOOK(nbStatus)
-#define btnCancelStCTRL_BUTTON(btnCancelSt)
-#define btnTerminateSt CTRL_BUTTON(btnTerminateSt)
-#define btnCancelLkCTRL_BUTTON(btnCancelLk)
-#define btnTerminateLk CTRL_BUTTON(btnTerminateLk)
#define cbLogfiles CTRL_COMBOBOX(cbLogfiles)
#define btnRotateLogCTRL_BUTTON(btnRotateLog)
@@ -69,6 +63,14 @@
Destroy();
}
+
+void ChangeButtonId(wxButton *btn, int id, const wxChar *txt)
+{
+btn-SetId(id);
+btn-SetLabel(txt);
+}
+
+
frmStatus::frmStatus(frmMain *form, const wxString _title, pgConn *conn)
{
wxLogInfo(wxT(Creating server status box));
@@ -89,6 +91,14 @@
connection=conn;
logHasTimestamp = false;
logFormatKnown = false;
+btnCancelSt = CTRL_BUTTON(btnCancelSt);
+btnCancelLk = CTRL_BUTTON(btnCancelLk);
+btnTerminateSt = CTRL_BUTTON(btnTerminateSt);
+btnTerminateLk = CTRL_BUTTON(btnTerminateLk);
+ChangeButtonId(btnCancelSt, wxID_CANCEL, _(Cancel));
+ChangeButtonId(btnCancelLk, wxID_CANCEL, _(Cancel));
+ChangeButtonId(btnTerminateSt, wxID_STOP, _(Terminate));
+ChangeButtonId(btnTerminateLk, wxID_STOP, _(Terminate));
logfileLength = 0;
backend_pid=conn-GetBackendPID();
---(end of broadcast)---
TIP 8: explain analyze is your friend
[pgadmin-hackers] english typo
While translating pgA3 to french, I think I found a typo: Query inserted one rows with OID %d.\n shouldn't it be Query inserted one row with OID %d.\n ? Shall I modify the original string in poedit (I bet I shouldn't but would like to be sure...) ? Cheers, Raphaël ---(end of broadcast)--- TIP 2: you can get off all lists at once with the unregister command (send unregister YourEmailAddressHere to [EMAIL PROTECTED])
[pgadmin-hackers] translation question volume 2 ;)
Dear all and in particular translators, Just trying to help with the french translation as Jean-Michel is not available. I've seen some strings with ampersand behind a particular caracter. I bet it has something to do with keyboard shortcut... If yes, shall I respect the shortcut or is it dynamically calculated at run time because of the ampersand behind the caracter ? Example: Tip becomes Astuce in french. Shall I declare Astuce or must I declare Astuce ? Regards, Raphaël ---(end of broadcast)--- TIP 1: subscribe and unsubscribe commands go to [EMAIL PROTECTED]
