Thread: SVN Commit by andreas: r4597 - in trunk/pgadmin3/src: dlg slony slony/include

SVN Commit by andreas: r4597 - in trunk/pgadmin3/src: dlg slony slony/include

From
svn@pgadmin.org
Date:
Author: andreas
Date: 2005-10-23 16:48:48 +0100 (Sun, 23 Oct 2005)
New Revision: 4597

Modified:
   trunk/pgadmin3/src/dlg/dlgProperty.cpp
   trunk/pgadmin3/src/slony/dlgRepCluster.cpp
   trunk/pgadmin3/src/slony/include/dlgRepCluster.h
   trunk/pgadmin3/src/slony/include/dlgRepListen.h
   trunk/pgadmin3/src/slony/include/dlgRepNode.h
   trunk/pgadmin3/src/slony/include/dlgRepPath.h
   trunk/pgadmin3/src/slony/include/dlgRepSequence.h
   trunk/pgadmin3/src/slony/include/dlgRepSet.h
   trunk/pgadmin3/src/slony/include/dlgRepSubscription.h
   trunk/pgadmin3/src/slony/include/dlgRepTable.h
Log:
adding adding hooks


Modified: trunk/pgadmin3/src/dlg/dlgProperty.cpp
===================================================================
--- trunk/pgadmin3/src/dlg/dlgProperty.cpp    2005-10-23 15:48:06 UTC (rev 4596)
+++ trunk/pgadmin3/src/dlg/dlgProperty.cpp    2005-10-23 15:48:48 UTC (rev 4597)
@@ -138,7 +138,7 @@
 {
     wxString page;

-    pgObject *obj=0; //GetObject();
+    pgObject *obj=((dlgProperty*)this)->GetObject();
     if (obj)
         page=obj->GetHelpPage(false);
     else

Modified: trunk/pgadmin3/src/slony/dlgRepCluster.cpp
===================================================================
--- trunk/pgadmin3/src/slony/dlgRepCluster.cpp    2005-10-23 15:48:06 UTC (rev 4596)
+++ trunk/pgadmin3/src/slony/dlgRepCluster.cpp    2005-10-23 15:48:48 UTC (rev 4597)
@@ -226,6 +226,16 @@



+wxString dlgRepCluster::GetHelpPage() const
+{
+    wxString page=wxT("slony-install");
+    if (chkJoinCluster->GetValue())
+        page += wxT("#join");
+
+    return page;
+}
+
+
 int dlgRepCluster::Go(bool modal)
 {
     chkJoinCluster->SetValue(false);

Modified: trunk/pgadmin3/src/slony/include/dlgRepCluster.h
===================================================================
--- trunk/pgadmin3/src/slony/include/dlgRepCluster.h    2005-10-23 15:48:06 UTC (rev 4596)
+++ trunk/pgadmin3/src/slony/include/dlgRepCluster.h    2005-10-23 15:48:48 UTC (rev 4597)
@@ -52,6 +52,7 @@
 public:
     dlgRepCluster(pgaFactory *factory, frmMain *frame, slCluster *cl, pgDatabase *obj);
     int Go(bool modal);
+    wxString GetHelpPage() const;

     void CheckChange();
     wxString GetSql();
@@ -80,7 +81,9 @@
 public:
     dlgRepClusterUpgrade(pgaFactory *factory, frmMain *frame, slCluster *cl);
     int Go(bool modal);
+    wxString GetHelpPage() const { return wxT("slony-install#upgrade"); }

+
     void CheckChange();
     wxString GetSql();
     pgObject *CreateObject(pgCollection *collection);

Modified: trunk/pgadmin3/src/slony/include/dlgRepListen.h
===================================================================
--- trunk/pgadmin3/src/slony/include/dlgRepListen.h    2005-10-23 15:48:06 UTC (rev 4596)
+++ trunk/pgadmin3/src/slony/include/dlgRepListen.h    2005-10-23 15:48:48 UTC (rev 4597)
@@ -23,6 +23,7 @@
 public:
     dlgRepListen(pgaFactory *factory, frmMain *frame, slListen *l, slNode *n);
     int Go(bool modal);
+    wxString GetHelpPage() const { return wxT("slony-path#listen"); }

     void CheckChange();
     wxString GetSql();

Modified: trunk/pgadmin3/src/slony/include/dlgRepNode.h
===================================================================
--- trunk/pgadmin3/src/slony/include/dlgRepNode.h    2005-10-23 15:48:06 UTC (rev 4596)
+++ trunk/pgadmin3/src/slony/include/dlgRepNode.h    2005-10-23 15:48:48 UTC (rev 4597)
@@ -24,6 +24,7 @@
 public:
     dlgRepNode(pgaFactory *factory, frmMain *frame, slNode *node, slCluster *c);
     int Go(bool modal);
+    wxString GetHelpPage() const { return wxT("slony-install#node"); }

     void CheckChange();
     wxString GetSql();

Modified: trunk/pgadmin3/src/slony/include/dlgRepPath.h
===================================================================
--- trunk/pgadmin3/src/slony/include/dlgRepPath.h    2005-10-23 15:48:06 UTC (rev 4596)
+++ trunk/pgadmin3/src/slony/include/dlgRepPath.h    2005-10-23 15:48:48 UTC (rev 4597)
@@ -23,6 +23,7 @@
 public:
     dlgRepPath(pgaFactory *factory, frmMain *frame, slPath *p, slNode *n);
     int Go(bool modal);
+    wxString GetHelpPage() const { return wxT("slony-path"); }

     void CheckChange();
     wxString GetSql();

Modified: trunk/pgadmin3/src/slony/include/dlgRepSequence.h
===================================================================
--- trunk/pgadmin3/src/slony/include/dlgRepSequence.h    2005-10-23 15:48:06 UTC (rev 4596)
+++ trunk/pgadmin3/src/slony/include/dlgRepSequence.h    2005-10-23 15:48:48 UTC (rev 4597)
@@ -23,6 +23,7 @@
 public:
     dlgRepSequence(pgaFactory *factory, frmMain *frame, slSequence *tab, slSet *s);
     int Go(bool modal);
+    wxString GetHelpPage() const { return wxT("slony-set#sequence"); }

     void CheckChange();
     wxString GetSql();

Modified: trunk/pgadmin3/src/slony/include/dlgRepSet.h
===================================================================
--- trunk/pgadmin3/src/slony/include/dlgRepSet.h    2005-10-23 15:48:06 UTC (rev 4596)
+++ trunk/pgadmin3/src/slony/include/dlgRepSet.h    2005-10-23 15:48:48 UTC (rev 4597)
@@ -23,6 +23,7 @@
 public:
     dlgRepSet(pgaFactory *factory, frmMain *frame, slSet *set, slCluster *c);
     int Go(bool modal);
+    wxString GetHelpPage() const { return wxT("slony-set"); }

     void CheckChange();
     wxString GetSql();
@@ -41,6 +42,7 @@
 public:
     dlgRepSetMerge(pgaFactory *factory, frmMain *frame, slSet *set);
     int Go(bool modal);
+    wxString GetHelpPage() const { return wxT("slony-functions"); }

     void CheckChange();
     wxString GetSql();
@@ -58,6 +60,7 @@
 public:
     dlgRepSetMove(pgaFactory *f, frmMain *frame, slSet *set);
     int Go(bool modal);
+    wxString GetHelpPage() const { return wxT("slony-functions"); }

     void CheckChange();
     wxString GetSql();

Modified: trunk/pgadmin3/src/slony/include/dlgRepSubscription.h
===================================================================
--- trunk/pgadmin3/src/slony/include/dlgRepSubscription.h    2005-10-23 15:48:06 UTC (rev 4596)
+++ trunk/pgadmin3/src/slony/include/dlgRepSubscription.h    2005-10-23 15:48:48 UTC (rev 4597)
@@ -23,6 +23,7 @@
 public:
     dlgRepSubscription(pgaFactory *factory, frmMain *frame, slSubscription *sub, slSet *s);
     int Go(bool modal);
+    wxString GetHelpPage() const { return wxT("slony-set#subscription"); }

     void CheckChange();
     wxString GetSql();

Modified: trunk/pgadmin3/src/slony/include/dlgRepTable.h
===================================================================
--- trunk/pgadmin3/src/slony/include/dlgRepTable.h    2005-10-23 15:48:06 UTC (rev 4596)
+++ trunk/pgadmin3/src/slony/include/dlgRepTable.h    2005-10-23 15:48:48 UTC (rev 4597)
@@ -23,6 +23,7 @@
 public:
     dlgRepTable(pgaFactory *factory, frmMain *frame, slTable *tab, slSet *s);
     int Go(bool modal);
+    wxString GetHelpPage() const { return wxT("slony-set#table"); }

     void CheckChange();
     wxString GetSql();