From f36ff660b397f12bd049957f7af90a96c700482e Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Sat, 17 Mar 2018 22:32:39 +0000 Subject: [PATCH] build: Remove old Ubuntu icons --- SparkleShare/Common/SparkleShare.cs | 29 ++++++++++-------- SparkleShare/Linux/Images/icons/meson.build | 28 ++--------------- .../status/24/process-syncing-down.png | Bin 271 -> 0 bytes .../status/24/process-syncing-error.png | Bin 266 -> 0 bytes .../status/24/process-syncing-idle.png | Bin 361 -> 0 bytes .../status/24/process-syncing-up.png | Bin 271 -> 0 bytes .../status/24/process-syncing.png | Bin 268 -> 0 bytes .../status/24/process-syncing-down.png | Bin 258 -> 0 bytes .../status/24/process-syncing-error.png | Bin 250 -> 0 bytes .../status/24/process-syncing-idle.png | Bin 337 -> 0 bytes .../status/24/process-syncing-up.png | Bin 259 -> 0 bytes .../status/24/process-syncing.png | Bin 252 -> 0 bytes 12 files changed, 19 insertions(+), 38 deletions(-) delete mode 100644 SparkleShare/Linux/Images/icons/ubuntu-mono-dark/status/24/process-syncing-down.png delete mode 100644 SparkleShare/Linux/Images/icons/ubuntu-mono-dark/status/24/process-syncing-error.png delete mode 100644 SparkleShare/Linux/Images/icons/ubuntu-mono-dark/status/24/process-syncing-idle.png delete mode 100644 SparkleShare/Linux/Images/icons/ubuntu-mono-dark/status/24/process-syncing-up.png delete mode 100644 SparkleShare/Linux/Images/icons/ubuntu-mono-dark/status/24/process-syncing.png delete mode 100644 SparkleShare/Linux/Images/icons/ubuntu-mono-light/status/24/process-syncing-down.png delete mode 100644 SparkleShare/Linux/Images/icons/ubuntu-mono-light/status/24/process-syncing-error.png delete mode 100644 SparkleShare/Linux/Images/icons/ubuntu-mono-light/status/24/process-syncing-idle.png delete mode 100644 SparkleShare/Linux/Images/icons/ubuntu-mono-light/status/24/process-syncing-up.png delete mode 100644 SparkleShare/Linux/Images/icons/ubuntu-mono-light/status/24/process-syncing.png diff --git a/SparkleShare/Common/SparkleShare.cs b/SparkleShare/Common/SparkleShare.cs index 75312b97..d91da0db 100644 --- a/SparkleShare/Common/SparkleShare.cs +++ b/SparkleShare/Common/SparkleShare.cs @@ -39,18 +39,7 @@ namespace SparkleShare { InstallationInfo.OperatingSystem != OS.macOS && InstallationInfo.OperatingSystem != OS.Windows) { - string n = Environment.NewLine; - - Console.WriteLine (n + - "Share and collaborate by syncing with any Git repository instantly." + n + - n + - "Version: " + InstallationInfo.Version + n + - "Copyright (C) 2010 Hylke Bons and others" + n + - "This program comes with ABSOLUTELY NO WARRANTY." + n + - n + - "This is free software, and you are welcome to redistribute it" + n + - "under certain conditions. Please read the GNU GPLv3 for details." + n); - + DisplayHelp (); Environment.Exit (0); } @@ -76,6 +65,22 @@ namespace SparkleShare { } + void DisplayHelp () + { + string n = Environment.NewLine; + + Console.WriteLine (n + + "Share and collaborate by syncing with any Git repository instantly." + n + + n + + "Version: " + InstallationInfo.Version + n + + "Copyright (C) 2010 Hylke Bons and others" + n + + "This program comes with ABSOLUTELY NO WARRANTY." + n + + n + + "This is free software, and you are welcome to redistribute it" + n + + "under certain conditions. Please read the GNU GPLv3 for details." + n); + } + + static void OnUnhandledException (object sender, UnhandledExceptionEventArgs exception_args) { var exception = (Exception) exception_args.ExceptionObject; diff --git a/SparkleShare/Linux/Images/icons/meson.build b/SparkleShare/Linux/Images/icons/meson.build index 01c570bc..1bfa8aec 100644 --- a/SparkleShare/Linux/Images/icons/meson.build +++ b/SparkleShare/Linux/Images/icons/meson.build @@ -11,6 +11,8 @@ foreach size : icon_sizes install_dir: join_paths(theme_dir, icon_dir)) endforeach + +# Don't forget the symbolic icons install_data( sources: join_paths('hicolor', 'symbolic', 'apps', app_icon_name + '-symbolic.svg'), install_dir: join_paths(theme_dir, 'symbolic', 'apps')) @@ -55,29 +57,3 @@ foreach size : sizes install_dir: join_paths(app_theme_dir, size + 'x' + size, category)) endforeach - -# Install Ubuntu icons -if get_option('ubuntu') - themes = ['ubuntu-mono-dark', 'ubuntu-mono-light'] - size = '24' - - foreach theme : themes - theme_dir = join_paths(get_option('prefix'), 'share', 'icons', theme) - - install_data(sources: join_paths(theme, category, size, 'process-syncing.png'), - install_dir: join_paths(theme_dir, category, size)) - - install_data(sources: join_paths(theme, category, size, 'process-syncing-idle.png'), - install_dir: join_paths(theme_dir, category, size)) - - install_data(sources: join_paths(theme, category, size, 'process-syncing-up.png'), - install_dir: join_paths(theme_dir, category, size)) - - install_data(sources: join_paths(theme, category, size, 'process-syncing-down.png'), - install_dir: join_paths(theme_dir, category, size)) - - install_data(sources: join_paths(theme, category, size, 'process-syncing-error.png'), - install_dir: join_paths(theme_dir, category, size)) - endforeach -endif - diff --git a/SparkleShare/Linux/Images/icons/ubuntu-mono-dark/status/24/process-syncing-down.png b/SparkleShare/Linux/Images/icons/ubuntu-mono-dark/status/24/process-syncing-down.png deleted file mode 100644 index 6a0086532b4163a836cd77af52a3c1b5f3fd6028..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 271 zcmV+q0r38bP)T*bS%J9!G2ax-)gPDA=C6}WRWb%(7FH0_k&0SJQP?J+zfyF1tZ6;;c zx4p95M4&i+fZ*0t09_E=TL`WocsfBsrr-ZtGBU3aTtHA%1lgXG;k&GOJcbojoWU7+ zmKRb=J3@p#^DKVM$voHCki-kg@XGTMigp|aO)rt@E|FqnWM0xQNaUuD*)Tix@=?ml#&CE9M|{ z0w@yLjUa*2{*Vw|BvaTiZXt+B25j^16LjyI$RwQV&Az#S2I3Hm%p|tr14A}r-FpVr Q1poj507*qoM6N<$f|9;(I{*Lx diff --git a/SparkleShare/Linux/Images/icons/ubuntu-mono-dark/status/24/process-syncing-idle.png b/SparkleShare/Linux/Images/icons/ubuntu-mono-dark/status/24/process-syncing-idle.png deleted file mode 100644 index 32da58bb77718b4e7b608c03f12d220d704c0d85..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 361 zcmV-v0ha!WP)bF5XSdJY_+!$J6o~SQeVSDt$hWptt|8ntQ736@&F3S?i%Ixe>enfghNm7)FaLW z#U;#z3l?8kzMc8)%tu&RmMmzwevSNLF!Bfi-UuK0?+Ey+jV7vGj6DAHa8U?ltVsz2=8r$$cV&7e)o+eY)T@-}~9S6SUmzb+bhx$UgNOzhR?OatqFn zpu*a0BhT|W0+2JO#aU#u67-(1pyUds-yXnIf1fVlj{nj(`teqNI!T4#00000NkvXX Hu0mjf2wJ6_ diff --git a/SparkleShare/Linux/Images/icons/ubuntu-mono-dark/status/24/process-syncing-up.png b/SparkleShare/Linux/Images/icons/ubuntu-mono-dark/status/24/process-syncing-up.png deleted file mode 100644 index 6f129a6e685c0da4c1d3c90361fe160bc2843d29..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 271 zcmV+q0r38bP)T*bS%J9!x6Vi@H6E;};0ZnqYq7WDMN_il@_tLL~^EZtGhz~{F VU%|@-Dg^)l002ovPDHLkV1hu_ZJGc8 diff --git a/SparkleShare/Linux/Images/icons/ubuntu-mono-dark/status/24/process-syncing.png b/SparkleShare/Linux/Images/icons/ubuntu-mono-dark/status/24/process-syncing.png deleted file mode 100644 index 3cb78b56e25a8ca80085d786ed3a210bca14a031..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 268 zcmV+n0rUQeP)-0=mR8_SpdQD&7MePOxO*6o!1%M37;@L4mo2*dl1fxs$-8PB5<#6wa~= z=tN4{s}d-|9w^AoAoAH1Z}t&nICsc$6x@F|`3wsU1veBtEkR}qzQB52I(Nm5qNyMf zbY;B3g_vcROa**t$x;*~bpl}F$aZiow(a_fpt~W;=R;WR+Y6{C4_+T1=PzEIrColi S@&ai90000}9on**$$UvgixN~;6 zz+9Et7E66kUa;O_T`7A|*`iwLpyxplaOF_imeu)RI%C6`KHm|Bo&8Y-ZYK|^dQLj2-^9eqE?UH`-u*y-onaH(`~?onro8%Pw_cN-D^6gF zV3SZ&ddmaGgS%xfyjlLX^76eqN;{kbBAIksB(9}uKD|*GZvM>jUR&|Klb`pvzh3-U z_U-T9gG~|DpJe;CA97ako|byEL+p3Mr)g?ej;p$UWZbv<;j@b5$SXikF?hQAxvXxQNa|E&ZXsiqGUD_&!bwjt&mD2#1Jw>QR%TAe08Z4j&Yfd~K3~ z_a3y?E2KpH7YAfaagLAR6pCUBrPTZvL527PO^C-FBf+1Xa|HoT&;US32+`--V{gX+ z_N0^pM(`j(ol0=d4N)>-1T_insRU!pjMm5qZX|dzEi8~FBe=qQ&%PxWV1gBG2zL_aZ$7wZbvB|!`^=>Px#07*qoM6N<$f{CSJ A@&Et; diff --git a/SparkleShare/Linux/Images/icons/ubuntu-mono-light/status/24/process-syncing-idle.png b/SparkleShare/Linux/Images/icons/ubuntu-mono-light/status/24/process-syncing-idle.png deleted file mode 100644 index b0fa2466aeca87b947d6061d0f952f3659c8147a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 337 zcmV-X0j~auP)Lo`!_iB2eeQSB$R?K1!=X3 zRnG5&1a5d9AqGBN?&aO*?!Al9S_>&<53GSU_yCvm-9|3>0-9mv`+ld0AOZRW2aqtt zyr4MWMFh`aZWGxA8>Lh|2m;?$o^AI#pde^td^nNwPlD74yyxAGqNs}bJp_+=3{M5I zPa{7i!Oj#Q$-y`UzeYU4b>5HwFK@6npx-~}dCa}{jO-eEmVHmck j`z01Xq0}bb?^zrHjuy{YuqAys00000NkvXXu0mjf?e&pY diff --git a/SparkleShare/Linux/Images/icons/ubuntu-mono-light/status/24/process-syncing-up.png b/SparkleShare/Linux/Images/icons/ubuntu-mono-light/status/24/process-syncing-up.png deleted file mode 100644 index 79d50843037c5230845ed5e9503b8a9c79759f67..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 259 zcmV+e0sQ`nP)2tILGWreXm#`Ey6D}~A$UUY@m#M&P;1=} z%-{h*9U-_g6cK^~f;>WSz=St==*XHWr6yDyJB0UiyCGH-#TTd5;pQCkDw6;J002ov JPDHLkV1l*CX@LL$ diff --git a/SparkleShare/Linux/Images/icons/ubuntu-mono-light/status/24/process-syncing.png b/SparkleShare/Linux/Images/icons/ubuntu-mono-light/status/24/process-syncing.png deleted file mode 100644 index 59df7969e7d705e820452cade68ce2101326a2c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 252 zcmVp)kt zpvnn|Rirx#rPMx9l(G|A>oJAX50?+dm?3}8Uwi?}FXbg#c=S*J0000