SVN Commit by andreas: r4446 - in trunk/pgadmin3/src: agent agent/include include/images

Author: andreas
Date: 2005-09-17 22:58:46 +0100 (Sat, 17 Sep 2005)
New Revision: 4446

Modified:
trunk/pgadmin3/src/agent/include/pgaJob.h
trunk/pgadmin3/src/agent/include/pgaSchedule.h
trunk/pgadmin3/src/agent/include/pgaStep.h
trunk/pgadmin3/src/agent/pgaJob.cpp
trunk/pgadmin3/src/agent/pgaSchedule.cpp
trunk/pgadmin3/src/agent/pgaStep.cpp
trunk/pgadmin3/src/include/images/loginroles.xpm
trunk/pgadmin3/src/include/images/schedule.xpm
trunk/pgadmin3/src/include/images/step.xpm
trunk/pgadmin3/src/include/images/steps.xpm
trunk/pgadmin3/src/include/images/user.xpm
Log:
Fix pgaJobObj missing class hierarchy level

Modified: trunk/pgadmin3/src/agent/include/pgaJob.h
===================================================================
--- trunk/pgadmin3/src/agent/include/pgaJob.h 2005-09-17 21:22:35 UTC (rev 4445)
+++ trunk/pgadmin3/src/agent/include/pgaJob.h 2005-09-17 21:58:46 UTC (rev 4446)
@@ -93,4 +93,19 @@
pgaJob *job;
};

+
+class pgaJobObjCollection : public pgServerObjCollection
+{
+public:
+ pgaJobObjCollection(pgaFactory *factory, pgaJob *job);
+ bool CanCreate();
+};
+
+class pgaJobObjFactory : public pgServerObjFactory
+{
+public:
+ pgaJobObjFactory(const wxChar *tn, const wxChar *ns, const wxChar *nls, char **img, char **imgSm=0)
+ : pgServerObjFactory(tn, ns, nls, img, imgSm) {}
+ virtual pgCollection *CreateCollection(pgObject *obj);
+};
#endif

Modified: trunk/pgadmin3/src/agent/include/pgaSchedule.h
===================================================================
--- trunk/pgadmin3/src/agent/include/pgaSchedule.h 2005-09-17 21:22:35 UTC (rev 4445)
+++ trunk/pgadmin3/src/agent/include/pgaSchedule.h 2005-09-17 21:58:46 UTC (rev 4446)
@@ -15,7 +15,7 @@
#include "pgaJob.h"


-class pgaScheduleFactory : public pgServerObjFactory
+class pgaScheduleFactory : public pgaJobObjFactory
{
public:
pgaScheduleFactory();

Modified: trunk/pgadmin3/src/agent/include/pgaStep.h
===================================================================
--- trunk/pgadmin3/src/agent/include/pgaStep.h 2005-09-17 21:22:35 UTC (rev 4445)
+++ trunk/pgadmin3/src/agent/include/pgaStep.h 2005-09-17 21:58:46 UTC (rev 4446)
@@ -16,7 +16,7 @@



-class pgaStepFactory : public pgServerObjFactory
+class pgaStepFactory : public pgaJobObjFactory
{
public:
pgaStepFactory();
@@ -25,6 +25,7 @@
};
extern pgaStepFactory stepFactory;

+
class pgaStep : public pgaJobObject
{
public:

Modified: trunk/pgadmin3/src/agent/pgaJob.cpp
===================================================================
--- trunk/pgadmin3/src/agent/pgaJob.cpp 2005-09-17 21:22:35 UTC (rev 4445)
+++ trunk/pgadmin3/src/agent/pgaJob.cpp 2005-09-17 21:58:46 UTC (rev 4446)
@@ -248,7 +248,26 @@
}


+pgaJobObjCollection::pgaJobObjCollection(pgaFactory *factory, pgaJob *_job)
+: pgServerObjCollection(factory, _job->GetServer())
+{
+ job = _job;
+}

+
+bool pgaJobObjCollection::CanCreate()
+{
+ return job->CanCreate();
+}
+
+
+pgCollection *pgaJobObjFactory::CreateCollection(pgObject *obj)
+{
+ return new pgaJobObjCollection(GetCollectionFactory(), (pgaJob*)obj);
+}
+
+
+
#include "images/job.xpm"
#include "images/jobs.xpm"
#include "images/jobdisabled.xpm"

Modified: trunk/pgadmin3/src/agent/pgaSchedule.cpp
===================================================================
--- trunk/pgadmin3/src/agent/pgaSchedule.cpp 2005-09-17 21:22:35 UTC (rev 4445)
+++ trunk/pgadmin3/src/agent/pgaSchedule.cpp 2005-09-17 21:58:46 UTC (rev 4446)
@@ -488,7 +488,7 @@
#include "images/schedules.xpm"

pgaScheduleFactory::pgaScheduleFactory()
-: pgServerObjFactory(__("Schedule"), __("New Schedule"), __("Create a new Schedule."), schedule_xpm)
+: pgaJobObjFactory(__("Schedule"), __("New Schedule"), __("Create a new Schedule."), schedule_xpm)
{
}

Modified: trunk/pgadmin3/src/agent/pgaStep.cpp
===================================================================
--- trunk/pgadmin3/src/agent/pgaStep.cpp 2005-09-17 21:22:35 UTC (rev 4445)
+++ trunk/pgadmin3/src/agent/pgaStep.cpp 2005-09-17 21:58:46 UTC (rev 4446)
@@ -216,7 +216,7 @@
#include "images/steps.xpm"

pgaStepFactory::pgaStepFactory()
-: pgServerObjFactory(__("Step"), __("New Step"), __("Create a new Step."), step_xpm)
+: pgaJobObjFactory(__("Step"), __("New Step"), __("Create a new Step."), step_xpm)
{
}

Modified: trunk/pgadmin3/src/include/images/loginroles.xpm
===================================================================
--- trunk/pgadmin3/src/include/images/loginroles.xpm 2005-09-17 21:22:35 UTC (rev 4445)
+++ trunk/pgadmin3/src/include/images/loginroles.xpm 2005-09-17 21:58:46 UTC (rev 4446)
@@ -1,126 +1,147 @@
/* XPM */
static char * loginroles_xpm[] = {
-"16 16 107 2",
+"16 16 128 2",
" c None",
-". c #7C7C7C",
-"+ c #6A6A6A",
-"@ c #999999",
-"# c #A8A6A5",
-"$ c #A59E98",
-"% c #DED2C9",
-"& c #EADDD5",
-"* c #B8B0AC",
-"= c #A09D9D",
-"- c #A29C97",
-"; c #EFE1D7",
-"> c #F7EAE1",
-", c #F7EAE3",
-"' c #F2E5E2",
-") c #B1AAA9",
-"! c #A5A5A5",
-"~ c #CBC1B9",
-"{ c #F7EAE6",
-"] c #F7EAE8",
-"^ c #E6DBDD",
-"/ c #C2BAB4",
-"( c #F7EAE5",
-"_ c #F7EAEB",
-": c #DAD0D3",
-"< c #797979",
-"[ c #948F8E",
-"} c #E5DAD6",
-"| c #EEE2E5",
-"1 c #A09A9C",
-"2 c #5B5C5C",
-"3 c #898484",
-"4 c #D0C7C8",
-"5 c #E3D8DB",
-"6 c #9F999B",
-"7 c #606162",
-"8 c #888C8D",
-"9 c #ADBCBF",
-"0 c #B7C9CE",
-"a c #909CA0",
-"b c #849095",
-"c c #A2B7C0",
-"d c #A7C0CC",
-"e c #717C81",
-"f c #97A2A5",
-"g c #CFE5EC",
-"h c #CEE7F0",
-"i c #C9E5F0",
-"j c #C5E3F1",
-"k c #C0E1F1",
-"l c #BBDEF1",
-"m c #9EBAC9",
-"n c #949494",
-"o c #B6C8CD",
-"p c #CAE5F1",
-"q c #CCDACB",
-"r c #D0B852",
-"s c #CCB245",
-"t c #C8CFB4",
-"u c #929CA2",
-"v c #666666",
-"w c #C7DEE6",
-"x c #CAE5F0",
-"y c #CBDBCF",
-"z c #D7C166",
-"A c #EDE5B4",
-"B c #EEE7B3",
-"C c #DAC76C",
-"D c #9F9964",
-"E c #868686",
-"F c #7D8689",
-"G c #7B8489",
-"H c #798489",
-"I c #D2BA57",
-"J c #DBC973",
-"K c #F2EEB6",
-"L c #EEE599",
-"M c #E3D479",
-"N c #E2D373",
-"O c #E2D16B",
-"P c #E1D05E",
-"Q c #E3D166",
-"R c #D3BB50",
-"S c #CBB03E",
-"T c #F0EABE",
-"U c #CFB647",
-"V c #F2ECAD",
-"W c #F0E790",
-"X c #F2EB9D",
-"Y c #DFCD6B",
-"Z c #E6D778",
-"` c #F0E47F",
-" . c #E6D56D",
-".. c #D1B854",
-"+. c #E0CF8B",
-"@. c #DECD7C",
-"#. c #EFE9AE",
-"$. c #EFE79F",
-"%. c #E1D075",
-"&. c #C6A727",
-"*. c #D6BF65",
-"=. c #CFB54B",
-"-. c #C3A320",
-";. c #C8AA31",
-">. c #D6C064",
-",. c #D8C46B",
-"'. c #D6C15F",
-" . + @ ",
+". c #999999",
+"+ c #707070",
+"@ c #6A6A6A",
+"# c #989592",
+"$ c #B1A8A2",
+"% c #E1D5CB",
+"& c #E6DAD2",
+"* c #B7AFAB",
+"= c #938F8E",
+"- c #918D8A",
+"; c #BDB4AD",
+"> c #F1E3D9",
+", c #F7EAE1",
+"' c #F7EAE2",
+") c #F3E6E1",
+"! c #C9BFBD",
+"~ c #908C8C",
+"{ c #A29E9A",
+"] c #E4D7CE",
+"^ c #F7EAE0",
+"/ c #F7EAE4",
+"( c #F7EAE7",
+"_ c #E9DEDD",
+": c #ADA7A8",
+"< c #9E9995",
+"[ c #EFE2D9",
+"} c #F7EAE9",
+"| c #F1E4E6",
+"1 c #AFA9AA",
+"2 c #A39F9D",
+"3 c #E0D5CF",
+"4 c #F7EAEB",
+"5 c #E8DCDF",
+"6 c #ABA6A7",
+"7 c #898584",
+"8 c #B6AEAB",
+"9 c #EFE2E0",
+"0 c #F2E6EA",
+"a c #C2B9BD",
+"b c #878385",
+"c c #6E6D6D",
+"d c #A59F9F",
+"e c #DCD1D3",
+"f c #E3D8DA",
+"g c #ADA6A9",
+"h c #737172",
+"i c #5A5C5C",
+"j c #8B9495",
+"k c #B3C3C7",
+"l c #9CA9AD",
+"m c #777E80",
+"n c #71787B",
+"o c #90A0A7",
+"p c #A7BFCA",
+"q c #8898A0",
+"r c #686F72",
+"s c #7B8182",
+"t c #BFD2D7",
+"u c #D1E8F0",
+"v c #CEE7F0",
+"w c #CFDFD6",
+"x c #D5BF64",
+"y c #CBB03E",
+"z c #E0CF8B",
+"A c #AECEDE",
+"B c #7A8890",
+"C c #939696",
+"D c #A4B1B5",
+"E c #CDE1E1",
+"F c #D0B64D",
+"G c #E8DCA3",
+"H c #EEE8B8",
+"I c #E0D083",
+"J c #C5B75C",
+"K c #9DB0AA",
+"L c #96967D",
+"M c #858889",
+"N c #BBCFD5",
+"O c #CAE5F0",
+"P c #DAC675",
+"Q c #E7DB9F",
+"R c #EDE5B1",
+"S c #EFE9AF",
+"T c #F2ECAE",
+"U c #DDCB6F",
+"V c #CFB53F",
+"W c #CFB53D",
+"X c #CFB53A",
+"Y c #CFB436",
+"Z c #CFB53C",
+"` c #D2BA55",
+" . c #6D7071",
+".. c #C9E1EA",
+"+. c #C6E3F1",
+"@. c #EFE9BD",
+"#. c #DBC871",
+"$. c #E6DA8D",
+"%. c #F0E895",
+"&. c #F1E998",
+"*. c #EEE494",
+"=. c #F1E897",
+"-. c #E8DA78",
+";. c #F2E883",
+">. c #E9DB79",
+",. c #D1B74B",
+"'. c #585858",
+"). c #676B6C",
+"!. c #65696B",
+"~. c #D6C169",
+"{. c #E8DDA2",
+"]. c #E9DE9B",
+"^. c #ECE499",
+"/. c #F1E997",
+"(. c #E1D071",
+"_. c #D8C35F",
+":. c #D8C259",
+"<. c #DAC669",
+"[. c #D6BF46",
+"}. c #D3BB4C",
+"|. c #D6BF65",
+"1. c #D3BB56",
+"2. c #E9DE9D",
+"3. c #EEE6A3",
+"4. c #E3D37E",
+"5. c #CCB039",
+"6. c #D7C36A",
+"7. c #CFB74C",
+" . + @ . ",
" # $ % & * = ",
-" - ; > , ' ) ! ",
-" ~ > , { ] ^ + ",
-" / , ( ] _ : < ",
-" [ } ] _ | 1 ",
-" 2 3 4 5 6 7 ",
-" 8 9 0 a b c d e ",
-" f g h i j k l m ",
-" n o h p j q r s t u ",
-" v w x j y z A B C D ",
-" E F G H I A J K L M N O P Q R ",
-" S T U V W X Y Z ` ...",
-" +(dot)(at)(dot)#(dot)$(dot)%(dot)&.*.=.-.;. ",
-" >.,.'. ",
-" "};
+" - ; > , ' ) ! ~ ",
+" { ] ^ ' / ( _ : ",
+" < [ ' / ( } | 1 ",
+" 2 3 / ( } 4 5 6 ",
+" 7 8 9 } 4 0 a b ",
+" c d e f g h i ",
+" j k l m n o p q r ",
+" s t u v w x y z A B ",
+"C D u v E F G H I J K L ",
+"M N v O P Q R S T U V W X Y Z ` ",
+" ...O +.y @.#.$.%.&.*.=.-.;.>.,.",
+"'.).!.!.~.{.].^./.(._.:.<.[.}.|.",
+" 1.2.3.4.5. ",
+" 6.7. "};

Modified: trunk/pgadmin3/src/include/images/schedule.xpm
===================================================================
--- trunk/pgadmin3/src/include/images/schedule.xpm 2005-09-17 21:22:35 UTC (rev 4445)
+++ trunk/pgadmin3/src/include/images/schedule.xpm 2005-09-17 21:58:46 UTC (rev 4446)
@@ -2,15 +2,15 @@
static char * schedule_xpm[] = {
"16 16 101 2",
" c None",
-". c #E79F94",
-"+ c #E3897E",
-"@ c #E7968B",
-"# c #F6D3D0",
-"$ c #EFC6BE",
-"% c #E19385",
-"& c #E28D80",
-"* c #E2877B",
-"= c #E28276",
+". c #E28276",
+"+ c #E79F94",
+"@ c #E3897E",
+"# c #E7968B",
+"$ c #F6D3D0",
+"% c #EFC6BE",
+"& c #E19385",
+"* c #E28D80",
+"= c #E2877B",
"- c #E27C71",
"; c #E2766C",
"> c #E37268",
@@ -103,14 +103,14 @@
"&. c #E5312E",
"*. c #F18B8B",
" ",
-" . + @ # ",
-" $ % & * = - ; > , ",
+" . + @ # . $ ",
+" % & * = . - ; > , ",
" ' ) ! ~ { ] ^ / ( _ ",
-" : % ) < [ } | 1 2 3 4 5 6 ",
-" & ! 7 8 9 | 0 a b c d e ",
-" . * f g h i | a b j k l m ",
-" + = n o p q | r s t u v w ",
-" @ - x y z A r | B C D E F ",
+" : & ) < [ } | 1 2 3 4 5 6 ",
+" . * ! 7 8 9 | 0 a b c d e ",
+" + = f g h i | a b j k l m ",
+" @ . n o p q | r s t u v w ",
+" # - x y z A r | B C D E F ",
" G ; H I J K L M | N O P Q ",
" > R S T U V W X Y Z ` . ",
" , ( (dot)(dot)+(dot)(at)(dot)#(dot)$(dot)%(dot)Z &.*. ",

Modified: trunk/pgadmin3/src/include/images/step.xpm
===================================================================
--- trunk/pgadmin3/src/include/images/step.xpm 2005-09-17 21:22:35 UTC (rev 4445)
+++ trunk/pgadmin3/src/include/images/step.xpm 2005-09-17 21:58:46 UTC (rev 4446)
@@ -1,6 +1,6 @@
/* XPM */
static char * step_xpm[] = {
-"16 16 36 1",
+"16 16 35 1",
" c None",
". c #7E7F80",
"+ c #FFFFFF",
@@ -36,8 +36,7 @@
"4 c #AEDEEF",
"5 c #AADDEE",
"6 c #A8DCEE",
-"7 c #B3B4B4",
-" .......... ",
+" ............ ",
" (dot)++(at)#$%&*=-. ",
" .+;#;;;;;;>. ",
" (dot)(at)#$%&*=->,. ",
@@ -51,5 +50,5 @@
" .>,:<}|1234. ",
" .,;<;;;;;;5. ",
" .:<}|123456. ",
-" ..........7 ",
+" ............ ",
" "};

Modified: trunk/pgadmin3/src/include/images/steps.xpm
===================================================================
--- trunk/pgadmin3/src/include/images/steps.xpm 2005-09-17 21:22:35 UTC (rev 4445)
+++ trunk/pgadmin3/src/include/images/steps.xpm 2005-09-17 21:58:46 UTC (rev 4446)
@@ -1,69 +1,68 @@
/* XPM */
static char * steps_xpm[] = {
-"16 16 50 1",
+"16 16 49 1",
" c None",
". c #A5A5A5",
-"+ c #CACACA",
-"@ c #F28282",
-"# c #F17F80",
-"$ c #EF7C7C",
-"% c #EE7878",
-"& c #EC7474",
-"* c #EA6F70",
-"= c #E86A6B",
-"- c #E56565",
-"; c #E35F60",
-"> c #E05A5A",
-", c #DE5454",
-"' c #DB4D4E",
-") c #D84747",
-"! c #D54141",
-"~ c #FFFFFF",
-"{ c #FDFEFF",
-"] c #F9FDFE",
-"^ c #F6FBFD",
-"/ c #F2FAFC",
-"( c #EDF8FC",
-"_ c #E9F6FB",
-": c #E4F4FA",
-"< c #DEF2F9",
-"[ c #D9F0F8",
-"} c #D33B3B",
-"| c #1E50AD",
-"1 c #D3EDF6",
-"2 c #D03535",
-"3 c #CEEBF5",
-"4 c #CD2E2F",
-"5 c #CB2829",
-"6 c #C9E9F4",
-"7 c #C3E7F3",
-"8 c #C82323",
-"9 c #BEE5F2",
-"0 c #C61D1D",
-"a c #BAE3F1",
-"b c #C31818",
-"c c #C11313",
-"d c #B5E1F1",
-"e c #B1DFF0",
-"f c #BF0E0E",
-"g c #AEDEEF",
-"h c #BD0A0A",
-"i c #AADDEE",
-"j c #BC0606",
-"k c #BA0303",
-" ..........+ ",
-" @#$%&*=-;>,')! ",
-" #.~{]^/(_:<[.} ",
-" $.{|^||||||1.2 ",
-" %.]^/(_:<[13.4 ",
-" &*=-;>,')!}245 ",
-" *./(_:<[1367.8 ",
-" =.(|:||||||9.0 ",
-" -._:<[13679a.b ",
-" ;>,')!}24580bc ",
-" >.<[13679ade.f ",
-" ,.[|3||||||g.h ",
-" '.13679adegi.j ",
-" )!}24580bcfhjk ",
-" +.......... ",
+"+ c #F28282",
+"@ c #F17F80",
+"# c #EF7C7C",
+"$ c #EE7878",
+"% c #EC7474",
+"& c #EA6F70",
+"* c #E86A6B",
+"= c #E56565",
+"- c #E35F60",
+"; c #E05A5A",
+"> c #DE5454",
+", c #DB4D4E",
+"' c #D84747",
+") c #D54141",
+"! c #FFFFFF",
+"~ c #FDFEFF",
+"{ c #F9FDFE",
+"] c #F6FBFD",
+"^ c #F2FAFC",
+"/ c #EDF8FC",
+"( c #E9F6FB",
+"_ c #E4F4FA",
+": c #DEF2F9",
+"< c #D9F0F8",
+"[ c #D33B3B",
+"} c #1E50AD",
+"| c #D3EDF6",
+"1 c #D03535",
+"2 c #CEEBF5",
+"3 c #CD2E2F",
+"4 c #CB2829",
+"5 c #C9E9F4",
+"6 c #C3E7F3",
+"7 c #C82323",
+"8 c #BEE5F2",
+"9 c #C61D1D",
+"0 c #BAE3F1",
+"a c #C31818",
+"b c #C11313",
+"c c #B5E1F1",
+"d c #B1DFF0",
+"e c #BF0E0E",
+"f c #AEDEEF",
+"g c #BD0A0A",
+"h c #AADDEE",
+"i c #BC0606",
+"j c #BA0303",
+" .............. ",
+" +(at)#$%&*=-;>,') ",
+" @.!~{]^/(_:<.[ ",
+" #.~}]}}}}}}|.1 ",
+" $.{]^/(_:<|2.3 ",
+" %&*=-;>,')[134 ",
+" &.^/(_:<|256.7 ",
+" *./}_}}}}}}8.9 ",
+" =.(_:<|25680.a ",
+" -;>,')[13479ab ",
+" ;.:<|25680cd.e ",
+" >.<}2}}}}}}f.g ",
+" ,.|25680cdfh.i ",
+" ')[13479abegij ",
+" .............. ",
" "};

Modified: trunk/pgadmin3/src/include/images/user.xpm
===================================================================
--- trunk/pgadmin3/src/include/images/user.xpm 2005-09-17 21:22:35 UTC (rev 4445)
+++ trunk/pgadmin3/src/include/images/user.xpm 2005-09-17 21:58:46 UTC (rev 4446)
@@ -1,6 +1,6 @@
/* XPM */
static char * user_xpm[] = {
-"16 16 70 1",
+"16 16 69 1",
" c None",
". c #999999",
"+ c #6A6A6A",
@@ -69,8 +69,7 @@
"A c #CCE5EE",
"B c #B1DAF2",
"C c #B0D8F0",
-"D c #9E9E9E",
-"E c #555555",
+"D c #555555",
" .++. ",
" @#$%&*=@ ",
" #-;>,')! ",
@@ -86,4 +85,4 @@
" rsefghijkoptur ",
" vwfghijkoptxyv ",
" zAghijkoptxBCz ",
-" DzEEEEEEEEEEzD "};
+" DzDDDDDDDDDDzD "};