SVN Commit by dpage: r4165 - in trunk/pgadmin3/src: . base ui

Author: dpage
Date: 2005-05-08 21:08:41 +0100 (Sun, 08 May 2005)
New Revision: 4165

Added:
trunk/pgadmin3/src/ui/dlgAggregate.xrc
trunk/pgadmin3/src/ui/dlgCast.xrc
trunk/pgadmin3/src/ui/dlgCheck.xrc
trunk/pgadmin3/src/ui/dlgColumn.xrc
trunk/pgadmin3/src/ui/dlgConnect.xrc
trunk/pgadmin3/src/ui/dlgConversion.xrc
trunk/pgadmin3/src/ui/dlgDatabase.xrc
trunk/pgadmin3/src/ui/dlgDomain.xrc
trunk/pgadmin3/src/ui/dlgEditGridOptions.xrc
trunk/pgadmin3/src/ui/dlgForeignKey.xrc
trunk/pgadmin3/src/ui/dlgFunction.xrc
trunk/pgadmin3/src/ui/dlgGroup.xrc
trunk/pgadmin3/src/ui/dlgHbaConfig.xrc
trunk/pgadmin3/src/ui/dlgIndex.xrc
trunk/pgadmin3/src/ui/dlgIndexConstraint.xrc
trunk/pgadmin3/src/ui/dlgJob.xrc
trunk/pgadmin3/src/ui/dlgLanguage.xrc
trunk/pgadmin3/src/ui/dlgMainConfig.xrc
trunk/pgadmin3/src/ui/dlgOperator.xrc
trunk/pgadmin3/src/ui/dlgRepCluster.xrc
trunk/pgadmin3/src/ui/dlgRepClusterUpgrade.xrc
trunk/pgadmin3/src/ui/dlgRepListen.xrc
trunk/pgadmin3/src/ui/dlgRepNode.xrc
trunk/pgadmin3/src/ui/dlgRepPath.xrc
trunk/pgadmin3/src/ui/dlgRepSequence.xrc
trunk/pgadmin3/src/ui/dlgRepSet.xrc
trunk/pgadmin3/src/ui/dlgRepSetMerge.xrc
trunk/pgadmin3/src/ui/dlgRepSetMove.xrc
trunk/pgadmin3/src/ui/dlgRepSubscription.xrc
trunk/pgadmin3/src/ui/dlgRepTable.xrc
trunk/pgadmin3/src/ui/dlgRule.xrc
trunk/pgadmin3/src/ui/dlgSchedule.xrc
trunk/pgadmin3/src/ui/dlgSchema.xrc
trunk/pgadmin3/src/ui/dlgSequence.xrc
trunk/pgadmin3/src/ui/dlgServer.xrc
trunk/pgadmin3/src/ui/dlgStep.xrc
trunk/pgadmin3/src/ui/dlgTable.xrc
trunk/pgadmin3/src/ui/dlgTablespace.xrc
trunk/pgadmin3/src/ui/dlgTrigger.xrc
trunk/pgadmin3/src/ui/dlgType.xrc
trunk/pgadmin3/src/ui/dlgUser.xrc
trunk/pgadmin3/src/ui/dlgView.xrc
trunk/pgadmin3/src/ui/embed-xrc
trunk/pgadmin3/src/ui/embed-xrc.bat
trunk/pgadmin3/src/ui/frmAddTableView.xrc
trunk/pgadmin3/src/ui/frmBackup.xrc
trunk/pgadmin3/src/ui/frmExport.xrc
trunk/pgadmin3/src/ui/frmGrantWizard.xrc
trunk/pgadmin3/src/ui/frmHint.xrc
trunk/pgadmin3/src/ui/frmIndexcheck.xrc
trunk/pgadmin3/src/ui/frmMaintenance.xrc
trunk/pgadmin3/src/ui/frmOptions.xrc
trunk/pgadmin3/src/ui/frmPassword.xrc
trunk/pgadmin3/src/ui/frmQBJoin.xrc
trunk/pgadmin3/src/ui/frmRestore.xrc
trunk/pgadmin3/src/ui/frmStatus.xrc
trunk/pgadmin3/src/ui/frmUpdate.xrc
trunk/pgadmin3/src/ui/xrcDialogs.cpp
Removed:
trunk/pgadmin3/src/ui/common/
Modified:
trunk/pgadmin3/src/Makefile.am
trunk/pgadmin3/src/base/appbase.cpp
trunk/pgadmin3/src/pgAdmin3.dsp
Log:
Move the src files to /ui (removing the long redundant /common/ directory).
Add pgAdmin3.h to appbase.cpp to stop VC++ complaining about missing pch directives.

Modified: trunk/pgadmin3/src/Makefile.am
===================================================================
--- trunk/pgadmin3/src/Makefile.am 2005-05-08 19:35:29 UTC (rev 4164)
+++ trunk/pgadmin3/src/Makefile.am 2005-05-08 20:08:41 UTC (rev 4165)
@@ -74,7 +74,7 @@
$(srcdir)/slony/dlgRepPath.cpp $(srcdir)/slony/dlgRepSet.cpp $(srcdir)/slony/dlgRepSequence.cpp \
$(srcdir)/slony/dlgRepTable.cpp $(srcdir)/slony/dlgRepSubscription.cpp $(srcdir)/slony/slFunctions.cpp \
\
-$(srcdir)/ui/common/xrcDialogs.cpp
+$(srcdir)/ui/xrcDialogs.cpp

noinst_HEADERS = \
$(srcdir)/include/base/base.h $(srcdir)/include/base/appbase.h $(srcdir)/include/base/sysLogger.h \
@@ -142,7 +142,7 @@
$(srcdir)/include/images/pgAdmin3.ico

TMP_ui = \
-$(srcdir)/ui/common/*.xrc
+$(srcdir)/ui/*.xrc

if !APPBUNDLE

Modified: trunk/pgadmin3/src/base/appbase.cpp
===================================================================
--- trunk/pgadmin3/src/base/appbase.cpp 2005-05-08 19:35:29 UTC (rev 4164)
+++ trunk/pgadmin3/src/base/appbase.cpp 2005-05-08 20:08:41 UTC (rev 4165)
@@ -9,6 +9,8 @@
//
//////////////////////////////////////////////////////////////////////////

+#include "pgAdmin3.h"
+
// wxWindows headers
#include <wx/wx.h>
#include <wx/dir.h>
@@ -30,7 +32,6 @@

#define DOC_DIR wxT("/docs")
#define UI_DIR wxT("/ui")
-#define COMMON_DIR wxT("/common")
#define I18N_DIR wxT("/i18n")

#define SCRIPT_DIR wxT("/scripts")
@@ -152,7 +153,7 @@
#else

// for debugging, dialog resources are read from file
- wxXmlResource::Get()->Load(uiPath+COMMON_DIR + wxT("/*.xrc"));
+ wxXmlResource::Get()->Load(uiPath + wxT("/*.xrc"));
#endif

}

Modified: trunk/pgadmin3/src/pgAdmin3.dsp
===================================================================
--- trunk/pgadmin3/src/pgAdmin3.dsp 2005-05-08 19:35:29 UTC (rev 4164)
+++ trunk/pgadmin3/src/pgAdmin3.dsp 2005-05-08 20:08:41 UTC (rev 4165)
@@ -379,155 +379,155 @@
# PROP Default_Filter ".xrc"
# Begin Source File

-SOURCE=.\ui\common\dlgAggregate.xrc
+SOURCE=.\ui\dlgAggregate.xrc
# End Source File
# Begin Source File

-SOURCE=.\ui\common\dlgCast.xrc
+SOURCE=.\ui\dlgCast.xrc
# End Source File
# Begin Source File

-SOURCE=.\ui\common\dlgCheck.xrc
+SOURCE=.\ui\dlgCheck.xrc
# End Source File
# Begin Source File

-SOURCE=.\ui\common\dlgColumn.xrc
+SOURCE=.\ui\dlgColumn.xrc
# End Source File
# Begin Source File

-SOURCE=.\ui\common\dlgConversion.xrc
+SOURCE=.\ui\dlgConversion.xrc
# End Source File
# Begin Source File

-SOURCE=.\ui\common\dlgDatabase.xrc
+SOURCE=.\ui\dlgDatabase.xrc
# End Source File
# Begin Source File

-SOURCE=.\ui\common\dlgDomain.xrc
+SOURCE=.\ui\dlgDomain.xrc
# End Source File
# Begin Source File

-SOURCE=.\ui\common\dlgEditGridOptions.xrc
+SOURCE=.\ui\dlgEditGridOptions.xrc
# End Source File
# Begin Source File

-SOURCE=.\ui\common\dlgForeignKey.xrc
+SOURCE=.\ui\dlgForeignKey.xrc
# End Source File
# Begin Source File

-SOURCE=.\ui\common\dlgFunction.xrc
+SOURCE=.\ui\dlgFunction.xrc
# End Source File
# Begin Source File

-SOURCE=.\ui\common\dlgGroup.xrc
+SOURCE=.\ui\dlgGroup.xrc
# End Source File
# Begin Source File

-SOURCE=.\ui\common\dlgHbaConfig.xrc
+SOURCE=.\ui\dlgHbaConfig.xrc
# End Source File
# Begin Source File

-SOURCE=.\ui\common\dlgIndex.xrc
+SOURCE=.\ui\dlgIndex.xrc
# End Source File
# Begin Source File

-SOURCE=.\ui\common\dlgIndexConstraint.xrc
+SOURCE=.\ui\dlgIndexConstraint.xrc
# End Source File
# Begin Source File

-SOURCE=.\ui\common\dlgJob.xrc
+SOURCE=.\ui\dlgJob.xrc
# End Source File
# Begin Source File

-SOURCE=.\ui\common\dlgLanguage.xrc
+SOURCE=.\ui\dlgLanguage.xrc
# End Source File
# Begin Source File

-SOURCE=.\ui\common\dlgMainConfig.xrc
+SOURCE=.\ui\dlgMainConfig.xrc
# End Source File
# Begin Source File

-SOURCE=.\ui\common\dlgOperator.xrc
+SOURCE=.\ui\dlgOperator.xrc
# End Source File
# Begin Source File

-SOURCE=.\ui\common\dlgRule.xrc
+SOURCE=.\ui\dlgRule.xrc
# End Source File
# Begin Source File

-SOURCE=.\ui\common\dlgSchedule.xrc
+SOURCE=.\ui\dlgSchedule.xrc
# End Source File
# Begin Source File

-SOURCE=.\ui\common\dlgSchema.xrc
+SOURCE=.\ui\dlgSchema.xrc
# End Source File
# Begin Source File

-SOURCE=.\ui\common\dlgSequence.xrc
+SOURCE=.\ui\dlgSequence.xrc
# End Source File
# Begin Source File

-SOURCE=.\ui\common\dlgStep.xrc
+SOURCE=.\ui\dlgStep.xrc
# End Source File
# Begin Source File

-SOURCE=.\ui\common\dlgTable.xrc
+SOURCE=.\ui\dlgTable.xrc
# End Source File
# Begin Source File

-SOURCE=.\ui\common\dlgTrigger.xrc
+SOURCE=.\ui\dlgTrigger.xrc
# End Source File
# Begin Source File

-SOURCE=.\ui\common\dlgType.xrc
+SOURCE=.\ui\dlgType.xrc
# End Source File
# Begin Source File

-SOURCE=.\ui\common\dlgUser.xrc
+SOURCE=.\ui\dlgUser.xrc
# End Source File
# Begin Source File

-SOURCE=.\ui\common\dlgView.xrc
+SOURCE=.\ui\dlgView.xrc
# End Source File
# Begin Source File

-SOURCE=.\ui\common\frmAddTableView.xrc
+SOURCE=.\ui\frmAddTableView.xrc
# End Source File
# Begin Source File

-SOURCE=.\ui\common\frmConnect.xrc
+SOURCE=.\ui\frmConnect.xrc
# End Source File
# Begin Source File

-SOURCE=.\ui\common\frmExport.xrc
+SOURCE=.\ui\frmExport.xrc
# End Source File
# Begin Source File

-SOURCE=.\ui\common\frmOptions.xrc
+SOURCE=.\ui\frmOptions.xrc
# End Source File
# Begin Source File

-SOURCE=.\ui\common\frmPassword.xrc
+SOURCE=.\ui\frmPassword.xrc
# End Source File
# Begin Source File

-SOURCE=.\ui\common\frmQBJoin.xrc
+SOURCE=.\ui\frmQBJoin.xrc
# End Source File
# Begin Source File

-SOURCE=.\ui\common\frmServer.xrc
+SOURCE=.\ui\frmServer.xrc
# End Source File
# Begin Source File

-SOURCE=.\ui\common\frmStatus.xrc
+SOURCE=.\ui\frmStatus.xrc
# End Source File
# Begin Source File

-SOURCE=.\ui\common\frmVacuum.xrc
+SOURCE=.\ui\frmVacuum.xrc
# End Source File
# Begin Source File

-SOURCE=.\ui\common\xrcDialogs.cpp
+SOURCE=.\ui\xrcDialogs.cpp
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# End Group

Copied: trunk/pgadmin3/src/ui/dlgAggregate.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/dlgAggregate.xrc)

Copied: trunk/pgadmin3/src/ui/dlgCast.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/dlgCast.xrc)

Copied: trunk/pgadmin3/src/ui/dlgCheck.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/dlgCheck.xrc)

Copied: trunk/pgadmin3/src/ui/dlgColumn.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/dlgColumn.xrc)

Copied: trunk/pgadmin3/src/ui/dlgConnect.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/dlgConnect.xrc)

Copied: trunk/pgadmin3/src/ui/dlgConversion.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/dlgConversion.xrc)

Copied: trunk/pgadmin3/src/ui/dlgDatabase.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/dlgDatabase.xrc)

Copied: trunk/pgadmin3/src/ui/dlgDomain.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/dlgDomain.xrc)

Copied: trunk/pgadmin3/src/ui/dlgEditGridOptions.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/dlgEditGridOptions.xrc)

Copied: trunk/pgadmin3/src/ui/dlgForeignKey.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/dlgForeignKey.xrc)

Copied: trunk/pgadmin3/src/ui/dlgFunction.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/dlgFunction.xrc)

Copied: trunk/pgadmin3/src/ui/dlgGroup.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/dlgGroup.xrc)

Copied: trunk/pgadmin3/src/ui/dlgHbaConfig.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/dlgHbaConfig.xrc)

Copied: trunk/pgadmin3/src/ui/dlgIndex.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/dlgIndex.xrc)

Copied: trunk/pgadmin3/src/ui/dlgIndexConstraint.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/dlgIndexConstraint.xrc)

Copied: trunk/pgadmin3/src/ui/dlgJob.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/dlgJob.xrc)

Copied: trunk/pgadmin3/src/ui/dlgLanguage.xrc (from rev 4164, trunk/pgadmin3/src/ui/common/dlgLanguage.xrc)

Copied: trunk/pgadmin3/src/ui/dlgMainConfig.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/dlgMainConfig.xrc)

Copied: trunk/pgadmin3/src/ui/dlgOperator.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/dlgOperator.xrc)

Copied: trunk/pgadmin3/src/ui/dlgRepCluster.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/dlgRepCluster.xrc)

Copied: trunk/pgadmin3/src/ui/dlgRepClusterUpgrade.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/dlgRepClusterUpgrade.xrc)

Copied: trunk/pgadmin3/src/ui/dlgRepListen.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/dlgRepListen.xrc)

Copied: trunk/pgadmin3/src/ui/dlgRepNode.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/dlgRepNode.xrc)

Copied: trunk/pgadmin3/src/ui/dlgRepPath.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/dlgRepPath.xrc)

Copied: trunk/pgadmin3/src/ui/dlgRepSequence.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/dlgRepSequence.xrc)

Copied: trunk/pgadmin3/src/ui/dlgRepSet.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/dlgRepSet.xrc)

Copied: trunk/pgadmin3/src/ui/dlgRepSetMerge.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/dlgRepSetMerge.xrc)

Copied: trunk/pgadmin3/src/ui/dlgRepSetMove.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/dlgRepSetMove.xrc)

Copied: trunk/pgadmin3/src/ui/dlgRepSubscription.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/dlgRepSubscription.xrc)

Copied: trunk/pgadmin3/src/ui/dlgRepTable.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/dlgRepTable.xrc)

Copied: trunk/pgadmin3/src/ui/dlgRule.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/dlgRule.xrc)

Copied: trunk/pgadmin3/src/ui/dlgSchedule.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/dlgSchedule.xrc)

Copied: trunk/pgadmin3/src/ui/dlgSchema.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/dlgSchema.xrc)

Copied: trunk/pgadmin3/src/ui/dlgSequence.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/dlgSequence.xrc)

Copied: trunk/pgadmin3/src/ui/dlgServer.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/dlgServer.xrc)

Copied: trunk/pgadmin3/src/ui/dlgStep.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/dlgStep.xrc)

Copied: trunk/pgadmin3/src/ui/dlgTable.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/dlgTable.xrc)

Copied: trunk/pgadmin3/src/ui/dlgTablespace.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/dlgTablespace.xrc)

Copied: trunk/pgadmin3/src/ui/dlgTrigger.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/dlgTrigger.xrc)

Copied: trunk/pgadmin3/src/ui/dlgType.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/dlgType.xrc)

Copied: trunk/pgadmin3/src/ui/dlgUser.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/dlgUser.xrc)

Copied: trunk/pgadmin3/src/ui/dlgView.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/dlgView.xrc)

Copied: trunk/pgadmin3/src/ui/embed-xrc (from rev 4162, trunk/pgadmin3/src/ui/common/embed-xrc)

Copied: trunk/pgadmin3/src/ui/embed-xrc.bat (from rev 4162, trunk/pgadmin3/src/ui/common/embed-xrc.bat)

Copied: trunk/pgadmin3/src/ui/frmAddTableView.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/frmAddTableView.xrc)

Copied: trunk/pgadmin3/src/ui/frmBackup.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/frmBackup.xrc)

Copied: trunk/pgadmin3/src/ui/frmExport.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/frmExport.xrc)

Copied: trunk/pgadmin3/src/ui/frmGrantWizard.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/frmGrantWizard.xrc)

Copied: trunk/pgadmin3/src/ui/frmHint.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/frmHint.xrc)

Copied: trunk/pgadmin3/src/ui/frmIndexcheck.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/frmIndexcheck.xrc)

Copied: trunk/pgadmin3/src/ui/frmMaintenance.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/frmMaintenance.xrc)

Copied: trunk/pgadmin3/src/ui/frmOptions.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/frmOptions.xrc)

Copied: trunk/pgadmin3/src/ui/frmPassword.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/frmPassword.xrc)

Copied: trunk/pgadmin3/src/ui/frmQBJoin.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/frmQBJoin.xrc)

Copied: trunk/pgadmin3/src/ui/frmRestore.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/frmRestore.xrc)

Copied: trunk/pgadmin3/src/ui/frmStatus.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/frmStatus.xrc)

Copied: trunk/pgadmin3/src/ui/frmUpdate.xrc (from rev 4162, trunk/pgadmin3/src/ui/common/frmUpdate.xrc)

Copied: trunk/pgadmin3/src/ui/xrcDialogs.cpp (from rev 4164, trunk/pgadmin3/src/ui/common/xrcDialogs.cpp)