diff --git a/include/Mw/Icon.h b/include/Mw/Icon.h index a858da5..f736972 100644 --- a/include/Mw/Icon.h +++ b/include/Mw/Icon.h @@ -77,7 +77,6 @@ MWDECL char* MwIconUp[]; */ MWDECL char* MwIconWarning[]; - #ifdef __cplusplus } #endif diff --git a/include/Mw/TypeDefs.h b/include/Mw/TypeDefs.h index 6a63897..a936bdc 100644 --- a/include/Mw/TypeDefs.h +++ b/include/Mw/TypeDefs.h @@ -154,8 +154,9 @@ struct _MwSizeHints { }; struct _MwDirectoryEntry { - char* name; - int type; + char* name; + int type; + MwOffset size; }; #define MwCursorDataHeight 16 diff --git a/src/directory.c b/src/directory.c index 0b29522..5b84796 100644 --- a/src/directory.c +++ b/src/directory.c @@ -71,6 +71,12 @@ MwDirectoryEntry* MwDirectoryRead(void* handle) { } else { entry->type = MwDIRECTORY_FILE; } + entry->size = 0; + + entry->size = entry->size << 32; + entry->size |= dir->ffd.nFileSizeHigh; + entry->size = entry->size << 32; + entry->size |= dir->ffd.nFileSizeLow; #else struct dirent* d; struct stat s; @@ -92,6 +98,7 @@ MwDirectoryEntry* MwDirectoryRead(void* handle) { } else { entry->type = MwDIRECTORY_FILE; } + entry->size = s.st_size; free(p); #endif diff --git a/src/filechooser.c b/src/filechooser.c index 5c33896..9d93e8c 100644 --- a/src/filechooser.c +++ b/src/filechooser.c @@ -236,7 +236,7 @@ static void resize(MwWidget handle, void* user, void* call) { layout(handle); } -static int qsort_files(const void* a, const void* b){ +static int qsort_files(const void* a, const void* b) { MwDirectoryEntry* aent = *(MwDirectoryEntry**)a; MwDirectoryEntry* bent = *(MwDirectoryEntry**)b; @@ -244,13 +244,15 @@ static int qsort_files(const void* a, const void* b){ } static void scan(MwWidget handle, const char* path) { - filechooser_t* fc = handle->opaque; - void* dir = MwDirectoryOpen(path); + filechooser_t* fc = handle->opaque; + void* dir = MwDirectoryOpen(path); MwDirectoryEntry** entries = NULL; - int i; - char** names = NULL; - MwLLPixmap* icons = NULL; - if(dir != NULL){ + int i; + char** names = NULL; + char** dates = NULL; + char** sizes = NULL; + MwLLPixmap* icons = NULL; + if(dir != NULL) { MwDirectoryEntry* entry; while((entry = MwDirectoryRead(dir)) != NULL) arrput(entries, entry); MwDirectoryClose(dir); @@ -264,26 +266,56 @@ static void scan(MwWidget handle, const char* path) { MwListBoxReset(fc->files); MwListBoxInsert(fc->files, -1, NULL, "Name", "Date modified", "Size", NULL); - MwListBoxSetWidth(fc->files, 0, -128 - 64); + MwListBoxSetWidth(fc->files, 0, -128 - 96); MwListBoxSetWidth(fc->files, 1, 128); MwListBoxSetWidth(fc->files, 2, 0); icons = NULL; names = NULL; - for(i = 0; i < arrlen(entries); i++){ + dates = NULL; + sizes = NULL; + for(i = 0; i < arrlen(entries); i++) { if(strcmp(entries[i]->name, ".") == 0 || strcmp(entries[i]->name, "..") == 0) continue; - if(entries[i]->type == MwDIRECTORY_DIRECTORY){ + if(entries[i]->type == MwDIRECTORY_DIRECTORY) { arrput(names, entries[i]->name); + arrput(dates, NULL); + arrput(sizes, NULL); arrput(icons, fc->dir); } } - for(i = 0; i < arrlen(entries); i++){ - if(entries[i]->type == MwDIRECTORY_FILE){ + for(i = 0; i < arrlen(entries); i++) { + if(entries[i]->type == MwDIRECTORY_FILE) { + char* date = malloc(128); + char* size = malloc(128); + + memset(date, 0, 128); + memset(size, 0, 128); + + if(entries[i]->size / 1024 == 0) { + sprintf(size, "%d", (int)entries[i]->size); + } else if(entries[i]->size / 1024 / 1024 == 0) { + sprintf(size, "%.1fK", (double)entries[i]->size / 1024); + } else if(entries[i]->size / 1024 / 1024 / 1024 == 0) { + sprintf(size, "%.1fM", (double)entries[i]->size / 1024 / 1024); + } else { + sprintf(size, "%.1fG", (double)entries[i]->size / 1024 / 1024 / 1024); + } + arrput(names, entries[i]->name); + arrput(dates, date); + arrput(sizes, size); arrput(icons, fc->file); } } - MwListBoxInsertMultiple(fc->files, -1, arrlen(names), icons, names, NULL); + MwListBoxInsertMultiple(fc->files, -1, arrlen(names), icons, names, dates, sizes, NULL); + for(i = 0; i < arrlen(dates); i++) { + if(dates[i] != NULL) free(dates[i]); + } + for(i = 0; i < arrlen(sizes); i++) { + if(sizes[i] != NULL) free(sizes[i]); + } + arrfree(sizes); + arrfree(dates); arrfree(names); arrfree(icons); @@ -299,7 +331,7 @@ MwWidget MwFileChooser(MwWidget handle, const char* title) { int w, h; filechooser_t* fc = malloc(sizeof(*fc)); char* path; - MwLLPixmap icon; + MwLLPixmap icon; memset(fc, 0, sizeof(*fc)); @@ -321,8 +353,8 @@ MwWidget MwFileChooser(MwWidget handle, const char* title) { icon = MwLoadXPM(window, MwIconSearch); MwVaApply(window, - MwNiconPixmap, icon, - NULL); + MwNiconPixmap, icon, + NULL); window->opaque = fc; diff --git a/src/icon/back.c b/src/icon/back.c index bcc7dab..915cfcc 100644 --- a/src/icon/back.c +++ b/src/icon/back.c @@ -2,35 +2,34 @@ #include /* XPM */ -char *MwIconBack[] = { -/* columns rows colors chars-per-pixel */ -"20 22 5 1 ", -" c black", -". c gray20", -"X c gray40", -"o c gray60", -"O c None", -/* pixels */ -"OOOOOOOOOOOOOOOOOOOO", -"OOOOOOOOXO..OOOOOOOO", -"OOOOOOOOo......OOOOO", -"OOOOOOOOXO.......OOO", -"OOOOOOOOo.........OO", -"OOOOOOOOXO.........O", -"OOOOOOOOo...........", -"OOOOOOOOXO........O ", -"OOOOOOOOOO......OO ", -"OOOOOOOOOOOO.OOo. ", -"OOOOO OOOOOOo. ", -"OOOO OOOo. ", -"OOO ", -"OO .", -"O o", -" XO", -"O .oOO", -"OO .oOOOOO", -"OOO .oOOOOOOOOO", -"OOOO OOOOOOOOOOOOOO", -"OOOOO OOOOOOOOOOOOOO", -"OOOOOOOOOOOOOOOOOOOO" -}; +char* MwIconBack[] = { + /* columns rows colors chars-per-pixel */ + "20 22 5 1 ", + " c black", + ". c gray20", + "X c gray40", + "o c gray60", + "O c None", + /* pixels */ + "OOOOOOOOOOOOOOOOOOOO", + "OOOOOOOOXO..OOOOOOOO", + "OOOOOOOOo......OOOOO", + "OOOOOOOOXO.......OOO", + "OOOOOOOOo.........OO", + "OOOOOOOOXO.........O", + "OOOOOOOOo...........", + "OOOOOOOOXO........O ", + "OOOOOOOOOO......OO ", + "OOOOOOOOOOOO.OOo. ", + "OOOOO OOOOOOo. ", + "OOOO OOOo. ", + "OOO ", + "OO .", + "O o", + " XO", + "O .oOO", + "OO .oOOOOO", + "OOO .oOOOOOOOOO", + "OOOO OOOOOOOOOOOOOO", + "OOOOO OOOOOOOOOOOOOO", + "OOOOOOOOOOOOOOOOOOOO"}; diff --git a/src/icon/computer.c b/src/icon/computer.c index 319629b..b7f8705 100644 --- a/src/icon/computer.c +++ b/src/icon/computer.c @@ -2,32 +2,31 @@ #include /* XPM */ -char *MwIconComputer[] = { -/* columns rows colors chars-per-pixel */ -"16 16 8 1 ", -" c black", -". c #292118", -"X c #5A6363", -"o c #39A5CE", -"O c #73BDDE", -"+ c gray58", -"@ c white", -"# c None", -/* pixels */ -"################", -"################", -"################", -"##+XXXXXXX######", -"##X+++++++.#####", -"##XX++XXX+ +####", -"##XX+OOOo+ +####", -"##XXoOOO++ +####", -"##X++++++@ +####", -"#oXXXXXXXXXo####", -"OoOoooooooOoX###", -"OOooooooooooX###", -"#o+++XXXXXXX+###", -"+X+++++++++.X###", -" +XXXXXXXXX+ +##", -"X ......... X###" -}; +char* MwIconComputer[] = { + /* columns rows colors chars-per-pixel */ + "16 16 8 1 ", + " c black", + ". c #292118", + "X c #5A6363", + "o c #39A5CE", + "O c #73BDDE", + "+ c gray58", + "@ c white", + "# c None", + /* pixels */ + "################", + "################", + "################", + "##+XXXXXXX######", + "##X+++++++.#####", + "##XX++XXX+ +####", + "##XX+OOOo+ +####", + "##XXoOOO++ +####", + "##X++++++@ +####", + "#oXXXXXXXXXo####", + "OoOoooooooOoX###", + "OOooooooooooX###", + "#o+++XXXXXXX+###", + "+X+++++++++.X###", + " +XXXXXXXXX+ +##", + "X ......... X###"}; diff --git a/src/icon/directory.c b/src/icon/directory.c index 058ed6b..7f08f67 100644 --- a/src/icon/directory.c +++ b/src/icon/directory.c @@ -2,31 +2,30 @@ #include /* XPM */ -char *MwIconDirectory[] = { -/* columns rows colors chars-per-pixel */ -"16 16 7 1 ", -" c black", -". c #2B251D", -"X c #574B3B", -"o c #B8A07D", -"O c NavajoWhite", -"+ c #FFDCAE", -"@ c None", -/* pixels */ -"@@ @@@@@@@@@@@@", -" .oo @@ @@@@@@", -" O..oo oO @@@@", -" OOO..ooooOo @@@", -" OOOOO..oooo @@@", -" OOOOOOO..oo @@@", -" OOOOOOOOO o @@@", -" OOOOOOOOo X @@@", -" OOOOOOOOo X @@@", -" OOOOOOOOo X @@@", -" XoOOOOOOo X @@@", -"@ XoOOOOo X @@@", -"@@@ XoOOo X .@@", -"@@@@@ Xoo X ..@", -"@@@@@@@ X X ..@", -"@@@@@@@@@ ..@@" -}; +char* MwIconDirectory[] = { + /* columns rows colors chars-per-pixel */ + "16 16 7 1 ", + " c black", + ". c #2B251D", + "X c #574B3B", + "o c #B8A07D", + "O c NavajoWhite", + "+ c #FFDCAE", + "@ c None", + /* pixels */ + "@@ @@@@@@@@@@@@", + " .oo @@ @@@@@@", + " O..oo oO @@@@", + " OOO..ooooOo @@@", + " OOOOO..oooo @@@", + " OOOOOOO..oo @@@", + " OOOOOOOOO o @@@", + " OOOOOOOOo X @@@", + " OOOOOOOOo X @@@", + " OOOOOOOOo X @@@", + " XoOOOOOOo X @@@", + "@ XoOOOOo X @@@", + "@@@ XoOOo X .@@", + "@@@@@ Xoo X ..@", + "@@@@@@@ X X ..@", + "@@@@@@@@@ ..@@"}; diff --git a/src/icon/error.c b/src/icon/error.c index 0d52f4e..c705a3f 100644 --- a/src/icon/error.c +++ b/src/icon/error.c @@ -2,48 +2,47 @@ #include /* XPM */ -char *MwIconError[] = { -/* columns rows colors chars-per-pixel */ -"32 32 8 1 ", -" c black", -". c DarkSlateGray", -"X c SlateGray", -"o c gray", -"O c gainsboro", -"+ c lavender", -"@ c white", -"# c None", -/* pixels */ -"## ###################### ##", -"## @o #################### @@ ##", -" @@o #################### @@@ ", -" @@oo #################### @@Oo ", -" @@ooo ### ###### @Oooo ", -"# @oo O+++++++o ### @oo .", -"#### @o XO++@@@@@++Oo # @oo ....", -"##### XOO+@@@@@@+OOOo Xoo ..###", -"###### OOO+@@@@@++OOOo .X ..####", -"##### XOOO+@@@@++OOOooX ..#####", -"##### XOOO+@@+++OOOOooX ..######", -"##### Xooo+++++OOOOoXXX ...#####", -"##### oo@@@@@+OOO++++XX ...#####", -"##### o@@OOOOOOO++OOooX ...#####", -"###### oo OOOOO oo ...#####", -"###### o ooo o ....#####", -"###### @ ooo .Xo ...######", -"##### o@.... @oo .XX.oo ..######", -"##### O@o.. @o o@ ..o@o ...#####", -"##### OO@@@@o o@@@Ooo ...#####", -"###### oOO@o o oOOOo . ..#####", -"####### oOOo o oOOo .XX .#####", -"###### o o@@@@@OOo o XXX #####", -"##### oo o .o@@o o .. Xo@ ##", -"#### @@o @.o .o o ... oo@@@ #", -"# @@o @.@.o.o.@ o ...# o@oo #", -" @@@oo .. @ .@.@. o ....# @oo .", -" @@@o ... @ .o.o. o ...## oo ...", -" ooo ..## @ o ....### ..#", -"## oo .### @@@@ooo ...#####...##", -"## ..#### ooooo ...###########", -"###....##### ..#############" -}; +char* MwIconError[] = { + /* columns rows colors chars-per-pixel */ + "32 32 8 1 ", + " c black", + ". c DarkSlateGray", + "X c SlateGray", + "o c gray", + "O c gainsboro", + "+ c lavender", + "@ c white", + "# c None", + /* pixels */ + "## ###################### ##", + "## @o #################### @@ ##", + " @@o #################### @@@ ", + " @@oo #################### @@Oo ", + " @@ooo ### ###### @Oooo ", + "# @oo O+++++++o ### @oo .", + "#### @o XO++@@@@@++Oo # @oo ....", + "##### XOO+@@@@@@+OOOo Xoo ..###", + "###### OOO+@@@@@++OOOo .X ..####", + "##### XOOO+@@@@++OOOooX ..#####", + "##### XOOO+@@+++OOOOooX ..######", + "##### Xooo+++++OOOOoXXX ...#####", + "##### oo@@@@@+OOO++++XX ...#####", + "##### o@@OOOOOOO++OOooX ...#####", + "###### oo OOOOO oo ...#####", + "###### o ooo o ....#####", + "###### @ ooo .Xo ...######", + "##### o@.... @oo .XX.oo ..######", + "##### O@o.. @o o@ ..o@o ...#####", + "##### OO@@@@o o@@@Ooo ...#####", + "###### oOO@o o oOOOo . ..#####", + "####### oOOo o oOOo .XX .#####", + "###### o o@@@@@OOo o XXX #####", + "##### oo o .o@@o o .. Xo@ ##", + "#### @@o @.o .o o ... oo@@@ #", + "# @@o @.@.o.o.@ o ...# o@oo #", + " @@@oo .. @ .@.@. o ....# @oo .", + " @@@o ... @ .o.o. o ...## oo ...", + " ooo ..## @ o ....### ..#", + "## oo .### @@@@ooo ...#####...##", + "## ..#### ooooo ...###########", + "###....##### ..#############"}; diff --git a/src/icon/file.c b/src/icon/file.c index ad08bdf..c073f4a 100644 --- a/src/icon/file.c +++ b/src/icon/file.c @@ -2,31 +2,30 @@ #include /* XPM */ -char *MwIconFile[] = { -/* columns rows colors chars-per-pixel */ -"16 16 7 1 ", -" c #393939", -". c gray42", -"X c gray55", -"o c #CECECE", -"O c #E7E7E7", -"+ c white", -"@ c None", -/* pixels */ -"@@@@@@@@@@@@@@@@", -"@@@@@@@@X@@@@@@@", -"o++++++oOX@@@@@@", -"o++++++o+OX@@@@@", -"o++++++ooo@X@@@@", -"o+++++++ @@@@", -"o++++++++@@.@@@@", -"o+++++++++O.@@@@", -"o++++++++++.@@@@", -"o++++++++++.@@@@", -"o++++++++++.@@@@", -"o++++++++++.@@@@", -"o++++++++++.@@@@", -"o++++++++++.@@@@", -"o++++++++++.@@@@", -"@X......... @@@@" -}; +char* MwIconFile[] = { + /* columns rows colors chars-per-pixel */ + "16 16 7 1 ", + " c #393939", + ". c gray42", + "X c gray55", + "o c #CECECE", + "O c #E7E7E7", + "+ c white", + "@ c None", + /* pixels */ + "@@@@@@@@@@@@@@@@", + "@@@@@@@@X@@@@@@@", + "o++++++oOX@@@@@@", + "o++++++o+OX@@@@@", + "o++++++ooo@X@@@@", + "o+++++++ @@@@", + "o++++++++@@.@@@@", + "o+++++++++O.@@@@", + "o++++++++++.@@@@", + "o++++++++++.@@@@", + "o++++++++++.@@@@", + "o++++++++++.@@@@", + "o++++++++++.@@@@", + "o++++++++++.@@@@", + "o++++++++++.@@@@", + "@X......... @@@@"}; diff --git a/src/icon/forward.c b/src/icon/forward.c index 4510041..49745f8 100644 --- a/src/icon/forward.c +++ b/src/icon/forward.c @@ -2,35 +2,34 @@ #include /* XPM */ -char *MwIconForward[] = { -/* columns rows colors chars-per-pixel */ -"20 22 5 1 ", -" c black", -". c gray20", -"X c gray40", -"o c gray60", -"O c None", -/* pixels */ -"OOOOOOOOOOOOOOOOOOOO", -"OOOOOOOO..OXOOOOOOOO", -"OOOOO......oOOOOOOOO", -"OOO.......OXOOOOOOOO", -"OO.........oOOOOOOOO", -"O.........OXOOOOOOOO", -"...........oOOOOOOOO", -" O........OXOOOOOOOO", -" OO......OOOOOOOOOO", -" .oOO.OOOOOOOOOOOO", -" .oOOOOOO OOOOO", -" .oOOO OOOO", -" OOO", -". OO", -"o O", -"OX ", -"OOo. O", -"OOOOOo. OO", -"OOOOOOOOOo. OOO", -"OOOOOOOOOOOOOO OOOO", -"OOOOOOOOOOOOOO OOOOO", -"OOOOOOOOOOOOOOOOOOOO" -}; +char* MwIconForward[] = { + /* columns rows colors chars-per-pixel */ + "20 22 5 1 ", + " c black", + ". c gray20", + "X c gray40", + "o c gray60", + "O c None", + /* pixels */ + "OOOOOOOOOOOOOOOOOOOO", + "OOOOOOOO..OXOOOOOOOO", + "OOOOO......oOOOOOOOO", + "OOO.......OXOOOOOOOO", + "OO.........oOOOOOOOO", + "O.........OXOOOOOOOO", + "...........oOOOOOOOO", + " O........OXOOOOOOOO", + " OO......OOOOOOOOOO", + " .oOO.OOOOOOOOOOOO", + " .oOOOOOO OOOOO", + " .oOOO OOOO", + " OOO", + ". OO", + "o O", + "OX ", + "OOo. O", + "OOOOOo. OO", + "OOOOOOOOOo. OOO", + "OOOOOOOOOOOOOO OOOO", + "OOOOOOOOOOOOOO OOOOO", + "OOOOOOOOOOOOOOOOOOOO"}; diff --git a/src/icon/info.c b/src/icon/info.c index 1e02f0e..75ea655 100644 --- a/src/icon/info.c +++ b/src/icon/info.c @@ -2,43 +2,42 @@ #include /* XPM */ -char *MwIconInfo[] = { -/* columns rows colors chars-per-pixel */ -"32 32 3 1 ", -" c DarkSlateGray", -". c blue", -"X c None", -/* pixels */ -"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", -"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", -"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", -"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", -"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", -"XXXXXXXXXXXXXXXXX.....XXXXXXXXXX", -"XXXXXXXXXXXXXXXX.......XXXXXXXXX", -"XXXXXXXXXXXXXXXXX..... XXXXXXXX", -"XXXXXXXXXXXXXXXXX XXXXXXXXXX", -"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", -"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", -"XXXXXXXXXXXXXX......XXXXXXXXXXXX", -"XXXXXXXXXXXX....... XXXXXXXXXXX", -"XXXXXXXX.......... XXXXXXXXXXXX", -"XXXXXXXXX ..... XXXXXXXXXXXXX", -"XXXXXXXXXXX..... XXXXXXXXXXXXXX", -"XXXXXXXXXX..... XXXXXXXXXXXXXXX", -"XXXXXXXXXX..... XXXXXXXXXXXXXXX", -"XXXXXXXXX..... XXXXXXXXXXXXXXXX", -"XXXXXXXX..... XXXXXXXXXXXXXXXXX", -"XXXXXXXX..... XXXXXXXXXXXXXXXXX", -"XXXXXXXX.... XXXXXXXXXXXXXXXXXX", -"XXXXXXXX.... XXXXXXXXXXXXXXXXXX", -"XXXXXXXX.... XXXX.XXXXXXXXXXXXX", -"XXXXXXXXX.... XX... XXXXXXXXXXX", -"XXXXXXXXXX....... XXXXXXXXXXXX", -"XXXXXXXXXXX XXXXXXXXXXXXXX", -"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", -"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", -"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", -"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", -"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" -}; +char* MwIconInfo[] = { + /* columns rows colors chars-per-pixel */ + "32 32 3 1 ", + " c DarkSlateGray", + ". c blue", + "X c None", + /* pixels */ + "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXXX.....XXXXXXXXXX", + "XXXXXXXXXXXXXXXX.......XXXXXXXXX", + "XXXXXXXXXXXXXXXXX..... XXXXXXXX", + "XXXXXXXXXXXXXXXXX XXXXXXXXXX", + "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXX......XXXXXXXXXXXX", + "XXXXXXXXXXXX....... XXXXXXXXXXX", + "XXXXXXXX.......... XXXXXXXXXXXX", + "XXXXXXXXX ..... XXXXXXXXXXXXX", + "XXXXXXXXXXX..... XXXXXXXXXXXXXX", + "XXXXXXXXXX..... XXXXXXXXXXXXXXX", + "XXXXXXXXXX..... XXXXXXXXXXXXXXX", + "XXXXXXXXX..... XXXXXXXXXXXXXXXX", + "XXXXXXXX..... XXXXXXXXXXXXXXXXX", + "XXXXXXXX..... XXXXXXXXXXXXXXXXX", + "XXXXXXXX.... XXXXXXXXXXXXXXXXXX", + "XXXXXXXX.... XXXXXXXXXXXXXXXXXX", + "XXXXXXXX.... XXXX.XXXXXXXXXXXXX", + "XXXXXXXXX.... XX... XXXXXXXXXXX", + "XXXXXXXXXX....... XXXXXXXXXXXX", + "XXXXXXXXXXX XXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"}; diff --git a/src/icon/news.c b/src/icon/news.c index d08639e..393a0e3 100644 --- a/src/icon/news.c +++ b/src/icon/news.c @@ -2,45 +2,44 @@ #include /* XPM */ -char *MwIconNews[] = { -/* columns rows colors chars-per-pixel */ -"32 32 5 1 ", -" c black", -". c SlateGray", -"X c gray", -"o c white", -"O c None", -/* pixels */ -"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", -"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", -"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", -"OOOOOOOOOOOO OOOOOOOOOOOOOOOOO", -"OOOOOOOOOOO ooo OOOOOOOOOOOOOOO", -"OOOOOOOOOO oo ooo OOOOOOOOOOOOO", -"OOOOOOOOO oo o ooo OOOOOOOOOOO", -"OOOOOOOO oo o oo .oo OOOOOOOOO", -"OOOOOOO oo oo oo o. ooo OOOOOOO", -"OOOOOO oXooo oo X oo oooo OOOOO", -"OOOOO oo. .ooo .ooo o.o.ooo OOO", -"OOOO oXooo. XooX o o. o o .oo O", -"OOO oo. .oooX .ooo o o o. ooo ", -"OO oXooo. Xooo. .ooo ooo oooo X", -"O oo. .oooX .oooXo ooo .o ooo X ", -" .Xooo. Xooo. .oo o oo. ooo X X", -" o. .oooX .oooXo Xooo oooo X X ", -" ooo. Xooo. .oo XXXXooo oo X X X", -" X .ooX .oooXo ...XXXX oo X X X ", -" .XX .oo. .ooo ....X oo X X X O", -"O .XXX.oo.XXooo .. oo X X X OO", -"OOO .XX .ooX .ooo oo X X X OOO", -"OOOOO .XX .oo. .oooo X X X OOOO", -"OOOOOOO .XoX.oo. oo X X X OOOOO", -"OOOOOOOOO .X. .ooo X X X OOOOOO", -"OOOOOOOOOOO .XX o X X X OOOOOOO", -"OOOOOOOOOOOOO .XX X X OOOOOOOO", -"OOOOOOOOOOOOOOO . .XX OOOOOOOOO", -"OOOOOOOOOOOOOOOOO OOOOOOOOOO", -"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", -"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", -"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO" -}; +char* MwIconNews[] = { + /* columns rows colors chars-per-pixel */ + "32 32 5 1 ", + " c black", + ". c SlateGray", + "X c gray", + "o c white", + "O c None", + /* pixels */ + "OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", + "OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", + "OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", + "OOOOOOOOOOOO OOOOOOOOOOOOOOOOO", + "OOOOOOOOOOO ooo OOOOOOOOOOOOOOO", + "OOOOOOOOOO oo ooo OOOOOOOOOOOOO", + "OOOOOOOOO oo o ooo OOOOOOOOOOO", + "OOOOOOOO oo o oo .oo OOOOOOOOO", + "OOOOOOO oo oo oo o. ooo OOOOOOO", + "OOOOOO oXooo oo X oo oooo OOOOO", + "OOOOO oo. .ooo .ooo o.o.ooo OOO", + "OOOO oXooo. XooX o o. o o .oo O", + "OOO oo. .oooX .ooo o o o. ooo ", + "OO oXooo. Xooo. .ooo ooo oooo X", + "O oo. .oooX .oooXo ooo .o ooo X ", + " .Xooo. Xooo. .oo o oo. ooo X X", + " o. .oooX .oooXo Xooo oooo X X ", + " ooo. Xooo. .oo XXXXooo oo X X X", + " X .ooX .oooXo ...XXXX oo X X X ", + " .XX .oo. .ooo ....X oo X X X O", + "O .XXX.oo.XXooo .. oo X X X OO", + "OOO .XX .ooX .ooo oo X X X OOO", + "OOOOO .XX .oo. .oooo X X X OOOO", + "OOOOOOO .XoX.oo. oo X X X OOOOO", + "OOOOOOOOO .X. .ooo X X X OOOOOO", + "OOOOOOOOOOO .XX o X X X OOOOOOO", + "OOOOOOOOOOOOO .XX X X OOOOOOOO", + "OOOOOOOOOOOOOOO . .XX OOOOOOOOO", + "OOOOOOOOOOOOOOOOO OOOOOOOOOO", + "OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", + "OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", + "OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO"}; diff --git a/src/icon/note.c b/src/icon/note.c index 05224b7..abea9fe 100644 --- a/src/icon/note.c +++ b/src/icon/note.c @@ -2,47 +2,46 @@ #include /* XPM */ -char *MwIconNote[] = { -/* columns rows colors chars-per-pixel */ -"32 32 7 1 ", -" c black", -". c red", -"X c yellow", -"o c magenta", -"O c gray", -"+ c white", -"@ c None", -/* pixels */ -"@@@@@@ @@@@@@@@@@@@@@@@@@@@@", -"@@@@@ ..... @@@@@@@@@@@@@@@@@@@@", -"@@@@ ....... @@@@@@@@@@@@@@@@@@@", -"@@@@ ......o @@@@@@@@@@@@@@@@@@@", -"@@@@ .oo++o. @@@@@ @@@@@@@@@@@@", -"@@@@@ ..++. @@@@ X+ @@@@@@@@@@@", -"@@@@@@ @@@ +X+X @@@@@@@@@@@", -"@@@@@ ... X+X+X+X @@@@@@@@@@", -"@@@@ . ..+ . X+X+X+X+ @@@@@@@@@@", -"@@@ .. ..o .o X+X+X+X+ @@@@@@@@@", -"@@@ ... ..o +X+X+X+X @@@@@@@@@", -"@@@ .o.....o. X+X+X+X+X @@@@@@@@", -"@@ ..oo++o.. +X+X+X+X+ @@@@@@@@", -" O ....... +X+X+X+X+X+ @@@@@@@", -" OOO +X+X+X+X+X+X @@@@@@@", -"@ O O O +X+X+X+X+XOO+X+X @@@@@@", -"@ OO O O X+X+X+X+OOX+X+X+ @@@@@@", -"@@ OO O O+X+XOXOO+X+X+X+X+ @@@@@", -"@@ OOO O+X+X+OOX+O+X+OOX+X @@@@@", -"@@@ O+X+X+XOO+X+X+XOO+X+X+X @@@@", -"@@@ OO+X+OOXOO+X+OOX+O+X+X+X @@@", -"@@@@ OX+X+X+X+XOO+X+X+X+OOX+X ", -"@@@@ OOX+X+XOOOX+X+X+XOO+X+X+X+ ", -"@@@@@ O+X+OOX+XOXOX+OOX+X+X+X+ @", -"@@@@@ OO+X+X+X+X+XOO+XOX+X+X+ @@", -"@@@@@@ OX+X+X+X+OOX+X+X+X+X @@@", -"@@@@@@ OX+X+X+X+X+X+X+X+ @@@@@", -"@@@@@@@ +X+X+X+X+X+X @@@@@@@", -"@@@@@@@@ X+X+X+ @@@@@@@@@", -"@@@@@@@@@ X++ X+X @@@@@@@@@@@", -"@@@@@@@@@@ X @@@@@@@@@@@@@", -"@@@@@@@@@@@@ @@@@@@@@@@@@@@@" -}; +char* MwIconNote[] = { + /* columns rows colors chars-per-pixel */ + "32 32 7 1 ", + " c black", + ". c red", + "X c yellow", + "o c magenta", + "O c gray", + "+ c white", + "@ c None", + /* pixels */ + "@@@@@@ @@@@@@@@@@@@@@@@@@@@@", + "@@@@@ ..... @@@@@@@@@@@@@@@@@@@@", + "@@@@ ....... @@@@@@@@@@@@@@@@@@@", + "@@@@ ......o @@@@@@@@@@@@@@@@@@@", + "@@@@ .oo++o. @@@@@ @@@@@@@@@@@@", + "@@@@@ ..++. @@@@ X+ @@@@@@@@@@@", + "@@@@@@ @@@ +X+X @@@@@@@@@@@", + "@@@@@ ... X+X+X+X @@@@@@@@@@", + "@@@@ . ..+ . X+X+X+X+ @@@@@@@@@@", + "@@@ .. ..o .o X+X+X+X+ @@@@@@@@@", + "@@@ ... ..o +X+X+X+X @@@@@@@@@", + "@@@ .o.....o. X+X+X+X+X @@@@@@@@", + "@@ ..oo++o.. +X+X+X+X+ @@@@@@@@", + " O ....... +X+X+X+X+X+ @@@@@@@", + " OOO +X+X+X+X+X+X @@@@@@@", + "@ O O O +X+X+X+X+XOO+X+X @@@@@@", + "@ OO O O X+X+X+X+OOX+X+X+ @@@@@@", + "@@ OO O O+X+XOXOO+X+X+X+X+ @@@@@", + "@@ OOO O+X+X+OOX+O+X+OOX+X @@@@@", + "@@@ O+X+X+XOO+X+X+XOO+X+X+X @@@@", + "@@@ OO+X+OOXOO+X+OOX+O+X+X+X @@@", + "@@@@ OX+X+X+X+XOO+X+X+X+OOX+X ", + "@@@@ OOX+X+XOOOX+X+X+XOO+X+X+X+ ", + "@@@@@ O+X+OOX+XOXOX+OOX+X+X+X+ @", + "@@@@@ OO+X+X+X+X+XOO+XOX+X+X+ @@", + "@@@@@@ OX+X+X+X+OOX+X+X+X+X @@@", + "@@@@@@ OX+X+X+X+X+X+X+X+ @@@@@", + "@@@@@@@ +X+X+X+X+X+X @@@@@@@", + "@@@@@@@@ X+X+X+ @@@@@@@@@", + "@@@@@@@@@ X++ X+X @@@@@@@@@@@", + "@@@@@@@@@@ X @@@@@@@@@@@@@", + "@@@@@@@@@@@@ @@@@@@@@@@@@@@@"}; diff --git a/src/icon/question.c b/src/icon/question.c index ceca58a..2d74d32 100644 --- a/src/icon/question.c +++ b/src/icon/question.c @@ -2,45 +2,44 @@ #include /* XPM */ -char *MwIconQuestion[] = { -/* columns rows colors chars-per-pixel */ -"32 32 5 1 ", -" c firebrick", -". c red", -"X c orange", -"o c SlateGray", -"O c None", -/* pixels */ -"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", -"OOOOOOOOOOXXXXXXXXXXXOOOOOOOOOOO", -"OOOOOOOOXX.............OOOOOOOOO", -"OOOOOOOX..... ..oOOOOOOO", -"OOOOOOX.... .oOOOOOO", -"OOOOOX.... .... .oOOOOO", -"OOOOX.... oooO.. oOOOO", -"OOOX.... oooOOO.. ooOOO", -"OOOX... ooOOOOX.. ooOOO", -"OOOX... oOOOOX.. ooOOO", -"OOOO... ooOOOX.. ooOOO", -"OOOOO.. ooOOX... ooOOO", -"OOOOOO.. oooOOX.. oooOOO", -"OOOOOOO.. oooOOX.. oooOOOO", -"OOOOOOOOoooooOOX.. ooooOOOO", -"OOOOOOOOOoooOOX.. ooooOOOOO", -"OOOOOOOOOOOOOX.. oooooOOOOOO", -"OOOOOOOOOOOOX.. ooooOOOOOOOO", -"OOOOOOOOOOOX.. ooooOOOOOOOOO", -"OOOOOOOOOOOX.. ooooOOOOOOOOOO", -"OOOOOOOOOOOO.. ooooOOOOOOOOOOO", -"OOOOOOOOOOOOO.. ooooOOOOOOOOOOOO", -"OOOOOOOOOOOOOOoooooOOOOOOOOOOOOO", -"OOOOOOOOOOOOX.. oOOOOOOOOOOOOOO", -"OOOOOOOOOOOX.X.. OOOOOOOOOOOOOO", -"OOOOOOOOOOX.X.X.. OOOOOOOOOOOOO", -"OOOOOOOOOOX..X... oOOOOOOOOOOOO", -"OOOOOOOOOOO...... ooOOOOOOOOOOO", -"OOOOOOOOOOOO.... oooOOOOOOOOOOO", -"OOOOOOOOOOOOO. ooooOOOOOOOOOOO", -"OOOOOOOOOOOOOOooooooOOOOOOOOOOOO", -"OOOOOOOOOOOOOOOooooOOOOOOOOOOOOO" -}; +char* MwIconQuestion[] = { + /* columns rows colors chars-per-pixel */ + "32 32 5 1 ", + " c firebrick", + ". c red", + "X c orange", + "o c SlateGray", + "O c None", + /* pixels */ + "OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", + "OOOOOOOOOOXXXXXXXXXXXOOOOOOOOOOO", + "OOOOOOOOXX.............OOOOOOOOO", + "OOOOOOOX..... ..oOOOOOOO", + "OOOOOOX.... .oOOOOOO", + "OOOOOX.... .... .oOOOOO", + "OOOOX.... oooO.. oOOOO", + "OOOX.... oooOOO.. ooOOO", + "OOOX... ooOOOOX.. ooOOO", + "OOOX... oOOOOX.. ooOOO", + "OOOO... ooOOOX.. ooOOO", + "OOOOO.. ooOOX... ooOOO", + "OOOOOO.. oooOOX.. oooOOO", + "OOOOOOO.. oooOOX.. oooOOOO", + "OOOOOOOOoooooOOX.. ooooOOOO", + "OOOOOOOOOoooOOX.. ooooOOOOO", + "OOOOOOOOOOOOOX.. oooooOOOOOO", + "OOOOOOOOOOOOX.. ooooOOOOOOOO", + "OOOOOOOOOOOX.. ooooOOOOOOOOO", + "OOOOOOOOOOOX.. ooooOOOOOOOOOO", + "OOOOOOOOOOOO.. ooooOOOOOOOOOOO", + "OOOOOOOOOOOOO.. ooooOOOOOOOOOOOO", + "OOOOOOOOOOOOOOoooooOOOOOOOOOOOOO", + "OOOOOOOOOOOOX.. oOOOOOOOOOOOOOO", + "OOOOOOOOOOOX.X.. OOOOOOOOOOOOOO", + "OOOOOOOOOOX.X.X.. OOOOOOOOOOOOO", + "OOOOOOOOOOX..X... oOOOOOOOOOOOO", + "OOOOOOOOOOO...... ooOOOOOOOOOOO", + "OOOOOOOOOOOO.... oooOOOOOOOOOOO", + "OOOOOOOOOOOOO. ooooOOOOOOOOOOO", + "OOOOOOOOOOOOOOooooooOOOOOOOOOOOO", + "OOOOOOOOOOOOOOOooooOOOOOOOOOOOOO"}; diff --git a/src/icon/search.c b/src/icon/search.c index ea0f115..e43996b 100644 --- a/src/icon/search.c +++ b/src/icon/search.c @@ -2,36 +2,35 @@ #include /* XPM */ -char *MwIconSearch[] = { -/* columns rows colors chars-per-pixel */ -"20 22 6 1 ", -" c black", -". c gray20", -"X c #66CCFF", -"o c gray60", -"O c white", -"+ c None", -/* pixels */ -".............+++++++", -".OOOOOOOOOO.O.++++++", -".OOOOOOOOOO.OO.+++++", -".OOOOOOOOOO.OOO.++++", -".OOOOOOOOOO.OOOO.+++", -".OOOOOOOOOO . . . ++", -".OOOOOOOOOO ++", -".OOOOOooooOOOoooo ++", -".OOOo. .oOOooo ++", -".OOo .oXXo. oOOOo ++", -".OO..XXXXXX..OOOo ++", -".Oo oXOOXXXo . . ", -".Oo XXOXXXXX ...... ", -".Oo XXXXXXXX oooooo ", -".Oo oXXXXXXo ", -".OO..XXXXXX..OOOo ++", -".OOo .oXXo. oOOOo ++", -".OOOo. .oOOOOo ++", -".OOOOOooooOOOOOOo ++", -".OOOOOOOOOOOOOOOo ++", -"..oooooooooooooo. ++", -"++ ++" -}; +char* MwIconSearch[] = { + /* columns rows colors chars-per-pixel */ + "20 22 6 1 ", + " c black", + ". c gray20", + "X c #66CCFF", + "o c gray60", + "O c white", + "+ c None", + /* pixels */ + ".............+++++++", + ".OOOOOOOOOO.O.++++++", + ".OOOOOOOOOO.OO.+++++", + ".OOOOOOOOOO.OOO.++++", + ".OOOOOOOOOO.OOOO.+++", + ".OOOOOOOOOO . . . ++", + ".OOOOOOOOOO ++", + ".OOOOOooooOOOoooo ++", + ".OOOo. .oOOooo ++", + ".OOo .oXXo. oOOOo ++", + ".OO..XXXXXX..OOOo ++", + ".Oo oXOOXXXo . . ", + ".Oo XXOXXXXX ...... ", + ".Oo XXXXXXXX oooooo ", + ".Oo oXXXXXXo ", + ".OO..XXXXXX..OOOo ++", + ".OOo .oXXo. oOOOo ++", + ".OOOo. .oOOOOo ++", + ".OOOOOooooOOOOOOo ++", + ".OOOOOOOOOOOOOOOo ++", + "..oooooooooooooo. ++", + "++ ++"}; diff --git a/src/icon/up.c b/src/icon/up.c index 4b96eff..f600c10 100644 --- a/src/icon/up.c +++ b/src/icon/up.c @@ -2,32 +2,31 @@ #include /* XPM */ -char *MwIconUp[] = { -/* columns rows colors chars-per-pixel */ -"20 22 2 1 ", -" c black", -". c None", -/* pixels */ -"....................", -"....................", -"....................", -"....................", -"....................", -"....................", -"......... .........", -"........ ........", -"....... .......", -"...... ......", -"..... .....", -".... ....", -"... ...", -".. ..", -". .", -"....................", -"....................", -"....................", -"....................", -"....................", -"....................", -"...................." -}; +char* MwIconUp[] = { + /* columns rows colors chars-per-pixel */ + "20 22 2 1 ", + " c black", + ". c None", + /* pixels */ + "....................", + "....................", + "....................", + "....................", + "....................", + "....................", + "......... .........", + "........ ........", + "....... .......", + "...... ......", + "..... .....", + ".... ....", + "... ...", + ".. ..", + ". .", + "....................", + "....................", + "....................", + "....................", + "....................", + "....................", + "...................."}; diff --git a/src/icon/warning.c b/src/icon/warning.c index cd9f284..512de6d 100644 --- a/src/icon/warning.c +++ b/src/icon/warning.c @@ -2,45 +2,44 @@ #include /* XPM */ -char *MwIconWarning[] = { -/* columns rows colors chars-per-pixel */ -"32 32 5 1 ", -" c black", -". c DarkSlateGray", -"X c red", -"o c yellow", -"O c None", -/* pixels */ -"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", -"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", -"OOOOOOOOOOOOOOXXXOOOOOOOOOOOOOOO", -"OOOOOOOOOOOOOXXXXXOOOOOOOOOOOOOO", -"OOOOOOOOOOOOOXXoXX..OOOOOOOOOOOO", -"OOOOOOOOOOOOXXoooXX..OOOOOOOOOOO", -"OOOOOOOOOOOOXXoooXX..OOOOOOOOOOO", -"OOOOOOOOOOOXXoooooXX..OOOOOOOOOO", -"OOOOOOOOOOOXXoooooXX..OOOOOOOOOO", -"OOOOOOOOOOXXoo ooXX..OOOOOOOOO", -"OOOOOOOOOOXXo oXX..OOOOOOOOO", -"OOOOOOOOOXXoo ooXX..OOOOOOOO", -"OOOOOOOOOXXoo ooXX..OOOOOOOO", -"OOOOOOOOXXooo oooXX..OOOOOOO", -"OOOOOOOOXXooo oooXX..OOOOOOO", -"OOOOOOOXXoooo ooooXX..OOOOOO", -"OOOOOOOXXoooo ooooXX..OOOOOO", -"OOOOOOXXooooo oooooXX..OOOOO", -"OOOOOOXXoooooo ooooooXX..OOOOO", -"OOOOOXXooooooo oooooooXX..OOOO", -"OOOOOXXooooooo oooooooXX..OOOO", -"OOOOXXoooooooo ooooooooXX..OOO", -"OOOOXXoooooooooooooooooooXX..OOO", -"OOOXXooooooooo oooooooooXX..OO", -"OOOXXoooooooo ooooooooXX..OO", -"OOXXooooooooo oooooooooXX..O", -"OOXXoooooooooo ooooooooooXX..O", -"OXXoooooooooooooooooooooooooXX..", -"OXXXXXXXXXXXXXXXXXXXXXXXXXXXXX..", -"OOXXXXXXXXXXXXXXXXXXXXXXXXXXX...", -"OOOO...........................O", -"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO" -}; +char* MwIconWarning[] = { + /* columns rows colors chars-per-pixel */ + "32 32 5 1 ", + " c black", + ". c DarkSlateGray", + "X c red", + "o c yellow", + "O c None", + /* pixels */ + "OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", + "OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", + "OOOOOOOOOOOOOOXXXOOOOOOOOOOOOOOO", + "OOOOOOOOOOOOOXXXXXOOOOOOOOOOOOOO", + "OOOOOOOOOOOOOXXoXX..OOOOOOOOOOOO", + "OOOOOOOOOOOOXXoooXX..OOOOOOOOOOO", + "OOOOOOOOOOOOXXoooXX..OOOOOOOOOOO", + "OOOOOOOOOOOXXoooooXX..OOOOOOOOOO", + "OOOOOOOOOOOXXoooooXX..OOOOOOOOOO", + "OOOOOOOOOOXXoo ooXX..OOOOOOOOO", + "OOOOOOOOOOXXo oXX..OOOOOOOOO", + "OOOOOOOOOXXoo ooXX..OOOOOOOO", + "OOOOOOOOOXXoo ooXX..OOOOOOOO", + "OOOOOOOOXXooo oooXX..OOOOOOO", + "OOOOOOOOXXooo oooXX..OOOOOOO", + "OOOOOOOXXoooo ooooXX..OOOOOO", + "OOOOOOOXXoooo ooooXX..OOOOOO", + "OOOOOOXXooooo oooooXX..OOOOO", + "OOOOOOXXoooooo ooooooXX..OOOOO", + "OOOOOXXooooooo oooooooXX..OOOO", + "OOOOOXXooooooo oooooooXX..OOOO", + "OOOOXXoooooooo ooooooooXX..OOO", + "OOOOXXoooooooooooooooooooXX..OOO", + "OOOXXooooooooo oooooooooXX..OO", + "OOOXXoooooooo ooooooooXX..OO", + "OOXXooooooooo oooooooooXX..O", + "OOXXoooooooooo ooooooooooXX..O", + "OXXoooooooooooooooooooooooooXX..", + "OXXXXXXXXXXXXXXXXXXXXXXXXXXXXX..", + "OOXXXXXXXXXXXXXXXXXXXXXXXXXXX...", + "OOOO...........................O", + "OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO"};