SVN Commit by andreas: r4291 - in trunk/pgadmin3: . src/frm src/include src/include/images src/slony src/slony/include

Author: andreas
Date: 2005-06-09 12:20:32 +0100 (Thu, 09 Jun 2005)
New Revision: 4291

Added:
trunk/pgadmin3/src/include/images/slset2.xpm
trunk/pgadmin3/src/include/images/slsubscription2.xpm
Modified:
trunk/pgadmin3/CHANGELOG.txt
trunk/pgadmin3/src/frm/frmMain.cpp
trunk/pgadmin3/src/include/misc.h
trunk/pgadmin3/src/slony/include/slSet.h
trunk/pgadmin3/src/slony/include/slSubscription.h
trunk/pgadmin3/src/slony/slSet.cpp
trunk/pgadmin3/src/slony/slSubscription.cpp
Log:
Different icons for own and foreign slony sets and subscriptions

Modified: trunk/pgadmin3/CHANGELOG.txt
===================================================================
--- trunk/pgadmin3/CHANGELOG.txt 2005-06-09 09:43:22 UTC (rev 4290)
+++ trunk/pgadmin3/CHANGELOG.txt 2005-06-09 11:20:32 UTC (rev 4291)
@@ -17,6 +17,7 @@
</ul>
<br>
<ul>
+ <li>2005-06-09 AP Different icons for own and foreign slony sets and subscriptions
<li>2005-06-09 DP 1.2.3 Fix disable triggers option for data only plain text backups per Howard Cole.
<li>2005-06-03 AP Support for pgsql 8.1 aggregate sortop
<li>2005-06-03 AP Support for pgsql 8.1 pg_stat_activity

Modified: trunk/pgadmin3/src/frm/frmMain.cpp
===================================================================
--- trunk/pgadmin3/src/frm/frmMain.cpp 2005-06-09 09:43:22 UTC (rev 4290)
+++ trunk/pgadmin3/src/frm/frmMain.cpp 2005-06-09 11:20:32 UTC (rev 4291)
@@ -110,7 +110,9 @@
#include "images/slpath.xpm"
#include "images/sllisten.xpm"
#include "images/slset.xpm"
+#include "images/slset2.xpm"
#include "images/slsubscription.xpm"
+#include "images/slsubscription2.xpm"


#if wxDIALOG_UNIT_COMPATIBILITY
@@ -389,7 +391,9 @@
imageList->Add(wxIcon(slpath_xpm));
imageList->Add(wxIcon(sllisten_xpm));
imageList->Add(wxIcon(slset_xpm));
+ imageList->Add(wxIcon(slset2_xpm));
imageList->Add(wxIcon(slsubscription_xpm));
+ imageList->Add(wxIcon(slsubscription2_xpm));

browser->SetImageList(imageList);

Added: trunk/pgadmin3/src/include/images/slset2.xpm
===================================================================
--- trunk/pgadmin3/src/include/images/slset2.xpm 2005-06-09 09:43:22 UTC (rev 4290)
+++ trunk/pgadmin3/src/include/images/slset2.xpm 2005-06-09 11:20:32 UTC (rev 4291)
@@ -0,0 +1,26 @@
+/* XPM */
+static char * slset2_xpm[] = {
+"16 16 7 1",
+" c None",
+". c #7F7F7F",
+"+ c #000080",
+"@ c #868686",
+"# c #000000",
+"$ c #0000FF",
+"% c #C0C0C0",
+" ",
+" ",
+" ...... ",
+" . . ",
+" . . ",
+" .. .. ",
+" . ...... . ",
+" . . ",
+" . . ",
+" . ++++++",
+" .. @@@@@@#$$$$$",
+" @@% #$$$$$",
+" ###@@ %#+$$$$",
+"#(at)% %##+++++",
+" ##(at)% @# ######",
+" ##### "};

Added: trunk/pgadmin3/src/include/images/slsubscription2.xpm
===================================================================
--- trunk/pgadmin3/src/include/images/slsubscription2.xpm 2005-06-09 09:43:22 UTC (rev 4290)
+++ trunk/pgadmin3/src/include/images/slsubscription2.xpm 2005-06-09 11:20:32 UTC (rev 4291)
@@ -0,0 +1,28 @@
+/* XPM */
+static char * slsubscription2_xpm[] = {
+"16 16 9 1",
+" c None",
+". c #FF0000",
+"+ c #C00000",
+"@ c #7F7F7F",
+"# c #000080",
+"$ c #868686",
+"% c #000000",
+"& c #0000FF",
+"* c #C0C0C0",
+" ",
+" .+ ",
+" @@@@@@ .+ ",
+" @ .+ ",
+" @ .+ ",
+" @@ .+@ ",
+" @ @.+@@.+@ ",
+" @ .+.+ @ ",
+" @ ...+ @ ",
+" @ .+ ######",
+" @@ $$$+$$%&&&&&",
+" $$* %&&&&&",
+" %%%$$ *%#&&&&",
+"%$* *%%#####",
+" %%$* $% %%%%%%",
+" %%%%% "};

Modified: trunk/pgadmin3/src/include/misc.h
===================================================================
--- trunk/pgadmin3/src/include/misc.h 2005-06-09 09:43:22 UTC (rev 4290)
+++ trunk/pgadmin3/src/include/misc.h 2005-06-09 11:20:32 UTC (rev 4291)
@@ -109,7 +109,9 @@
SLICON_PATH,
SLICON_LISTEN,
SLICON_SET,
- SLICON_SUBSCRIPTION
+ SLICON_SET2,
+ SLICON_SUBSCRIPTION,
+ SLICON_SUBSCRIPTION2
};

Modified: trunk/pgadmin3/src/slony/include/slSet.h
===================================================================
--- trunk/pgadmin3/src/slony/include/slSet.h 2005-06-09 09:43:22 UTC (rev 4290)
+++ trunk/pgadmin3/src/slony/include/slSet.h 2005-06-09 11:20:32 UTC (rev 4291)
@@ -29,7 +29,7 @@
slSet(slCluster *_cluster, const wxString& newName = wxT(""));
~slSet();

- int GetIcon() { return SLICON_SET; }
+ int GetIcon();
void ShowTreeDetail(wxTreeCtrl *browser, frmMain *form=0, ctlListView *properties=0, ctlSQLBox *sqlPane=0);
static pgObject *ReadObjects(slCollection *coll, wxTreeCtrl *browser, const wxString &restriction);
static pgObject *ReadObjects(slCollection *coll, wxTreeCtrl *browser);

Modified: trunk/pgadmin3/src/slony/include/slSubscription.h
===================================================================
--- trunk/pgadmin3/src/slony/include/slSubscription.h 2005-06-09 09:43:22 UTC (rev 4290)
+++ trunk/pgadmin3/src/slony/include/slSubscription.h 2005-06-09 11:20:32 UTC (rev 4291)
@@ -29,7 +29,7 @@
slSubscription(slSet *set, const wxString& newName = wxT(""));
~slSubscription();

- int GetIcon() { return SLICON_SUBSCRIPTION; }
+ int GetIcon();
void ShowTreeDetail(wxTreeCtrl *browser, frmMain *form=0, ctlListView *properties=0, ctlSQLBox *sqlPane=0);
static pgObject *ReadObjects(slSetCollection *coll, wxTreeCtrl *browser, const wxString &restriction);
static pgObject *ReadObjects(slSetCollection *coll, wxTreeCtrl *browser);

Modified: trunk/pgadmin3/src/slony/slSet.cpp
===================================================================
--- trunk/pgadmin3/src/slony/slSet.cpp 2005-06-09 09:43:22 UTC (rev 4290)
+++ trunk/pgadmin3/src/slony/slSet.cpp 2005-06-09 11:20:32 UTC (rev 4291)
@@ -34,6 +34,15 @@
}


+int slSet::GetIcon()
+{
+ if (GetOriginId() == GetCluster()->GetLocalNodeID())
+ return SLICON_SET;
+ else
+ return SLICON_SET2;
+}
+
+
wxMenu *slSet::GetNewMenu()
{
wxMenu *menu=pgObject::GetNewMenu();

Modified: trunk/pgadmin3/src/slony/slSubscription.cpp
===================================================================
--- trunk/pgadmin3/src/slony/slSubscription.cpp 2005-06-09 09:43:22 UTC (rev 4290)
+++ trunk/pgadmin3/src/slony/slSubscription.cpp 2005-06-09 11:20:32 UTC (rev 4291)
@@ -35,6 +35,16 @@
}


+
+int slSubscription::GetIcon()
+{
+ if (GetReceiverId() == GetCluster()->GetLocalNodeID())
+ return SLICON_SUBSCRIPTION2;
+ else
+ return SLICON_SUBSCRIPTION;
+}
+
+
bool slSubscription::DropObject(wxFrame *frame, wxTreeCtrl *browser, bool cascaded)
{
return GetDatabase()->ExecuteVoid(