From f9a82ef70d7b215d8bc77e1eed709d8c4cc9cdc8 Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Wed, 6 Apr 2016 13:29:37 +0100 Subject: [PATCH] build: Rearrange icons --- SparkleShare.sln | 36 +++++------- SparkleShare/Common/Presets/gitlab.xml | 2 +- SparkleShare/Linux/Pixmaps/icons/Makefile.am | 55 +----------------- .../Linux/Pixmaps/icons/gnome/Makefile.am | 21 ------- .../Linux/Pixmaps/icons/hicolor/Makefile.am | 50 ++++++++++++++++ .../icons/{ => hicolor}/document-added-12.png | Bin .../{ => hicolor}/document-deleted-12.png | Bin .../{ => hicolor}/document-edited-12.png | Bin .../icons/{ => hicolor}/document-moved-12.png | Bin .../icons/{ => hicolor}/list-point-16.png | Bin .../org.sparkleshare.SparkleShare-16.png | Bin .../org.sparkleshare.SparkleShare-22.png | Bin .../org.sparkleshare.SparkleShare-24.png | Bin .../org.sparkleshare.SparkleShare-256.png | Bin .../org.sparkleshare.SparkleShare-32.png | Bin .../org.sparkleshare.SparkleShare-48.png | Bin ...org.sparkleshare.SparkleShare-symbolic.svg | 0 .../{ => hicolor}/process-syncing-24.png | Bin .../{ => hicolor}/process-syncing-48.png | Bin .../{ => hicolor}/process-syncing-down-24.png | Bin .../{ => hicolor}/process-syncing-down-48.png | Bin .../process-syncing-error-24.png | Bin .../process-syncing-error-48.png | Bin .../{ => hicolor}/process-syncing-up-24.png | Bin .../{ => hicolor}/process-syncing-up-48.png | Bin .../{ => hicolor}/process-working-22.png | Bin .../icons/ubuntu-mono-dark/Makefile.am | 1 + SparkleShare/Linux/Setup.cs | 3 +- SparkleShare/Linux/SetupWindow.cs | 27 +++------ SparkleShare/Linux/SparkleShare.Linux.csproj | 5 ++ Sparkles/InstallationInfo.Directory.cs | 2 +- build/build.environment.mk | 4 +- build/icon-theme-installer | 6 +- build/m4/sparkleshare/gtk-sharp.m4 | 15 +++-- configure.ac | 6 +- 35 files changed, 101 insertions(+), 132 deletions(-) delete mode 100644 SparkleShare/Linux/Pixmaps/icons/gnome/Makefile.am create mode 100644 SparkleShare/Linux/Pixmaps/icons/hicolor/Makefile.am rename SparkleShare/Linux/Pixmaps/icons/{ => hicolor}/document-added-12.png (100%) rename SparkleShare/Linux/Pixmaps/icons/{ => hicolor}/document-deleted-12.png (100%) rename SparkleShare/Linux/Pixmaps/icons/{ => hicolor}/document-edited-12.png (100%) rename SparkleShare/Linux/Pixmaps/icons/{ => hicolor}/document-moved-12.png (100%) rename SparkleShare/Linux/Pixmaps/icons/{ => hicolor}/list-point-16.png (100%) rename SparkleShare/Linux/Pixmaps/icons/{ => hicolor}/org.sparkleshare.SparkleShare-16.png (100%) rename SparkleShare/Linux/Pixmaps/icons/{ => hicolor}/org.sparkleshare.SparkleShare-22.png (100%) rename SparkleShare/Linux/Pixmaps/icons/{ => hicolor}/org.sparkleshare.SparkleShare-24.png (100%) rename SparkleShare/Linux/Pixmaps/icons/{ => hicolor}/org.sparkleshare.SparkleShare-256.png (100%) rename SparkleShare/Linux/Pixmaps/icons/{ => hicolor}/org.sparkleshare.SparkleShare-32.png (100%) rename SparkleShare/Linux/Pixmaps/icons/{ => hicolor}/org.sparkleshare.SparkleShare-48.png (100%) rename SparkleShare/Linux/Pixmaps/icons/{gnome => hicolor}/org.sparkleshare.SparkleShare-symbolic.svg (100%) rename SparkleShare/Linux/Pixmaps/icons/{ => hicolor}/process-syncing-24.png (100%) rename SparkleShare/Linux/Pixmaps/icons/{ => hicolor}/process-syncing-48.png (100%) rename SparkleShare/Linux/Pixmaps/icons/{ => hicolor}/process-syncing-down-24.png (100%) rename SparkleShare/Linux/Pixmaps/icons/{ => hicolor}/process-syncing-down-48.png (100%) rename SparkleShare/Linux/Pixmaps/icons/{ => hicolor}/process-syncing-error-24.png (100%) rename SparkleShare/Linux/Pixmaps/icons/{ => hicolor}/process-syncing-error-48.png (100%) rename SparkleShare/Linux/Pixmaps/icons/{ => hicolor}/process-syncing-up-24.png (100%) rename SparkleShare/Linux/Pixmaps/icons/{ => hicolor}/process-syncing-up-48.png (100%) rename SparkleShare/Linux/Pixmaps/icons/{ => hicolor}/process-working-22.png (100%) diff --git a/SparkleShare.sln b/SparkleShare.sln index 516668c0..40b22bd5 100644 --- a/SparkleShare.sln +++ b/SparkleShare.sln @@ -1,4 +1,4 @@ - + Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleShare.Mac", "SparkleShare\Mac\SparkleShare.Mac.csproj", "{CF5BC8DB-A633-4FCC-8A3E-E3AC9B59FABC}" @@ -30,24 +30,24 @@ Global {2C914413-B31C-4362-93C7-1AE34F09112A}.Release|Any CPU.Build.0 = Release|Any CPU {2C914413-B31C-4362-93C7-1AE34F09112A}.ReleaseDist|Any CPU.ActiveCfg = Release|Any CPU {2C914413-B31C-4362-93C7-1AE34F09112A}.ReleaseDist|Any CPU.Build.0 = Release|Any CPU + {5714D3CA-88A6-4330-A29D-4CA90D1D193C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5714D3CA-88A6-4330-A29D-4CA90D1D193C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5714D3CA-88A6-4330-A29D-4CA90D1D193C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5714D3CA-88A6-4330-A29D-4CA90D1D193C}.Release|Any CPU.Build.0 = Release|Any CPU + {5714D3CA-88A6-4330-A29D-4CA90D1D193C}.ReleaseDist|Any CPU.ActiveCfg = Release|Any CPU + {5714D3CA-88A6-4330-A29D-4CA90D1D193C}.ReleaseDist|Any CPU.Build.0 = Release|Any CPU + {728483AA-E34B-4441-BF2C-C8BC2901E4E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {728483AA-E34B-4441-BF2C-C8BC2901E4E0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {728483AA-E34B-4441-BF2C-C8BC2901E4E0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {728483AA-E34B-4441-BF2C-C8BC2901E4E0}.Release|Any CPU.Build.0 = Release|Any CPU + {728483AA-E34B-4441-BF2C-C8BC2901E4E0}.ReleaseDist|Any CPU.ActiveCfg = Release|Any CPU + {728483AA-E34B-4441-BF2C-C8BC2901E4E0}.ReleaseDist|Any CPU.Build.0 = Release|Any CPU {CF5BC8DB-A633-4FCC-8A3E-E3AC9B59FABC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CF5BC8DB-A633-4FCC-8A3E-E3AC9B59FABC}.Debug|Any CPU.Build.0 = Debug|Any CPU {CF5BC8DB-A633-4FCC-8A3E-E3AC9B59FABC}.Release|Any CPU.ActiveCfg = Release|Any CPU {CF5BC8DB-A633-4FCC-8A3E-E3AC9B59FABC}.Release|Any CPU.Build.0 = Release|Any CPU {CF5BC8DB-A633-4FCC-8A3E-E3AC9B59FABC}.ReleaseDist|Any CPU.ActiveCfg = ReleaseDist|Any CPU {CF5BC8DB-A633-4FCC-8A3E-E3AC9B59FABC}.ReleaseDist|Any CPU.Build.0 = ReleaseDist|Any CPU - {728483AA-E34B-4441-BF2C-C8BC2901E4E0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {728483AA-E34B-4441-BF2C-C8BC2901E4E0}.Release|Any CPU.Build.0 = Release|Any CPU - {728483AA-E34B-4441-BF2C-C8BC2901E4E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {728483AA-E34B-4441-BF2C-C8BC2901E4E0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {728483AA-E34B-4441-BF2C-C8BC2901E4E0}.ReleaseDist|Any CPU.ActiveCfg = Release|Any CPU - {728483AA-E34B-4441-BF2C-C8BC2901E4E0}.ReleaseDist|Any CPU.Build.0 = Release|Any CPU - {5714D3CA-88A6-4330-A29D-4CA90D1D193C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5714D3CA-88A6-4330-A29D-4CA90D1D193C}.Release|Any CPU.Build.0 = Release|Any CPU - {5714D3CA-88A6-4330-A29D-4CA90D1D193C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5714D3CA-88A6-4330-A29D-4CA90D1D193C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5714D3CA-88A6-4330-A29D-4CA90D1D193C}.ReleaseDist|Any CPU.ActiveCfg = Release|Any CPU - {5714D3CA-88A6-4330-A29D-4CA90D1D193C}.ReleaseDist|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(MonoDevelopProperties) = preSolution Policies = $0 @@ -55,20 +55,14 @@ Global $1.DirectoryNamespaceAssociation = None $1.ResourceNamePolicy = FileFormatDefault $0.TextStylePolicy = $2 - $2.inheritsSet = VisualStudio - $2.scope = text/plain $2.FileWidth = 120 + $2.inheritsSet = VisualStudio $2.inheritsScope = text/plain + $2.scope = text/plain $0.CSharpFormattingPolicy = $3 $3.inheritsSet = Mono $3.inheritsScope = text/x-csharp $3.scope = text/x-csharp - $0.TextStylePolicy = $4 - $4.FileWidth = 120 - $4.inheritsSet = VisualStudio - $4.inheritsScope = text/plain - $4.scope = text/plain version = - StartupItem = SparkleShare.csproj EndGlobalSection EndGlobal diff --git a/SparkleShare/Common/Presets/gitlab.xml b/SparkleShare/Common/Presets/gitlab.xml index 71842e8f..259bf157 100644 --- a/SparkleShare/Common/Presets/gitlab.xml +++ b/SparkleShare/Common/Presets/gitlab.xml @@ -2,7 +2,7 @@ - GitLab.com + GitLab Open Source GitHub alternative gitlab.png Git diff --git a/SparkleShare/Linux/Pixmaps/icons/Makefile.am b/SparkleShare/Linux/Pixmaps/icons/Makefile.am index 4b769ec9..7fccd42e 100755 --- a/SparkleShare/Linux/Pixmaps/icons/Makefile.am +++ b/SparkleShare/Linux/Pixmaps/icons/Makefile.am @@ -1,53 +1,4 @@ -SUBDIRS = ubuntu-mono-dark \ - ubuntu-mono-light\ - gnome - -theme = hicolor -system_themedir = $(datadir)/icons/$(theme) -app_themedir = $(pkgdatadir)/icons/$(theme) - -if BUILD_XDG_APP -system_themedir = app_themedir -endif - -system_theme_icons = \ - apps,org.sparkleshare.SparkleShare-16.png \ - apps,org.sparkleshare.SparkleShare-22.png \ - apps,org.sparkleshare.SparkleShare-24.png \ - apps,org.sparkleshare.SparkleShare-32.png \ - apps,org.sparkleshare.SparkleShare-48.png \ - apps,org.sparkleshare.SparkleShare-256.png \ - status,process-syncing-up-24.png \ - status,process-syncing-down-24.png \ - status,process-syncing-24.png \ - status,process-syncing-error-24.png \ - status,process-syncing-up-48.png \ - status,process-syncing-down-48.png \ - status,process-syncing-48.png \ - status,process-syncing-error-48.png - -app_theme_icons = \ - status,document-added-12.png \ - status,document-edited-12.png \ - status,document-deleted-12.png \ - status,document-moved-12.png \ - status,list-point-16.png - -install_icon_exec = $(top_srcdir)/build/icon-theme-installer \ - -t "$(theme)" \ - -s "$(srcdir)" \ - -d "x$(DESTDIR)" \ - -m "$(mkinstalldirs)" \ - -x "$(INSTALL_DATA)" - -install-data-local: - @-$(install_icon_exec) -i -b "$(system_themedir)" $(system_theme_icons) - @-$(install_icon_exec) -i -b "$(app_themedir)" $(app_theme_icons) - -uninstall-hook: - @-$(install_icon_exec) -u -b "$(system_themedir)" $(system_theme_icons) - @-$(install_icon_exec) -u -b "$(app_themedir)" $(app_theme_icons) - -MAINTAINERCLEANFILES = Makefile.in -EXTRA_DIST = $(wildcard *.png *.svg) +SUBDIRS = hicolor \ + ubuntu-mono-dark \ + ubuntu-mono-light diff --git a/SparkleShare/Linux/Pixmaps/icons/gnome/Makefile.am b/SparkleShare/Linux/Pixmaps/icons/gnome/Makefile.am deleted file mode 100644 index b868e266..00000000 --- a/SparkleShare/Linux/Pixmaps/icons/gnome/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -gnome_theme = gnome -gnome_themedir = /usr/share/icons/$(gnome_theme) - -gnome_theme_icons = apps,org.sparkleshare.SparkleShare-symbolic.svg - -install_icon_exec = $(top_srcdir)/build/icon-theme-installer \ - -t "$(gnome_theme)" \ - -s "$(srcdir)" \ - -d "x$(DESTDIR)" \ - -m "$(mkinstalldirs)" \ - -x "$(INSTALL_DATA)" - -install-data-local: - @-$(install_icon_exec) -i -b "$(gnome_themedir)" $(gnome_theme_icons) - -uninstall-hook: - @-$(install_icon_exec) -u -b "$(gnome_themedir)" $(gnome_theme_icons) - -MAINTAINERCLEANFILES = Makefile.in -EXTRA_DIST = $(wildcard *.png *.svg) - diff --git a/SparkleShare/Linux/Pixmaps/icons/hicolor/Makefile.am b/SparkleShare/Linux/Pixmaps/icons/hicolor/Makefile.am new file mode 100644 index 00000000..b9d1b14a --- /dev/null +++ b/SparkleShare/Linux/Pixmaps/icons/hicolor/Makefile.am @@ -0,0 +1,50 @@ +theme = hicolor +system_themedir = $(datadir)/icons/$(theme) +app_themedir = $(pkgdatadir)/icons/$(theme) + +if BUILD_XDG_APP +system_themedir = $(app_themedir) +endif + +system_theme_icons = \ + apps,org.sparkleshare.SparkleShare-16.png \ + apps,org.sparkleshare.SparkleShare-symbolic.svg \ + apps,org.sparkleshare.SparkleShare-22.png \ + apps,org.sparkleshare.SparkleShare-24.png \ + apps,org.sparkleshare.SparkleShare-32.png \ + apps,org.sparkleshare.SparkleShare-48.png \ + apps,org.sparkleshare.SparkleShare-256.png + +app_theme_icons = \ + status,document-added-12.png \ + status,document-edited-12.png \ + status,document-deleted-12.png \ + status,document-moved-12.png \ + status,list-point-16.png \ + status,process-syncing-up-24.png \ + status,process-syncing-down-24.png \ + status,process-syncing-24.png \ + status,process-syncing-error-24.png \ + status,process-syncing-up-48.png \ + status,process-syncing-down-48.png \ + status,process-syncing-48.png \ + status,process-syncing-error-48.png + +install_icon_exec = $(top_srcdir)/build/icon-theme-installer \ + -t "$(theme)" \ + -s "$(srcdir)" \ + -d "x$(DESTDIR)" \ + -m "$(mkinstalldirs)" \ + -x "$(INSTALL_DATA)" + +install-data-local: + @-$(install_icon_exec) -i -b "$(system_themedir)" $(system_theme_icons) + @-$(install_icon_exec) -i -b "$(app_themedir)" $(app_theme_icons) + +uninstall-hook: + @-$(install_icon_exec) -u -b "$(system_themedir)" $(system_theme_icons) + @-$(install_icon_exec) -u -b "$(app_themedir)" $(app_theme_icons) + +MAINTAINERCLEANFILES = Makefile.in +EXTRA_DIST = $(wildcard *.png *.svg) + diff --git a/SparkleShare/Linux/Pixmaps/icons/document-added-12.png b/SparkleShare/Linux/Pixmaps/icons/hicolor/document-added-12.png similarity index 100% rename from SparkleShare/Linux/Pixmaps/icons/document-added-12.png rename to SparkleShare/Linux/Pixmaps/icons/hicolor/document-added-12.png diff --git a/SparkleShare/Linux/Pixmaps/icons/document-deleted-12.png b/SparkleShare/Linux/Pixmaps/icons/hicolor/document-deleted-12.png similarity index 100% rename from SparkleShare/Linux/Pixmaps/icons/document-deleted-12.png rename to SparkleShare/Linux/Pixmaps/icons/hicolor/document-deleted-12.png diff --git a/SparkleShare/Linux/Pixmaps/icons/document-edited-12.png b/SparkleShare/Linux/Pixmaps/icons/hicolor/document-edited-12.png similarity index 100% rename from SparkleShare/Linux/Pixmaps/icons/document-edited-12.png rename to SparkleShare/Linux/Pixmaps/icons/hicolor/document-edited-12.png diff --git a/SparkleShare/Linux/Pixmaps/icons/document-moved-12.png b/SparkleShare/Linux/Pixmaps/icons/hicolor/document-moved-12.png similarity index 100% rename from SparkleShare/Linux/Pixmaps/icons/document-moved-12.png rename to SparkleShare/Linux/Pixmaps/icons/hicolor/document-moved-12.png diff --git a/SparkleShare/Linux/Pixmaps/icons/list-point-16.png b/SparkleShare/Linux/Pixmaps/icons/hicolor/list-point-16.png similarity index 100% rename from SparkleShare/Linux/Pixmaps/icons/list-point-16.png rename to SparkleShare/Linux/Pixmaps/icons/hicolor/list-point-16.png diff --git a/SparkleShare/Linux/Pixmaps/icons/org.sparkleshare.SparkleShare-16.png b/SparkleShare/Linux/Pixmaps/icons/hicolor/org.sparkleshare.SparkleShare-16.png similarity index 100% rename from SparkleShare/Linux/Pixmaps/icons/org.sparkleshare.SparkleShare-16.png rename to SparkleShare/Linux/Pixmaps/icons/hicolor/org.sparkleshare.SparkleShare-16.png diff --git a/SparkleShare/Linux/Pixmaps/icons/org.sparkleshare.SparkleShare-22.png b/SparkleShare/Linux/Pixmaps/icons/hicolor/org.sparkleshare.SparkleShare-22.png similarity index 100% rename from SparkleShare/Linux/Pixmaps/icons/org.sparkleshare.SparkleShare-22.png rename to SparkleShare/Linux/Pixmaps/icons/hicolor/org.sparkleshare.SparkleShare-22.png diff --git a/SparkleShare/Linux/Pixmaps/icons/org.sparkleshare.SparkleShare-24.png b/SparkleShare/Linux/Pixmaps/icons/hicolor/org.sparkleshare.SparkleShare-24.png similarity index 100% rename from SparkleShare/Linux/Pixmaps/icons/org.sparkleshare.SparkleShare-24.png rename to SparkleShare/Linux/Pixmaps/icons/hicolor/org.sparkleshare.SparkleShare-24.png diff --git a/SparkleShare/Linux/Pixmaps/icons/org.sparkleshare.SparkleShare-256.png b/SparkleShare/Linux/Pixmaps/icons/hicolor/org.sparkleshare.SparkleShare-256.png similarity index 100% rename from SparkleShare/Linux/Pixmaps/icons/org.sparkleshare.SparkleShare-256.png rename to SparkleShare/Linux/Pixmaps/icons/hicolor/org.sparkleshare.SparkleShare-256.png diff --git a/SparkleShare/Linux/Pixmaps/icons/org.sparkleshare.SparkleShare-32.png b/SparkleShare/Linux/Pixmaps/icons/hicolor/org.sparkleshare.SparkleShare-32.png similarity index 100% rename from SparkleShare/Linux/Pixmaps/icons/org.sparkleshare.SparkleShare-32.png rename to SparkleShare/Linux/Pixmaps/icons/hicolor/org.sparkleshare.SparkleShare-32.png diff --git a/SparkleShare/Linux/Pixmaps/icons/org.sparkleshare.SparkleShare-48.png b/SparkleShare/Linux/Pixmaps/icons/hicolor/org.sparkleshare.SparkleShare-48.png similarity index 100% rename from SparkleShare/Linux/Pixmaps/icons/org.sparkleshare.SparkleShare-48.png rename to SparkleShare/Linux/Pixmaps/icons/hicolor/org.sparkleshare.SparkleShare-48.png diff --git a/SparkleShare/Linux/Pixmaps/icons/gnome/org.sparkleshare.SparkleShare-symbolic.svg b/SparkleShare/Linux/Pixmaps/icons/hicolor/org.sparkleshare.SparkleShare-symbolic.svg similarity index 100% rename from SparkleShare/Linux/Pixmaps/icons/gnome/org.sparkleshare.SparkleShare-symbolic.svg rename to SparkleShare/Linux/Pixmaps/icons/hicolor/org.sparkleshare.SparkleShare-symbolic.svg diff --git a/SparkleShare/Linux/Pixmaps/icons/process-syncing-24.png b/SparkleShare/Linux/Pixmaps/icons/hicolor/process-syncing-24.png similarity index 100% rename from SparkleShare/Linux/Pixmaps/icons/process-syncing-24.png rename to SparkleShare/Linux/Pixmaps/icons/hicolor/process-syncing-24.png diff --git a/SparkleShare/Linux/Pixmaps/icons/process-syncing-48.png b/SparkleShare/Linux/Pixmaps/icons/hicolor/process-syncing-48.png similarity index 100% rename from SparkleShare/Linux/Pixmaps/icons/process-syncing-48.png rename to SparkleShare/Linux/Pixmaps/icons/hicolor/process-syncing-48.png diff --git a/SparkleShare/Linux/Pixmaps/icons/process-syncing-down-24.png b/SparkleShare/Linux/Pixmaps/icons/hicolor/process-syncing-down-24.png similarity index 100% rename from SparkleShare/Linux/Pixmaps/icons/process-syncing-down-24.png rename to SparkleShare/Linux/Pixmaps/icons/hicolor/process-syncing-down-24.png diff --git a/SparkleShare/Linux/Pixmaps/icons/process-syncing-down-48.png b/SparkleShare/Linux/Pixmaps/icons/hicolor/process-syncing-down-48.png similarity index 100% rename from SparkleShare/Linux/Pixmaps/icons/process-syncing-down-48.png rename to SparkleShare/Linux/Pixmaps/icons/hicolor/process-syncing-down-48.png diff --git a/SparkleShare/Linux/Pixmaps/icons/process-syncing-error-24.png b/SparkleShare/Linux/Pixmaps/icons/hicolor/process-syncing-error-24.png similarity index 100% rename from SparkleShare/Linux/Pixmaps/icons/process-syncing-error-24.png rename to SparkleShare/Linux/Pixmaps/icons/hicolor/process-syncing-error-24.png diff --git a/SparkleShare/Linux/Pixmaps/icons/process-syncing-error-48.png b/SparkleShare/Linux/Pixmaps/icons/hicolor/process-syncing-error-48.png similarity index 100% rename from SparkleShare/Linux/Pixmaps/icons/process-syncing-error-48.png rename to SparkleShare/Linux/Pixmaps/icons/hicolor/process-syncing-error-48.png diff --git a/SparkleShare/Linux/Pixmaps/icons/process-syncing-up-24.png b/SparkleShare/Linux/Pixmaps/icons/hicolor/process-syncing-up-24.png similarity index 100% rename from SparkleShare/Linux/Pixmaps/icons/process-syncing-up-24.png rename to SparkleShare/Linux/Pixmaps/icons/hicolor/process-syncing-up-24.png diff --git a/SparkleShare/Linux/Pixmaps/icons/process-syncing-up-48.png b/SparkleShare/Linux/Pixmaps/icons/hicolor/process-syncing-up-48.png similarity index 100% rename from SparkleShare/Linux/Pixmaps/icons/process-syncing-up-48.png rename to SparkleShare/Linux/Pixmaps/icons/hicolor/process-syncing-up-48.png diff --git a/SparkleShare/Linux/Pixmaps/icons/process-working-22.png b/SparkleShare/Linux/Pixmaps/icons/hicolor/process-working-22.png similarity index 100% rename from SparkleShare/Linux/Pixmaps/icons/process-working-22.png rename to SparkleShare/Linux/Pixmaps/icons/hicolor/process-working-22.png diff --git a/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-dark/Makefile.am b/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-dark/Makefile.am index 48bc9ee2..42b3e74c 100644 --- a/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-dark/Makefile.am +++ b/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-dark/Makefile.am @@ -23,3 +23,4 @@ uninstall-hook: MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = $(wildcard *.png *.svg) + diff --git a/SparkleShare/Linux/Setup.cs b/SparkleShare/Linux/Setup.cs index 19693947..54a67dc8 100755 --- a/SparkleShare/Linux/Setup.cs +++ b/SparkleShare/Linux/Setup.cs @@ -63,7 +63,7 @@ namespace SparkleShare { ColumnSpacing = 6 }; - Label name_label = new Label ("" + "Full Name:" + "") { + Label name_label = new Label ("" + "Your Name:" + "") { UseMarkup = true, Xalign = 1 }; @@ -254,7 +254,6 @@ namespace SparkleShare { layout_fields.PackStart (layout_address, true, true, 0); layout_fields.PackStart (layout_path, true, true, 0); - layout_vertical.PackStart (new Label (""), false, false, 0); layout_vertical.PackStart (scrolled_window, true, true, 0); layout_vertical.PackStart (layout_fields, false, false, 0); diff --git a/SparkleShare/Linux/SetupWindow.cs b/SparkleShare/Linux/SetupWindow.cs index 1761752c..a701c6a7 100644 --- a/SparkleShare/Linux/SetupWindow.cs +++ b/SparkleShare/Linux/SetupWindow.cs @@ -41,34 +41,29 @@ namespace SparkleShare { TypeHint = Gdk.WindowTypeHint.Dialog; - SetSizeRequest (680, 400); + SetSizeRequest (400, 400); DeleteEvent += delegate (object sender, DeleteEventArgs args) { args.RetVal = true; }; - HBox layout_horizontal = new HBox (false, 0); - VBox layout_vertical = new VBox (false, 0); + VBox layout_vertical = new VBox (false, 16); + layout_vertical.BorderWidth = 16; this.content_area = new EventBox (); this.option_area = new EventBox (); this.buttons = CreateButtonBox (); - HBox layout_actions = new HBox (false , 48); + HBox layout_actions = new HBox (false , 16); layout_actions.PackStart (this.option_area, true, true, 0); layout_actions.PackStart (this.buttons, false, false, 0); layout_vertical.PackStart (this.content_area, true, true, 0); - layout_vertical.PackStart (layout_actions, false, false, 15); + layout_vertical.PackStart (layout_actions, false, false, 0); - Image side_splash = UserInterfaceHelpers.GetImage ("side-splash.png"); - side_splash.Yalign = 1; - layout_horizontal.PackStart (side_splash, false, false, 0); - layout_horizontal.PackStart (layout_vertical, true, true, 30); - - base.Add (layout_horizontal); + base.Add (layout_vertical); } @@ -97,14 +92,9 @@ namespace SparkleShare { new public void Add (Widget widget) { - Label header = new Label ("" + Header + "") { - UseMarkup = true, - Xalign = 0, - }; + Title = Header; VBox layout_vertical = new VBox (false, 0); - layout_vertical.PackStart (new Label (""), false, false, 6); - layout_vertical.PackStart (header, false, false, 0); if (!string.IsNullOrEmpty (Description)) { Label description = new Label (Description) { @@ -113,7 +103,7 @@ namespace SparkleShare { LineWrapMode = Pango.WrapMode.WordChar }; - layout_vertical.PackStart (description, false, false, 21); + layout_vertical.PackStart (description, false, false, 0); } if (widget != null) @@ -146,6 +136,7 @@ namespace SparkleShare { default_button.CanDefault = true; Default = default_button; + default_button.StyleContext.AddClass ("suggested-action"); } Present (); diff --git a/SparkleShare/Linux/SparkleShare.Linux.csproj b/SparkleShare/Linux/SparkleShare.Linux.csproj index fd6f239c..ccf774b3 100644 --- a/SparkleShare/Linux/SparkleShare.Linux.csproj +++ b/SparkleShare/Linux/SparkleShare.Linux.csproj @@ -22,6 +22,11 @@ prompt 4 true + + + + + true diff --git a/Sparkles/InstallationInfo.Directory.cs b/Sparkles/InstallationInfo.Directory.cs index e2745a08..0082dbec 100644 --- a/Sparkles/InstallationInfo.Directory.cs +++ b/Sparkles/InstallationInfo.Directory.cs @@ -24,6 +24,6 @@ using System.Reflection; namespace Sparkles { public partial class InstallationInfo { - public const string Directory = "/app/share/sparkleshare"; + public const string Directory = "/usr/local/share/sparkleshare"; } } diff --git a/build/build.environment.mk b/build/build.environment.mk index e976b8eb..580d2b16 100755 --- a/build/build.environment.mk +++ b/build/build.environment.mk @@ -9,8 +9,8 @@ DIR_BIN = $(top_builddir)/bin LINK_SYSTEM = -r:System LINK_MONO_POSIX = -r:Mono.Posix -LINK_GLIB = $(GLIBSHARP_LIBS) -LINK_GTK = $(GTKSHARP_LIBS) +LINK_GLIB = $(GLIB_SHARP_LIBS) +LINK_GTK = $(GTK_SHARP_LIBS) LINK_WEBKIT = $(WEBKITGTK_SHARP_LIBS) LINK_APP_INDICATOR = $(APP_INDICATOR_LIBS) diff --git a/build/icon-theme-installer b/build/icon-theme-installer index bf049391..bf1130f2 100755 --- a/build/icon-theme-installer +++ b/build/icon-theme-installer @@ -123,12 +123,12 @@ for icon in $@; do install_name=$(basename $install_name) if test -z $size; then - size=scalable; + size=symbolic if [[ "${INSTALL_BASE_DIR}" == *ubuntu-mono-* ]]; then install_dir=${INSTALL_DEST_DIR}${INSTALL_BASE_DIR}/$category/$size - else - install_dir=${INSTALL_DEST_DIR}${INSTALL_BASE_DIR}/$size/$category + else + install_dir=${INSTALL_DEST_DIR}${INSTALL_BASE_DIR}/$size/$category fi else if [[ "${INSTALL_BASE_DIR}" == *ubuntu-mono-* ]]; then diff --git a/build/m4/sparkleshare/gtk-sharp.m4 b/build/m4/sparkleshare/gtk-sharp.m4 index c8974902..12ee06e1 100755 --- a/build/m4/sparkleshare/gtk-sharp.m4 +++ b/build/m4/sparkleshare/gtk-sharp.m4 @@ -1,14 +1,13 @@ AC_DEFUN([SPARKLESHARE_CHECK_GTK_SHARP], [ - GTKSHARP_REQUIRED=2.99.1 + GTK_SHARP_REQUIRED=2.99.1 - PKG_CHECK_MODULES(GTKSHARP, - gtk-sharp-3.0 >= $GTKSHARP_REQUIRED) - AC_SUBST(GTKSHARP_LIBS) - - PKG_CHECK_MODULES(GLIBSHARP, - glib-sharp-3.0 >= $GTKSHARP_REQUIRED) - AC_SUBST(GLIBSHARP_LIBS) + PKG_CHECK_MODULES(GTK_SHARP, + gtk-sharp-3.0 >= $GTK_SHARP_REQUIRED) + AC_SUBST(GTK_SHARP_LIBS) + PKG_CHECK_MODULES(GLIB_SHARP, + glib-sharp-3.0 >= $GTK_SHARP_REQUIRED) + AC_SUBST(GLIB_SHARP_LIBS) ]) diff --git a/configure.ac b/configure.ac index 270aa398..9aca857a 100755 --- a/configure.ac +++ b/configure.ac @@ -105,6 +105,7 @@ SHAMROCK_CHECK_NUNIT SHAVE_INIT([build/m4/shave], [enable]) AC_OUTPUT([ +Makefile build/Makefile build/m4/Makefile build/m4/shave/shave @@ -112,6 +113,7 @@ build/m4/shave/shave-libtool Sparkles/InstallationInfo.Directory.cs Sparkles/Makefile Sparkles/Git/Makefile +SparkleShare/Makefile SparkleShare/Common/Makefile SparkleShare/Common/HTML/Makefile SparkleShare/Common/Presets/Makefile @@ -119,12 +121,10 @@ SparkleShare/Common/Pixmaps/Makefile SparkleShare/Linux/Makefile SparkleShare/Linux/Pixmaps/Makefile SparkleShare/Linux/Pixmaps/icons/Makefile -SparkleShare/Linux/Pixmaps/icons/gnome/Makefile +SparkleShare/Linux/Pixmaps/icons/hicolor/Makefile SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-dark/Makefile SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-light/Makefile SparkleShare/Linux/sparkleshare -SparkleShare/Makefile -Makefile ]) echo "