SVN Commit by andreas: r4319 - in trunk/pgadmin3: . docs/en_US src/schema src/ui

Author: andreas
Date: 2005-06-21 10:47:45 +0100 (Tue, 21 Jun 2005)
New Revision: 4319

Modified:
   trunk/pgadmin3/CHANGELOG.txt
   trunk/pgadmin3/docs/en_US/appendices.html
   trunk/pgadmin3/docs/en_US/index.html
   trunk/pgadmin3/docs/en_US/pgagent-install.html
   trunk/pgadmin3/src/schema/pgDatabase.cpp
   trunk/pgadmin3/src/schema/pgObject.cpp
   trunk/pgadmin3/src/schema/pgServer.cpp
   trunk/pgadmin3/src/ui/dlgServer.xrc
Log:
typo fixes, rename "initial db" to "maintenance db"

Modified: trunk/pgadmin3/CHANGELOG.txt
===================================================================
--- trunk/pgadmin3/CHANGELOG.txt    2005-06-19 20:39:42 UTC (rev 4318)
+++ trunk/pgadmin3/CHANGELOG.txt    2005-06-21 09:47:45 UTC (rev 4319)
@@ -17,6 +17,7 @@
 </ul>
 <br>
 <ul>
+    <li>2005-06-21 AP        typo fixes, rename "initial db" to "maintenance db"
     <li>2005-06-19 AP        pgAgent moved under server, some more fixes
     <li>2005-06-19 AP        further translation issues
     <li>2005-06-17 AP        reduce translation nightmare

Modified: trunk/pgadmin3/docs/en_US/appendices.html
===================================================================
--- trunk/pgadmin3/docs/en_US/appendices.html    2005-06-19 20:39:42 UTC (rev 4318)
+++ trunk/pgadmin3/docs/en_US/appendices.html    2005-06-21 09:47:45 UTC (rev 4319)
@@ -11,11 +11,11 @@
 <H3>Appendices</H3>

 <UL>
-  <LI><A HREF="bugreporting.html">Reporting bugs</A> in pgAdmin III.<BR>&bnsp;</LI>
-  <LI>The pgAdmin <A HREF="team.html">development team</A>.<BR>&bnsp;</LI>
-  <LI>The pgAdmin <A HREF="translation_team.html">translation team</A>.<BR>&bnsp;</LI>
-  <LI>The pgAdmin III <A HREF="licence.html">licence</A>.<BR>&bnsp;</LI>
-  <LI>The OpenSSL <A HREF="openssl.html">licence</A>.<BR>&bnsp;</LI>
+  <LI><A HREF="bugreporting.html">Reporting bugs</A> in pgAdmin III.<BR> </LI>
+  <LI>The pgAdmin <A HREF="team.html">development team</A>.<BR> </LI>
+  <LI>The pgAdmin <A HREF="translation_team.html">translation team</A>.<BR> </LI>
+  <LI>The pgAdmin III <A HREF="licence.html">licence</A>.<BR> </LI>
+  <LI>The OpenSSL <A HREF="openssl.html">licence</A>.<BR> </LI>
 </UL>
 </BODY>
 </HTML>

Modified: trunk/pgadmin3/docs/en_US/index.html
===================================================================
--- trunk/pgadmin3/docs/en_US/index.html    2005-06-19 20:39:42 UTC (rev 4318)
+++ trunk/pgadmin3/docs/en_US/index.html    2005-06-21 09:47:45 UTC (rev 4319)
@@ -24,10 +24,10 @@
 native libpq library.</P>

 <UL>
-  <LI><A HREF="using.html">Using pgAdmin III</A><BR>&bnsp;</LI>
-  <LI><A HREF="pgagent.html">pgAgent</A> - a job scheduler for PostgreSQL.<BR>&bnsp;</LI>
-  <LI><A HREF="extend.html">Extended features</A> - a contrib module for PostgreSQL to extend pgAdmin's
functionality.<BR>&bnsp;</LI>
-  <LI><A HREF="appendices.html">Appendices</A> - bug reporting, licence info etc.<BR>&bnsp;</LI>
+  <LI><A HREF="using.html">Using pgAdmin III</A><BR> </LI>
+  <LI><A HREF="pgagent.html">pgAgent</A> - a job scheduler for PostgreSQL.<BR> </LI>
+  <LI><A HREF="extend.html">Extended features</A> - a contrib module for PostgreSQL to extend pgAdmin's
functionality.<BR> </LI>
+  <LI><A HREF="appendices.html">Appendices</A> - bug reporting, licence info etc.<BR> </LI>
 </UL>
 </BODY>
 </HTML>

Modified: trunk/pgadmin3/docs/en_US/pgagent-install.html
===================================================================
--- trunk/pgadmin3/docs/en_US/pgagent-install.html    2005-06-19 20:39:42 UTC (rev 4318)
+++ trunk/pgadmin3/docs/en_US/pgagent-install.html    2005-06-21 09:47:45 UTC (rev 4319)
@@ -18,9 +18,9 @@
 execution of the same instance of a job by multiple hosts.</P>

 <H3>Database setup</H3>
-<P>pgAgent can store it's configuration in any database in your cluster. To
-setup a dedicated database for this purpose, create a new database using
-pgAdmin called 'pgadmin' (or any other name if you prefer). The database
+<P>pgAgent stores it's configuration in the "postgres" database in your cluster. This
+database exists by default in PostgreSQL 8.1 versions, for earlier versions
+you need to create the database yourself. The database
 must have the pl/pgsql procedural language installed - PostgreSQL's
 'createlang' program can do this if required.</P>

@@ -28,8 +28,9 @@
 Select the File -> Open option from the menu and find the 'pgagent.sql'
 script installed with pgAdmin. The installation location for this file
 varies from operating system to operating system, however it will normally
-be found under 'C:\Program files\pgAdmin III' on Windows systems, or
-'/usr/local/pgadmin3/share/pgadmin3' or '/usr/share/pgadmin3' on *nix
+be found under 'C:\Program files\pgAdmin III' on Windows systems (or
+'C:\Program files\PostgreSQL\8.x\pgAdmin III' if installed with the PostgreSQL server installer),
+or '/usr/local/pgadmin3/share/pgadmin3' or '/usr/share/pgadmin3' on *nix
 systems. Once the file is loaded, click the 'Run' button to execute the script.</P>

 <P>The script will create a number of tables and other objects in a schema called

Modified: trunk/pgadmin3/src/schema/pgDatabase.cpp
===================================================================
--- trunk/pgadmin3/src/schema/pgDatabase.cpp    2005-06-19 20:39:42 UTC (rev 4318)
+++ trunk/pgadmin3/src/schema/pgDatabase.cpp    2005-06-21 09:47:45 UTC (rev 4319)
@@ -251,8 +251,8 @@
 {
     if (useServerConnection)
     {
-        wxMessageDialog(frame, _("Initial database can't be dropped."),
-                        _("Dropping database not allowed"), wxICON_EXCLAMATION | wxOK);
+        wxMessageDialog(frame, _("Maintenance database can't be dropped."),
+                        _("Dropping database not allowed"), wxICON_EXCLAMATION | wxOK).ShowModal();

         return false;
     }

Modified: trunk/pgadmin3/src/schema/pgObject.cpp
===================================================================
--- trunk/pgadmin3/src/schema/pgObject.cpp    2005-06-19 20:39:42 UTC (rev 4318)
+++ trunk/pgadmin3/src/schema/pgObject.cpp    2005-06-21 09:47:45 UTC (rev 4319)
@@ -81,7 +81,7 @@
     {__("Check"), PGICON_CHECK, __("New Check Constraint"), __("Add a new Check Constraint.") },
     {__("Foreign Key"), PGICON_FOREIGNKEY, __("New Foreign Key"), __("Add a new Foreign Key.") },

-    {__("Jobs"), PGAICON_JOB, 0, 0},
+    {__("pgAgent Jobs"), PGAICON_JOB, 0, 0},
     {__("Job"), PGAICON_JOB, __("New Job"), __("Create a new Job") },
     {__("Schedules"), PGAICON_SCHEDULE, 0, 0},
     {__("Schedule"), PGAICON_SCHEDULE, __("New Schedule"), __("Create new Schedule") },

Modified: trunk/pgadmin3/src/schema/pgServer.cpp
===================================================================
--- trunk/pgadmin3/src/schema/pgServer.cpp    2005-06-19 20:39:42 UTC (rev 4318)
+++ trunk/pgadmin3/src/schema/pgServer.cpp    2005-06-21 09:47:45 UTC (rev 4319)
@@ -23,6 +23,8 @@
 #include "pgfeatures.h"


+#define DEFAULT_PG_DATABASE wxT("postgres")
+
 pgServer::pgServer(const wxString& newName, const wxString& newDescription, const wxString& newDatabase, const
wxString&newUsername, int newPort, bool _trusted, int _ssl) 
 : pgObject(PG_SERVER, newName)
 {
@@ -415,10 +417,11 @@

         if (database.IsEmpty())
         {
-            conn = new pgConn(GetName(), wxT("pg_system"), username, password, port, ssl);
+            conn = new pgConn(GetName(), DEFAULT_PG_DATABASE, username, password, port, ssl);
             if (conn->GetStatus() == PGCONN_OK)
-                database=wxT("pg_system");
-            else if (conn->GetStatus() == PGCONN_BAD && conn->GetLastError().Find(wxT("database \"pg_system\" does not
exist"))>= 0) 
+                database=DEFAULT_PG_DATABASE;
+            else if (conn->GetStatus() == PGCONN_BAD && conn->GetLastError().Find(
+                                wxT("database \"") DEFAULT_PG_DATABASE wxT("\" does not exist")) >= 0)
             {
                 delete conn;
                 conn = new pgConn(GetName(), wxT("template1"), username, password, port, ssl);
@@ -686,7 +689,7 @@
         if (!serviceId.IsEmpty())
             properties->AppendItem(_("Service"), serviceId);

-        properties->AppendItem(_("Initial database"), GetDatabaseName());
+        properties->AppendItem(_("Maintenance database"), GetDatabaseName());
         properties->AppendItem(_("Username"), GetUsername());
         properties->AppendItem(_("Need password?"), GetNeedPwd());
         if (GetConnected())

Modified: trunk/pgadmin3/src/ui/dlgServer.xrc
===================================================================
--- trunk/pgadmin3/src/ui/dlgServer.xrc    2005-06-19 20:39:42 UTC (rev 4318)
+++ trunk/pgadmin3/src/ui/dlgServer.xrc    2005-06-21 09:47:45 UTC (rev 4319)
@@ -49,7 +49,7 @@
             <content/>
           </object>
           <object class="wxStaticText" name="stDatabase">
-            <label>Initial DB</label>
+            <label>Maintenance DB</label>
             <pos>5,67d</pos>
           </object>
           <object class="wxComboBox" name="cbDatabase">