From 9899e989e23427dd42d3948b897e40556bf4d8ce Mon Sep 17 00:00:00 2001 From: Tim Warren Date: Wed, 15 Apr 2015 15:02:05 -0400 Subject: [PATCH] Smaller icons for windows/linux --- resources/xpm/small/clipboard.xpm | 40 +++++++++++++++++++++++++++++++ resources/xpm/small/close.xpm | 40 +++++++++++++++++++++++++++++++ resources/xpm/small/copy.xpm | 40 +++++++++++++++++++++++++++++++ resources/xpm/small/diskette.xpm | 40 +++++++++++++++++++++++++++++++ resources/xpm/small/file_add.xpm | 40 +++++++++++++++++++++++++++++++ resources/xpm/small/folder.xpm | 40 +++++++++++++++++++++++++++++++ resources/xpm/small/scissors.xpm | 40 +++++++++++++++++++++++++++++++ src/widgets/MainFrame.cpp | 10 ++++++++ 8 files changed, 290 insertions(+) create mode 100644 resources/xpm/small/clipboard.xpm create mode 100644 resources/xpm/small/close.xpm create mode 100644 resources/xpm/small/copy.xpm create mode 100644 resources/xpm/small/diskette.xpm create mode 100644 resources/xpm/small/file_add.xpm create mode 100644 resources/xpm/small/folder.xpm create mode 100644 resources/xpm/small/scissors.xpm diff --git a/resources/xpm/small/clipboard.xpm b/resources/xpm/small/clipboard.xpm new file mode 100644 index 0000000..29cfa7a --- /dev/null +++ b/resources/xpm/small/clipboard.xpm @@ -0,0 +1,40 @@ +/* XPM */ +const static char *clipboard[] = { +/* columns rows colors chars-per-pixel */ +"32 32 2 1 ", +" c #010101", +". c None", +/* pixels */ +"................................", +".............. ..............", +"............. .. .............", +"............ .... ............", +"..... .. .. .....", +"..... ...... .. .. ...... .....", +"..... ..... ...... ..... .....", +"..... .. .......... .. .....", +"..... . ................ . .....", +"..... . ................ . .....", +"..... . . .....", +"..... .. .............. .. .....", +"..... .. .............. .. .....", +"..... .. .............. .. .....", +"..... .. .............. .. .....", +"..... .. .............. .. .....", +"..... .. .............. .. .....", +"..... .. .............. .. .....", +"..... .. .............. .. .....", +"..... .. .............. .. .....", +"..... .. .............. .. .....", +"..... .. .............. .. .....", +"..... .. .............. .. .....", +"..... .. .............. .. .....", +"..... .. .............. .. .....", +"..... .. .............. .. .....", +"..... .. .. .....", +"..... .................... .....", +"..... .................... .....", +"..... .................... .....", +"..... .....", +"................................" +}; diff --git a/resources/xpm/small/close.xpm b/resources/xpm/small/close.xpm new file mode 100644 index 0000000..503090e --- /dev/null +++ b/resources/xpm/small/close.xpm @@ -0,0 +1,40 @@ +/* XPM */ +const static char *close[] = { +/* columns rows colors chars-per-pixel */ +"32 32 2 1 ", +" c black", +". c None", +/* pixels */ +"................................", +"................................", +"................................", +"............ ............", +".......... ...... ..........", +"........ .......... ........", +"....... .............. .......", +"...... ................ ......", +"..... .................. .....", +"..... ... ............ ... .....", +".... ..... .......... ..... ....", +".... ...... ........ ...... ....", +"... ....... ...... ....... ...", +"... ......... .... ......... ...", +"... .......... .. .......... ...", +"... ........... ........... ...", +"... ........... ........... ...", +"... .......... .. .......... ...", +"... ......... .... ......... ...", +"... ....... ...... ....... ...", +".... ...... ........ ...... ....", +".... ..... .......... ..... ....", +"..... ... ............ ... .....", +"..... .................. .....", +"...... ................ ......", +"....... .............. .......", +"........ .......... ........", +".......... ...... ..........", +"............ ............", +"................................", +"................................", +"................................" +}; diff --git a/resources/xpm/small/copy.xpm b/resources/xpm/small/copy.xpm new file mode 100644 index 0000000..57dd8c7 --- /dev/null +++ b/resources/xpm/small/copy.xpm @@ -0,0 +1,40 @@ +/* XPM */ +const static char *copy[] = { +/* columns rows colors chars-per-pixel */ +"32 32 2 1 ", +" c #010101", +". c None", +/* pixels */ +"................................", +".......... ...........", +".......... ......... ..........", +".......... ......... .........", +".......... ......... . ........", +".......... ......... .. .......", +".......... ......... ... ......", +".... ..... .... .....", +".... ......... .... ....", +".... ......... .......... ....", +".... ......... . ......... ....", +".... ......... .. ........ ....", +".... ......... ... ....... ....", +".... ......... .... ...... ....", +".... ......... ..... ....", +".... ................ ..... ....", +".... ................ ..... ....", +".... ................ ..... ....", +".... ................ ..... ....", +".... ................ ..... ....", +".... ................ ..... ....", +".... ................ ..... ....", +".... ................ ..... ....", +".... ................ ..... ....", +".... ................ ....", +".... ................ ..........", +".... ................ ..........", +".... ................ ..........", +".... ................ ..........", +".... ................ ..........", +".... ..........", +"................................" +}; diff --git a/resources/xpm/small/diskette.xpm b/resources/xpm/small/diskette.xpm new file mode 100644 index 0000000..9e58ec1 --- /dev/null +++ b/resources/xpm/small/diskette.xpm @@ -0,0 +1,40 @@ +/* XPM */ +const static char *diskette[] = { +/* columns rows colors chars-per-pixel */ +"32 32 2 1 ", +" c #010101", +". c None", +/* pixels */ +"................................", +"................................", +"................................", +"................................", +".... .......", +".... ...... ......... ... ......", +".... ...... ...... . .... .....", +".... ...... ...... . ..... ....", +".... ...... ...... . ..... ....", +".... ...... ...... . ..... ....", +".... ...... ...... . ..... ....", +".... ...... ......... ..... ....", +".... ...... ..... ....", +".... ...................... ....", +".... ...................... ....", +".... ...................... ....", +".... ... ... ....", +".... ... .............. ... ....", +".... ... .............. ... ....", +".... ... .............. ... ....", +".... ... .............. ... ....", +".... ... .............. ... ....", +".... ... .............. ... ....", +".... ... .............. ... ....", +".... ... .............. ... ....", +".... ... .............. ... ....", +".... ... .............. ... ....", +".... ....", +"................................", +"................................", +"................................", +"................................" +}; diff --git a/resources/xpm/small/file_add.xpm b/resources/xpm/small/file_add.xpm new file mode 100644 index 0000000..8a9361f --- /dev/null +++ b/resources/xpm/small/file_add.xpm @@ -0,0 +1,40 @@ +/* XPM */ +const static char *file_add[] = { +/* columns rows colors chars-per-pixel */ +"32 32 2 1 ", +" c #010101", +". c None", +/* pixels */ +"................................", +"................................", +"...... .............", +"...... ........... ............", +"...... ........... ...........", +"...... ........... . ..........", +"...... ........... .. .........", +"...... ........... ... ........", +"...... ........... .... .......", +"...... ........... ......", +"...... .................. ......", +"...... .................. ......", +"...... .................. ......", +"...... ........ ......... ......", +"...... ........ ......... ......", +"...... ........ ......... ......", +"...... ..... ...... ......", +"...... ........ ......... ......", +"...... ........ ......... ......", +"...... ........ ......... ......", +"...... .................. ......", +"...... .................. ......", +"...... .................. ......", +"...... .................. ......", +"...... .................. ......", +"...... .................. ......", +"...... .................. ......", +"...... .................. ......", +"...... .................. ......", +"...... ......", +"................................", +"................................" +}; diff --git a/resources/xpm/small/folder.xpm b/resources/xpm/small/folder.xpm new file mode 100644 index 0000000..76231fc --- /dev/null +++ b/resources/xpm/small/folder.xpm @@ -0,0 +1,40 @@ +/* XPM */ +const static char *folder[] = { +/* columns rows colors chars-per-pixel */ +"32 32 2 1 ", +" c #010101", +". c None", +/* pixels */ +"................................", +"................................", +"................................", +"................................", +"... .....................", +".. ...... .....................", +".. ....... ....................", +".. ........ ......", +".. ..................... .....", +".. ..................... .....", +".. ..... ..", +".. ... .", +".. ... ...................... .", +".. ... ...................... .", +".. .. ..................... .", +".. .. ...................... ..", +".. .. ...................... ..", +".. .. ...................... ..", +".. . ..................... ..", +".. . ...................... ...", +".. . ...................... ...", +".. . ...................... ...", +".. . ...................... ...", +".. ...................... ...", +".. ...................... ....", +".. ...................... ....", +"... .....", +"................................", +"................................", +"................................", +"................................", +"................................" +}; diff --git a/resources/xpm/small/scissors.xpm b/resources/xpm/small/scissors.xpm new file mode 100644 index 0000000..578cc0a --- /dev/null +++ b/resources/xpm/small/scissors.xpm @@ -0,0 +1,40 @@ +/* XPM */ +const static char *scissors[] = { +/* columns rows colors chars-per-pixel */ +"32 32 2 1 ", +" c #010101", +". c None", +/* pixels */ +"................................", +"................................", +"......... ....................", +"........ ... ...................", +"....... ..... ..................", +"....... ..... ..................", +"....... ..... ..................", +"........ ... ..................", +"......... . ........ ......", +"............. ....... ... ....", +"............. ...... ..... ....", +"............. ..... ..... ....", +"............. ... . .... ....", +"............. ... .....", +"............ ... ..... .......", +"........... ... ...............", +".......... .. ...............", +"......... .. . ...............", +"........ .. .. ...............", +"....... .. .. ...............", +"....... .. . .. ...............", +"...... .. .. .. ...............", +"...... . ... .. ...............", +"..... . .... . ...............", +"..... ..... . ...............", +"..... ...... . ................", +"............. . ................", +"............. .................", +"............. .................", +"................................", +"................................", +"................................" +}; diff --git a/src/widgets/MainFrame.cpp b/src/widgets/MainFrame.cpp index 784ecfd..cb42534 100644 --- a/src/widgets/MainFrame.cpp +++ b/src/widgets/MainFrame.cpp @@ -48,6 +48,7 @@ void MainFrame::SetupStatusBar() void MainFrame::SetupToolbar() { // Icon files +#ifdef __WXMAC__ #include "../../resources/xpm/file_add.xpm" #include "../../resources/xpm/folder.xpm" #include "../../resources/xpm/diskette.xpm" @@ -55,6 +56,15 @@ void MainFrame::SetupToolbar() #include "../../resources/xpm/copy.xpm" #include "../../resources/xpm/scissors.xpm" #include "../../resources/xpm/clipboard.xpm" +#else + #include "../../resources/xpm/small/file_add.xpm" + #include "../../resources/xpm/small/folder.xpm" + #include "../../resources/xpm/small/diskette.xpm" + #include "../../resources/xpm/small/close.xpm" + #include "../../resources/xpm/small/copy.xpm" + #include "../../resources/xpm/small/scissors.xpm" + #include "../../resources/xpm/small/clipboard.xpm" +#endif CreateToolBar(wxNO_BORDER | wxTB_FLAT | wxTB_HORIZONTAL);