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 6a008653..00000000 Binary files a/SparkleShare/Linux/Images/icons/ubuntu-mono-dark/status/24/process-syncing-down.png and /dev/null differ diff --git a/SparkleShare/Linux/Images/icons/ubuntu-mono-dark/status/24/process-syncing-error.png b/SparkleShare/Linux/Images/icons/ubuntu-mono-dark/status/24/process-syncing-error.png deleted file mode 100644 index cfe52618..00000000 Binary files a/SparkleShare/Linux/Images/icons/ubuntu-mono-dark/status/24/process-syncing-error.png and /dev/null differ 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 32da58bb..00000000 Binary files a/SparkleShare/Linux/Images/icons/ubuntu-mono-dark/status/24/process-syncing-idle.png and /dev/null differ 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 6f129a6e..00000000 Binary files a/SparkleShare/Linux/Images/icons/ubuntu-mono-dark/status/24/process-syncing-up.png and /dev/null differ 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 3cb78b56..00000000 Binary files a/SparkleShare/Linux/Images/icons/ubuntu-mono-dark/status/24/process-syncing.png and /dev/null differ diff --git a/SparkleShare/Linux/Images/icons/ubuntu-mono-light/status/24/process-syncing-down.png b/SparkleShare/Linux/Images/icons/ubuntu-mono-light/status/24/process-syncing-down.png deleted file mode 100644 index 141243b2..00000000 Binary files a/SparkleShare/Linux/Images/icons/ubuntu-mono-light/status/24/process-syncing-down.png and /dev/null differ diff --git a/SparkleShare/Linux/Images/icons/ubuntu-mono-light/status/24/process-syncing-error.png b/SparkleShare/Linux/Images/icons/ubuntu-mono-light/status/24/process-syncing-error.png deleted file mode 100644 index 1f2dab56..00000000 Binary files a/SparkleShare/Linux/Images/icons/ubuntu-mono-light/status/24/process-syncing-error.png and /dev/null differ 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 b0fa2466..00000000 Binary files a/SparkleShare/Linux/Images/icons/ubuntu-mono-light/status/24/process-syncing-idle.png and /dev/null differ 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 79d50843..00000000 Binary files a/SparkleShare/Linux/Images/icons/ubuntu-mono-light/status/24/process-syncing-up.png and /dev/null differ 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 59df7969..00000000 Binary files a/SparkleShare/Linux/Images/icons/ubuntu-mono-light/status/24/process-syncing.png and /dev/null differ