SVN Commit by dpage: r4250 - in trunk/pgadmin3/src: agent agent/include dlg frm include main schema utils - Mailing list pgadmin-hackers
From | svn@pgadmin.org |
---|---|
Subject | SVN Commit by dpage: r4250 - in trunk/pgadmin3/src: agent agent/include dlg frm include main schema utils |
Date | |
Msg-id | 200505251333.j4PDXW83023836@developer.pgadmin.org Whole thread Raw |
List | pgadmin-hackers |
Author: dpage Date: 2005-05-25 14:33:31 +0100 (Wed, 25 May 2005) New Revision: 4250 Modified: trunk/pgadmin3/src/agent/dlgJob.cpp trunk/pgadmin3/src/agent/dlgSchedule.cpp trunk/pgadmin3/src/agent/dlgStep.cpp trunk/pgadmin3/src/agent/include/dlgJob.h trunk/pgadmin3/src/agent/include/dlgSchedule.h trunk/pgadmin3/src/agent/include/dlgStep.h trunk/pgadmin3/src/agent/include/pgaJob.h trunk/pgadmin3/src/agent/include/pgaSchedule.h trunk/pgadmin3/src/agent/include/pgaStep.h trunk/pgadmin3/src/dlg/dlgConnect.cpp trunk/pgadmin3/src/dlg/dlgDatabase.cpp trunk/pgadmin3/src/dlg/dlgHbaConfig.cpp trunk/pgadmin3/src/dlg/dlgProperty.cpp trunk/pgadmin3/src/dlg/dlgServer.cpp trunk/pgadmin3/src/dlg/dlgUser.cpp trunk/pgadmin3/src/frm/frmBackup.cpp trunk/pgadmin3/src/frm/frmGrantWizard.cpp trunk/pgadmin3/src/frm/frmMaintenance.cpp trunk/pgadmin3/src/frm/frmRestore.cpp trunk/pgadmin3/src/include/dlgCheck.h trunk/pgadmin3/src/include/dlgForeignKey.h trunk/pgadmin3/src/include/dlgIndexConstraint.h trunk/pgadmin3/src/include/pgCheck.h trunk/pgadmin3/src/include/pgColumn.h trunk/pgadmin3/src/include/pgConstraints.h trunk/pgadmin3/src/include/pgForeignKey.h trunk/pgadmin3/src/include/pgFunction.h trunk/pgadmin3/src/include/pgIndexConstraint.h trunk/pgadmin3/src/include/pgOperatorClass.h trunk/pgadmin3/src/include/pgServer.h trunk/pgadmin3/src/main/events.cpp trunk/pgadmin3/src/schema/pgObject.cpp trunk/pgadmin3/src/schema/pgTable.cpp trunk/pgadmin3/src/utils/misc.cpp Log: Fixup docs so they work consistently using the paths in the chm file rather than a random mix of pg/, pgadmin/ and /. Modified: trunk/pgadmin3/src/agent/dlgJob.cpp =================================================================== --- trunk/pgadmin3/src/agent/dlgJob.cpp 2005-05-25 12:41:48 UTC (rev 4249) +++ trunk/pgadmin3/src/agent/dlgJob.cpp 2005-05-25 13:33:31 UTC (rev 4250) @@ -485,8 +485,3 @@ return sql; } - -wxString dlgJob::GetHelpPage() const -{ - return wxT("../pgagent-jobs"); -} \ No newline at end of file Modified: trunk/pgadmin3/src/agent/dlgSchedule.cpp =================================================================== --- trunk/pgadmin3/src/agent/dlgSchedule.cpp 2005-05-25 12:41:48 UTC (rev 4249) +++ trunk/pgadmin3/src/agent/dlgSchedule.cpp 2005-05-25 13:33:31 UTC (rev 4250) @@ -603,8 +603,3 @@ return res; } - -wxString dlgSchedule::GetHelpPage() const -{ - return wxT("../pgagent-schedules"); -} \ No newline at end of file Modified: trunk/pgadmin3/src/agent/dlgStep.cpp =================================================================== --- trunk/pgadmin3/src/agent/dlgStep.cpp 2005-05-25 12:41:48 UTC (rev 4249) +++ trunk/pgadmin3/src/agent/dlgStep.cpp 2005-05-25 13:33:31 UTC (rev 4250) @@ -262,8 +262,3 @@ } return sql; } - -wxString dlgStep::GetHelpPage() const -{ - return wxT("../pgagent-steps"); -} \ No newline at end of file Modified: trunk/pgadmin3/src/agent/include/dlgJob.h =================================================================== --- trunk/pgadmin3/src/agent/include/dlgJob.h 2005-05-25 12:41:48 UTC (rev 4249) +++ trunk/pgadmin3/src/agent/include/dlgJob.h 2005-05-25 13:33:31 UTC (rev 4250) @@ -29,7 +29,8 @@ wxString GetInsertSql(); pgObject *CreateObject(pgCollection *collection); pgObject *GetObject(); - wxString GetHelpPage() const; + + wxString GetHelpPage(bool forCreate) const { return wxT("pgagent-jobs"); } private: pgaJob *job; Modified: trunk/pgadmin3/src/agent/include/dlgSchedule.h =================================================================== --- trunk/pgadmin3/src/agent/include/dlgSchedule.h 2005-05-25 12:41:48 UTC (rev 4249) +++ trunk/pgadmin3/src/agent/include/dlgSchedule.h 2005-05-25 13:33:31 UTC (rev 4250) @@ -34,8 +34,9 @@ pgObject *CreateObject(pgCollection *collection); pgObject *GetObject(); void SetJobId(long id) { jobId = id; } - wxString GetHelpPage() const; + wxString GetHelpPage(bool forCreate) const { return wxT("pgagent-schedules"); } + private: long jobId; pgaSchedule *schedule; Modified: trunk/pgadmin3/src/agent/include/dlgStep.h =================================================================== --- trunk/pgadmin3/src/agent/include/dlgStep.h 2005-05-25 12:41:48 UTC (rev 4249) +++ trunk/pgadmin3/src/agent/include/dlgStep.h 2005-05-25 13:33:31 UTC (rev 4250) @@ -32,8 +32,9 @@ pgObject *CreateObject(pgCollection *collection); pgObject *GetObject(); void SetJobId(long id) { jobId = id; } - wxString GetHelpPage() const; + wxString GetHelpPage(bool forCreate) const { return wxT("pgagent-steps"); } + private: long jobId; ctlSQLBox *sqlBox; Modified: trunk/pgadmin3/src/agent/include/pgaJob.h =================================================================== --- trunk/pgadmin3/src/agent/include/pgaJob.h 2005-05-25 12:41:48 UTC (rev 4249) +++ trunk/pgadmin3/src/agent/include/pgaJob.h 2005-05-25 13:33:31 UTC (rev 4250) @@ -63,6 +63,8 @@ bool CanDrop() { return true; } bool WantDummyChild() { return true; } + wxString GetHelpPage(bool forCreate) const { return wxT("pgagent-jobs"); } + private: bool enabled; wxDateTime created, changed, nextrun, lastrun; Modified: trunk/pgadmin3/src/agent/include/pgaSchedule.h =================================================================== --- trunk/pgadmin3/src/agent/include/pgaSchedule.h 2005-05-25 12:41:48 UTC (rev 4249) +++ trunk/pgadmin3/src/agent/include/pgaSchedule.h 2005-05-25 13:33:31 UTC (rev 4250) @@ -69,6 +69,8 @@ wxString GetExceptionsString(); void iSetExceptions(const wxString &s) { exceptions = s; } + wxString GetHelpPage(bool forCreate) const { return wxT("pgagent-schedules"); } + private: bool enabled; wxDateTime start, end; Modified: trunk/pgadmin3/src/agent/include/pgaStep.h =================================================================== --- trunk/pgadmin3/src/agent/include/pgaStep.h 2005-05-25 12:41:48 UTC (rev 4249) +++ trunk/pgadmin3/src/agent/include/pgaStep.h 2005-05-25 13:33:31 UTC (rev 4250) @@ -55,6 +55,8 @@ long GetRecId() const { return recId; } void iSetRecId(const long l) { recId=l; } + wxString GetHelpPage(bool forCreate) const { return wxT("pgagent-steps"); } + private: bool enabled; wxString kind, code, dbname, onError; Modified: trunk/pgadmin3/src/dlg/dlgConnect.cpp =================================================================== --- trunk/pgadmin3/src/dlg/dlgConnect.cpp 2005-05-25 12:41:48 UTC (rev 4249) +++ trunk/pgadmin3/src/dlg/dlgConnect.cpp 2005-05-25 13:33:31 UTC (rev 4250) @@ -66,7 +66,7 @@ wxString dlgConnect::GetHelpPage() const { - return wxT("server-connect"); + return wxT("pg/server-connect"); } Modified: trunk/pgadmin3/src/dlg/dlgDatabase.cpp =================================================================== --- trunk/pgadmin3/src/dlg/dlgDatabase.cpp 2005-05-25 12:41:48 UTC (rev 4249) +++ trunk/pgadmin3/src/dlg/dlgDatabase.cpp 2005-05-25 13:33:31 UTC (rev 4250) @@ -72,7 +72,7 @@ wxString dlgDatabase::GetHelpPage() const { if (nbNotebook->GetSelection() == 1) - return wxT("runtime-config"); + return wxT("pg/runtime-config"); return dlgSecurityProperty::GetHelpPage(); } Modified: trunk/pgadmin3/src/dlg/dlgHbaConfig.cpp =================================================================== --- trunk/pgadmin3/src/dlg/dlgHbaConfig.cpp 2005-05-25 12:41:48 UTC (rev 4249) +++ trunk/pgadmin3/src/dlg/dlgHbaConfig.cpp 2005-05-25 13:33:31 UTC (rev 4250) @@ -149,7 +149,7 @@ wxString dlgHbaConfig::GetHelpPage() const { - return wxT("client-authentication"); + return wxT("pg/client-authentication"); // auth-methods#auth-trust #auth-password #kerberos-auth #auth-ident #auth-pam } Modified: trunk/pgadmin3/src/dlg/dlgProperty.cpp =================================================================== --- trunk/pgadmin3/src/dlg/dlgProperty.cpp 2005-05-25 12:41:48 UTC (rev 4249) +++ trunk/pgadmin3/src/dlg/dlgProperty.cpp 2005-05-25 13:33:31 UTC (rev 4250) @@ -146,7 +146,7 @@ page=obj->GetHelpPage(false); else { - page=wxT("sql-create") + wxString(typesList[objectType].typName).Lower(); + page=wxT("pg/sql-create") + wxString(typesList[objectType].typName).Lower(); } return page; } @@ -1244,7 +1244,7 @@ wxString dlgSecurityProperty::GetHelpPage() const { if (nbNotebook->GetSelection() == (int)nbNotebook->GetPageCount()-2) - return wxT("sql-grant"); + return wxT("pg/sql-grant"); else return dlgProperty::GetHelpPage(); } Modified: trunk/pgadmin3/src/dlg/dlgServer.cpp =================================================================== --- trunk/pgadmin3/src/dlg/dlgServer.cpp 2005-05-25 12:41:48 UTC (rev 4249) +++ trunk/pgadmin3/src/dlg/dlgServer.cpp 2005-05-25 13:33:31 UTC (rev 4250) @@ -128,7 +128,7 @@ wxString dlgServer::GetHelpPage() const { - return wxT("pgadmin/connect"); + return wxT("connect"); } Modified: trunk/pgadmin3/src/dlg/dlgUser.cpp =================================================================== --- trunk/pgadmin3/src/dlg/dlgUser.cpp 2005-05-25 12:41:48 UTC (rev 4249) +++ trunk/pgadmin3/src/dlg/dlgUser.cpp 2005-05-25 13:33:31 UTC (rev 4250) @@ -179,7 +179,7 @@ wxString dlgUser::GetHelpPage() const { if (nbNotebook->GetSelection() == 2) - return wxT("runtime-config"); + return wxT("pg/runtime-config"); return dlgProperty::GetHelpPage(); } Modified: trunk/pgadmin3/src/frm/frmBackup.cpp =================================================================== --- trunk/pgadmin3/src/frm/frmBackup.cpp 2005-05-25 12:41:48 UTC (rev 4249) +++ trunk/pgadmin3/src/frm/frmBackup.cpp 2005-05-25 13:33:31 UTC (rev 4250) @@ -101,7 +101,7 @@ wxString frmBackup::GetHelpPage() const { wxString page; - page = wxT("app-pgdump"); + page = wxT("pg/app-pgdump"); return page; } Modified: trunk/pgadmin3/src/frm/frmGrantWizard.cpp =================================================================== --- trunk/pgadmin3/src/frm/frmGrantWizard.cpp 2005-05-25 12:41:48 UTC (rev 4249) +++ trunk/pgadmin3/src/frm/frmGrantWizard.cpp 2005-05-25 13:33:31 UTC (rev 4250) @@ -71,7 +71,7 @@ wxString frmGrantWizard::GetHelpPage() const { - wxString page=wxT("sql-grant"); + wxString page=wxT("pg/sql-grant"); return page; } Modified: trunk/pgadmin3/src/frm/frmMaintenance.cpp =================================================================== --- trunk/pgadmin3/src/frm/frmMaintenance.cpp 2005-05-25 12:41:48 UTC (rev 4249) +++ trunk/pgadmin3/src/frm/frmMaintenance.cpp 2005-05-25 13:33:31 UTC (rev 4250) @@ -89,9 +89,9 @@ wxString page; switch ((XRCCTRL(*(frmMaintenance*)this, "rbxAction", wxRadioBox))->GetSelection()) { - case 0: page = wxT("sql-vacuum"); break; - case 1: page = wxT("sql-analyze"); break; - case 2: page = wxT("sql-reindex"); break; + case 0: page = wxT("pg/sql-vacuum"); break; + case 1: page = wxT("pg/sql-analyze"); break; + case 2: page = wxT("pg/sql-reindex"); break; } return page; } Modified: trunk/pgadmin3/src/frm/frmRestore.cpp =================================================================== --- trunk/pgadmin3/src/frm/frmRestore.cpp 2005-05-25 12:41:48 UTC (rev 4249) +++ trunk/pgadmin3/src/frm/frmRestore.cpp 2005-05-25 13:33:31 UTC (rev 4250) @@ -120,7 +120,7 @@ wxString frmRestore::GetHelpPage() const { wxString page; - page = wxT("app-pgrestore"); + page = wxT("pg/app-pgrestore"); return page; } Modified: trunk/pgadmin3/src/include/dlgCheck.h =================================================================== --- trunk/pgadmin3/src/include/dlgCheck.h 2005-05-25 12:41:48 UTC (rev 4249) +++ trunk/pgadmin3/src/include/dlgCheck.h 2005-05-25 13:33:31 UTC (rev 4250) @@ -28,7 +28,7 @@ wxString GetDefinition(); pgObject *CreateObject(pgCollection *collection); pgObject *GetObject(); - wxString GetHelpPage() const { return wxT("sql-altertable"); } + wxString GetHelpPage() const { return wxT("pg/sql-altertable"); } int Go(bool modal); Modified: trunk/pgadmin3/src/include/dlgForeignKey.h =================================================================== --- trunk/pgadmin3/src/include/dlgForeignKey.h 2005-05-25 12:41:48 UTC (rev 4249) +++ trunk/pgadmin3/src/include/dlgForeignKey.h 2005-05-25 13:33:31 UTC (rev 4250) @@ -30,7 +30,7 @@ wxString GetDefinition(); pgObject *CreateObject(pgCollection *collection); pgObject *GetObject(); - wxString GetHelpPage() const { return wxT("sql-altertable"); } + wxString GetHelpPage() const { return wxT("pg/sql-altertable"); } int Go(bool modal); Modified: trunk/pgadmin3/src/include/dlgIndexConstraint.h =================================================================== --- trunk/pgadmin3/src/include/dlgIndexConstraint.h 2005-05-25 12:41:48 UTC (rev 4249) +++ trunk/pgadmin3/src/include/dlgIndexConstraint.h 2005-05-25 13:33:31 UTC (rev 4250) @@ -30,7 +30,7 @@ int Go(bool modal); wxString GetDefinition(); wxString GetSql(); - wxString GetHelpPage() const { return wxT("sql-altertable"); } + wxString GetHelpPage() const { return wxT("pg/sql-altertable"); } private: void OnCheckDeferrable(wxCommandEvent &ev); Modified: trunk/pgadmin3/src/include/pgCheck.h =================================================================== --- trunk/pgadmin3/src/include/pgCheck.h 2005-05-25 12:41:48 UTC (rev 4249) +++ trunk/pgadmin3/src/include/pgCheck.h 2005-05-25 13:33:31 UTC (rev 4250) @@ -49,7 +49,7 @@ bool DropObject(wxFrame *frame, wxTreeCtrl *browser, bool cascaded); wxString GetConstraint(); wxString GetSql(wxTreeCtrl *browser); - wxString GetHelpPage(bool forCreate) const { return wxT("sql-altertable"); } + wxString GetHelpPage(bool forCreate) const { return wxT("pg/sql-altertable"); } pgObject *Refresh(wxTreeCtrl *browser, const wxTreeItemId item); private: Modified: trunk/pgadmin3/src/include/pgColumn.h =================================================================== --- trunk/pgadmin3/src/include/pgColumn.h 2005-05-25 12:41:48 UTC (rev 4249) +++ trunk/pgadmin3/src/include/pgColumn.h 2005-05-25 13:33:31 UTC (rev 4250) @@ -89,7 +89,7 @@ bool GetSystemObject() const { return colNumber < 0; } wxString GetSql(wxTreeCtrl *browser); wxString GetCommentSql(); - wxString GetHelpPage(bool forCreate) const { return wxT("sql-createtable"); } + wxString GetHelpPage(bool forCreate) const { return wxT("pg/sql-createtable"); } virtual bool CanDrop() { return inheritedCount == 0 && pgSchemaObject::CanDrop(); } pgObject *Refresh(wxTreeCtrl *browser, const wxTreeItemId item); Modified: trunk/pgadmin3/src/include/pgConstraints.h =================================================================== --- trunk/pgadmin3/src/include/pgConstraints.h 2005-05-25 12:41:48 UTC (rev 4249) +++ trunk/pgadmin3/src/include/pgConstraints.h 2005-05-25 13:33:31 UTC (rev 4250) @@ -24,7 +24,7 @@ int GetIcon() { return PGICON_CONSTRAINT; } bool IsCollectionForType(int objType); bool CanCreate() { return true; }; - wxString GetHelpPage(bool forCreate) const { return wxT("sql-altertable"); } + wxString GetHelpPage(bool forCreate) const { return wxT("pg/sql-altertable"); } wxMenu *GetNewMenu(); void ShowTreeDetail(wxTreeCtrl *browser, frmMain *form, ctlListView *properties, ctlSQLBox *sqlPane); Modified: trunk/pgadmin3/src/include/pgForeignKey.h =================================================================== --- trunk/pgadmin3/src/include/pgForeignKey.h 2005-05-25 12:41:48 UTC (rev 4249) +++ trunk/pgadmin3/src/include/pgForeignKey.h 2005-05-25 13:33:31 UTC (rev 4250) @@ -72,7 +72,7 @@ bool DropObject(wxFrame *frame, wxTreeCtrl *browser, bool cascaded); wxString GetConstraint(); wxString GetSql(wxTreeCtrl *browser); - wxString GetHelpPage(bool forCreate) const { return wxT("sql-altertable"); } + wxString GetHelpPage(bool forCreate) const { return wxT("pg/sql-altertable"); } pgObject *Refresh(wxTreeCtrl *browser, const wxTreeItemId item); private: Modified: trunk/pgadmin3/src/include/pgFunction.h =================================================================== --- trunk/pgadmin3/src/include/pgFunction.h 2005-05-25 12:41:48 UTC (rev 4249) +++ trunk/pgadmin3/src/include/pgFunction.h 2005-05-25 13:33:31 UTC (rev 4250) @@ -73,7 +73,7 @@ bool CanRestore() { return true; } bool DropObject(wxFrame *frame, wxTreeCtrl *browser, bool cascaded); wxString GetSql(wxTreeCtrl *browser); - wxString GetHelpPage(bool forCreate) const { return wxT("sql-createfunction"); } + wxString GetHelpPage(bool forCreate) const { return wxT("pg/sql-createfunction"); } pgObject *Refresh(wxTreeCtrl *browser, const wxTreeItemId item); protected: Modified: trunk/pgadmin3/src/include/pgIndexConstraint.h =================================================================== --- trunk/pgadmin3/src/include/pgIndexConstraint.h 2005-05-25 12:41:48 UTC (rev 4249) +++ trunk/pgadmin3/src/include/pgIndexConstraint.h 2005-05-25 13:33:31 UTC (rev 4250) @@ -23,7 +23,7 @@ wxString GetDefinition(); wxString GetCreate(); wxString GetSql(wxTreeCtrl *browser); - wxString GetHelpPage(bool forCreate) const { return wxT("sql-altertable"); } + wxString GetHelpPage(bool forCreate) const { return wxT("pg/sql-altertable"); } protected: pgIndexConstraint(pgSchema *newSchema, const wxString& newName, int type) Modified: trunk/pgadmin3/src/include/pgOperatorClass.h =================================================================== --- trunk/pgadmin3/src/include/pgOperatorClass.h 2005-05-25 12:41:48 UTC (rev 4249) +++ trunk/pgadmin3/src/include/pgOperatorClass.h 2005-05-25 13:33:31 UTC (rev 4250) @@ -51,7 +51,7 @@ bool CanCreate() { return false; } bool CanEdit() { return false; } bool DropObject(wxFrame *frame, wxTreeCtrl *browser, bool cascaded); - wxString GetHelpPage(bool forCreate) const { return wxT("sql-createopclass"); } + wxString GetHelpPage(bool forCreate) const { return wxT("pg/sql-createopclass"); } pgObject *Refresh(wxTreeCtrl *browser, const wxTreeItemId item); private: Modified: trunk/pgadmin3/src/include/pgServer.h =================================================================== --- trunk/pgadmin3/src/include/pgServer.h 2005-05-25 12:41:48 UTC (rev 4249) +++ trunk/pgadmin3/src/include/pgServer.h 2005-05-25 13:33:31 UTC (rev 4250) @@ -92,7 +92,7 @@ pgSet *ExecuteSet(const wxString& sql) { return conn->ExecuteSet(sql); } void ShowTreeDetail(wxTreeCtrl *browser, frmMain *form=0, ctlListView *properties=0, ctlSQLBox *sqlPane=0); void ShowStatistics(frmMain *form, ctlListView *statistics); - wxString GetHelpPage(bool forCreate) const { return wxT("managing-databases"); } + wxString GetHelpPage(bool forCreate) const { return wxT("pg/managing-databases"); } int GetIcon() { return PGICON_SERVER; } wxMenu *GetNewMenu(); Modified: trunk/pgadmin3/src/main/events.cpp =================================================================== --- trunk/pgadmin3/src/main/events.cpp 2005-05-25 12:41:48 UTC (rev 4249) +++ trunk/pgadmin3/src/main/events.cpp 2005-05-25 13:33:31 UTC (rev 4250) @@ -305,7 +305,7 @@ { frmHelp *h=new frmHelp(this); h->Show(true); - if (!h->Load(wxT("http://www.pgadmin.org/pgadmin3/faq/"))) + if (!h->Load(wxT("http://www.pgadmin.org/faq/"))) h->Destroy(); } @@ -318,7 +318,7 @@ page=currentObject->GetHelpPage(true); if (page.IsEmpty()) - page = wxT("sql-commands"); + page = wxT("pg/sql-commands"); return page; } Modified: trunk/pgadmin3/src/schema/pgObject.cpp =================================================================== --- trunk/pgadmin3/src/schema/pgObject.cpp 2005-05-25 12:41:48 UTC (rev 4249) +++ trunk/pgadmin3/src/schema/pgObject.cpp 2005-05-25 13:33:31 UTC (rev 4250) @@ -161,7 +161,7 @@ wxString page; if (!IsCollection()) - page=wxT("sql-create") + GetTypeName().Lower(); + page=wxT("pg/sql-create") + GetTypeName().Lower(); return page; } Modified: trunk/pgadmin3/src/schema/pgTable.cpp =================================================================== --- trunk/pgadmin3/src/schema/pgTable.cpp 2005-05-25 12:41:48 UTC (rev 4249) +++ trunk/pgadmin3/src/schema/pgTable.cpp 2005-05-25 13:33:31 UTC (rev 4250) @@ -62,9 +62,9 @@ wxString pgTable::GetHelpPage(bool forCreate) const { if (forCreate) - return wxT("sql-createtable"); + return wxT("pg/sql-createtable"); else - return wxT("sql-altertable"); + return wxT("pg/sql-altertable"); } Modified: trunk/pgadmin3/src/utils/misc.cpp =================================================================== --- trunk/pgadmin3/src/utils/misc.cpp 2005-05-25 12:41:48 UTC (rev 4249) +++ trunk/pgadmin3/src/utils/misc.cpp 2005-05-25 13:33:31 UTC (rev 4250) @@ -402,12 +402,10 @@ void DisplaySqlHelp(wxWindow *wnd, const wxString &helpTopic, char **icon) { - if (helpTopic.Left(8) == wxT("pgadmin/")) - DisplayHelp(wnd, helpTopic.Mid(8), icon); - else if (settings->GetSqlHelpSite().length() != 0) - frmHelp::LoadSqlDoc(wnd, helpTopic + wxT(".html")); + if (settings->GetSqlHelpSite().length() != 0) + frmHelp::LoadSqlDoc(wnd, helpTopic.Mid(3) + wxT(".html")); else - DisplayHelp(wnd, wxT("pg/") + helpTopic, icon); + DisplayHelp(wnd, helpTopic, icon); }
pgadmin-hackers by date: