Skip to content

Commit

Permalink
Merge pull request #5524 from AenBleidd/vko_update_linux_app_icon
Browse files Browse the repository at this point in the history 
Add 64x64 xpm application icon
  • Loading branch information
@AenBleidd
AenBleidd authored Mar 1, 2024
2 parents 2b5091a + 5007f49 commit 88665e2
Show file tree
Hide file tree
Showing 3 changed files with 218 additions and 4 deletions.
8 changes: 6 additions & 2 deletions clientgui/SkinManager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
#include "res/skins/default/graphic/workunit_waiting_image.xpm"
#include "res/boinc.xpm"
#include "res/boinc32.xpm"
#include "res/boinc64.xpm"
#include "res/boincdisconnect.xpm"
#include "res/boincdisconnect32.xpm"
#include "res/boincsnooze.xpm"
Expand Down Expand Up @@ -308,10 +309,13 @@ bool CSkinIcon::SetDefaults(wxString strComponentName, wxString strIcon) {
}


bool CSkinIcon::SetDefaults(wxString strComponentName, const char** m_ppIcon, const char** m_ppIcon32) {
bool CSkinIcon::SetDefaults(wxString strComponentName, const char** m_ppIcon, const char** m_ppIcon32, const char** m_ppIcon64) {
m_strComponentName = strComponentName;
m_icoDefaultIcon.AddIcon(wxIcon(m_ppIcon));
m_icoDefaultIcon.AddIcon(wxIcon(m_ppIcon32));
if (m_ppIcon64) {
m_icoDefaultIcon.AddIcon(wxIcon(m_ppIcon64));
}
return true;
}

Expand Down Expand Up @@ -653,7 +657,7 @@ bool CSkinAdvanced::InitializeDelayedValidation() {
m_iconApplicationDisconnectedIcon.SetDefaults(wxT("application disconnected"), wxT("boincdisconnect"));
m_iconApplicationSnoozeIcon.SetDefaults(wxT("application snooze"), wxT("boincsnooze"));
#else
m_iconApplicationIcon.SetDefaults(wxT("application"), boinc_xpm, boinc32_xpm);
m_iconApplicationIcon.SetDefaults(wxT("application"), boinc_xpm, boinc32_xpm, boinc64_xpm);
m_iconApplicationDisconnectedIcon.SetDefaults(wxT("application disconnected"), boincdisconnect_xpm, boincdisconnect32_xpm);
m_iconApplicationSnoozeIcon.SetDefaults(wxT("application snooze"), boincsnooze_xpm, boincsnooze32_xpm);
#endif
Expand Down
4 changes: 2 additions & 2 deletions clientgui/SkinManager.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,8 @@ class CSkinIcon : public CSkinItem
bool SetDefaults(
wxString strComponentName,
const char** m_ppIcon,
const char** m_ppIcon32
const char** m_ppIcon32,
const char** m_ppIcon64 = NULL
);

bool Validate();
Expand All @@ -127,7 +128,6 @@ class CSkinIcon : public CSkinItem
wxIconBundle m_icoDefaultIcon;
wxString m_strDesiredIcon32;
wxString m_strDesiredTransparencyMask32;
wxIconBundle m_icoDefaultIcon32;
wxIconBundle m_icoIcon;
};

Expand Down
210 changes: 210 additions & 0 deletions clientgui/res/boinc64.xpm
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,210 @@
/* XPM */
static const char *boinc64_xpm[] = {
/* columns rows colors chars-per-pixel */
"64 64 140 2 ",
" c None",
". c #173E72",
"X c #183F73",
"o c #164176",
"O c #1B4275",
"+ c #15457B",
"@ c #1B4578",
"# c #15497E",
"$ c #1C497D",
"% c #214779",
"& c #244A7B",
"* c #2A4F7F",
"= c #FEBE00",
"- c #FFC300",
"; c #FFCC05",
": c #144C84",
"> c #1C4C80",
", c #1F5184",
"< c #13528A",
"1 c #1A588F",
"2 c #1C5B91",
"3 c #244F81",
"4 c #265284",
"5 c #2E5281",
"6 c #215488",
"7 c #24588C",
"8 c #335583",
"9 c #365986",
"0 c #3A5B87",
"q c #305C8B",
"w c #3B5D89",
"e c #255E92",
"r c #36608E",
"t c #38608E",
"y c #256196",
"u c #2C6395",
"i c #296699",
"p c #336191",
"a c #3D6692",
"s c #326B9C",
"d c #386E9F",
"f c #3B72A1",
"g c #44638D",
"h c #496790",
"j c #4D6B93",
"k c #496F98",
"l c #526F96",
"z c #48729C",
"x c #537096",
"c c #557399",
"v c #5A769B",
"b c #5E799D",
"n c #617C9F",
"m c #4277A4",
"M c #4678A4",
"N c #4D7AA5",
"B c #4D7EA8",
"V c #557DA4",
"C c #587EA5",
"Z c #637DA1",
"A c #5D81A6",
"S c #5482AB",
"D c #5983AB",
"F c #6481A4",
"G c #6B85A6",
"H c #6587AB",
"J c #6887AA",
"K c #648AAF",
"L c #7089A7",
"P c #738BAB",
"I c #798FAE",
"U c #7394B5",
"Y c #7D94B0",
"T c #7497B8",
"R c #7C9CBB",
"E c #8499B4",
"W c #8A9EB7",
"Q c #809DBB",
"! c #8D9FB9",
"~ c #8DA1BB",
"^ c #92A5BD",
"/ c #86A5C2",
"( c #8EA9C3",
") c #95A7C0",
"_ c #96AAC1",
"` c #9CADC3",
"' c #9EB0C6",
"] c #93B1CA",
"[ c #91B0C9",
"{ c #97B2C9",
"} c #97B2CA",
"| c #9AB3CB",
" . c #9DB9D0",
".. c #A0B0C5",
"X. c #A0B1C6",
"o. c #A3B3C7",
"O. c #A4B4C7",
"+. c #A2B4CA",
"@. c #A3B6CB",
"#. c #A7BACD",
"$. c #ADBDCF",
"%. c #AFBDCF",
"&. c #ACBBCE",
"*. c #B1BECF",
"=. c #B0BDCF",
"-. c #A5BED3",
";. c #A8BED3",
":. c #ACBDD0",
">. c #B2BED1",
",. c #ABC3D6",
"<. c #ACC3D7",
"1. c #B3C0D1",
"2. c #B5C1D2",
"3. c #B5C3D3",
"4. c #B8C5D5",
"5. c #B9C6D5",
"6. c #BDC7D7",
"7. c #BAC6D5",
"8. c #BDC8D7",
"9. c #BACDDD",
"0. c #BCCCDC",
"q. c #BDCFE0",
"w. c #C0CAD7",
"e. c #C0CAD8",
"r. c #C0CBD9",
"t. c #C1CCDB",
"y. c #C4CEDB",
"u. c #C3D0DE",
"i. c #C8D1DE",
"p. c #C5D5E3",
"a. c #CDD7E1",
"s. c #CFDCE7",
"d. c #CFDCE9",
"f. c #D7DCE6",
"g. c #D2DBE5",
"h. c #D9DEE7",
"j. c #DAE5EC",
"k. c #E1E4EC",
"l. c #E2E9F0",
"z. c #ECF0F5",
/* pixels */
" ",
" l. j. ",
" R y 9. { 2 [ ",
" / < < 1 ;. ( < < 1 . ",
" [ 1 < < < < { / : < < < 2 -. ",
" .2 < < < : : : / R : : : < < < 2 <. ",
",.2 < < < : : : : : U U : : : : : < < < e q.",
" M < < < : : : : : : H P : : : : : : : < < M ",
" B < : : : : : : # # V f.6.2.1.r. J # # : : : : : : : N ",
" D : : : : : # # # + k h._ G g @ . . . . . . % j I _ F # # # # : : : : : N ",
" K : : : : # # + + + a ' x X . . . . . . . . . . . . . . O Z 8. b + + + # # # : : : C ",
" U : : # # # + + + o 9 ^ 8 . . . . . . . . . . . . . . . . . . 0 c o o + + + # # # # C ",
" R # # # # + + o o o 5 1.2.w . . . . . . . . . . . . . . . . . . . 9 j o o o o + + # # # A ",
" ~ # + + + o o o . . @ X . . . . . . . . . . . . . . . . . . . 8 j . . o o o o + + + F ",
" _ $ + o o o o . . . . . . . . . . . . . . . . . . . . . . 5 j . . . . o o o o + F ",
" +.$ o o o . . . . . . . . . . . . . % j P E ! ~ E P v G g . . . . . . o o o G ",
" $.& o . . . . . . . . . . . @ F o. g . . . . . . . . o G ",
" 4.* . . . . . . . . . O P w . . . . . . . . . G ",
" t.5 . . . . . . . g r. 6.9 . . . . . . . . j ",
" i.9 . . . . . Z x . . . . . . . O $. ",
" w . . . G v . . . . . . . g ",
" g . b = - - - - - = = j . . . . . . . ~ ",
" P = - - - - - - - - - - = * . . . . . . w ",
" Y *. = - - - - ; ; ; ; ; ; - - - = ` . . . . . . . ` ",
" % O ^ = - - - ; ; ; ; ; ; ; ; ; ; - - = j . . . . . . b ",
" ^ . . X P - - ; ; ; ; ; ; ; ; ; ; ; ; ; - - = ` . . . . . . % ",
" G . . . . n = - - ; ; ; ; ; ; ; ; ; ; ; ; ; ; - - = 9 . . . . . . _ ",
" 0 . . . . . ^ = - - ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; - = P . . . . . . I ",
" o . . . . . b = - ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; - - = ^ . . . . . . b ",
" 4.. . . . . . v - - ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; - - = . . . . . . g ",
" o.. . . . . . G - - ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; - = @ . . . . . 5 ",
" ) . . . . . . P - - ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; - = & . . . . . & ",
" ) . . . . . . I - - ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; - = & . . . . . & ",
" o.. . . . . . G - - ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; - = @ . . . . . 8 ",
" 4.. . . . . . j - - ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; - - = . . . . . . g ",
" o . . . . . & = - ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; - - = z.O . . . . . n ",
" 0 . . . . . . 4. = - - ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; - = j . . . . . I ",
" G . . . . . . Y = - - ; ; ; ; ; ; ; ; ; ; ; ; ; ; - - = 9 . . . . ` ",
" ^ . . . . . . 5 - - ; ; ; ; ; ; ; ; ; ; ; ; ; - - = g . . % ",
" @ . . . . . . ^ = - - - ; ; ; ; ; ; ; ; ; ; - - = v . b ",
" Z . . . . . . * k. = - - - - ; ; ; ; ; ; - - - = P ` ",
" &.. . . . . . . F = - - - - - - - - - = = P ",
" c . . . . . . . ^ = = - - - - = = j . c ",
" 2.o . . . . . . O ` v . . . l ",
" P . . . . . . . O ~ l . . . . . h ",
" g.o . . . . . . . . Z *.9 . . . . . . . w a. ",
" g.w . . . . . . . . . n i.F X . . . . . . . . . 9 y. ",
" g.w o o . . . . . . . G ) c X . . . . . . . . . . o o 5 4. ",
" g.w o o o o . . . . X P 2.Z n I E W W E P g o . . . . . . . . . . . . o o o o 3 1. ",
" g.w + + o o o o . . X E >.% . . . . . . . . . . . . . . . . . . . . . o o o o + + > #. ",
" g.p # + + + o o o . o W 2.% . . . . . . . . . . . . . . . . . . . o . o o o o + + + # > ' ",
" g.p # # + # + + o o o ^ 6.& . . . . . . . . . . . . . . . . . . . h 2.~ @ o o + + + # # # : ( ",
" g.p : : # # # + + + @ ) w.& . . . . . . . . . . . . . . . . . . w ^ ` $ o o + # # # # : : Q ",
" s.u : : : : # # # + $ ' O.j o . . . . . . . . . . . . . . @ b ` $.4 + # # # # : : : : U ",
" s.u : : : : : # # # > +. f.^ G g @ . . . . . . & j L ^ 8.q # # : : : : : : : K ",
" s.u < : : : : : : # , &. 4.&.$.4. a : : : : : : : : < S ",
"d.u < < < : : : : : 6 3. z : : : : : : < < < B z.",
" f < < < : : : : 7 4. C : : : : < < < < m ",
" f < < < : : e 0. K : < < < < < f ",
" d < < < u u. T < < < < s ",
" s < u p. / < < i p. ",
" S s. | i 9. ",
" z. ",
" "
};

0 comments on commit 88665e2

Please sign in to comment.