adding the new logo

.gitattributes

@@ -51,6 +51,7 @@ visum.net     text eol=lf
 png.complex binary
 png.sumo binary
 png2.sumo binary
+*.ico binary
 *.png binary
 *.jpg binary
 *.ttf binary

src/CMakeLists.txt

@@ -51,7 +51,7 @@ if (FOX_FOUND)
             gui/GUITLLogicPhasesTrackerWindow.h gui/GUITLLogicPhasesTrackerWindow.cpp
             mesosim/MEVehicleControl.h mesosim/MEVehicleControl.cpp)
 
-    add_executable(sumo-gui version.h ${sumoguiexec} guisim.rc)
+    add_executable(sumo-gui version.h ${sumoguiexec} sumo-gui.rc)
     set_target_properties(sumo-gui PROPERTIES OUTPUT_NAME sumo-gui${BINARY_SUFFIX})
     set_target_properties(sumo-gui PROPERTIES OUTPUT_NAME_DEBUG sumo-gui${BINARY_SUFFIX}D)
     target_link_libraries(sumo-gui gui guinetload guisim gui_dialogs

src/gui/GUIApplicationWindow.cpp

@@ -273,7 +273,8 @@ GUIApplicationWindow::dependentBuild() {
 
     // start the simulation-thread (it will loop until the application ends deciding by itself whether to perform a step or not)
     myRunThread->start();
-    setIcon(GUIIconSubSys::getIcon(ICON_APP));
+    setIcon(GUIIconSubSys::getIcon(ICON_SUMO));
+    setMiniIcon(GUIIconSubSys::getIcon(ICON_SUMO_MINI));
 }
 
 
@@ -555,7 +556,7 @@ GUIApplicationWindow::fillMenuBar() {
     myHelpMenu = new FXMenuPane(this);
     new FXMenuTitle(myMenuBar, "&Help", NULL, myHelpMenu);
     new FXMenuCommand(myHelpMenu, "&Online Documentation\tF1\tOpen Online documentation", 0, this, MID_HELP);
-    new FXMenuCommand(myHelpMenu, "&About\tF2\tAbout sumo-gui", GUIIconSubSys::getIcon(ICON_APP),
+    new FXMenuCommand(myHelpMenu, "&About\tF2\tAbout sumo-gui", GUIIconSubSys::getIcon(ICON_SUMO_MINI),
                       this, MID_ABOUT);
 
     // initialize Ctrl hotkeys with Caps Lock enabled using decimal code (to avoid problems in Linux)
@@ -1588,7 +1589,7 @@ GUIApplicationWindow::openNewView(GUISUMOViewParent::ViewType vt) {
     std::string caption = "View #" + toString(myViewNumber++);
     FXuint opts = MDI_TRACKING;
     GUISUMOViewParent* w = new GUISUMOViewParent(myMDIClient, myMDIMenu, FXString(caption.c_str()),
-            this, GUIIconSubSys::getIcon(ICON_APP), opts, 10, 10, 300, 200);
+            this, GUIIconSubSys::getIcon(ICON_SUMO_MINI), opts, 10, 10, 300, 200);
     GUISUMOAbstractView* v = w->init(getBuildGLCanvas(), myRunThread->getNet(), vt);
     v->setApplicationSnapshots(&myRunThread->getSnapshots(), &myRunThread->getSnapshotsLock());
     if (oldView != 0) {

src/gui/dialogs/GUIDialog_AboutSUMO.cpp

@@ -38,13 +38,13 @@
 GUIDialog_AboutSUMO::GUIDialog_AboutSUMO(FXWindow* parent) :
     FXDialogBox(parent, "About Eclipse SUMO", GUIDesignDialogBox) {
     // set dialog icon
-    setIcon(GUIIconSubSys::getIcon(ICON_SUMO));
+    setIcon(GUIIconSubSys::getIcon(ICON_SUMO_MINI));
 
     // create frame for main info
     FXHorizontalFrame* mainInfoFrame = new FXHorizontalFrame(this, GUIDesignAuxiliarHorizontalFrame);
 
     // SUMO Icon
-    new FXLabel(mainInfoFrame, "", GUIIconSubSys::getIcon(ICON_SUMO), GUIDesignLabelIcon64x64noSpacing);
+    new FXLabel(mainInfoFrame, "", GUIIconSubSys::getIcon(ICON_SUMO_LOGO), GUIDesignLabelIcon64x64noSpacing);
 
     // "SUMO <VERSION>"
     FXVerticalFrame* descriptionFrame = new FXVerticalFrame(mainInfoFrame, GUIDesignLabelAboutInfo);

src/netedit/GNEApplicationWindow.cpp

@@ -588,7 +588,7 @@ GNEApplicationWindow::fillMenuBar() {
     new FXMenuSeparator(myEditMenu);
     new FXMenuCommand(myEditMenu,
                       "Open in SUMO GUI...\tCtrl+T\tOpens the SUMO GUI application with the current network.",
-                      GUIIconSubSys::getIcon(ICON_APP), this, MID_SUMOGUI);
+                      GUIIconSubSys::getIcon(ICON_SUMO_MINI), this, MID_SUMOGUI);
 
     // processing menu (trigger netbuild computations)
     myProcessingMenu = new FXMenuPane(this);

src/netedit/netedit.rc

@@ -1 +1,6 @@
-0 ICON DISCARDABLE "netedit64.ico"
+netedit_16 ICON DISCARDABLE "../../data/logo/netedit-16x16x32.ico"
+netedit_256 ICON DISCARDABLE "../../data/logo/netedit-256x256x32.ico"
+netedit_128 ICON DISCARDABLE "../../data/logo/netedit-128x128x32.ico"
+netedit_64 ICON DISCARDABLE "../../data/logo/netedit-64x64x32.ico"
+netedit_48 ICON DISCARDABLE "../../data/logo/netedit-48x48x32.ico"
+netedit_32 ICON DISCARDABLE "../../data/logo/netedit-32x32x32.ico"

src/sumo-gui.rc

@@ -0,0 +1,6 @@
+sumo_256 ICON DISCARDABLE "../data/logo/sumo-256x256x32.ico"
+sumo_128 ICON DISCARDABLE "../data/logo/sumo-128x128x32.ico"
+sumo_64 ICON DISCARDABLE "../data/logo/sumo-64x64x32.ico"
+sumo_48 ICON DISCARDABLE "../data/logo/sumo-48x48x32.ico"
+sumo_32 ICON DISCARDABLE "../data/logo/sumo-32x32x32.ico"
+sumo_16 ICON DISCARDABLE "../data/logo/sumo-16x16x32.ico"

src/utils/gui/div/GUIDesigns.h

@@ -175,7 +175,7 @@
 #define GUIDesignLabelIcon64x32Thicked      (FRAME_THICK | ICON_BEFORE_TEXT | LAYOUT_FIX_WIDTH | LAYOUT_FIX_HEIGHT), 0, 0, 94, 46, 2, 2, 2, 2
 
 /// @brief design for label with icon of 64x64 px
-#define GUIDesignLabelIcon64x64noSpacing    (LAYOUT_CENTER_Y | LAYOUT_CENTER_X | LAYOUT_FIX_WIDTH | LAYOUT_FIX_HEIGHT ), 0, 0, 64, 64, 0, 0, 0, 0
+#define GUIDesignLabelIcon64x64noSpacing    (LAYOUT_CENTER_Y | LAYOUT_CENTER_X ), 0, 0, 0, 0, 2, 2, 0, 0
 
 /// @brief label ticked filled extended over frame used for VClasses. can be used by icons of 64x32 pixels
 #define GUIDesignLabelIconExtendedx46Ticked (FRAME_THICK | ICON_BEFORE_TEXT | LAYOUT_FILL_X | LAYOUT_FIX_HEIGHT), 0, 0, 0, 46, 2, 2, 2, 2

src/utils/gui/images/GUIIconSubSys.cpp

@@ -28,8 +28,9 @@
 #include "GUIIcons.h"
 #include "GUIIconSubSys.h"
 
-#include "dlr.xpm"
-#include "sumo.xpm"
+#include "sumo_icon64.xpm"
+#include "sumo_icon16.xpm"
+#include "sumo_logo.xpm"
 
 #include "empty.xpm"
 #include "filesave.xpm"
@@ -113,7 +114,8 @@
 
 #include "undo.xpm"
 #include "redo.xpm"
-#include "netedit.xpm"
+#include "netedit_icon64.xpm"
+#include "netedit_icon16.xpm"
 #include "lock.xpm"
 #include "add.xpm"
 #include "remove.xpm"
@@ -231,9 +233,9 @@ GUIIconSubSys* GUIIconSubSys::myInstance = 0;
 
 GUIIconSubSys::GUIIconSubSys(FXApp* a) {
     // build icons
-    myIcons[ICON_APP] = new FXXPMIcon(a, document_xpm);
-    myIcons[ICON_DLR] = new FXXPMIcon(a, dlr_xpm);
-    myIcons[ICON_SUMO] = new FXXPMIcon(a, sumo_xpm);
+    myIcons[ICON_SUMO] = new FXXPMIcon(a, sumo_icon64_xpm);
+    myIcons[ICON_SUMO_MINI] = new FXXPMIcon(a, sumo_icon16_xpm);
+    myIcons[ICON_SUMO_LOGO] = new FXXPMIcon(a, sumo_logo_xpm);
     myIcons[ICON_EMPTY] = new FXXPMIcon(a, empty_xpm);
     myIcons[ICON_OPEN_CONFIG] = new FXXPMIcon(a, fileopen_xpm);
     myIcons[ICON_OPEN_NET] = new FXXPMIcon(a, netopen_xpm);
@@ -320,7 +322,8 @@ GUIIconSubSys::GUIIconSubSys(FXApp* a) {
 
     myIcons[ICON_UNDO] = new FXXPMIcon(a, undo_xpm);
     myIcons[ICON_REDO] = new FXXPMIcon(a, redo_xpm);
-    myIcons[ICON_NETEDIT] = new FXXPMIcon(a, netedit_xpm);
+    myIcons[ICON_NETEDIT] = new FXXPMIcon(a, netedit_icon64_xpm);
+    myIcons[ICON_NETEDIT_MINI] = new FXXPMIcon(a, netedit_icon16_xpm);
     myIcons[ICON_LOCK] = new FXXPMIcon(a, lock_xpm);
     myIcons[ICON_ADD] = new FXXPMIcon(a, add_xpm);
     myIcons[ICON_REMOVE] = new FXXPMIcon(a, remove_xpm);

src/utils/gui/images/GUIIcons.h

@@ -36,9 +36,9 @@
 enum GUIIcon {
     /// @name general Interface icons
     /// @{
-    ICON_APP = 0,
-    ICON_DLR,
     ICON_SUMO,
+    ICON_SUMO_MINI,
+    ICON_SUMO_LOGO,
     ICON_EMPTY,
     ICON_OPEN_CONFIG,
     ICON_OPEN_NET,
@@ -177,6 +177,7 @@ enum GUIIcon {
     ICON_UNDO,
     ICON_REDO,
     ICON_NETEDIT,
+    ICON_NETEDIT_MINI,
     ICON_LOCK,
     ICON_ADD,
     ICON_REMOVE,

src/utils/gui/images/netedit_icon16.xpm

@@ -0,0 +1,173 @@
+/* XPM */
+static const char * netedit_icon16_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 151 2 ",
+"   c #151515151515",
+".  c gray11",
+"X  c gray16",
+"o  c #313131313131",
+"O  c #323232323232",
+"+  c gray20",
+"@  c #343433333131",
+"#  c #343434343333",
+"$  c #353534343333",
+"%  c #373736363232",
+"&  c #3A3A37373030",
+"*  c #3A3A38383232",
+"=  c #3F3F3C3C3131",
+"-  c #3A3A3A3A3A3A",
+";  c gray23",
+":  c #44443F3F3131",
+">  c #484843433030",
+",  c #4C4C46463030",
+"<  c #4C4C48483A3A",
+"1  c #5A5A52523232",
+"2  c #69695D5D2C2C",
+"3  c #69695D5D2D2D",
+"4  c #717164642B2B",
+"5  c #747466662C2C",
+"6  c #79796B6B2A2A",
+"7  c #7F7F70702929",
+"8  c #79796D6D3B3B",
+"9  c gray26",
+"0  c #494949494949",
+"q  c #595954544545",
+"w  c #555555555555",
+"e  c gray42",
+"r  c #6C6C6C6C6C6C",
+"t  c #757570706060",
+"y  c #737373737272",
+"u  c #757574747474",
+"i  c gray46",
+"p  c #767676767676",
+"a  c #7A7A7A7A7878",
+"s  c #7D7D7D7D7C7C",
+"d  c #8E8E7C7C1F1F",
+"f  c #818170702525",
+"g  c #838373732525",
+"h  c #8F8F7D7D2323",
+"j  c #8B8B79792525",
+"k  c #8E8E7C7C2424",
+"l  c #838373732929",
+"z  c #858575752929",
+"x  c #8D8D7B7B2828",
+"c  c #88887A7A4141",
+"v  c #82827F7F7777",
+"b  c #B8B8A0A01919",
+"n  c #B9B9A1A11D1D",
+"m  c #BBBBA2A21E1E",
+"M  c #959582822626",
+"N  c #999986862121",
+"B  c #9B9B87872222",
+"V  c #949482823434",
+"C  c #A1A18C8C2121",
+"Z  c #A3A38E8E2525",
+"A  c #ABAB95952020",
+"S  c #ACAC96962121",
+"D  c #ADAD97972121",
+"F  c #ACAC96962424",
+"G  c #B2B29B9B2121",
+"H  c #B7B7A0A02323",
+"J  c #BCBCA3A32121",
+"K  c #BDBDA4A42020",
+"L  c #BDBDA5A53131",
+"P  c #C3C3A9A91515",
+"I  c #C2C2A8A81B1B",
+"U  c #C4C4ABAB1B1B",
+"Y  c #C6C6ADAD1B1B",
+"T  c #C2C2A9A91F1F",
+"R  c #C3C3AAAA1E1E",
+"E  c #C4C4ABAB1F1F",
+"W  c #C7C7ADAD1E1E",
+"Q  c #C6C6ADAD1F1F",
+"!  c #C9C9AFAF1B1B",
+"~  c #C8C8AFAF1D1D",
+"^  c #CFCFB4B41717",
+"/  c #CACAB0B01B1B",
+"(  c #CBCBB1B11C1C",
+")  c #CCCCB1B11C1C",
+"_  c #CECEB3B31C1C",
+"`  c #D2D2B6B61C1C",
+"'  c #D6D6BABA1919",
+"]  c #D9D9BDBD1A1A",
+"[  c #D8D8BCBC1C1C",
+"{  c #DDDDC0C01A1A",
+"}  c #EAEACBCB1717",
+"|  c #E0E0C3C31A1A",
+" . c #E3E3C6C61919",
+".. c #E1E1C4C41A1A",
+"X. c #E5E5C7C71919",
+"o. c #E6E6C8C81A1A",
+"O. c #E9E9CACA1919",
+"+. c #E9E9CBCB1919",
+"@. c #EAEACBCB1919",
+"#. c #EFEFCFCF1919",
+"$. c #F4F4D5D51717",
+"%. c #F6F6D6D61717",
+"&. c #F1F1D1D11818",
+"*. c #F0F0D2D21818",
+"=. c #F1F1D2D21818",
+"-. c #F2F2D2D21818",
+";. c #F2F2D3D31818",
+":. c #F6F6D6D61818",
+">. c #F7F7D8D81818",
+",. c #F8F8D8D81818",
+"<. c #F9F9D8D81818",
+"1. c #FAFAD9D91818",
+"2. c #FAFADADA1818",
+"3. c #FBFBDADA1818",
+"4. c #FBFBDBDB1818",
+"5. c #FCFCDBDB1818",
+"6. c #FDFDDCDC1818",
+"7. c #FEFEDDDD1818",
+"8. c #838380807676",
+"9. c #848480807474",
+"0. c #989890907A7A",
+"q. c #838383838282",
+"w. c gray52",
+"e. c #868686868585",
+"r. c #8E8E8B8B8282",
+"t. c gray57",
+"y. c #949494949393",
+"u. c gray58",
+"i. c gray59",
+"p. c gray60",
+"a. c #9A9A9A9A9999",
+"s. c gray61",
+"d. c #A3A3A3A3A2A2",
+"f. c #A4A4A4A4A3A3",
+"g. c gray65",
+"h. c gray66",
+"j. c #B4B4B3B3B1B1",
+"k. c #C6C6C6C6C6C6",
+"l. c #CACACACACACA",
+"z. c gray80",
+"x. c #D1D1D0D0D0D0",
+"c. c #D8D8D8D8D8D8",
+"v. c gray88",
+"b. c #E6E6E6E6E6E6",
+"n. c #EAEAEAEAEAEA",
+"m. c gray92",
+"M. c #ECECECECECEC",
+"N. c gray93",
+"B. c #F3F3F3F3F3F3",
+"V. c #F6F6F6F6F6F6",
+"C. c None",
+/* pixels */
+"C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.",
+"C.y.y 9 O O O O O O & 8 v a O C.",
+"0 q.d.f.e.w # # # = G P U , O C.",
+"p.z.i.s p.9.H F 4 g b ^ 6 O O C.",
+"i z.m.k.q g _ *.,. .m h > # O C.",
+"  ; i t [ *.! N D { ,.,.O.T 1 C.",
+"  O O * z ` ,.1...D k K O.o.8.C.",
+"  O # # l ! h / :.5.*.W j 3 q.C.",
+"  # # x #.I ' S 4 T %.7.O.r.s.C.",
+"  # M *.Y / } B J ] %.7.L x.m.C.",
+". 5 *._ n 5.%.5.7.7.,.;.0.M.M.C.",
+"t.j.V C ,.7.,.X.E Z z 3 i l.b.C.",
+"h.c.w.c X.W 7 : # + O O # ; e C.",
+"e g.V.l.< # O # # # O O O # O C.",
+"C.v.B.y.O O O O O O O O O O X C.",
+"C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C."
+};