[pgadmin-hackers] CVS Commit by andreas: rewrite of properties actions

2004-09-16 Thread cvs 
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

2004-09-16 Thread cvs 
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