SVN Commit by andreas: r4320 - in trunk/pgadmin3/src: . frm schema utils

[svn(at)pgadmin(dot)org]

Author: andreas
Date: 2005-06-21 10:55:10 +0100 (Tue, 21 Jun 2005)
New Revision: 4320

Modified:
   trunk/pgadmin3/src/frm/frmMain.cpp
   trunk/pgadmin3/src/pgAdmin3.dsp
   trunk/pgadmin3/src/schema/pgObject.cpp
   trunk/pgadmin3/src/utils/sysSettings.cpp
Log:
template1 fixes

Modified: trunk/pgadmin3/src/frm/frmMain.cpp
===================================================================
--- trunk/pgadmin3/src/frm/frmMain.cpp	2005-06-21 09:47:45 UTC (rev 4319)
+++ trunk/pgadmin3/src/frm/frmMain.cpp	2005-06-21 09:55:10 UTC (rev 4320)
@@ -1020,7 +1020,7 @@
 			    wxRegKey *svcKey = new wxRegKey(key);
 
                 servername = wxT("localhost");
-                database = wxT("template1");
+                database = wxEmptyString;
 			    svcKey->QueryValue(wxT("Display Name"), description);
 			    svcKey->QueryValue(wxT("Database Superuser"), username);
                 svcKey->QueryValue(wxT("Port"), &port);

Modified: trunk/pgadmin3/src/pgAdmin3.dsp
===================================================================
--- trunk/pgadmin3/src/pgAdmin3.dsp	2005-06-21 09:47:45 UTC (rev 4319)
+++ trunk/pgadmin3/src/pgAdmin3.dsp	2005-06-21 09:55:10 UTC (rev 4320)
@@ -470,6 +470,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=.\ui\dlgServer.xrc
+# End Source File
+# Begin Source File
+
 SOURCE=.\ui\dlgStep.xrc
 # End Source File
 # Begin Source File

Modified: trunk/pgadmin3/src/schema/pgObject.cpp
===================================================================
--- trunk/pgadmin3/src/schema/pgObject.cpp	2005-06-21 09:47:45 UTC (rev 4319)
+++ trunk/pgadmin3/src/schema/pgObject.cpp	2005-06-21 09:55:10 UTC (rev 4320)
@@ -28,7 +28,7 @@
 {
     {__("None"), -1, 0, 0},
     {__("Servers"), PGICON_SERVER, 0, 0},
-    {__("Server"), PGICON_SERVER, __("New Server"), __("Create a new Server connection.") },
+    {__("Server"), PGICON_SERVER, __("New Server Registration"), __("Create a new Server registration.") },
     {__("Databases"), PGICON_DATABASE, 0, 0},
     {__("Database"), PGICON_DATABASE, __("New Database"), __("Create a new Database.") },
     {__("Groups"), PGICON_GROUP, 0, 0},

Modified: trunk/pgadmin3/src/utils/sysSettings.cpp
===================================================================
--- trunk/pgadmin3/src/utils/sysSettings.cpp	2005-06-21 09:47:45 UTC (rev 4319)
+++ trunk/pgadmin3/src/utils/sysSettings.cpp	2005-06-21 09:55:10 UTC (rev 4320)
@@ -44,7 +44,7 @@
 
     // Last Connection
     Read(wxT("LastServer"), &lastServer, wxT("localhost")); 
-    Read(wxT("LastDatabase"), &lastDatabase, wxT("template1")); 
+    Read(wxT("LastDatabase"), &lastDatabase, wxEmptyString); 
 	Read(wxT("LastDescription"), &lastDescription, wxT("PostgreSQL Server")); 
     Read(wxT("LastUsername"), &lastUsername, wxT("postgres")); 
     Read(wxT("LastPort"), &lastPort, 5432);