From f57f98a24c774785361ae5053f1510106da19052 Mon Sep 17 00:00:00 2001 From: Daniel Gonzalez Date: Tue, 4 Dec 2012 14:10:45 +0100 Subject: [PATCH] Feature #1711 CreaDevManager application implementation icons in tree --- appli/creaDevManager/creaDevManager.cpp | 4 +- lib/creaDevManagerLib/images/AIcon20.xpm | 138 ++++++ .../images/{AIcon.xpm => AIcon64.xpm} | 2 +- lib/creaDevManagerLib/images/ApIcon20.xpm | 159 ++++++ .../images/{ApIcon.xpm => ApIcon64.xpm} | 2 +- lib/creaDevManagerLib/images/BBIcon20.xpm | 158 ++++++ .../images/{BBIcon.xpm => BBIcon64.xpm} | 2 +- lib/creaDevManagerLib/images/CIcon20.xpm | 138 ++++++ .../images/{Cicon.xpm => CIcon64.xpm} | 2 +- lib/creaDevManagerLib/images/CMIcon20.xpm | 157 ++++++ .../images/{CMIcon.xpm => CMIcon64.xpm} | 2 +- lib/creaDevManagerLib/images/Cicon64.xpm | 297 ------------ lib/creaDevManagerLib/images/FdIcon20.xpm | 150 ++++++ .../images/{FdIcon.xpm => FdIcon64.xpm} | 2 +- lib/creaDevManagerLib/images/FlIcon20.xpm | 141 ++++++ .../images/{FlIcon.xpm => FlIcon64.xpm} | 2 +- lib/creaDevManagerLib/images/LIcon20.xpm | 111 +++++ .../images/{LIcon.xpm => LIcon64.xpm} | 2 +- lib/creaDevManagerLib/images/LbIcon20.xpm | 151 ++++++ .../images/{LbIcon.xpm => LbIcon64.xpm} | 2 +- lib/creaDevManagerLib/images/PkIcon20.xpm | 156 ++++++ .../images/{PkIcon.xpm => PkIcon64.xpm} | 2 +- lib/creaDevManagerLib/images/PrIcon20.xpm | 148 ++++++ .../images/{PrIcon.xpm => PrIcon64.xpm} | 2 +- lib/creaDevManagerLib/modelCDMFolder.h | 5 +- .../modelCDMIProjectTreeNode.cpp | 4 +- lib/creaDevManagerLib/modelCDMLib.cpp | 138 +++++- lib/creaDevManagerLib/modelCDMProject.cpp | 2 +- lib/creaDevManagerLib/modelCDMProject.h | 1 - .../wxCDMAppliDescriptionPanel.cpp | 4 +- .../wxCDMApplicationDescriptionPanel.cpp | 4 +- .../wxCDMBlackBoxDescriptionPanel.cpp | 4 +- .../wxCDMCMakeListsDescriptionPanel.cpp | 4 +- .../wxCDMFileDescriptionPanel.cpp | 4 +- .../wxCDMFolderDescriptionPanel.cpp | 4 +- .../wxCDMLibDescriptionPanel.cpp | 43 +- .../wxCDMLibraryDescriptionPanel.cpp | 4 +- .../wxCDMMainDescriptionPanel.cpp | 4 +- lib/creaDevManagerLib/wxCDMMainFrame.cpp | 456 +++++++----------- .../wxCDMPackageDescriptionPanel.cpp | 4 +- .../wxCDMProjectDescriptionPanel.cpp | 43 +- .../wxCDMProjectsTreeCtrl.cxx | 125 ++++- lib/creaDevManagerLib/wxCDMProjectsTreeCtrl.h | 30 +- 43 files changed, 2167 insertions(+), 646 deletions(-) create mode 100644 lib/creaDevManagerLib/images/AIcon20.xpm rename lib/creaDevManagerLib/images/{AIcon.xpm => AIcon64.xpm} (99%) create mode 100644 lib/creaDevManagerLib/images/ApIcon20.xpm rename lib/creaDevManagerLib/images/{ApIcon.xpm => ApIcon64.xpm} (99%) create mode 100644 lib/creaDevManagerLib/images/BBIcon20.xpm rename lib/creaDevManagerLib/images/{BBIcon.xpm => BBIcon64.xpm} (99%) create mode 100644 lib/creaDevManagerLib/images/CIcon20.xpm rename lib/creaDevManagerLib/images/{Cicon.xpm => CIcon64.xpm} (99%) create mode 100644 lib/creaDevManagerLib/images/CMIcon20.xpm rename lib/creaDevManagerLib/images/{CMIcon.xpm => CMIcon64.xpm} (99%) delete mode 100644 lib/creaDevManagerLib/images/Cicon64.xpm create mode 100644 lib/creaDevManagerLib/images/FdIcon20.xpm rename lib/creaDevManagerLib/images/{FdIcon.xpm => FdIcon64.xpm} (99%) create mode 100644 lib/creaDevManagerLib/images/FlIcon20.xpm rename lib/creaDevManagerLib/images/{FlIcon.xpm => FlIcon64.xpm} (99%) create mode 100644 lib/creaDevManagerLib/images/LIcon20.xpm rename lib/creaDevManagerLib/images/{LIcon.xpm => LIcon64.xpm} (99%) create mode 100644 lib/creaDevManagerLib/images/LbIcon20.xpm rename lib/creaDevManagerLib/images/{LbIcon.xpm => LbIcon64.xpm} (99%) create mode 100644 lib/creaDevManagerLib/images/PkIcon20.xpm rename lib/creaDevManagerLib/images/{PkIcon.xpm => PkIcon64.xpm} (99%) create mode 100644 lib/creaDevManagerLib/images/PrIcon20.xpm rename lib/creaDevManagerLib/images/{PrIcon.xpm => PrIcon64.xpm} (99%) diff --git a/appli/creaDevManager/creaDevManager.cpp b/appli/creaDevManager/creaDevManager.cpp index ea6af6a..74146c2 100644 --- a/appli/creaDevManager/creaDevManager.cpp +++ b/appli/creaDevManager/creaDevManager.cpp @@ -2,7 +2,7 @@ # --------------------------------------------------------------------- # # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image -# pour la Santé) +# pour la Sant�) # # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton # # This software is governed by the CeCILL-B license under French law and @@ -44,7 +44,7 @@ bool wxCreaDevManagerApp::OnInit() SetTopWindow(mainWindow); mainWindow->SetSize(800, 600); mainWindow->Show(true); - + std::cout << "Crea DevManager opened." << std::endl; return true; diff --git a/lib/creaDevManagerLib/images/AIcon20.xpm b/lib/creaDevManagerLib/images/AIcon20.xpm new file mode 100644 index 0000000..bcc1a0b --- /dev/null +++ b/lib/creaDevManagerLib/images/AIcon20.xpm @@ -0,0 +1,138 @@ +/* XPM */ +const static char * AIcon20[] = { +"20 20 115 2", +" c None", +". c #171E27", +"+ c #666B71", +"@ c #8E9297", +"# c #909498", +"$ c #8F9297", +"% c #6A6F75", +"& c #191F29", +"* c #686C72", +"= c #ECECED", +"- c #909398", +"; c #868B8F", +"> c #878B8F", +", c #EBECEC", +"' c #A6A9AC", +") c #EAEBEB", +"! c #EBEDED", +"~ c #ECEDED", +"{ c #EAEBEC", +"] c #EBEBEC", +"^ c #686C73", +"/ c #ECEDEE", +"( c #363C44", +"_ c #111821", +": c #131B24", +"< c #0F1721", +"[ c #111822", +"} c #272E36", +"| c #262C35", +"1 c #101820", +"2 c #0E161F", +"3 c #101721", +"4 c #0F1620", +"5 c #353C43", +"6 c #84888D", +"7 c #182029", +"8 c #1C232C", +"9 c #1D242C", +"0 c #282F38", +"a c #F6F7F7", +"b c #D9DBDC", +"c c #222931", +"d c #181F28", +"e c #86898D", +"f c #7E8387", +"g c #192029", +"h c #1D242D", +"i c #161D27", +"j c #8A8E92", +"k c #FFFFFF", +"l c #373D45", +"m c #82858A", +"n c #7D8086", +"o c #161D26", +"p c #9A9DA1", +"q c #A7ABAE", +"r c #141C25", +"s c #7E8287", +"t c #7E8187", +"u c #5A5F65", +"v c #484D55", +"w c #AFB1B4", +"x c #232A33", +"y c #7C8186", +"z c #1B222B", +"A c #A4A6AA", +"B c #F5F5F6", +"C c #53585F", +"D c #6B6F75", +"E c #7D8186", +"F c #808489", +"G c #141B25", +"H c #EFF0F0", +"I c #E8E9EA", +"J c #7F8388", +"K c #8F9397", +"L c #FBFBFB", +"M c #B4B7BA", +"N c #1A212A", +"O c #808488", +"P c #5A5E65", +"Q c #19212A", +"R c #7B8085", +"S c #909499", +"T c #7F8389", +"U c #171E28", +"V c #D9DADC", +"W c #EDEEEF", +"X c #0C141D", +"Y c #5B5F66", +"Z c #7A7E83", +"` c #7D8286", +" . c #353B43", +".. c #F9F9F9", +"+. c #9EA1A5", +"@. c #E9EAEB", +"#. c #8D9196", +"$. c #141B24", +"%. c #474D54", +"&. c #C4C6C8", +"*. c #BCBEC1", +"=. c #2F353E", +"-. c #8D9195", +";. c #6B7075", +">. c #B3B5B9", +",. c #7A7F84", +"'. c #808389", +"). c #7F8488", +"!. c #80858A", +"~. c #797E83", +"{. c #B0B3B6", +"]. c #65696F", +"^. c #8C9095", +"/. c #8C9094", +"(. c #64686E", +" ", +" ", +" . + @ # # # # # # # # # # $ % & ", +" * = - ; > > > > > > > > ; - , % ", +" * ' ) ! ) ~ { ) ) ] ~ { ! ) ' ^ ", +" > / ( _ : < [ } | 1 2 3 4 5 / > ", +" # 6 7 8 8 9 0 a b c 8 8 8 d e # ", +" # f g h h i j k k l 8 h h g m # ", +" # n g h h o k p k q r h h g s # ", +" - t g h h u k v w k x h h g y # ", +" # s g h z A B } C k D h h g E # ", +" # F g h G H I J K L M N h g E # ", +" # O g N P k k k k k L Q 8 g R S ", +" # T g U V W X : [ Y k Z g g ` # ", +" # s g ...+.z h 8 i @.I 8 g J # ", +" #.A $.%.&.%.g g g d s *.=.$.A -. ", +" ;.k >.,.E '.'.).!.J F F ~.{.k ]. ", +" N % ^.S # # # # # # # # S /.(.i ", +" ", +" "}; diff --git a/lib/creaDevManagerLib/images/AIcon.xpm b/lib/creaDevManagerLib/images/AIcon64.xpm similarity index 99% rename from lib/creaDevManagerLib/images/AIcon.xpm rename to lib/creaDevManagerLib/images/AIcon64.xpm index e1bcd34..c580dc4 100644 --- a/lib/creaDevManagerLib/images/AIcon.xpm +++ b/lib/creaDevManagerLib/images/AIcon64.xpm @@ -1,5 +1,5 @@ /* XPM */ -const static char * AIcon[] = { +const static char * AIcon64[] = { "64 64 228 2", " c None", ". c #1D242D", diff --git a/lib/creaDevManagerLib/images/ApIcon20.xpm b/lib/creaDevManagerLib/images/ApIcon20.xpm new file mode 100644 index 0000000..3549270 --- /dev/null +++ b/lib/creaDevManagerLib/images/ApIcon20.xpm @@ -0,0 +1,159 @@ +/* XPM */ +const static char * ApIcon20[] = { +"20 20 136 2", +" c None", +". c #171E27", +"+ c #666B71", +"@ c #8E9297", +"# c #909498", +"$ c #8F9297", +"% c #6A6F75", +"& c #191F29", +"* c #686C72", +"= c #ECECED", +"- c #909398", +"; c #868B8F", +"> c #878B8F", +", c #EBECEC", +"' c #A6A9AC", +") c #EAEBEB", +"! c #EBEDED", +"~ c #ECEDED", +"{ c #EAEBEC", +"] c #EBEBEC", +"^ c #686C73", +"/ c #ECEDEE", +"( c #363C44", +"_ c #111821", +": c #101721", +"< c #09111A", +"[ c #101821", +"} c #121923", +"| c #101720", +"1 c #0E161F", +"2 c #0F1620", +"3 c #353C43", +"4 c #84888D", +"5 c #182029", +"6 c #192029", +"7 c #7F8388", +"8 c #DFE0E1", +"9 c #171D26", +"0 c #1D242D", +"a c #1C232C", +"b c #181F28", +"c c #86898D", +"d c #7E8387", +"e c #FFFFFF", +"f c #4A4F57", +"g c #1B222B", +"h c #161D26", +"i c #161D27", +"j c #82858A", +"k c #7D8086", +"l c #42484F", +"m c #F9FAFA", +"n c #82858B", +"o c #CDCED0", +"p c #171E28", +"q c #2B313A", +"r c #979A9E", +"s c #63686F", +"t c #8E9196", +"u c #3C424A", +"v c #7E8287", +"w c #7E8187", +"x c #151C25", +"y c #8B8E93", +"z c #7D8187", +"A c #252B34", +"B c #FEFEFE", +"C c #313740", +"D c #373D45", +"E c #FDFDFD", +"F c #A3A6A9", +"G c #94979C", +"H c #62666C", +"I c #7C8085", +"J c #F0F0F1", +"K c #61666C", +"L c #353B43", +"M c #FCFDFD", +"N c #4B5158", +"O c #C9CACD", +"P c #BABCBF", +"Q c #808488", +"R c #585D63", +"S c #30363E", +"T c #272D36", +"U c #7C8186", +"V c #CDCED1", +"W c #2B323A", +"X c #494F56", +"Y c #1A212A", +"Z c #DCDDDE", +"` c #9EA1A5", +" . c #7C8185", +".. c #808589", +"+. c #CBCCCF", +"@. c #A9ACAF", +"#. c #262D35", +"$. c #52575E", +"%. c #F8F8F9", +"&. c #E9EAEB", +"*. c #F2F2F3", +"=. c #C9CBCD", +"-. c #222932", +";. c #7B8085", +">. c #909499", +",. c #7F8389", +"'. c #111922", +"). c #181F29", +"!. c #141B24", +"~. c #343A42", +"{. c #484D54", +"]. c #19202A", +"^. c #7D8286", +"/. c #FCFCFD", +"(. c #4E545A", +"_. c #8D9196", +":. c #A4A6AA", +"<. c #141C25", +"[. c #2C333B", +"}. c #BFC1C4", +"|. c #3E444B", +"1. c #8D9195", +"2. c #6B7075", +"3. c #B3B5B9", +"4. c #7A7F84", +"5. c #808389", +"6. c #7F8488", +"7. c #80848A", +"8. c #808489", +"9. c #818589", +"0. c #797E83", +"a. c #B0B3B6", +"b. c #65696F", +"c. c #8C9095", +"d. c #8C9094", +"e. c #64686E", +" ", +" ", +" . + @ # # # # # # # # # # $ % & ", +" * = - ; > > > > > > > > ; - , % ", +" * ' ) ! ) ~ { ) ) ] ~ { ! ) ' ^ ", +" > / ( _ : < _ [ } | 1 : 2 3 / > ", +" # 4 5 6 7 8 9 0 0 0 a a a b c # ", +" # d 6 0 = e f g a h 6 i g 6 j # ", +" # k 6 l m n o p q r s t u 6 v # ", +" - w x y z A B C D E F G e H I # ", +" # v 1 J e e e K L M N b O P I # ", +" # Q R ) S T U V W M X Y Z ` .# ", +" # ..+.@.a 0 #.e $.%.&.*.=.-.;.>. ", +" # ,.'.).0 0 a !.~.E {.!.6 ].^.# ", +" # v 6 0 0 0 0 0 ( /.(.0 0 6 7 # ", +" _.:.<.6 6 6 6 6 [.}.|.6 ].!.:.1. ", +" 2.e 3.4.v 5.5.6.7.v 8.9.0.a.e b. ", +" Y % c.>.# # # # # # # # >.d.e.i ", +" ", +" "}; diff --git a/lib/creaDevManagerLib/images/ApIcon.xpm b/lib/creaDevManagerLib/images/ApIcon64.xpm similarity index 99% rename from lib/creaDevManagerLib/images/ApIcon.xpm rename to lib/creaDevManagerLib/images/ApIcon64.xpm index 8d3aedb..ffa278b 100644 --- a/lib/creaDevManagerLib/images/ApIcon.xpm +++ b/lib/creaDevManagerLib/images/ApIcon64.xpm @@ -1,5 +1,5 @@ /* XPM */ -const static char * ApIcon[] = { +const static char * ApIcon64[] = { "64 64 247 2", " c None", ". c #1D242D", diff --git a/lib/creaDevManagerLib/images/BBIcon20.xpm b/lib/creaDevManagerLib/images/BBIcon20.xpm new file mode 100644 index 0000000..57e2110 --- /dev/null +++ b/lib/creaDevManagerLib/images/BBIcon20.xpm @@ -0,0 +1,158 @@ +/* XPM */ +const static char * BBIcon20[] = { +"20 20 135 2", +" c None", +". c #171E27", +"+ c #666B71", +"@ c #8E9297", +"# c #909498", +"$ c #8F9297", +"% c #6A6F75", +"& c #191F29", +"* c #686C72", +"= c #ECECED", +"- c #909398", +"; c #868B8F", +"> c #878B8F", +", c #EBECEC", +"' c #A6A9AC", +") c #EAEBEB", +"! c #EBEDED", +"~ c #ECEDED", +"{ c #EAEBEC", +"] c #EBEBEC", +"^ c #686C73", +"/ c #ECEDEE", +"( c #363C44", +"_ c #111821", +": c #131B24", +"< c #0F1721", +"[ c #111721", +"} c #101821", +"| c #121923", +"1 c #101720", +"2 c #0E161F", +"3 c #101721", +"4 c #0F1620", +"5 c #353C43", +"6 c #84888D", +"7 c #182029", +"8 c #1C232C", +"9 c #1D232C", +"0 c #1D242D", +"a c #181F28", +"b c #86898D", +"c c #7E8387", +"d c #3E444B", +"e c #4E545A", +"f c #4E535A", +"g c #323840", +"h c #293038", +"i c #4E545B", +"j c #41464E", +"k c #19202A", +"l c #82858A", +"m c #7C7F85", +"n c #C4C6C8", +"o c #FFFFFF", +"p c #F5F5F6", +"q c #686D73", +"r c #1A212A", +"s c #585D64", +"t c #F4F4F4", +"u c #FDFDFD", +"v c #9FA2A6", +"w c #131A23", +"x c #7E8287", +"y c #7D8086", +"z c #C1C3C5", +"A c #C2C4C6", +"B c #131A24", +"C c #989BA0", +"D c #E4E5E6", +"E c #161D26", +"F c #575C63", +"G c #050C16", +"H c #3B424A", +"I c #09111B", +"J c #7C8186", +"K c #7D8186", +"L c #D9DADB", +"M c #7B7F84", +"N c #F2F2F3", +"O c #8D9196", +"P c #696E74", +"Q c #D3D5D6", +"R c #BFC1C3", +"S c #141B24", +"T c #7F8388", +"U c #C8CACC", +"V c #2D333C", +"W c #787C82", +"X c #FCFCFD", +"Y c #464C53", +"Z c #1F262E", +"` c #50555C", +" . c #EFF0F0", +".. c #909499", +"+. c #7C8185", +"@. c #7F8387", +"#. c #C5C7C9", +"$. c #1F262F", +"%. c #3E434B", +"&. c #4F545B", +"*. c #2F353D", +"=. c #DDDDDF", +"-. c #AAACB0", +";. c #7E8288", +">. c #BCBEC0", +",. c #FAFAFA", +"'. c #B4B6B9", +"). c #555A61", +"!. c #F8F9F9", +"~. c #D8DADB", +"{. c #7D8286", +"]. c #2C333B", +"^. c #2B313A", +"/. c #232A33", +"(. c #363D44", +"_. c #30363E", +":. c #192029", +"<. c #A4A6AA", +"[. c #141C25", +"}. c #8D9195", +"|. c #6B7075", +"1. c #B3B5B9", +"2. c #7A7F84", +"3. c #808389", +"4. c #7F8488", +"5. c #80858A", +"6. c #818489", +"7. c #818589", +"8. c #797E83", +"9. c #B0B3B6", +"0. c #65696F", +"a. c #8C9095", +"b. c #8C9094", +"c. c #64686E", +"d. c #161D27", +" ", +" ", +" . + @ # # # # # # # # # # $ % & ", +" * = - ; > > > > > > > > ; - , % ", +" * ' ) ! ) ~ { ) ) ] ~ { ! ) ' ^ ", +" > / ( _ : < [ } | 1 2 3 4 5 / > ", +" # 6 7 8 8 8 9 0 0 0 8 8 8 a b # ", +" # c d e f g a 0 h i i j 7 k l # ", +" # m n o p o q r s o t u v w x # ", +" - y z A B C D E F o G H o I J # ", +" # K z L M N O r F o P Q R S K # ", +" # T z U V W X Y F o Z ` ...+.# ", +" # @.z #.$.%.o &.F o | *.=.-.M .. ", +" # ;.>.,.o u '.8 ).!.o u ~.r {.# ", +" # x ].( ( ^.. 8 /.(.( _.k :.T # ", +" O <.[.:.:.:.:.:.:.:.:.:.k S <.}. ", +" |.o 1.2.x 3.3.4.5.T 6.7.8.9.o 0. ", +" r % a...# # # # # # # # ..b.c.d. ", +" ", +" "}; diff --git a/lib/creaDevManagerLib/images/BBIcon.xpm b/lib/creaDevManagerLib/images/BBIcon64.xpm similarity index 99% rename from lib/creaDevManagerLib/images/BBIcon.xpm rename to lib/creaDevManagerLib/images/BBIcon64.xpm index 71e600b..8b39549 100644 --- a/lib/creaDevManagerLib/images/BBIcon.xpm +++ b/lib/creaDevManagerLib/images/BBIcon64.xpm @@ -1,5 +1,5 @@ /* XPM */ -const static char * BBIcon[] = { +const static char * BBIcon64[] = { "64 64 204 2", " c None", ". c #1D242D", diff --git a/lib/creaDevManagerLib/images/CIcon20.xpm b/lib/creaDevManagerLib/images/CIcon20.xpm new file mode 100644 index 0000000..bff4129 --- /dev/null +++ b/lib/creaDevManagerLib/images/CIcon20.xpm @@ -0,0 +1,138 @@ +/* XPM */ +const static char * CIcon20[] = { +"20 20 115 2", +" c None", +". c #171E27", +"+ c #666B71", +"@ c #8E9297", +"# c #909498", +"$ c #8F9297", +"% c #6A6F75", +"& c #191F29", +"* c #686C72", +"= c #ECECED", +"- c #909398", +"; c #868B8F", +"> c #878B8F", +", c #EBECEC", +"' c #A6A9AC", +") c #EAEBEB", +"! c #EBEDED", +"~ c #ECEDED", +"{ c #EAEBEC", +"] c #EBEBEC", +"^ c #686C73", +"/ c #ECEDEE", +"( c #363C44", +"_ c #111821", +": c #131B24", +"< c #101721", +"[ c #0E1620", +"} c #0B131C", +"| c #0B131D", +"1 c #0A111B", +"2 c #101821", +"3 c #0F1620", +"4 c #353C43", +"5 c #84888D", +"6 c #192029", +"7 c #1C232C", +"8 c #151C26", +"9 c #555A61", +"0 c #C4C6C8", +"a c #E8E9E9", +"b c #D4D5D7", +"c c #81858A", +"d c #232B33", +"e c #181F28", +"f c #86898D", +"g c #808389", +"h c #1D242D", +"i c #171F28", +"j c #BBBDBF", +"k c #FFFFFF", +"l c #E1E2E3", +"m c #BCBEC0", +"n c #C8CACC", +"o c #FEFEFE", +"p c #2B323A", +"q c #82858A", +"r c #A1A3A8", +"s c #8B8F94", +"t c #141C25", +"u c #182029", +"v c #151D26", +"w c #7E8287", +"x c #272D36", +"y c #F6F6F6", +"z c #BEC0C2", +"A c #7D8186", +"B c #7F8388", +"C c #343A43", +"D c #F7F8F8", +"E c #19202A", +"F c #7E8286", +"G c #81848A", +"H c #F5F6F6", +"I c #B0B2B5", +"J c #1A212A", +"K c #808489", +"L c #C5C6C9", +"M c #63686E", +"N c #121A23", +"O c #161D26", +"P c #7C8085", +"Q c #7F8389", +"R c #1B222B", +"S c #EDEEEF", +"T c #CFD0D1", +"U c #868A8F", +"V c #94989C", +"W c #293038", +"X c #7D8286", +"Y c #2C333B", +"Z c #92959A", +"` c #EFF0F0", +" . c #F5F5F6", +".. c #AEB0B3", +"+. c #383E46", +"@. c #1B222C", +"#. c #8D9196", +"$. c #A4A6AA", +"%. c #141B24", +"&. c #09111A", +"*. c #111922", +"=. c #8D9195", +"-. c #6B7075", +";. c #B3B5B9", +">. c #7A7F84", +",. c #7F8488", +"'. c #818589", +"). c #797E83", +"!. c #B0B3B6", +"~. c #65696F", +"{. c #8C9095", +"]. c #909499", +"^. c #8C9094", +"/. c #64686E", +"(. c #161D27", +" ", +" ", +" . + @ # # # # # # # # # # $ % & ", +" * = - ; > > > > > > > > ; - , % ", +" * ' ) ! ) ~ { ) ) ] ~ { ! ) ' ^ ", +" > / ( _ : < [ } | 1 | 2 3 4 / > ", +" # 5 6 7 7 8 9 0 a b c d 7 e f # ", +" # g 6 h i j k l m n o p 7 6 q # ", +" # c 6 e r k s t 6 u v h h 6 w # ", +" # c 6 x y z 8 h h h h h h 6 A # ", +" # B 6 C D - 7 h h h h h 7 E F # ", +" # G 6 p H I J h h h h h 7 6 B # ", +" # K 6 e L k M N . O _ 7 h 6 P # ", +" # Q 6 7 R S k T U V = W 7 6 X # ", +" # w 6 h 7 Y Z ` k ...+.@.6 B # ", +" #.$.t 6 6 E %.| &.} *.u E %.$.=. ", +" -.k ;.>.w g g ,.c B G '.).!.k ~. ", +" J % {.].# # # # # # # # ].^./.(. ", +" ", +" "}; diff --git a/lib/creaDevManagerLib/images/Cicon.xpm b/lib/creaDevManagerLib/images/CIcon64.xpm similarity index 99% rename from lib/creaDevManagerLib/images/Cicon.xpm rename to lib/creaDevManagerLib/images/CIcon64.xpm index 6aa47f3..2b6ec23 100644 --- a/lib/creaDevManagerLib/images/Cicon.xpm +++ b/lib/creaDevManagerLib/images/CIcon64.xpm @@ -1,5 +1,5 @@ /* XPM */ -const static char * Cicon[] = { +const static char * CIcon64[] = { "64 64 230 2", " c None", ". c #1D242D", diff --git a/lib/creaDevManagerLib/images/CMIcon20.xpm b/lib/creaDevManagerLib/images/CMIcon20.xpm new file mode 100644 index 0000000..3224569 --- /dev/null +++ b/lib/creaDevManagerLib/images/CMIcon20.xpm @@ -0,0 +1,157 @@ +/* XPM */ +const static char * CMIcon20[] = { +"20 20 134 2", +" c None", +". c #171E27", +"+ c #666B71", +"@ c #8E9297", +"# c #909498", +"$ c #8F9297", +"% c #6A6F75", +"& c #191F29", +"* c #686C72", +"= c #ECECED", +"- c #909398", +"; c #868B8F", +"> c #878B8F", +", c #EBECEC", +"' c #A6A9AC", +") c #EAEBEB", +"! c #EBEDED", +"~ c #ECEDED", +"{ c #EAEBEC", +"] c #EBEBEC", +"^ c #686C73", +"/ c #ECEDEE", +"( c #363C44", +"_ c #111821", +": c #131B24", +"< c #0F1721", +"[ c #111721", +"} c #101821", +"| c #121923", +"1 c #101720", +"2 c #0E161F", +"3 c #101721", +"4 c #0F1620", +"5 c #353C43", +"6 c #84888D", +"7 c #182029", +"8 c #1C232C", +"9 c #1D232C", +"0 c #1D242D", +"a c #181F28", +"b c #86898D", +"c c #7E8387", +"d c #192029", +"e c #1A212A", +"f c #111822", +"g c #131A24", +"h c #0D141E", +"i c #131A23", +"j c #82858B", +"k c #7D8086", +"l c #4F555C", +"m c #DFE0E1", +"n c #FAFAFA", +"o c #BABCBE", +"p c #FFFFFF", +"q c #494E55", +"r c #1B222B", +"s c #C4C7C8", +"t c #C9CACD", +"u c #7D8186", +"v c #7E8187", +"w c #545960", +"x c #EEEFEF", +"y c #494F56", +"z c #373D45", +"A c #F1F1F2", +"B c #313840", +"C c #EEEEEF", +"D c #C2C4C6", +"E c #7B8085", +"F c #BBBDC0", +"G c #81858A", +"H c #0C131D", +"I c #F0F0F1", +"J c #AEB1B4", +"K c #73777D", +"L c #C9CACC", +"M c #8A8E92", +"N c #C9CBCD", +"O c #7C8085", +"P c #7F8388", +"Q c #B2B4B7", +"R c #909397", +"S c #F5F6F6", +"T c #1F262F", +"U c #EDEDED", +"V c #B4B6BA", +"W c #64686F", +"X c #7F8488", +"Y c #3D424B", +"Z c #F9F9F9", +"` c #787C81", +" . c #52575F", +".. c #74787E", +"+. c #121922", +"@. c #F6F6F6", +"#. c #232A32", +"$. c #363C45", +"%. c #20272F", +"&. c #686D73", +"*. c #7A7F84", +"=. c #909499", +"-. c #7F8389", +";. c #181F29", +">. c #3A4148", +",. c #CFD1D3", +"'. c #EBECED", +"). c #A3A5A9", +"!. c #161E27", +"~. c #E8E8E9", +"{. c #63686E", +"]. c #BEC0C2", +"^. c #7C8185", +"/. c #7E8287", +"(. c #161D26", +"_. c #141B24", +":. c #8D9196", +"<. c #A4A6AA", +"[. c #141C25", +"}. c #19202A", +"|. c #8D9195", +"1. c #6B7075", +"2. c #B3B5B9", +"3. c #808389", +"4. c #80858A", +"5. c #818489", +"6. c #818589", +"7. c #797E83", +"8. c #B0B3B6", +"9. c #65696F", +"0. c #8C9095", +"a. c #8C9094", +"b. c #64686E", +"c. c #161D27", +" ", +" ", +" . + @ # # # # # # # # # # $ % & ", +" * = - ; > > > > > > > > ; - , % ", +" * ' ) ! ) ~ { ) ) ] ~ { ! ) ' ^ ", +" > / ( _ : < [ } | 1 2 3 4 5 / > ", +" # 6 7 8 8 8 9 0 0 0 8 8 8 a b # ", +" # c d e f 4 g 0 h e 0 8 i 2 j # ", +" # k a l m n o g p q r 0 s t u # ", +" - v w x y z q h p A . B C D E # ", +" # u F G 8 0 0 H I J K L M N O # ", +" # P Q R 8 0 0 H S T U V W N O # ", +" # X Y Z ` ...+.@.#.$.%.&.N *.=. ", +" # -.;.>.,.'.).!.~.#.0 8 {.].^.# ", +" # /.d r !.(.a 0 (.8 0 0 e _.P # ", +" :.<.[.d d d d d d d d d }._.<.|. ", +" 1.p 2.*./.3.3.X 4.P 5.6.7.8.p 9. ", +" e % 0.=.# # # # # # # # =.a.b.c. ", +" ", +" "}; diff --git a/lib/creaDevManagerLib/images/CMIcon.xpm b/lib/creaDevManagerLib/images/CMIcon64.xpm similarity index 99% rename from lib/creaDevManagerLib/images/CMIcon.xpm rename to lib/creaDevManagerLib/images/CMIcon64.xpm index b563a21..b14b238 100644 --- a/lib/creaDevManagerLib/images/CMIcon.xpm +++ b/lib/creaDevManagerLib/images/CMIcon64.xpm @@ -1,5 +1,5 @@ /* XPM */ -const static char * CMIcon[] = { +const static char * CMIcon64[] = { "64 64 238 2", " c None", ". c #1D242D", diff --git a/lib/creaDevManagerLib/images/Cicon64.xpm b/lib/creaDevManagerLib/images/Cicon64.xpm deleted file mode 100644 index 6aa47f3..0000000 --- a/lib/creaDevManagerLib/images/Cicon64.xpm +++ /dev/null @@ -1,297 +0,0 @@ -/* XPM */ -const static char * Cicon[] = { -"64 64 230 2", -" c None", -". c #1D242D", -"+ c #1C232C", -"@ c #1A212B", -"# c #19212A", -"$ c #192029", -"% c #19202A", -"& c #1A212A", -"* c #141C25", -"= c #131A24", -"- c #202730", -"; c #272E37", -"> c #2B313A", -", c #282F37", -"' c #222931", -") c #151C25", -"! c #131B24", -"~ c #4A5158", -"{ c #A0A4A7", -"] c #CFD0D2", -"^ c #E6E7E8", -"/ c #F1F2F2", -"( c #E9EAEB", -"_ c #D4D5D7", -": c #A8ABAE", -"< c #575D63", -"[ c #151D26", -"} c #1B222B", -"| c #141B25", -"1 c #777B81", -"2 c #F6F7F7", -"3 c #FFFFFF", -"4 c #898C91", -"5 c #161D26", -"6 c #4C5158", -"7 c #FBFBFC", -"8 c #FDFDFD", -"9 c #F4F4F5", -"0 c #F1F1F2", -"a c #565B62", -"b c #141B24", -"c c #A3A5AA", -"d c #E1E1E3", -"e c #898D92", -"f c #4E535A", -"g c #30373E", -"h c #252C35", -"i c #272D36", -"j c #AAADB0", -"k c #151C26", -"l c #222831", -"m c #D3D5D7", -"n c #B0B2B5", -"o c #252C34", -"p c #030A15", -"q c #232A33", -"r c #272E36", -"s c #D8D9DB", -"t c #232A32", -"u c #C6C8CA", -"v c #0F1720", -"w c #323940", -"x c #929599", -"y c #CACCCE", -"z c #E9E9EA", -"A c #F6F6F7", -"B c #293038", -"C c #2D343C", -"D c #F3F3F4", -"E c #52575F", -"F c #5F646A", -"G c #ECECED", -"H c #52575E", -"I c #2F353D", -"J c #DADCDD", -"K c #6D7177", -"L c #FAFAFA", -"M c #F9F9F9", -"N c #F2F2F3", -"O c #EEEFEF", -"P c #EDEEEF", -"Q c #EFEFF0", -"R c #EEEEEF", -"S c #2D333C", -"T c #E2E3E4", -"U c #D5D7D8", -"V c #777B80", -"W c #41474F", -"X c #2C323B", -"Y c #2A3139", -"Z c #2B323A", -"` c #30363E", -" . c #2A313A", -".. c #242A33", -"+. c #282E37", -"@. c #252B34", -"#. c #212831", -"$. c #242B34", -"%. c #222932", -"&. c #F1F1F1", -"*. c #9B9FA2", -"=. c #0F1620", -"-. c #181F28", -";. c #B7B9BC", -">. c #171E27", -",. c #FCFCFC", -"'. c #52585F", -"). c #121922", -"!. c #F2F3F3", -"~. c #2B3139", -"{. c #373D45", -"]. c #73787D", -"^. c #E1E2E3", -"/. c #F4F4F4", -"(. c #F5F5F5", -"_. c #DFE0E1", -":. c #C9CBCD", -"<. c #B3B5B8", -"[. c #7D8186", -"}. c #3C4249", -"|. c #2D333B", -"1. c #262C35", -"2. c #5E6369", -"3. c #CCCED0", -"4. c #DCDDDE", -"5. c #9B9EA2", -"6. c #4C5259", -"7. c #2A3039", -"8. c #40464D", -"9. c #D1D2D4", -"0. c #A0A3A7", -"a. c #696E73", -"b. c #4B5057", -"c. c #6F7379", -"d. c #EFF0F0", -"e. c #D2D4D5", -"f. c #BEC0C2", -"g. c #BCBEC1", -"h. c #C8C9CC", -"i. c #D8DADB", -"j. c #D8D9DA", -"k. c #292F38", -"l. c #F8F8F9", -"m. c #9FA2A6", -"n. c #4F545B", -"o. c #1E252E", -"p. c #595E65", -"q. c #8D9095", -"r. c #C4C6C8", -"s. c #808489", -"t. c #E6E6E7", -"u. c #363C44", -"v. c #85898E", -"w. c #ABAEB1", -"x. c #C9CACC", -"y. c #5B6067", -"z. c #41474E", -"A. c #B2B4B7", -"B. c #CDCED0", -"C. c #383E46", -"D. c #F7F8F8", -"E. c #DEDFE0", -"F. c #444951", -"G. c #7E8287", -"H. c #92959A", -"I. c #CECFD1", -"J. c #242B33", -"K. c #51565D", -"L. c #63686E", -"M. c #212830", -"N. c #1F262F", -"O. c #E8E9EA", -"P. c #20262F", -"Q. c #DADBDD", -"R. c #E0E0E2", -"S. c #6B6F75", -"T. c #1E252D", -"U. c #232932", -"V. c #262D36", -"W. c #494F56", -"X. c #D9DADC", -"Y. c #3F454D", -"Z. c #95989C", -"`. c #DBDCDE", -" + c #CBCDCF", -".+ c #585D64", -"++ c #64696F", -"@+ c #656A70", -"#+ c #D6D7D9", -"$+ c #C5C7C9", -"%+ c #353B43", -"&+ c #3D434B", -"*+ c #B8BABD", -"=+ c #D1D3D5", -"-+ c #BBBDC0", -";+ c #A3A5A9", -">+ c #73777C", -",+ c #121923", -"'+ c #51575E", -")+ c #F2F2F2", -"!+ c #ECEDED", -"~+ c #B6B8BB", -"{+ c #B5B7BA", -"]+ c #121A23", -"^+ c #CED0D1", -"/+ c #20272F", -"(+ c #AEB0B3", -"_+ c #75797F", -":+ c #40454E", -"<+ c #2C333B", -"[+ c #2E353D", -"}+ c #30363F", -"|+ c #9C9FA3", -"1+ c #131A23", -"2+ c #5C6167", -"3+ c #F0F1F1", -"4+ c #F7F7F7", -"5+ c #929699", -"6+ c #F3F3F3", -"7+ c #6E7378", -"8+ c #161E27", -"9+ c #5D6268", -"0+ c #ABADB1", -"a+ c #D6D6D8", -"b+ c #EBECED", -"c+ c #E7E8E9", -"d+ c #CDCFD0", -"e+ c #9DA0A4", -"f+ c #454B52", -"g+ c #1A222B", -" ", -" ", -" ", -" ", -" ", -" . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", -" . . + @ # $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ % & + . . ", -" . . . * = - ; > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > , ' ) = + . . ", -" . + ! ~ { ] ^ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / ( _ : < [ } . ", -" . . | 1 2 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 4 5 + . ", -" . . | 6 7 3 3 3 8 9 0 / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / 0 9 8 3 3 3 3 a = . . ", -" . . b c 3 3 d e f g h i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i h g f e d 3 3 j k + . ", -" . } l m 3 n o p 5 q r i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i r q 5 p o n 3 s t & . ", -" . % , 9 u v w x y z / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / z y x w v u A B $ . ", -" . $ C D E F G 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 G F H D C $ . ", -" . $ I J K L 3 3 3 3 M N / / / O P Q / / / 0 P P R P P P P R P P 0 / / / Q P O / / / N M 3 3 3 3 L K J I $ . ", -" . $ S T U 3 3 3 s V W X Y Z i ` .h ..+.@.@.B Y , o , B .` > , ' #.$.%.o Y q - r Y X W V s 3 3 3 U T S $ . ", -" . $ > &.3 3 3 *.$.=.-.+ + + . . . . . + . . . . . . . . . . . . . . . . . . . . & $ $ 5 =.$.*.3 3 3 &.> $ . ", -" . $ > / 3 3 ;.* >.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . + . . . . >.* ;.3 3 / > $ . ", -" . $ > / 3 ,.'.5 . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . + . . . . ).'.,.3 / > $ . ", -" . $ > / 3 !.~.+ . . . . . . . . . . . . . . . {.].n ] ^./.(._.:.<.[.}.. . . . . . . . . . . & |.!.3 / > $ . ", -" . $ > / 3 / 1.. . . . . . . . . . . . . . 2.3.3 3 3 3 3 3 3 3 3 3 3 3 4.5.6.. . . . . . . . } 7./ 3 / > $ . ", -" . $ > / 3 / 1.. . . . . . . . . . . . 8.9.3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 0.. . . . . . . . + > / 3 / > $ . ", -" . $ > / 3 / 1.. . . . . . . . . . . a./.3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 b.. . . . . . . . + > / 3 / > $ . ", -" . $ > / 3 / 1.. . . . . . . . . . c.3 3 3 3 3 3 3 3 d.e.f.g.h.i.,.3 3 3 j.. . . . . . . . . + k./ 3 / > $ . ", -" . $ > / 3 / 1.. . . . . . . . . '.M 3 3 3 3 3 l.m.n.o.. . . . . r p.q.r.s.. . . . . . . . . . i / 3 / > $ . ", -" . $ > / 3 / i . . . . . . . . ..t.3 3 3 3 3 u u.. . . . . . . . . . . . . . . . . . . . . . . $./ 3 / > $ . ", -" . $ > / 3 / k.+ . . . . . . . v.3 3 3 3 3 w.- . . . . . . . . . . . . . . . . . . . . . . . . #./ 3 / > $ . ", -" . $ > / 3 / > + . . . . . . ' d.3 3 3 3 x.#.. . . . . . . . . . . . . . . . . . . . . . . . . - / 3 / > $ . ", -" . $ > / 3 / > + . . . . . . y.3 3 3 3 ,.z.. . . . . . . . . . . . . . . . . . . . . . . . . . - / 3 / > $ . ", -" . $ > / 3 / k.+ . . . . . . 0.3 3 3 3 A.. . . . . . . . . . . . . . . . . . . . . . . . . . . - / 3 / > $ . ", -" . $ > / 3 / +.. . . . . . . B.3 3 3 3 a.. . . . . . . . . . . . . . . . . . . . . . . . . . . - / 3 / > $ . ", -" . $ > / 3 / 1.. . . . . . . T 3 3 3 3 C.. . . . . . . . . . . . . . . . . . . . . . . . . . . - / 3 / > $ . ", -" . $ > / 3 / ... . . . . . . D.3 3 3 3 ... . . . . . . . . . . . . . . . . . . . . . . . . . . #./ 3 / > $ . ", -" . $ > / 3 / @.+ . . . . . . N 3 3 3 3 > . . . . . . . . . . . . . . . . . . . . . . . . . . . ../ 3 / > $ . ", -" . $ > / 3 / i . . . . . . . E.3 3 3 3 F.. . . . . . . . . . . . . . . . . . . . . . + - . . . @./ 3 / > $ . ", -" . $ > / 3 / , + . . . . . . h.3 3 3 3 G.. . . . . . . . . . . . . . . . . . . . . + . . . . . o / 3 / > $ . ", -" . $ > / 3 / +.. . . . . . . H.3 3 3 3 I.. . . . . . . . . . . . . + . . . . . . . . . . . . . ../ 3 / > $ . ", -" . $ > / 3 / J.o.. . . . . . K.3 3 3 3 3 L.. . . . . . . . . . . . . . . . . . . . . . . . . . M./ 3 / > $ . ", -" . $ > / 3 / @.o.. . . . . . N.t.3 3 3 3 O.{.. . . . . . . . . . . . . . . . . . . . . . . . . P./ 3 / > $ . ", -" . $ > / 3 / +.. . . . . . . . 1 3 3 3 3 3 Q.C.. . . . . . . . . . . . . . . . . . . . . . . . . / 3 / > $ . ", -" . $ > / 3 / B + . . . . . . . #.R.3 3 3 3 3 Q S.T.. . . . . . . . . . . U.. . . . . . . . . . . / 3 / > $ . ", -" . $ > / 3 / V.+ . . . . . . . . W.2 3 3 3 3 3 3 X.[.Y.. . . . . h p.Z.9.`.T.. . . . . . . . . N./ 3 / > $ . ", -" . $ > / 3 / $.+ . . . . . . . . . S.3 3 3 3 3 3 3 3 3 d.`. +i.Q 3 3 3 3 3 .+. . . . . . . . . #./ 3 / > $ . ", -" . $ > / 3 / 1.. . . . . . . . . . . ++/.3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 ;.. . . . . . . . . $./ 3 / > $ . ", -" . $ > / 3 / 1.. . . . . . . . . . . . F.e.3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 L C . . . . . . . . 1./ 3 / > $ . ", -" . $ > / 3 / @.. . . . . . . . . . . . . T.@+#+3 3 3 3 3 3 3 3 3 3 3 ,.$+[.%+. . . . . . . . . i / 3 / > $ . ", -" . $ > / 3 / 1.+ . . . . . . . . . . . . . . . &+[.*+=+t.l.R _ -+;+>+C + . . . . . . . . . . . +./ 3 / > $ . ", -" . $ > / 3 !.> + . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . } X !.3 / > $ . ", -" . $ > / 3 ,.H 5 . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . + + ,+'+,.3 )+> $ . ", -" . $ B !+3 3 ~+| } . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . + >.| {+3 3 z , % . ", -" . & t i.3 3 3 5.%.& + + . . . . . . . . . . . . . . . . . . . . . . . + + } + . . . . + ]+$.5.3 3 3 ^+/+} . ", -" . + 5 (+3 3 3 3 s _+:+$.o.. N.#.$.1.1.1.1.1.1.J.$.k.<+[+[+1.' $.1.1.i k.> > i l N.. o.}+_+s 3 3 3 3 |+1+. . ", -" . . 1+2+3 3 3 3 3 3 l./ / / / / / / / / / / / / 3+P P P P 3+/ / / / / / / / / / / / / l.3 3 3 3 3 4+F.k . . ", -" . + -.5+3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 6+7+= . . ", -" . @ 8+9+0+a+b+/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / c+d+e+f+= + . ", -" . . + ]+5 %.k.> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > +.- ]+) . . . ", -" . . + & % $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ # g++ . . ", -" . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", -" ", -" ", -" ", -" ", -" "}; diff --git a/lib/creaDevManagerLib/images/FdIcon20.xpm b/lib/creaDevManagerLib/images/FdIcon20.xpm new file mode 100644 index 0000000..4cb8207 --- /dev/null +++ b/lib/creaDevManagerLib/images/FdIcon20.xpm @@ -0,0 +1,150 @@ +/* XPM */ +const static char * FdIcon20[] = { +"20 20 127 2", +" c None", +". c #171E27", +"+ c #666B71", +"@ c #8E9297", +"# c #909498", +"$ c #8F9297", +"% c #6A6F75", +"& c #191F29", +"* c #686C72", +"= c #ECECED", +"- c #909398", +"; c #868B8F", +"> c #878B8F", +", c #EBECEC", +"' c #A6A9AC", +") c #EAEBEB", +"! c #EBEDED", +"~ c #ECEDED", +"{ c #EAEBEC", +"] c #EBEBEC", +"^ c #686C73", +"/ c #ECEDEE", +"( c #363C44", +"_ c #111821", +": c #131B24", +"< c #0F1721", +"[ c #111721", +"} c #101821", +"| c #121923", +"1 c #101720", +"2 c #0E161F", +"3 c #101721", +"4 c #0F1620", +"5 c #353C43", +"6 c #84888D", +"7 c #151C26", +"8 c #181F28", +"9 c #191F28", +"0 c #1C232C", +"a c #1D242D", +"b c #192029", +"c c #151C25", +"d c #86898D", +"e c #7E8287", +"f c #9C9FA3", +"g c #CFD1D2", +"h c #D4D6D7", +"i c #D3D5D7", +"j c #444A51", +"k c #A0A3A6", +"l c #81858A", +"m c #7C7F85", +"n c #C1C3C5", +"o c #DDDEDF", +"p c #7C8085", +"q c #7D8086", +"r c #313840", +"s c #1A222B", +"t c #C4C6C8", +"u c #7D8186", +"v c #BFC1C4", +"w c #070F19", +"x c #08101A", +"y c #09111B", +"z c #1B222B", +"A c #1B222C", +"B c #232A33", +"C c #A3A6AA", +"D c #C1C2C5", +"E c #E8E8E9", +"F c #7B8085", +"G c #FFFFFF", +"H c #2D343C", +"I c #272E37", +"J c #F7F7F7", +"K c #D9DADC", +"L c #A6A8AC", +"M c #EDEEEF", +"N c #7F8388", +"O c #C8CACC", +"P c #2A3139", +"Q c #2B323A", +"R c #50565C", +"S c #1F262F", +"T c #7F8387", +"U c #1B232C", +"V c #53595F", +"W c #1C222C", +"X c #161D27", +"Y c #C2C4C7", +"Z c #7A7F84", +"` c #909499", +" . c #7E8288", +".. c #C5C6C9", +"+. c #343B43", +"@. c #F4F4F5", +"#. c #D3D5D6", +"$. c #E6E6E7", +"%. c #C1C3C6", +"&. c #7C8185", +"*. c #7E8286", +"=. c #898D91", +"-. c #8C9094", +";. c #3E444B", +">. c #989B9F", +",. c #ABAEB1", +"'. c #85898E", +"). c #8D9196", +"!. c #A4A7AA", +"~. c #131A24", +"{. c #111922", +"]. c #0D151E", +"^. c #A4A6AA", +"/. c #8D9195", +"(. c #6B7075", +"_. c #B3B5B9", +":. c #808389", +"<. c #7F8488", +"[. c #80858A", +"}. c #818489", +"|. c #818589", +"1. c #797E83", +"2. c #B0B3B6", +"3. c #65696F", +"4. c #1A212A", +"5. c #8C9095", +"6. c #64686E", +" ", +" ", +" . + @ # # # # # # # # # # $ % & ", +" * = - ; > > > > > > > > ; - , % ", +" * ' ) ! ) ~ { ) ) ] ~ { ! ) ' ^ ", +" > / ( _ : < [ } | 1 2 3 4 5 / > ", +" # 6 7 8 8 8 9 0 a a 0 a b c d # ", +" # e f g h h i j 0 0 a 0 k f l # ", +" # m n o p q p r a 0 0 s t n u # ", +" - q n v w x y z A B C D E n F # ", +" # u n G G G G H I J K L M n p # ", +" # N n O P Q P a R G S z t n p # ", +" # T n t U a a a V G W X Y n Z ` ", +" # .n ..U a a a +.@.#.N $.%.&.# ", +" # *.=.-.0 a a a z ;.>.,.'.-.e # ", +" ).!.2 ~.b b b b b b : {.7 ].^./. ", +" (.G _.Z e :.:.<.[.N }.|.1.2.G 3. ", +" 4.% 5.` # # # # # # # # ` -.6.X ", +" ", +" "}; diff --git a/lib/creaDevManagerLib/images/FdIcon.xpm b/lib/creaDevManagerLib/images/FdIcon64.xpm similarity index 99% rename from lib/creaDevManagerLib/images/FdIcon.xpm rename to lib/creaDevManagerLib/images/FdIcon64.xpm index c00d8c1..8f39e2d 100644 --- a/lib/creaDevManagerLib/images/FdIcon.xpm +++ b/lib/creaDevManagerLib/images/FdIcon64.xpm @@ -1,5 +1,5 @@ /* XPM */ -const static char * FdIcon[] = { +const static char * FdIcon64[] = { "64 64 207 2", " c None", ". c #1D242D", diff --git a/lib/creaDevManagerLib/images/FlIcon20.xpm b/lib/creaDevManagerLib/images/FlIcon20.xpm new file mode 100644 index 0000000..36fc442 --- /dev/null +++ b/lib/creaDevManagerLib/images/FlIcon20.xpm @@ -0,0 +1,141 @@ +/* XPM */ +const static char * FlIcon20[] = { +"20 20 118 2", +" c None", +". c #171E27", +"+ c #666B71", +"@ c #8E9297", +"# c #909498", +"$ c #8F9297", +"% c #6A6F75", +"& c #191F29", +"* c #686C72", +"= c #ECECED", +"- c #909398", +"; c #868B8F", +"> c #878B8F", +", c #EBECEC", +"' c #A6A9AC", +") c #EAEBEB", +"! c #EBEDED", +"~ c #ECEDED", +"{ c #EAEBEC", +"] c #EBEBEC", +"^ c #686C73", +"/ c #ECEDEE", +"( c #363C44", +"_ c #111821", +": c #131B24", +"< c #0F1721", +"[ c #111721", +"} c #101821", +"| c #121923", +"1 c #101720", +"2 c #0E161F", +"3 c #101721", +"4 c #0F1620", +"5 c #353C43", +"6 c #84888D", +"7 c #192029", +"8 c #131A23", +"9 c #141B24", +"0 c #141B25", +"a c #1D242D", +"b c #151D26", +"c c #181F28", +"d c #86898D", +"e c #7E8387", +"f c #070F19", +"g c #FFFFFF", +"h c #A1A4A7", +"i c #D8DADB", +"j c #FDFDFD", +"k c #151C25", +"l c #82858A", +"m c #7D8086", +"n c #08101A", +"o c #A4A7AA", +"p c #2D343C", +"q c #343A42", +"r c #343A43", +"s c #283037", +"t c #CDCFD1", +"u c #F0F0F1", +"v c #7E8287", +"w c #7E8187", +"x c #95999D", +"y c #0C131D", +"z c #131A24", +"A c #1B222B", +"B c #7C8186", +"C c #DFDFE1", +"D c #B4B7BA", +"E c #B7B9BC", +"F c #C0C2C4", +"G c #272E37", +"H c #7D8186", +"I c #808489", +"J c #D2D3D5", +"K c #979A9E", +"L c #9A9DA1", +"M c #A1A5A8", +"N c #252D35", +"O c #808488", +"P c #969A9E", +"Q c #151C26", +"R c #1C232C", +"S c #7B8085", +"T c #909499", +"U c #7F8389", +"V c #999DA0", +"W c #CCCED0", +"X c #F4F4F4", +"Y c #393F47", +"Z c #1F262F", +"` c #7D8286", +" . c #A2A6A9", +".. c #252C34", +"+. c #7F8387", +"@. c #8D9196", +"#. c #A4A6AA", +"$. c #161D26", +"%. c #1A212A", +"&. c #09101A", +"*. c #0B121C", +"=. c #8D9195", +"-. c #6B7075", +";. c #B3B5B9", +">. c #7A7F84", +",. c #808389", +"'. c #7F8488", +"). c #80858A", +"!. c #7F8388", +"~. c #818489", +"{. c #818589", +"]. c #797E83", +"^. c #B0B3B6", +"/. c #65696F", +"(. c #8C9095", +"_. c #8C9094", +":. c #64686E", +"<. c #161D27", +" ", +" ", +" . + @ # # # # # # # # # # $ % & ", +" * = - ; > > > > > > > > ; - , % ", +" * ' ) ! ) ~ { ) ) ] ~ { ! ) ' ^ ", +" > / ( _ : < [ } | 1 2 3 4 5 / > ", +" # 6 7 8 : : 9 0 7 a b 0 a c d # ", +" # e f g g g g g h . i j k 7 l # ", +" # m n g o p q r s c t u b 7 v # ", +" - w n g x y z 8 A c t u b 7 B # ", +" # v n g C D E F G c t u b 7 H # ", +" # I n g J K L M N c t u b 7 H # ", +" # O n g P 2 b Q R c t u 0 7 S T ", +" # U n g V b a a a c W X Y Z ` # ", +" # v f g .k a a a R I g g ..+.# ", +" @.#.$.f 3 %.7 7 7 7 9 &.*.z #.=. ", +" -.g ;.>.v ,.,.'.).!.~.{.].^.g /. ", +" %.% (.T # # # # # # # # T _.:.<. ", +" ", +" "}; diff --git a/lib/creaDevManagerLib/images/FlIcon.xpm b/lib/creaDevManagerLib/images/FlIcon64.xpm similarity index 99% rename from lib/creaDevManagerLib/images/FlIcon.xpm rename to lib/creaDevManagerLib/images/FlIcon64.xpm index c0fea95..79a1850 100644 --- a/lib/creaDevManagerLib/images/FlIcon.xpm +++ b/lib/creaDevManagerLib/images/FlIcon64.xpm @@ -1,5 +1,5 @@ /* XPM */ -const static char * FlIcon[] = { +const static char * FlIcon64[] = { "64 64 180 2", " c None", ". c #1D242D", diff --git a/lib/creaDevManagerLib/images/LIcon20.xpm b/lib/creaDevManagerLib/images/LIcon20.xpm new file mode 100644 index 0000000..591c5f6 --- /dev/null +++ b/lib/creaDevManagerLib/images/LIcon20.xpm @@ -0,0 +1,111 @@ +/* XPM */ +const static char * LIcon20[] = { +"20 20 88 1", +" c None", +". c #171E27", +"+ c #666B71", +"@ c #8E9297", +"# c #909498", +"$ c #8F9297", +"% c #6A6F75", +"& c #191F29", +"* c #686C72", +"= c #ECECED", +"- c #909398", +"; c #868B8F", +"> c #878B8F", +", c #EBECEC", +"' c #A6A9AC", +") c #EAEBEB", +"! c #EBEDED", +"~ c #ECEDED", +"{ c #EAEBEC", +"] c #EBEBEC", +"^ c #686C73", +"/ c #ECEDEE", +"( c #363C44", +"_ c #111821", +": c #121A23", +"< c #2B323B", +"[ c #1C232C", +"} c #101721", +"| c #121923", +"1 c #101720", +"2 c #0E161F", +"3 c #0F1620", +"4 c #353C43", +"5 c #84888D", +"6 c #182029", +"7 c #141B24", +"8 c #FFFFFF", +"9 c #7F8388", +"0 c #1A212A", +"a c #1D242D", +"b c #181F28", +"c c #86898D", +"d c #7E8387", +"e c #192029", +"f c #131B24", +"g c #82868B", +"h c #82858A", +"i c #7D8086", +"j c #7E8287", +"k c #7E8187", +"l c #7C8186", +"m c #7D8186", +"n c #808489", +"o c #808488", +"p c #7B8085", +"q c #909499", +"r c #7F8389", +"s c #858A8E", +"t c #1F262F", +"u c #232A33", +"v c #222931", +"w c #7D8286", +"x c #F0F0F1", +"y c #E3E4E5", +"z c #E4E5E6", +"A c #BDBFC2", +"B c #8D9196", +"C c #A4A6AA", +"D c #141C25", +"E c #CBCDCF", +"F c #C1C3C5", +"G c #A0A3A7", +"H c #151C26", +"I c #19202A", +"J c #8D9195", +"K c #6B7075", +"L c #B3B5B9", +"M c #7A7F84", +"N c #7F8288", +"O c #7F8489", +"P c #81858A", +"Q c #797E83", +"R c #B0B3B6", +"S c #65696F", +"T c #8C9095", +"U c #8C9094", +"V c #64686E", +"W c #161D27", +" ", +" ", +" .+@##########$%& ", +" *=-;>>>>>>>>;-,% ", +" *')!)~{))]~{!)'^ ", +" >/(_:<[}|12}34/> ", +" #56[7890aa[[[bc# ", +" #deaf8ge[[aaaeh# ", +" #ieaf8geaaaaaej# ", +" -keaf8geaaaaael# ", +" #jeaf8geaaaaaem# ", +" #neaf8geaaaaaem# ", +" #oeaf8geaaaaaepq ", +" #reaf8stuuv[aew# ", +" #jeaf8xyzzAbae9# ", +" BCDe:EFFFFGHI7CJ ", +" K8LMjNNdOjnPQR8S ", +" 0%Tq########qUVW ", +" ", +" "}; diff --git a/lib/creaDevManagerLib/images/LIcon.xpm b/lib/creaDevManagerLib/images/LIcon64.xpm similarity index 99% rename from lib/creaDevManagerLib/images/LIcon.xpm rename to lib/creaDevManagerLib/images/LIcon64.xpm index 0f94b65..a5369f5 100644 --- a/lib/creaDevManagerLib/images/LIcon.xpm +++ b/lib/creaDevManagerLib/images/LIcon64.xpm @@ -1,5 +1,5 @@ /* XPM */ -const static char * LIcon[] = { +const static char * LIcon64[] = { "64 64 166 2", " c None", ". c #1D242D", diff --git a/lib/creaDevManagerLib/images/LbIcon20.xpm b/lib/creaDevManagerLib/images/LbIcon20.xpm new file mode 100644 index 0000000..3dc2f4c --- /dev/null +++ b/lib/creaDevManagerLib/images/LbIcon20.xpm @@ -0,0 +1,151 @@ +/* XPM */ +const static char * LbIcon20[] = { +"20 20 128 2", +" c None", +". c #171E27", +"+ c #666B71", +"@ c #8E9297", +"# c #909498", +"$ c #8F9297", +"% c #6A6F75", +"& c #191F29", +"* c #686C72", +"= c #ECECED", +"- c #909398", +"; c #868B8F", +"> c #878B8F", +", c #EBECEC", +"' c #A6A9AC", +") c #EAEBEB", +"! c #EBEDED", +"~ c #ECEDED", +"{ c #EAEBEC", +"] c #EBEBEC", +"^ c #686C73", +"/ c #ECEDEE", +"( c #363C44", +"_ c #111821", +": c #131B24", +"< c #0F1721", +"[ c #111721", +"} c #101821", +"| c #121923", +"1 c #101720", +"2 c #0E161F", +"3 c #101721", +"4 c #0F1620", +"5 c #353C43", +"6 c #84888D", +"7 c #151C26", +"8 c #192029", +"9 c #1C232C", +"0 c #1D232C", +"a c #1D242D", +"b c #1A212B", +"c c #1A212A", +"d c #181F28", +"e c #86898D", +"f c #7E8287", +"g c #9C9FA3", +"h c #A0A3A6", +"i c #1C242D", +"j c #161D26", +"k c #95989C", +"l c #7F8388", +"m c #82858A", +"n c #7C7F85", +"o c #C1C3C5", +"p c #C4C6C8", +"q c #1B232C", +"r c #141B25", +"s c #B7B9BC", +"t c #9A9DA1", +"u c #141C25", +"v c #7D8086", +"w c #B5B7BA", +"x c #CBCCCE", +"y c #B8BABC", +"z c #ADAFB3", +"A c #434950", +"B c #7C8186", +"C c #7D8186", +"D c #B4B6B9", +"E c #EAEAEB", +"F c #AFB1B4", +"G c #D2D3D5", +"H c #FFFFFF", +"I c #444A51", +"J c #7C8086", +"K c #1F262F", +"L c #D2D4D5", +"M c #B2B4B7", +"N c #7C8185", +"O c #7F8387", +"P c #C2C4C7", +"Q c #151C25", +"R c #131A24", +"S c #979A9E", +"T c #CECFD1", +"U c #B0B3B6", +"V c #7B7F84", +"W c #909499", +"X c #7E8288", +"Y c #E4E4E5", +"Z c #94979C", +"` c #93969A", +" . c #293039", +".. c #B5B8BA", +"+. c #71767A", +"@. c #ADB0B3", +"#. c #444B51", +"$. c #7E8286", +"%. c #898D91", +"&. c #B4B7B9", +"*. c #B4B7BA", +"=. c #323941", +"-. c #83878C", +";. c #B0B2B6", +">. c #9CA0A3", +",. c #434951", +"'. c #8D9196", +"). c #A4A7AA", +"!. c #111822", +"~. c #111922", +"{. c #131A23", +"]. c #141B24", +"^. c #A4A6AA", +"/. c #8D9195", +"(. c #6B7075", +"_. c #B3B5B9", +":. c #7A7F84", +"<. c #808389", +"[. c #7F8488", +"}. c #80858A", +"|. c #818489", +"1. c #818589", +"2. c #797E83", +"3. c #65696F", +"4. c #8C9095", +"5. c #8C9094", +"6. c #64686E", +"7. c #161D27", +" ", +" ", +" . + @ # # # # # # # # # # $ % & ", +" * = - ; > > > > > > > > ; - , % ", +" * ' ) ! ) ~ { ) ) ] ~ { ! ) ' ^ ", +" > / ( _ : < [ } | 1 2 3 4 5 / > ", +" # 6 7 8 9 9 0 a b c a 9 9 d e # ", +" # f g h 9 a i j k l . a a 8 m # ", +" # n o p q a a r s t u 9 9 8 f # ", +" - v o p q a a r w x y z A j B # ", +" # C o p q a a r D E F G H I J # ", +" # l o p q a a r s t u K L M N # ", +" # O o P Q j j R s S _ j T U V W ", +" # X o Y Z k ` ...G +.@.H #.C # ", +" # $.%.&.s s *.=.-.f ;.>.,.7 l # ", +" '.).2 !.!.!.!.d : j ~.{.8 ].^./. ", +" (.H _.:.f <.<.[.}.l |.1.2.U H 3. ", +" c % 4.W # # # # # # # # W 5.6.7. ", +" ", +" "}; diff --git a/lib/creaDevManagerLib/images/LbIcon.xpm b/lib/creaDevManagerLib/images/LbIcon64.xpm similarity index 99% rename from lib/creaDevManagerLib/images/LbIcon.xpm rename to lib/creaDevManagerLib/images/LbIcon64.xpm index 67119d8..53ac0bc 100644 --- a/lib/creaDevManagerLib/images/LbIcon.xpm +++ b/lib/creaDevManagerLib/images/LbIcon64.xpm @@ -1,5 +1,5 @@ /* XPM */ -const static char * LbIcon[] = { +const static char * LbIcon64[] = { "64 64 207 2", " c None", ". c #1D242D", diff --git a/lib/creaDevManagerLib/images/PkIcon20.xpm b/lib/creaDevManagerLib/images/PkIcon20.xpm new file mode 100644 index 0000000..abc8e45 --- /dev/null +++ b/lib/creaDevManagerLib/images/PkIcon20.xpm @@ -0,0 +1,156 @@ +/* XPM */ +const static char * PkIcon20[] = { +"20 20 133 2", +" c None", +". c #171E27", +"+ c #666B71", +"@ c #8E9297", +"# c #909498", +"$ c #8F9297", +"% c #6A6F75", +"& c #191F29", +"* c #686C72", +"= c #ECECED", +"- c #909398", +"; c #868B8F", +"> c #878B8F", +", c #EBECEC", +"' c #A6A9AC", +") c #EAEBEB", +"! c #EBEDED", +"~ c #ECEDED", +"{ c #EAEBEC", +"] c #EBEBEC", +"^ c #686C73", +"/ c #ECEDEE", +"( c #363C44", +"_ c #111821", +": c #131B24", +"< c #0F1721", +"[ c #111721", +"} c #101821", +"| c #121923", +"1 c #101720", +"2 c #0E161F", +"3 c #101721", +"4 c #0F1620", +"5 c #353C43", +"6 c #84888D", +"7 c #121922", +"8 c #141B24", +"9 c #181E27", +"0 c #1D242D", +"a c #1C232D", +"b c #1A222B", +"c c #1C232C", +"d c #181F28", +"e c #86898D", +"f c #7D8286", +"g c #CBCDCF", +"h c #FFFFFF", +"i c #DFDFE1", +"j c #3C424A", +"k c #373E45", +"l c #51575D", +"m c #192029", +"n c #82858A", +"o c #7C7F85", +"p c #C1C3C5", +"q c #C2C4C6", +"r c #131A24", +"s c #222932", +"t c #E7E7E8", +"u c #A2A4A8", +"v c #2F363E", +"w c #FCFCFD", +"x c #4E545A", +"y c #182029", +"z c #7E8287", +"A c #7D8086", +"B c #060E18", +"C c #BDBFC2", +"D c #4E545B", +"E c #B8BABD", +"F c #83868B", +"G c #7D8186", +"H c #B8BBBD", +"I c #DFE1E2", +"J c #4C5158", +"K c #FCFDFD", +"L c #565C62", +"M c #D0D1D4", +"N c #B1B3B6", +"O c #0C131C", +"P c #7F8388", +"Q c #E5E6E7", +"R c #94979B", +"S c #777A81", +"T c #2A3138", +"U c #F8F9F9", +"V c #F8F8F9", +"W c #ADAFB2", +"X c #7F8387", +"Y c #C2C4C7", +"Z c #151C25", +"` c #FCFCFC", +" . c #969A9E", +".. c #161D26", +"+. c #7B8085", +"@. c #909499", +"#. c #7E8288", +"$. c #C1C3C6", +"%. c #C5C7C9", +"&. c #1B232C", +"*. c #363D44", +"=. c #FDFDFD", +"-. c #494F56", +";. c #686D73", +">. c #444A52", +",. c #484D55", +"'. c #232A33", +"). c #565B62", +"!. c #293038", +"~. c #1B222B", +"{. c #4E535A", +"]. c #474D54", +"^. c #7F8488", +"/. c #8D9196", +"(. c #A4A6AA", +"_. c #141C25", +":. c #19202A", +"<. c #8D9195", +"[. c #6B7075", +"}. c #B3B5B9", +"|. c #7A7F84", +"1. c #808389", +"2. c #80858A", +"3. c #818489", +"4. c #818589", +"5. c #797E83", +"6. c #B0B3B6", +"7. c #65696F", +"8. c #1A212A", +"9. c #8C9095", +"0. c #8C9094", +"a. c #64686E", +"b. c #161D27", +" ", +" ", +" . + @ # # # # # # # # # # $ % & ", +" * = - ; > > > > > > > > ; - , % ", +" * ' ) ! ) ~ { ) ) ] ~ { ! ) ' ^ ", +" > / ( _ : < [ } | 1 2 3 4 5 / > ", +" # 6 7 : : 8 9 0 a : b c c d e # ", +" # f g h h h i j k h l 0 0 m n # ", +" # o p q r s t u v w x c c y z # ", +" - A p q r B C ' v w D m E F G # ", +" # G p ~ H I h J ( K L M N O G # ", +" # P p Q R S T 0 ( U V W m m G # ", +" # X p Y Z d c 0 ( ` .h J ..+.@. ", +" # #.$.%.&.0 0 0 *.=.-.;.h ( f # ", +" # z >.,.c 0 0 0 '.).!.~.{.].^.# ", +" /.(._.m m m m m m m m m :.8 (.<. ", +" [.h }.|.z 1.1.^.2.P 3.4.5.6.h 7. ", +" 8.% 9.@.# # # # # # # # @.0.a.b. ", +" ", +" "}; diff --git a/lib/creaDevManagerLib/images/PkIcon.xpm b/lib/creaDevManagerLib/images/PkIcon64.xpm similarity index 99% rename from lib/creaDevManagerLib/images/PkIcon.xpm rename to lib/creaDevManagerLib/images/PkIcon64.xpm index c933c56..6b2ffeb 100644 --- a/lib/creaDevManagerLib/images/PkIcon.xpm +++ b/lib/creaDevManagerLib/images/PkIcon64.xpm @@ -1,5 +1,5 @@ /* XPM */ -const static char * PkIcon[] = { +const static char * PkIcon64[] = { "64 64 217 2", " c None", ". c #1D242D", diff --git a/lib/creaDevManagerLib/images/PrIcon20.xpm b/lib/creaDevManagerLib/images/PrIcon20.xpm new file mode 100644 index 0000000..844a33c --- /dev/null +++ b/lib/creaDevManagerLib/images/PrIcon20.xpm @@ -0,0 +1,148 @@ +/* XPM */ +const static char * PrIcon20[] = { +"20 20 125 2", +" c None", +". c #171E27", +"+ c #666B71", +"@ c #8E9297", +"# c #909498", +"$ c #8F9297", +"% c #6A6F75", +"& c #191F29", +"* c #686C72", +"= c #ECECED", +"- c #909398", +"; c #868B8F", +"> c #878B8F", +", c #EBECEC", +"' c #A6A9AC", +") c #EAEBEB", +"! c #EBEDED", +"~ c #ECEDED", +"{ c #EAEBEC", +"] c #EBEBEC", +"^ c #686C73", +"/ c #ECEDEE", +"( c #363C44", +"_ c #111821", +": c #131B24", +"< c #0F1721", +"[ c #111721", +"} c #101821", +"| c #121923", +"1 c #101720", +"2 c #0E161F", +"3 c #101721", +"4 c #0F1620", +"5 c #353C43", +"6 c #84888D", +"7 c #181F28", +"8 c #1A2029", +"9 c #1D242D", +"0 c #1C232C", +"a c #86898D", +"b c #7E8287", +"c c #545A60", +"d c #D4D6D7", +"e c #D3D4D6", +"f c #BFC1C3", +"g c #686D73", +"h c #161D26", +"i c #192029", +"j c #82858A", +"k c #7D8085", +"l c #656A70", +"m c #F8F8F9", +"n c #818489", +"o c #84888C", +"p c #CACBCD", +"q c #FFFFFF", +"r c #393E46", +"s c #7E8186", +"t c #EDEDEE", +"u c #202730", +"v c #F2F3F3", +"w c #5E6369", +"x c #676C72", +"y c #999CA0", +"z c #ACAFB2", +"A c #BDBEC1", +"B c #4A5057", +"C c #7C8086", +"D c #7E8187", +"E c #F4F4F5", +"F c #5C6167", +"G c #63676D", +"H c #A8ABAE", +"I c #232A33", +"J c #82868A", +"K c #C5C6C9", +"L c #CDCFD1", +"M c #3A4048", +"N c #808488", +"O c #656A6F", +"P c #F8F8F8", +"Q c #BFC1C4", +"R c #383E46", +"S c #82868B", +"T c #D5D6D8", +"U c #171F28", +"V c #7D8186", +"W c #7F8388", +"X c #0F1720", +"Y c #131A24", +"Z c #1B222C", +"` c #7B8085", +" . c #909499", +".. c #EEEEEF", +"+. c #7D8286", +"@. c #4C5158", +"#. c #212831", +"$. c #1A212A", +"%. c #60656B", +"&. c #969A9E", +"*. c #19212A", +"=. c #8D9196", +"-. c #A4A7AA", +";. c #111922", +">. c #121922", +",. c #151D26", +"'. c #121A23", +"). c #19202A", +"!. c #141B24", +"~. c #A4A6AA", +"{. c #8D9195", +"]. c #6B7075", +"^. c #B3B5B9", +"/. c #7A7F84", +"(. c #808389", +"_. c #7F8488", +":. c #80858A", +"<. c #818589", +"[. c #797E83", +"}. c #B0B3B6", +"|. c #65696F", +"1. c #8C9095", +"2. c #8C9094", +"3. c #64686E", +"4. c #161D27", +" ", +" ", +" . + @ # # # # # # # # # # $ % & ", +" * = - ; > > > > > > > > ; - , % ", +" * ' ) ! ) ~ { ) ) ] ~ { ! ) ' ^ ", +" > / ( _ : < [ } | 1 2 3 4 5 / > ", +" # 6 . 7 7 7 8 9 9 9 0 0 0 7 a # ", +" # b c d d e f g h 9 9 9 9 i j # ", +" # k l m n o p q r 0 0 0 0 i b # ", +" - s l t u 7 i v w x y z A B C # ", +" # D l E F G H q I J q K L M C # ", +" # N O q q P Q R 7 S T U 0 i V # ", +" # W O = h X Y Z i S d 7 9 i ` . ", +" # W l ..I 9 9 9 i S T 7 9 i +.# ", +" # b @.H #.9 9 9 $.%.&.*.9 i W # ", +" =.-.;.>.i i i i i ,.'.i ).!.~.{. ", +" ].q ^./.b (.(._.:.W n <.[.}.q |. ", +" $.% 1. .# # # # # # # # .2.3.4. ", +" ", +" "}; diff --git a/lib/creaDevManagerLib/images/PrIcon.xpm b/lib/creaDevManagerLib/images/PrIcon64.xpm similarity index 99% rename from lib/creaDevManagerLib/images/PrIcon.xpm rename to lib/creaDevManagerLib/images/PrIcon64.xpm index 90cf6fe..0398260 100644 --- a/lib/creaDevManagerLib/images/PrIcon.xpm +++ b/lib/creaDevManagerLib/images/PrIcon64.xpm @@ -1,5 +1,5 @@ /* XPM */ -const static char * PrIcon[] = { +const static char * PrIcon64[] = { "64 64 209 2", " c None", ". c #1D242D", diff --git a/lib/creaDevManagerLib/modelCDMFolder.h b/lib/creaDevManagerLib/modelCDMFolder.h index bcd2166..f8cd26c 100644 --- a/lib/creaDevManagerLib/modelCDMFolder.h +++ b/lib/creaDevManagerLib/modelCDMFolder.h @@ -57,9 +57,12 @@ public: virtual const bool Refresh(std::string*& result); bool HasCMakeLists(); + +protected: + modelCDMCMakeListsFile* CMakeLists; private: std::vector folders; - modelCDMCMakeListsFile* CMakeLists; + }; #endif /* MODELCDMFOLDER_H_ */ diff --git a/lib/creaDevManagerLib/modelCDMIProjectTreeNode.cpp b/lib/creaDevManagerLib/modelCDMIProjectTreeNode.cpp index c8770d2..1c9db62 100644 --- a/lib/creaDevManagerLib/modelCDMIProjectTreeNode.cpp +++ b/lib/creaDevManagerLib/modelCDMIProjectTreeNode.cpp @@ -34,6 +34,8 @@ #include "modelCDMIProjectTreeNode.h" #include +#include "wx/dir.h" + bool modelCDMIProjectTreeNode::CompareNodeItem(const modelCDMIProjectTreeNode* x, const modelCDMIProjectTreeNode* y) { bool returnValue; @@ -71,7 +73,7 @@ bool modelCDMIProjectTreeNode::CompareNodeItem(const modelCDMIProjectTreeNode* x if(xType != yType) { - if(xType == DT_DIR) + if(xType == wxDIR_DIRS) returnValue = true; else returnValue = false; diff --git a/lib/creaDevManagerLib/modelCDMLib.cpp b/lib/creaDevManagerLib/modelCDMLib.cpp index 2201891..9ecaea4 100644 --- a/lib/creaDevManagerLib/modelCDMLib.cpp +++ b/lib/creaDevManagerLib/modelCDMLib.cpp @@ -35,6 +35,7 @@ #include "modelCDMLib.h" #include +#include #include "CDMUtilities.h" #include "creaWx.h" @@ -62,6 +63,7 @@ modelCDMLib::modelCDMLib(const std::string& path, const int& level) if (dir.IsOpened()) { wxString fileName; + //folders bool cont = dir.GetFirst(&fileName, wxEmptyString, wxDIR_DIRS); while (cont) { @@ -73,7 +75,26 @@ modelCDMLib::modelCDMLib(const std::string& path, const int& level) cont = dir.GetNext(&fileName); } + //files + cont = dir.GetFirst(&fileName, wxEmptyString, wxDIR_FILES); + while (cont) + { + std::string stdfileName = crea::wx2std(fileName); + //if CMakeLists, create CMakeLists + if(stdfileName == "CMakeLists.txt") + { + this->CMakeLists = new modelCDMCMakeListsFile(pathFixed + "/" + stdfileName, this->level + 1); + this->children.push_back(this->CMakeLists); + } + //if is an unknown file, create file + else + { + this->children.push_back(new modelCDMFile(pathFixed + "/" + stdfileName, this->level + 1)); + } + + cont = dir.GetNext(&fileName); + } } this->SortChildren(); } @@ -95,7 +116,7 @@ modelCDMIProjectTreeNode* modelCDMLib::CreateLibrary( result = new std::string("An error occurred while running '" + copyCommand + "'."); return NULL; } - //TODO: set name of library in CMakeLists inside copied folder + //set name of library in CMakeLists inside copied folder std::string line; std::ifstream in((this->path + "/" + name + "/CMakeLists.txt").c_str()); if( !in.is_open()) @@ -125,6 +146,8 @@ modelCDMIProjectTreeNode* modelCDMLib::CreateLibrary( this->libraries.push_back(library); this->children.push_back(library); + this->SortChildren(); + result = new std::string(this->path + "/" + name); return library; } @@ -138,5 +161,118 @@ bool modelCDMLib::OpenCMakeListsFile(std::string*& result) const bool modelCDMLib::Refresh(std::string*& result) { //TODO: implement method + + + + this->type = wxDIR_DIRS; + this->name = "lib"; + this->level = level; + this->path = path; + + + + std::vector checked(this->children.size(), false); + std::vector checkedLibraries(this->libraries.size(), false); + + //check all folders + wxDir dir(crea::std2wx((this->path).c_str())); + if (dir.IsOpened()) + { + wxString fileName; + bool cont = dir.GetFirst(&fileName, wxEmptyString, wxDIR_DIRS); + while (cont) + { + std::string stdfileName = crea::wx2std(fileName); + std::string libraryName = stdfileName; + //check if they already exist + bool found = false; + for (int i = 0;!found && i < this->libraries.size(); i++) + { + if (this->libraries[i]->GetName() == libraryName) + { + found = true; + int pos = std::find(this->children.begin(), this->children.end(), this->libraries[i]) - this->children.begin(); + checked[pos] = true; + checkedLibraries[i] = true; + if(!this->libraries[i]->Refresh(result)) + return false; + } + } + if(!found) + { + modelCDMLibrary* library = new modelCDMLibrary(this->path + "/" + stdfileName, this->level + 1); + this->libraries.push_back(library); + this->children.push_back(library); + } + cont = dir.GetNext(&fileName); + } + + cont = dir.GetFirst(&fileName, wxEmptyString, wxDIR_FILES); + while (cont) + { + std::string stdfileName = crea::wx2std(fileName); + + //if CMakeLists, create CMakeLists + if(stdfileName == "CMakeLists.txt") + { + if (this->CMakeLists == NULL) + { + this->CMakeLists = new modelCDMCMakeListsFile(this->path + "/" + stdfileName, this->level + 1); + this->children.push_back(this->CMakeLists); + } + else + { + int pos = std::find(this->children.begin(), this->children.end(), this->CMakeLists) - this->children.begin(); + checked[pos] = true; + if(!this->CMakeLists->Refresh(result)) + return false; + } + } + //if is an unknown file, create file + else + { + bool found = false; + for (int i = 0; i children.size(); i++) + { + if (this->children[i]->GetName() == stdfileName) + { + found = true; + checked[i] = true; + if(!this->children[i]->Refresh(result)) + return false; + } + } + + if(!found) + { + modelCDMFile* file = new modelCDMFile(this->path + "/" + stdfileName, this->level + 1); + this->children.push_back(file); + } + } + + cont = dir.GetNext(&fileName); + } + } + + for (int i = 0; i < checkedLibraries.size(); i++) + { + if(!checkedLibraries[i]) + { + this->libraries.erase(this->libraries.begin()+i); + checkedLibraries.erase(checkedLibraries.begin()+i); + i--; + } + } + for (int i = 0; i < checked.size(); i++) + { + if(!checked[i]) + { + delete this->children[i]; + this->children.erase(this->children.begin()+i); + checked.erase(checked.begin()+i); + i--; + } + } + this->SortChildren(); return true; } diff --git a/lib/creaDevManagerLib/modelCDMProject.cpp b/lib/creaDevManagerLib/modelCDMProject.cpp index 1c4b898..7cadb24 100644 --- a/lib/creaDevManagerLib/modelCDMProject.cpp +++ b/lib/creaDevManagerLib/modelCDMProject.cpp @@ -297,7 +297,7 @@ bool modelCDMProject::OpenCMakeListsFile(std::string*& result) const bool modelCDMProject::Refresh(std::string*& result) { - + std::cout << "refreshing project" << std::endl; //open makelists file //TODO: set pathMakeLists for windows std::string pathMakeLists = this->path + "/CMakeLists.txt"; diff --git a/lib/creaDevManagerLib/modelCDMProject.h b/lib/creaDevManagerLib/modelCDMProject.h index b6f5662..2cb35b2 100644 --- a/lib/creaDevManagerLib/modelCDMProject.h +++ b/lib/creaDevManagerLib/modelCDMProject.h @@ -103,7 +103,6 @@ private: modelCDMLib* lib; modelCDMAppli* appli; std::vector packages; - modelCDMCMakeListsFile* CMakeLists; }; diff --git a/lib/creaDevManagerLib/wxCDMAppliDescriptionPanel.cpp b/lib/creaDevManagerLib/wxCDMAppliDescriptionPanel.cpp index 6910c32..617f39f 100644 --- a/lib/creaDevManagerLib/wxCDMAppliDescriptionPanel.cpp +++ b/lib/creaDevManagerLib/wxCDMAppliDescriptionPanel.cpp @@ -35,7 +35,7 @@ #include "wxCDMAppliDescriptionPanel.h" #include "creaDevManagerIds.h" -#include "images/ApIcon.xpm" +#include "images/ApIcon64.xpm" BEGIN_EVENT_TABLE(wxCDMAppliDescriptionPanel, wxPanel) EVT_MENU(ID_BUTTON_CREATE_APPLICATION, wxCDMAppliDescriptionPanel::OnBtnCreateApplication) @@ -83,7 +83,7 @@ void wxCDMAppliDescriptionPanel::CreateControls() sizer->Add(new wxStaticText(this, -1, _("Applications")),0, wxALIGN_CENTER, 0); //Image - sizer->Add(new wxStaticBitmap(this, -1, wxBitmap(ApIcon)),0, wxALIGN_CENTER, 0); + sizer->Add(new wxStaticBitmap(this, -1, wxBitmap(ApIcon64)),0, wxALIGN_CENTER, 0); //Actions wxStaticBox* actionsBox = new wxStaticBox(this, -1, _T("&Actions")); diff --git a/lib/creaDevManagerLib/wxCDMApplicationDescriptionPanel.cpp b/lib/creaDevManagerLib/wxCDMApplicationDescriptionPanel.cpp index 0aaa346..878d51d 100644 --- a/lib/creaDevManagerLib/wxCDMApplicationDescriptionPanel.cpp +++ b/lib/creaDevManagerLib/wxCDMApplicationDescriptionPanel.cpp @@ -35,7 +35,7 @@ #include "wxCDMApplicationDescriptionPanel.h" #include "creaDevManagerIds.h" -#include "images/AIcon.xpm" +#include "images/AIcon64.xpm" BEGIN_EVENT_TABLE(wxCDMApplicationDescriptionPanel, wxPanel) EVT_MENU(ID_BUTTON_CREATE_FOLDER, wxCDMApplicationDescriptionPanel::OnBtnCreateFolder) @@ -83,7 +83,7 @@ void wxCDMApplicationDescriptionPanel::CreateControls() sizer->Add(new wxStaticText(this, -1, _("Project")),0, wxALIGN_CENTER, 0); //Image - sizer->Add(new wxStaticBitmap(this, -1, wxBitmap(AIcon)),0, wxALIGN_CENTER, 0); + sizer->Add(new wxStaticBitmap(this, -1, wxBitmap(AIcon64)),0, wxALIGN_CENTER, 0); //Project Name sizer->Add(new wxStaticText(this, -1, crea::std2wx(this->application->GetNameApplication())),0, wxALIGN_CENTER, 0); diff --git a/lib/creaDevManagerLib/wxCDMBlackBoxDescriptionPanel.cpp b/lib/creaDevManagerLib/wxCDMBlackBoxDescriptionPanel.cpp index e893a65..f04d5af 100644 --- a/lib/creaDevManagerLib/wxCDMBlackBoxDescriptionPanel.cpp +++ b/lib/creaDevManagerLib/wxCDMBlackBoxDescriptionPanel.cpp @@ -35,7 +35,7 @@ #include "wxCDMBlackBoxDescriptionPanel.h" #include "creaDevManagerIds.h" -#include "images/BBIcon.xpm" +#include "images/BBIcon64.xpm" BEGIN_EVENT_TABLE(wxCDMBlackBoxDescriptionPanel, wxPanel) EVT_MENU(ID_BUTTON_OPEN_CXX, wxCDMBlackBoxDescriptionPanel::OnBtnOpenCxx) @@ -83,7 +83,7 @@ void wxCDMBlackBoxDescriptionPanel::CreateControls() sizer->Add(new wxStaticText(this, -1, _("Black Box")),0, wxALIGN_CENTER, 0); //Image - sizer->Add(new wxStaticBitmap(this, -1, wxBitmap(BBIcon)),0, wxALIGN_CENTER, 0); + sizer->Add(new wxStaticBitmap(this, -1, wxBitmap(BBIcon64)),0, wxALIGN_CENTER, 0); //BlackBox Name sizer->Add(new wxStaticText(this, -1, crea::std2wx(this->blackBox->GetNameBlackBox())),0, wxALIGN_CENTER, 0); diff --git a/lib/creaDevManagerLib/wxCDMCMakeListsDescriptionPanel.cpp b/lib/creaDevManagerLib/wxCDMCMakeListsDescriptionPanel.cpp index 54ff27f..653e0b8 100644 --- a/lib/creaDevManagerLib/wxCDMCMakeListsDescriptionPanel.cpp +++ b/lib/creaDevManagerLib/wxCDMCMakeListsDescriptionPanel.cpp @@ -35,7 +35,7 @@ #include "wxCDMCMakeListsDescriptionPanel.h" #include "creaDevManagerIds.h" -#include "images/CMIcon.xpm" +#include "images/CMIcon64.xpm" BEGIN_EVENT_TABLE(wxCDMCMakeListsDescriptionPanel, wxPanel) EVT_MENU(ID_BUTTON_EDIT_CMAKELISTSFILE, wxCDMCMakeListsDescriptionPanel::OnBtnOpenInEditor) @@ -82,7 +82,7 @@ void wxCDMCMakeListsDescriptionPanel::CreateControls() sizer->Add(new wxStaticText(this, -1, _("File")),0, wxALIGN_CENTER, 0); //Image - sizer->Add(new wxStaticBitmap(this, -1, wxBitmap(CMIcon)),0, wxALIGN_CENTER, 0); + sizer->Add(new wxStaticBitmap(this, -1, wxBitmap(CMIcon64)),0, wxALIGN_CENTER, 0); //File Name sizer->Add(new wxStaticText(this, -1, crea::std2wx("CMake Configuration File (CMakeLists.txt)")), 0, wxALIGN_CENTER, 0); diff --git a/lib/creaDevManagerLib/wxCDMFileDescriptionPanel.cpp b/lib/creaDevManagerLib/wxCDMFileDescriptionPanel.cpp index b7d8df2..75e2d5e 100644 --- a/lib/creaDevManagerLib/wxCDMFileDescriptionPanel.cpp +++ b/lib/creaDevManagerLib/wxCDMFileDescriptionPanel.cpp @@ -37,7 +37,7 @@ #include #include "creaDevManagerIds.h" -#include "images/FlIcon.xpm" +#include "images/FlIcon64.xpm" BEGIN_EVENT_TABLE(wxCDMFileDescriptionPanel, wxPanel) EVT_MENU(ID_BUTTON_OPEN_FOLDER, wxCDMFileDescriptionPanel::OnBtnOpenContainingFolder) @@ -85,7 +85,7 @@ void wxCDMFileDescriptionPanel::CreateControls() sizer->Add(new wxStaticText(this, -1, _("File")),0, wxALIGN_CENTER, 0); //Image - sizer->Add(new wxStaticBitmap(this, -1, wxBitmap(FlIcon)),0, wxALIGN_CENTER, 0); + sizer->Add(new wxStaticBitmap(this, -1, wxBitmap(FlIcon64)),0, wxALIGN_CENTER, 0); //BlackBox Name sizer->Add(new wxStaticText(this, -1, crea::std2wx(this->file->GetName())),0, wxALIGN_CENTER, 0); diff --git a/lib/creaDevManagerLib/wxCDMFolderDescriptionPanel.cpp b/lib/creaDevManagerLib/wxCDMFolderDescriptionPanel.cpp index 5532cb6..00e10ed 100644 --- a/lib/creaDevManagerLib/wxCDMFolderDescriptionPanel.cpp +++ b/lib/creaDevManagerLib/wxCDMFolderDescriptionPanel.cpp @@ -35,7 +35,7 @@ #include "wxCDMFolderDescriptionPanel.h" #include "creaDevManagerIds.h" -#include "images/FdIcon.xpm" +#include "images/FdIcon64.xpm" BEGIN_EVENT_TABLE(wxCDMFolderDescriptionPanel, wxPanel) EVT_MENU(ID_BUTTON_OPEN_FOLDER, wxCDMFolderDescriptionPanel::OnBtnOpenInExplorer) @@ -83,7 +83,7 @@ void wxCDMFolderDescriptionPanel::CreateControls() sizer->Add(new wxStaticText(this, -1, _("Folder")),0, wxALIGN_CENTER, 0); //Image - sizer->Add(new wxStaticBitmap(this, -1, wxBitmap(FdIcon)),0, wxALIGN_CENTER, 0); + sizer->Add(new wxStaticBitmap(this, -1, wxBitmap(FdIcon64)),0, wxALIGN_CENTER, 0); //Welcome sizer->Add(new wxStaticText(this, -1, crea::std2wx(this->folder->GetName())),0, wxALIGN_CENTER, 0); diff --git a/lib/creaDevManagerLib/wxCDMLibDescriptionPanel.cpp b/lib/creaDevManagerLib/wxCDMLibDescriptionPanel.cpp index cdefeed..d9392aa 100644 --- a/lib/creaDevManagerLib/wxCDMLibDescriptionPanel.cpp +++ b/lib/creaDevManagerLib/wxCDMLibDescriptionPanel.cpp @@ -34,12 +34,14 @@ #include "wxCDMLibDescriptionPanel.h" +#include "wxCDMMainFrame.h" + #include "creaDevManagerIds.h" -#include "images/LbIcon.xpm" +#include "images/LbIcon64.xpm" BEGIN_EVENT_TABLE(wxCDMLibDescriptionPanel, wxPanel) -EVT_MENU(ID_BUTTON_CREATE_LIBRARY, wxCDMLibDescriptionPanel::OnBtnCreateLibrary) -EVT_MENU(ID_BUTTON_EDIT_CMAKELISTSFILE, wxCDMLibDescriptionPanel::OnBtnEditCMakeLists) +EVT_BUTTON(ID_BUTTON_CREATE_LIBRARY, wxCDMLibDescriptionPanel::OnBtnCreateLibrary) +EVT_BUTTON(ID_BUTTON_EDIT_CMAKELISTSFILE, wxCDMLibDescriptionPanel::OnBtnEditCMakeLists) END_EVENT_TABLE() wxCDMLibDescriptionPanel::wxCDMLibDescriptionPanel( @@ -83,7 +85,7 @@ void wxCDMLibDescriptionPanel::CreateControls() sizer->Add(new wxStaticText(this, -1, _("Libraries")),0, wxALIGN_CENTER, 0); //Image - sizer->Add(new wxStaticBitmap(this, -1, wxBitmap(LbIcon)),0, wxALIGN_CENTER, 0); + sizer->Add(new wxStaticBitmap(this, -1, wxBitmap(LbIcon64)),0, wxALIGN_CENTER, 0); //Actions wxStaticBox* actionsBox = new wxStaticBox(this, -1, _T("&Actions")); @@ -105,6 +107,39 @@ void wxCDMLibDescriptionPanel::OnBtnCreateLibrary(wxCommandEvent& event) //TODO: implement method std::cerr << "Event OnBtnCreateLibrary not implemented" << std::endl; event.Skip(); + + + //get name + wxString libraryName = wxGetTextFromUser( + _T("Enter the new library name"), + _T("New Library - creaDevManager"), + _T("") + ); + //check name + if(libraryName.Len() > 0) + { + std::string* result; + //create library + modelCDMIProjectTreeNode* library = this->lib->CreateLibrary(crea::wx2std(libraryName),result); + //check library created + if(library == NULL) + { + wxMessageBox(crea::std2wx(*result),_T("New Library - Error!"),wxOK | wxICON_ERROR); + event.Skip(); + return; + } + wxMessageBox(crea::std2wx("Library successfully created."),_T("New Library - Success!"),wxOK | wxICON_INFORMATION); + + //refreshing tree and description + //send event instead of calling parent to avoid crashing + + ((wxCDMMainFrame*)this->GetParent())->RefreshProject(); + + wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_DISPLAY_CHANGED); + newEvent->SetInt(library->GetId()); + wxPostEvent(this->GetParent(), *newEvent); + event.Skip(); + } } void wxCDMLibDescriptionPanel::OnBtnEditCMakeLists(wxCommandEvent& event) diff --git a/lib/creaDevManagerLib/wxCDMLibraryDescriptionPanel.cpp b/lib/creaDevManagerLib/wxCDMLibraryDescriptionPanel.cpp index 8bbaf91..5ef919b 100644 --- a/lib/creaDevManagerLib/wxCDMLibraryDescriptionPanel.cpp +++ b/lib/creaDevManagerLib/wxCDMLibraryDescriptionPanel.cpp @@ -35,7 +35,7 @@ #include "wxCDMLibraryDescriptionPanel.h" #include "creaDevManagerIds.h" -#include "images/LIcon.xpm" +#include "images/LIcon64.xpm" BEGIN_EVENT_TABLE(wxCDMLibraryDescriptionPanel, wxPanel) EVT_MENU(ID_BUTTON_CREATE_FOLDER, wxCDMLibraryDescriptionPanel::OnBtnCreateFolder) @@ -83,7 +83,7 @@ void wxCDMLibraryDescriptionPanel::CreateControls() sizer->Add(new wxStaticText(this, -1, _("Library")),0, wxALIGN_CENTER, 0); //Image - sizer->Add(new wxStaticBitmap(this, -1, wxBitmap(LIcon)),0, wxALIGN_CENTER, 0); + sizer->Add(new wxStaticBitmap(this, -1, wxBitmap(LIcon64)),0, wxALIGN_CENTER, 0); //Project Name sizer->Add(new wxStaticText(this, -1, crea::std2wx(this->library->GetNameLibrary())),0, wxALIGN_CENTER, 0); diff --git a/lib/creaDevManagerLib/wxCDMMainDescriptionPanel.cpp b/lib/creaDevManagerLib/wxCDMMainDescriptionPanel.cpp index e02c915..63b45c5 100644 --- a/lib/creaDevManagerLib/wxCDMMainDescriptionPanel.cpp +++ b/lib/creaDevManagerLib/wxCDMMainDescriptionPanel.cpp @@ -36,7 +36,7 @@ #include "wxCDMMainDescriptionPanel.h" #include "creaDevManagerIds.h" -#include "images/Cicon.xpm" +#include "images/CIcon64.xpm" BEGIN_EVENT_TABLE(wxCDMMainDescriptionPanel, wxPanel) EVT_MENU(ID_MENU_NEW_PROJECT, wxCDMMainDescriptionPanel::OnBtnNewProject) @@ -81,7 +81,7 @@ void wxCDMMainDescriptionPanel::CreateControls() sizer->Add(new wxStaticText(this, -1, _("Welcome")),0, wxALIGN_CENTER, 0); //Image - sizer->Add(new wxStaticBitmap(this, -1, wxBitmap(Cicon)),0, wxALIGN_CENTER, 0); + sizer->Add(new wxStaticBitmap(this, -1, wxBitmap(CIcon64)),0, wxALIGN_CENTER, 0); //Crea Development Manager sizer->Add(new wxStaticText(this, -1, _("Crea Development Manager")),0, wxALIGN_CENTER, 0); diff --git a/lib/creaDevManagerLib/wxCDMMainFrame.cpp b/lib/creaDevManagerLib/wxCDMMainFrame.cpp index 355b284..acda55d 100755 --- a/lib/creaDevManagerLib/wxCDMMainFrame.cpp +++ b/lib/creaDevManagerLib/wxCDMMainFrame.cpp @@ -516,6 +516,8 @@ void wxCDMMainFrame::OnMenuRefreshProject(wxCommandEvent& event) { wxMessageBox( crea::std2wx(result->c_str()), wxT("Refresh Project - Error"), wxICON_ERROR); } + this->tree_Projects->BuildTree(this->model->GetModelElements(), this->model->GetProject()); + this->auiManager.Update(); //TODO: Show possible problems in CMakeLists files event.Skip(); } @@ -612,11 +614,11 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event) //TODO get element type //project modelCDMProject* elementProject = dynamic_cast(element); + wxPanel* description; if(elementProject != NULL) { - //create element description - wxCDMProjectDescriptionPanel* description = new wxCDMProjectDescriptionPanel( + description = new wxCDMProjectDescriptionPanel( this, elementProject, ID_WINDOW_PROPERTIES, @@ -625,291 +627,185 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event) wxSize(300, 400), 0 ); - //delete old view - if(this->panel_Properties!= NULL) - { - this->panel_Properties->Hide(); - this->panel_Properties->Destroy(); - auiManager.DetachPane(this->panel_Properties); - } - //set new view - this->panel_Properties = description; - auiManager.AddPane(panel_Properties, wxCENTER, wxT("Properties")); - auiManager.Update(); - event.Skip(); - return; - } - //appli - modelCDMAppli* elementAppli = dynamic_cast(element); - if(elementAppli != NULL) - { - //create element description - wxCDMAppliDescriptionPanel* description = new wxCDMAppliDescriptionPanel( - this, - elementAppli, - ID_WINDOW_PROPERTIES, - wxT("Description Panel"), - wxDefaultPosition, - wxSize(300, 400), - 0 - ); - //delete old view - if(this->panel_Properties!= NULL) - { - this->panel_Properties->Hide(); - this->panel_Properties->Destroy(); - auiManager.DetachPane(this->panel_Properties); - } - //set new view - this->panel_Properties = description; - auiManager.AddPane(panel_Properties, wxCENTER, wxT("Properties")); - auiManager.Update(); - event.Skip(); - return; - } - //application - modelCDMApplication* elementApplication = dynamic_cast(element); - if(elementApplication != NULL) - { - //create element description - wxCDMApplicationDescriptionPanel* description = new wxCDMApplicationDescriptionPanel( - this, - elementApplication, - ID_WINDOW_PROPERTIES, - wxT("Description Panel"), - wxDefaultPosition, - wxSize(300, 400), - 0 - ); - //delete old view - if(this->panel_Properties!= NULL) - { - this->panel_Properties->Hide(); - this->panel_Properties->Destroy(); - auiManager.DetachPane(this->panel_Properties); - - } - //set new view - this->panel_Properties = description; - auiManager.AddPane(panel_Properties, wxCENTER, wxT("Properties")); - auiManager.Update(); - event.Skip(); - return; - } - //lib - modelCDMLib* elementLib = dynamic_cast(element); - if(elementLib != NULL) - { - //create element description - wxCDMLibDescriptionPanel* description = new wxCDMLibDescriptionPanel( - this, - elementLib, - ID_WINDOW_PROPERTIES, - wxT("Description Panel"), - wxDefaultPosition, - wxSize(300, 400), - 0 - ); - //delete old view - if(this->panel_Properties!= NULL) - { - this->panel_Properties->Hide(); - this->panel_Properties->Destroy(); - auiManager.DetachPane(this->panel_Properties); - - } - //set new view - this->panel_Properties = description; - auiManager.AddPane(panel_Properties, wxCENTER, wxT("Properties")); - auiManager.Update(); - event.Skip(); - return; - } - //library - modelCDMLibrary* elementLibrary = dynamic_cast(element); - if(elementLibrary != NULL) - { - //create element description - wxCDMLibraryDescriptionPanel* description = new wxCDMLibraryDescriptionPanel( - this, - elementLibrary, - ID_WINDOW_PROPERTIES, - wxT("Description Panel"), - wxDefaultPosition, - wxSize(300, 400), - 0 - ); - //delete old view - if(this->panel_Properties!= NULL) - { - auiManager.DetachPane(this->panel_Properties); - this->panel_Properties->Hide(); - this->panel_Properties->Destroy(); - } - - //set new view - this->panel_Properties = description; - auiManager.AddPane(panel_Properties, wxCENTER, wxT("Properties")); - auiManager.Update(); - event.Skip(); - return; - } - //package - modelCDMPackage* elementPackage = dynamic_cast(element); - if(elementPackage != NULL) - { - //create element description - wxCDMPackageDescriptionPanel* description = new wxCDMPackageDescriptionPanel( - this, - elementPackage, - ID_WINDOW_PROPERTIES, - wxT("Description Panel"), - wxDefaultPosition, - wxSize(300, 400), - 0 - ); - //delete old view - if(this->panel_Properties!= NULL) - { - this->panel_Properties->Hide(); - this->panel_Properties->Destroy(); - auiManager.DetachPane(this->panel_Properties); - } - //set new view - this->panel_Properties = description; - auiManager.AddPane(panel_Properties, wxCENTER, wxT("Properties")); - auiManager.Update(); - event.Skip(); - return; } - //black box - modelCDMBlackBox* elementBlackBox = dynamic_cast(element); - if(elementBlackBox != NULL) + else { - //create element description - wxCDMBlackBoxDescriptionPanel* description = new wxCDMBlackBoxDescriptionPanel( - this, - elementBlackBox, - ID_WINDOW_PROPERTIES, - wxT("Description Panel"), - wxDefaultPosition, - wxSize(300, 400), - 0 - ); - //delete old view - if(this->panel_Properties!= NULL) + //appli + modelCDMAppli* elementAppli = dynamic_cast(element); + if(elementAppli != NULL) { - this->panel_Properties->Hide(); - this->panel_Properties->Destroy(); - auiManager.DetachPane(this->panel_Properties); - + //create element description + description = new wxCDMAppliDescriptionPanel( + this, + elementAppli, + ID_WINDOW_PROPERTIES, + wxT("Description Panel"), + wxDefaultPosition, + wxSize(300, 400), + 0 + ); } - //set new view - this->panel_Properties = description; - auiManager.AddPane(panel_Properties, wxCENTER, wxT("Properties")); - auiManager.Update(); - event.Skip(); - return; - } - //CMakeLists - modelCDMCMakeListsFile* elementCMakeLists = dynamic_cast(element); - if(elementCMakeLists != NULL) - { - //create element description - wxCDMCMakeListsDescriptionPanel* description = new wxCDMCMakeListsDescriptionPanel( - this, - elementCMakeLists, - ID_WINDOW_PROPERTIES, - wxT("Description Panel"), - wxDefaultPosition, - wxSize(300, 400), - 0 - ); - //delete old view - if(this->panel_Properties!= NULL) + else { - this->panel_Properties->Hide(); - this->panel_Properties->Destroy(); - auiManager.DetachPane(this->panel_Properties); - - } - //set new view - this->panel_Properties = description; - auiManager.AddPane(panel_Properties, wxCENTER, wxT("Properties")); - auiManager.Update(); - event.Skip(); - return; - } - //folder - modelCDMFolder* elementFolder = dynamic_cast(element); - if(elementFolder != NULL) - { - //create element description - wxCDMFolderDescriptionPanel* description = new wxCDMFolderDescriptionPanel( - this, - elementFolder, - ID_WINDOW_PROPERTIES, - wxT("Description Panel"), - wxDefaultPosition, - wxSize(300, 400), - 0 - ); - //delete old view - if(this->panel_Properties!= NULL) - { - this->panel_Properties->Hide(); - this->panel_Properties->Destroy(); - auiManager.DetachPane(this->panel_Properties); - - } - //set new view - this->panel_Properties = description; - auiManager.AddPane(panel_Properties, wxCENTER, wxT("Properties")); - auiManager.Update(); - event.Skip(); - return; - } - //TODO: file - modelCDMFile* elementFile = dynamic_cast(element); - if(elementFile != NULL) - { - //create element description - wxCDMFileDescriptionPanel* description = new wxCDMFileDescriptionPanel( - this, - elementFile, - ID_WINDOW_PROPERTIES, - wxT("Description Panel"), - wxDefaultPosition, - wxSize(300, 400), - 0 - ); - //delete old view - if(this->panel_Properties!= NULL) - { - this->panel_Properties->Hide(); - this->panel_Properties->Destroy(); - auiManager.DetachPane(this->panel_Properties); - + //application + modelCDMApplication* elementApplication = dynamic_cast(element); + if(elementApplication != NULL) + { + //create element description + description = new wxCDMApplicationDescriptionPanel( + this, + elementApplication, + ID_WINDOW_PROPERTIES, + wxT("Description Panel"), + wxDefaultPosition, + wxSize(300, 400), + 0 + ); + } + else + { + //lib + modelCDMLib* elementLib = dynamic_cast(element); + if(elementLib != NULL) + { + //create element description + description = new wxCDMLibDescriptionPanel( + this, + elementLib, + ID_WINDOW_PROPERTIES, + wxT("Description Panel"), + wxDefaultPosition, + wxSize(300, 400), + 0 + ); + } + else + { + //library + modelCDMLibrary* elementLibrary = dynamic_cast(element); + if(elementLibrary != NULL) + { + //create element description + description = new wxCDMLibraryDescriptionPanel( + this, + elementLibrary, + ID_WINDOW_PROPERTIES, + wxT("Description Panel"), + wxDefaultPosition, + wxSize(300, 400), + 0 + ); + } + else + { + //package + modelCDMPackage* elementPackage = dynamic_cast(element); + if(elementPackage != NULL) + { + //create element description + description = new wxCDMPackageDescriptionPanel( + this, + elementPackage, + ID_WINDOW_PROPERTIES, + wxT("Description Panel"), + wxDefaultPosition, + wxSize(300, 400), + 0 + ); + } + else + { + //black box + modelCDMBlackBox* elementBlackBox = dynamic_cast(element); + if(elementBlackBox != NULL) + { + //create element description + description = new wxCDMBlackBoxDescriptionPanel( + this, + elementBlackBox, + ID_WINDOW_PROPERTIES, + wxT("Description Panel"), + wxDefaultPosition, + wxSize(300, 400), + 0 + ); + } + else + { + //CMakeLists + modelCDMCMakeListsFile* elementCMakeLists = dynamic_cast(element); + if(elementCMakeLists != NULL) + { + //create element description + description = new wxCDMCMakeListsDescriptionPanel( + this, + elementCMakeLists, + ID_WINDOW_PROPERTIES, + wxT("Description Panel"), + wxDefaultPosition, + wxSize(300, 400), + 0 + ); + } + else + { + //folder + modelCDMFolder* elementFolder = dynamic_cast(element); + if(elementFolder != NULL) + { + //create element description + description = new wxCDMFolderDescriptionPanel( + this, + elementFolder, + ID_WINDOW_PROPERTIES, + wxT("Description Panel"), + wxDefaultPosition, + wxSize(300, 400), + 0 + ); + } + else + { + //file + modelCDMFile* elementFile = dynamic_cast(element); + if(elementFile != NULL) + { + //create element description + description = new wxCDMFileDescriptionPanel( + this, + elementFile, + ID_WINDOW_PROPERTIES, + wxT("Description Panel"), + wxDefaultPosition, + wxSize(300, 400), + 0 + ); + } + else + { + + //main if not any + //create element description + description = new wxCDMMainDescriptionPanel( + this, + ID_WINDOW_PROPERTIES, + wxT("Description Panel"), + wxDefaultPosition, + wxSize(300, 400), + 0 + ); + } + } + } + } + } + } + } + } } - //set new view - this->panel_Properties = description; - auiManager.AddPane(panel_Properties, wxCENTER, wxT("Properties")); - auiManager.Update(); - event.Skip(); - return; } - - //main if not any - //create element description - wxCDMMainDescriptionPanel* description = new wxCDMMainDescriptionPanel( - this, - ID_WINDOW_PROPERTIES, - wxT("Description Panel"), - wxDefaultPosition, - wxSize(300, 400), - 0 - ); + description->Hide(); //delete old view if(this->panel_Properties!= NULL) { @@ -919,9 +815,11 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event) } //set new view + this->panel_Properties = description; auiManager.AddPane(panel_Properties, wxCENTER, wxT("Properties")); auiManager.Update(); + this->panel_Properties->Show(true); event.Skip(); return; diff --git a/lib/creaDevManagerLib/wxCDMPackageDescriptionPanel.cpp b/lib/creaDevManagerLib/wxCDMPackageDescriptionPanel.cpp index a7f7a4e..a958d35 100644 --- a/lib/creaDevManagerLib/wxCDMPackageDescriptionPanel.cpp +++ b/lib/creaDevManagerLib/wxCDMPackageDescriptionPanel.cpp @@ -35,7 +35,7 @@ #include "wxCDMPackageDescriptionPanel.h" #include "creaDevManagerIds.h" -#include "images/PkIcon.xpm" +#include "images/PkIcon64.xpm" BEGIN_EVENT_TABLE(wxCDMPackageDescriptionPanel, wxPanel) EVT_MENU(ID_BUTTON_CREATE_BLACKBOX, wxCDMPackageDescriptionPanel::OnBtnCreateBlackBox) @@ -83,7 +83,7 @@ void wxCDMPackageDescriptionPanel::CreateControls() sizer->Add(new wxStaticText(this, -1, _("Package")),0, wxALIGN_CENTER, 0); //Image - sizer->Add(new wxStaticBitmap(this, -1, wxBitmap(PkIcon)),0, wxALIGN_CENTER, 0); + sizer->Add(new wxStaticBitmap(this, -1, wxBitmap(PkIcon64)),0, wxALIGN_CENTER, 0); //Project Name sizer->Add(new wxStaticText(this, -1, crea::std2wx(this->package->GetNamePackage())),0, wxALIGN_CENTER, 0); diff --git a/lib/creaDevManagerLib/wxCDMProjectDescriptionPanel.cpp b/lib/creaDevManagerLib/wxCDMProjectDescriptionPanel.cpp index 2d3aa8e..2d8b0c1 100644 --- a/lib/creaDevManagerLib/wxCDMProjectDescriptionPanel.cpp +++ b/lib/creaDevManagerLib/wxCDMProjectDescriptionPanel.cpp @@ -37,7 +37,7 @@ #include "wxCDMMainFrame.h" #include "creaDevManagerIds.h" -#include "images/PrIcon.xpm" +#include "images/PrIcon64.xpm" BEGIN_EVENT_TABLE(wxCDMProjectDescriptionPanel, wxPanel) EVT_BUTTON(ID_BUTTON_CREATE_PACKAGE, wxCDMProjectDescriptionPanel::OnBtnCreatePackage) @@ -89,7 +89,7 @@ void wxCDMProjectDescriptionPanel::CreateControls() sizer->Add(new wxStaticText(this, -1, _("Project")),0, wxALIGN_CENTER, 0); //Image - sizer->Add(new wxStaticBitmap(this, -1, wxBitmap(PrIcon)),0, wxALIGN_CENTER, 0); + sizer->Add(new wxStaticBitmap(this, -1, wxBitmap(PrIcon64)),0, wxALIGN_CENTER, 0); //Project Name sizer->Add(new wxStaticText(this, -1, crea::std2wx(this->project->GetName())),0, wxALIGN_CENTER, 0); @@ -157,30 +157,37 @@ void wxCDMProjectDescriptionPanel::OnBtnCreateBlackBox(wxCommandEvent& event) void wxCDMProjectDescriptionPanel::OnBtnCreateLibrary(wxCommandEvent& event) { - //implement method - std::cerr << "Event OnBtnCreatePackage not implemented" << std::endl; + //get name wxString libraryName = wxGetTextFromUser( _T("Enter the new library name"), _T("New Library - creaDevManager"), _T("") ); - std::string* result; - modelCDMIProjectTreeNode* library = this->project->CreateLibrary(crea::wx2std(libraryName),result); - if(library == NULL) + //check name + if(libraryName.Len() > 0) { - wxMessageBox(crea::std2wx(*result),_T("New Library - Error!"),wxOK | wxICON_ERROR); + std::string* result; + //create library + modelCDMIProjectTreeNode* library = this->project->CreateLibrary(crea::wx2std(libraryName),result); + //check library created + if(library == NULL) + { + wxMessageBox(crea::std2wx(*result),_T("New Library - Error!"),wxOK | wxICON_ERROR); + event.Skip(); + return; + } + wxMessageBox(crea::std2wx("Library successfully created."),_T("New Library - Success!"),wxOK | wxICON_INFORMATION); + + //refreshing tree and description + //send event instead of calling parent to avoid crashing + + ((wxCDMMainFrame*)this->GetParent())->RefreshProject(); + + wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_DISPLAY_CHANGED); + newEvent->SetInt(library->GetId()); + wxPostEvent(this->GetParent(), *newEvent); event.Skip(); - return; } - wxMessageBox(crea::std2wx("Library successfully created."),_T("New Library - Success!"),wxOK | wxICON_INFORMATION); - - //send event instead of calling parent to avoid crashing - ((wxCDMMainFrame*)this->GetParent())->RefreshProject(); - - wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_DISPLAY_CHANGED); - newEvent->SetInt(library->GetId()); - wxPostEvent(this->GetParent(), *newEvent); - event.Skip(); } void wxCDMProjectDescriptionPanel::OnBtnCreateApplication(wxCommandEvent& event) diff --git a/lib/creaDevManagerLib/wxCDMProjectsTreeCtrl.cxx b/lib/creaDevManagerLib/wxCDMProjectsTreeCtrl.cxx index 671574d..0d1a7ef 100755 --- a/lib/creaDevManagerLib/wxCDMProjectsTreeCtrl.cxx +++ b/lib/creaDevManagerLib/wxCDMProjectsTreeCtrl.cxx @@ -34,9 +34,24 @@ */ #include "wxCDMProjectsTreeCtrl.h" -#include "creaDevManagerIds.h" + #include +#include + +#include "creaDevManagerIds.h" +#include "images/AIcon20.xpm" +#include "images/ApIcon20.xpm" +#include "images/BBIcon20.xpm" +#include "images/CIcon20.xpm" +#include "images/CMIcon20.xpm" +#include "images/FdIcon20.xpm" +#include "images/FlIcon20.xpm" +#include "images/LbIcon20.xpm" +#include "images/LIcon20.xpm" +#include "images/PrIcon20.xpm" +#include "images/PkIcon20.xpm" + wxCDMProjectsTreeCtrl::wxCDMProjectsTreeCtrl( wxWindow *parent, wxWindowID id, @@ -65,19 +80,35 @@ bool wxCDMProjectsTreeCtrl::Create( ) { wxTreeCtrl::Create (parent, id, pos, size, style, validator, name); - wxTreeItemId rootIndex = this-> AddRoot(_("No Open Project")); + + wxImageList* images = new wxImageList(20, 20, true); + this->ID_AIcon = images->Add(wxIcon(AIcon20)); + this->ID_ApIcon = images->Add(wxIcon(ApIcon20)); + this->ID_BBIcon = images->Add(wxIcon(BBIcon20)); + this->ID_Cicon = images->Add(wxIcon(CIcon20)); + this->ID_CMIcon = images->Add(wxIcon(CMIcon20)); + this->ID_FdIcon = images->Add(wxIcon(FdIcon20)); + this->ID_FlIcon = images->Add(wxIcon(FlIcon20)); + this->ID_LbIcon = images->Add(wxIcon(LbIcon20)); + this->ID_LIcon = images->Add(wxIcon(LIcon20)); + this->ID_PrIcon = images->Add(wxIcon(PrIcon20)); + this->ID_PkIcon = images->Add(wxIcon(PkIcon20)); + this->AssignImageList(images); + + wxTreeItemId rootIndex = this-> AddRoot(_("No Open Project"), this->ID_Cicon, this->ID_Cicon); this->Update(); return TRUE; } void wxCDMProjectsTreeCtrl::BuildTree(std::map< wxTreeItemId, modelCDMIProjectTreeNode* >& modelElements, modelCDMProject* projectTree) { + std::cout << "building tree" << std::endl; this->DeleteAllItems(); modelElements.clear(); if(projectTree != NULL) { wxTreeItemId rootIndex; - rootIndex= this-> AddRoot(crea::std2wx(projectTree->GetName())); + rootIndex= this-> AddRoot(crea::std2wx(projectTree->GetName()), this->ID_PrIcon, this->ID_PrIcon); projectTree->SetId(rootIndex); modelElements[rootIndex] = projectTree; @@ -102,8 +133,9 @@ void wxCDMProjectsTreeCtrl::BuildTree(const std::vectorGetName()).c_str(), wxConvUTF8); - parentNodeIndex = this->AppendItem(parent, nodeName); + parentNodeIndex = this->AppendItem(parent, nodeName, idIcon, idIcon); treeNodes[i]->SetId(parentNodeIndex); modelElements[parentNodeIndex] = treeNodes[i]; @@ -116,3 +148,88 @@ void wxCDMProjectsTreeCtrl::BuildTree(const std::vector(node); + if(element != NULL) + { + return this->ID_PrIcon; + } + else + { + element = dynamic_cast(node); + if(element != NULL) + { + return this->ID_ApIcon; + } + else + { + element = dynamic_cast(node); + if(element != NULL) + { + return this->ID_AIcon; + } + else + { + element = dynamic_cast(node); + if(element != NULL) + { + return this->ID_LbIcon; + } + else + { + element = dynamic_cast(node); + if(element != NULL) + { + return this->ID_LbIcon; + } + else + { + element = dynamic_cast(node); + if(element != NULL) + { + return this->ID_PkIcon; + } + else + { + element = dynamic_cast(node); + if(element != NULL) + { + return this->ID_BBIcon; + } + else + { + element = dynamic_cast(node); + if(element != NULL) + { + return this->ID_CMIcon; + } + else + { + element = dynamic_cast(node); + if(element != NULL) + { + return this->ID_FdIcon; + } + else + { + element = dynamic_cast(node); + if(element != NULL) + { + return this->ID_FlIcon; + } + else + { + return this->ID_Cicon; + } + } + } + } + } + } + } + } + } + } +} diff --git a/lib/creaDevManagerLib/wxCDMProjectsTreeCtrl.h b/lib/creaDevManagerLib/wxCDMProjectsTreeCtrl.h index 596b0b1..82a9698 100755 --- a/lib/creaDevManagerLib/wxCDMProjectsTreeCtrl.h +++ b/lib/creaDevManagerLib/wxCDMProjectsTreeCtrl.h @@ -23,7 +23,7 @@ # The fact that you are presently reading this means that you have had # knowledge of the CeCILL-B license and that you accept its terms. # ------------------------------------------------------------------------ -*/ + */ /* @@ -58,19 +58,33 @@ public: ); ~wxCDMProjectsTreeCtrl(); bool Create( - wxWindow *parent, - wxWindowID id=wxID_ANY, - const wxPoint &pos=wxDefaultPosition, - const wxSize &size=wxDefaultSize, - long style=wxTR_DEFAULT_STYLE, - const wxValidator &validator=wxDefaultValidator, - const wxString &name=_("Projects tree") + wxWindow *parent, + wxWindowID id=wxID_ANY, + const wxPoint &pos=wxDefaultPosition, + const wxSize &size=wxDefaultSize, + long style=wxTR_DEFAULT_STYLE, + const wxValidator &validator=wxDefaultValidator, + const wxString &name=_("Projects tree") ); void BuildTree(std::map< wxTreeItemId, modelCDMIProjectTreeNode* >& modelElements, modelCDMProject* tree = NULL); private: + + int ID_AIcon; + int ID_ApIcon; + int ID_BBIcon; + int ID_Cicon; + int ID_CMIcon; + int ID_FdIcon; + int ID_FlIcon; + int ID_LbIcon; + int ID_LIcon; + int ID_PrIcon; + int ID_PkIcon; + void BuildTree(const std::vector& tree, std::map< wxTreeItemId, modelCDMIProjectTreeNode* >& modelElements, wxTreeItemId parent); + int GetIconId(modelCDMIProjectTreeNode* node); }; #endif /* WXCDMPROJECTSTREECTRL_H_ */ -- 2.47.1