[pgadmin-hackers] CVS Commit by andreas: fix dlgServer help

[cvs]

Log Message:
-----------
fix dlgServer help

Modified Files:
--------------
    pgadmin3/src/include:
        dlgServer.h (r1.2 -> r1.3)
    pgadmin3/src/ui:
        dlgServer.cpp (r1.5 -> r1.6)
    pgadmin3/src/utils:
        misc.cpp (r1.55 -> r1.56)


Index: dlgServer.h
===================================================================
RCS file: /projects/pgadmin3/src/include/dlgServer.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lsrc/include/dlgServer.h -Lsrc/include/dlgServer.h -u -w -r1.2 -r1.3
--- src/include/dlgServer.h
+++ src/include/dlgServer.h
@@ -21,6 +21,7 @@
 {
 public:
     dlgServer(frmMain *frame, pgServer *s);
+    ~dlgServer();
     int Go(bool modal);
     int GoNew();
 
Index: dlgServer.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgServer.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -Lsrc/ui/dlgServer.cpp -Lsrc/ui/dlgServer.cpp -u -w -r1.5 -r1.6
--- src/ui/dlgServer.cpp
+++ src/ui/dlgServer.cpp
@@ -121,7 +121,7 @@
 
 wxString dlgServer::GetHelpPage() const
 {
-    return wxT("server-connect");
+    return wxT("pgadmin/connect");
 }
 
 
Index: misc.cpp
===================================================================
RCS file: /projects/pgadmin3/src/utils/misc.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -Lsrc/utils/misc.cpp -Lsrc/utils/misc.cpp -u -w -r1.55 -r1.56
--- src/utils/misc.cpp
+++ src/utils/misc.cpp
@@ -523,7 +523,9 @@
 
 void DisplaySqlHelp(wxWindow *wnd, const wxString &helpTopic, char **icon)
 {
-    if (settings->GetSqlHelpSite().length() != 0) 
+    if (helpTopic.Left(8) == wxT("pgadmin/"))
+        DisplayHelp(wnd, helpTopic.Mid(8), icon);
+    else if (settings->GetSqlHelpSite().length() != 0) 
         frmHelp::LoadSqlDoc(wnd, helpTopic  + wxT(".html"));
     else
         DisplayHelp(wnd, wxT("pg/") + helpTopic, icon);
---------------------------(end of broadcast)---------------------------
TIP 5: Have you checked our extensive FAQ?

               http://www.postgresql.org/docs/faqs/FAQ.html