build: Use monochrome icons when on Ubuntu. Closes #505
1
NEWS
|
@ -12,6 +12,7 @@
|
||||||
- Show backend error message(s) when on failed project add
|
- Show backend error message(s) when on failed project add
|
||||||
- Update Growl framework to version 1.3.1: A separate Growl
|
- Update Growl framework to version 1.3.1: A separate Growl
|
||||||
is no longer needed and ready for Mountain Lion's notifications
|
is no longer needed and ready for Mountain Lion's notifications
|
||||||
|
- Monochrome appindicator icons on Ubuntu
|
||||||
|
|
||||||
Travis:
|
Travis:
|
||||||
- Rewrote the notification service, now more robust and reliable
|
- Rewrote the notification service, now more robust and reliable
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
SUBDIRS = ubuntu-mono-dark \
|
||||||
|
ubuntu-mono-light
|
||||||
|
|
||||||
theme = hicolor
|
theme = hicolor
|
||||||
system_themedir = $(datadir)/icons/$(theme)
|
system_themedir = $(datadir)/icons/$(theme)
|
||||||
app_themedir = $(pkgdatadir)/icons/$(theme)
|
app_themedir = $(pkgdatadir)/icons/$(theme)
|
||||||
|
|
|
@ -0,0 +1,26 @@
|
||||||
|
dark_theme = ubuntu-mono-dark
|
||||||
|
dark_themedir = /usr/share/icons/$(dark_theme)
|
||||||
|
|
||||||
|
dark_theme_icons = \
|
||||||
|
status,process-syncing-i-24.png \
|
||||||
|
status,process-syncing-ii-24.png \
|
||||||
|
status,process-syncing-iii-24.png \
|
||||||
|
status,process-syncing-iiii-24.png \
|
||||||
|
status,process-syncing-iiiii-24.png \
|
||||||
|
status,process-syncing-error-24.png
|
||||||
|
|
||||||
|
install_icon_exec = $(top_srcdir)/build/icon-theme-installer \
|
||||||
|
-t "$(dark_theme)" \
|
||||||
|
-s "$(srcdir)" \
|
||||||
|
-d "x$(DESTDIR)" \
|
||||||
|
-m "$(mkinstalldirs)" \
|
||||||
|
-x "$(INSTALL_DATA)"
|
||||||
|
|
||||||
|
install-data-local:
|
||||||
|
@-$(install_icon_exec) -i -b "$(dark_themedir)" $(dark_theme_icons)
|
||||||
|
|
||||||
|
uninstall-hook:
|
||||||
|
@-$(install_icon_exec) -u -b "$(dark_themedir)" $(dark_theme_icons)
|
||||||
|
|
||||||
|
MAINTAINERCLEANFILES = Makefile.in
|
||||||
|
EXTRA_DIST = $(wildcard *.png *.svg)
|
Before Width: | Height: | Size: 605 B After Width: | Height: | Size: 605 B |
Before Width: | Height: | Size: 806 B After Width: | Height: | Size: 806 B |
Before Width: | Height: | Size: 837 B After Width: | Height: | Size: 837 B |
Before Width: | Height: | Size: 829 B After Width: | Height: | Size: 829 B |
Before Width: | Height: | Size: 831 B After Width: | Height: | Size: 831 B |
Before Width: | Height: | Size: 838 B After Width: | Height: | Size: 838 B |
|
@ -0,0 +1,26 @@
|
||||||
|
light_theme = ubuntu-mono-light
|
||||||
|
light_themedir = /usr/share/icons/$(light_theme)
|
||||||
|
|
||||||
|
light_theme_icons = \
|
||||||
|
status,process-syncing-i-24.png \
|
||||||
|
status,process-syncing-ii-24.png \
|
||||||
|
status,process-syncing-iii-24.png \
|
||||||
|
status,process-syncing-iiii-24.png \
|
||||||
|
status,process-syncing-iiiii-24.png \
|
||||||
|
status,process-syncing-error-24.png
|
||||||
|
|
||||||
|
install_icon_exec = $(top_srcdir)/build/icon-theme-installer \
|
||||||
|
-t "$(light_theme)" \
|
||||||
|
-s "$(srcdir)" \
|
||||||
|
-d "x$(DESTDIR)" \
|
||||||
|
-m "$(mkinstalldirs)" \
|
||||||
|
-x "$(INSTALL_DATA)"
|
||||||
|
|
||||||
|
install-data-local:
|
||||||
|
@-$(install_icon_exec) -i -b "$(light_themedir)" $(light_theme_icons)
|
||||||
|
|
||||||
|
uninstall-hook:
|
||||||
|
@-$(install_icon_exec) -u -b "$(light_themedir)" $(light_theme_icons)
|
||||||
|
|
||||||
|
MAINTAINERCLEANFILES = Makefile.in
|
||||||
|
EXTRA_DIST = $(wildcard *.png *.svg)
|
Before Width: | Height: | Size: 586 B After Width: | Height: | Size: 586 B |
Before Width: | Height: | Size: 795 B After Width: | Height: | Size: 795 B |
Before Width: | Height: | Size: 825 B After Width: | Height: | Size: 825 B |
Before Width: | Height: | Size: 807 B After Width: | Height: | Size: 807 B |
Before Width: | Height: | Size: 833 B After Width: | Height: | Size: 833 B |
Before Width: | Height: | Size: 822 B After Width: | Height: | Size: 822 B |
|
@ -29,15 +29,22 @@
|
||||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
|
<Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
|
||||||
|
<Package>gtk-sharp-2.0</Package>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
|
<Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
|
||||||
|
<Package>gtk-sharp-2.0</Package>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
|
<Reference Include="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
|
||||||
|
<Package>gtk-sharp-2.0</Package>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="Mono.Posix" />
|
<Reference Include="Mono.Posix" />
|
||||||
<Reference Include="notify-sharp, Version=0.4.0.0, Culture=neutral, PublicKeyToken=2df29c54e245917a">
|
<Reference Include="notify-sharp, Version=0.4.0.0, Culture=neutral, PublicKeyToken=2df29c54e245917a">
|
||||||
<Private>False</Private>
|
<Private>False</Private>
|
||||||
|
<Package>notify-sharp</Package>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="appindicator-sharp">
|
||||||
|
<HintPath>..\..\..\..\..\..\usr\lib\mono\gac\appindicator-sharp\0.2.0.0__bcae265d1c7ab4c2\appindicator-sharp.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ProjectExtensions>
|
<ProjectExtensions>
|
||||||
|
@ -57,26 +64,24 @@
|
||||||
</ProjectExtensions>
|
</ProjectExtensions>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Include="SparkleBubbles.cs" />
|
<Compile Include="SparkleBubbles.cs" />
|
||||||
<Compile Include="SparkleBubblesController.cs" />
|
|
||||||
<Compile Include="SparkleController.cs" />
|
<Compile Include="SparkleController.cs" />
|
||||||
<Compile Include="SparkleEntry.cs" />
|
|
||||||
<Compile Include="SparkleSetup.cs" />
|
<Compile Include="SparkleSetup.cs" />
|
||||||
<Compile Include="SparkleSetupController.cs" />
|
|
||||||
<Compile Include="SparkleSetupWindow.cs" />
|
<Compile Include="SparkleSetupWindow.cs" />
|
||||||
<Compile Include="Program.cs" />
|
|
||||||
<Compile Include="SparkleSpinner.cs" />
|
<Compile Include="SparkleSpinner.cs" />
|
||||||
<Compile Include="SparkleStatusIcon.cs" />
|
<Compile Include="SparkleStatusIcon.cs" />
|
||||||
<Compile Include="SparkleStatusIconController.cs" />
|
|
||||||
<Compile Include="SparkleUI.cs" />
|
<Compile Include="SparkleUI.cs" />
|
||||||
<Compile Include="SparkleUIHelpers.cs" />
|
<Compile Include="SparkleUIHelpers.cs" />
|
||||||
<Compile Include="SparkleEventLogController.cs" />
|
|
||||||
<Compile Include="SparkleEventLog.cs" />
|
<Compile Include="SparkleEventLog.cs" />
|
||||||
<Compile Include="SparkleAboutController.cs" />
|
|
||||||
<Compile Include="SparkleAbout.cs" />
|
<Compile Include="SparkleAbout.cs" />
|
||||||
<Compile Include="SparkleExtensions.cs" />
|
<Compile Include="..\Program.cs" />
|
||||||
<Compile Include="SparkleControllerBase.cs" />
|
<Compile Include="..\SparkleAboutController.cs" />
|
||||||
<Compile Include="SparklePlugin.cs" />
|
<Compile Include="..\SparkleBubblesController.cs" />
|
||||||
<Compile Include="SparkleOptions.cs" />
|
<Compile Include="..\SparkleControllerBase.cs" />
|
||||||
<Compile Include="SparkleInvite.cs" />
|
<Compile Include="..\SparkleEventLogController.cs" />
|
||||||
|
<Compile Include="..\SparkleExtensions.cs" />
|
||||||
|
<Compile Include="..\SparkleInvite.cs" />
|
||||||
|
<Compile Include="..\SparklePlugin.cs" />
|
||||||
|
<Compile Include="..\SparkleSetupController.cs" />
|
||||||
|
<Compile Include="..\SparkleStatusIconController.cs" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
@ -56,7 +56,7 @@ namespace SparkleShare {
|
||||||
|
|
||||||
#if HAVE_APP_INDICATOR
|
#if HAVE_APP_INDICATOR
|
||||||
this.indicator = new ApplicationIndicator ("sparkleshare",
|
this.indicator = new ApplicationIndicator ("sparkleshare",
|
||||||
"process-syncing-sparkleshare-i", Category.ApplicationStatus);
|
"process-syncing-i", Category.ApplicationStatus);
|
||||||
|
|
||||||
this.indicator.Status = Status.Attention;
|
this.indicator.Status = Status.Attention;
|
||||||
#else
|
#else
|
||||||
|
@ -74,7 +74,7 @@ namespace SparkleShare {
|
||||||
Application.Invoke (delegate {
|
Application.Invoke (delegate {
|
||||||
if (icon_frame > -1) {
|
if (icon_frame > -1) {
|
||||||
#if HAVE_APP_INDICATOR
|
#if HAVE_APP_INDICATOR
|
||||||
string icon_name = "process-syncing-sparkleshare-";
|
string icon_name = "process-syncing-";
|
||||||
for (int i = 0; i <= icon_frame; i++)
|
for (int i = 0; i <= icon_frame; i++)
|
||||||
icon_name += "i";
|
icon_name += "i";
|
||||||
|
|
||||||
|
@ -85,9 +85,9 @@ namespace SparkleShare {
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
#if HAVE_APP_INDICATOR
|
#if HAVE_APP_INDICATOR
|
||||||
this.indicator.IconName = "sparkleshare-syncing-error";
|
this.indicator.IconName = "process-syncing-error";
|
||||||
#else
|
#else
|
||||||
this.status_icon.Pixbuf = SparkleUIHelpers.GetIcon ("sparkleshare-syncing-error", 24);
|
this.status_icon.Pixbuf = SparkleUIHelpers.GetIcon ("process-syncing-error", 24);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
@ -124,11 +124,21 @@ for icon in $@; do
|
||||||
|
|
||||||
if test -z $size; then
|
if test -z $size; then
|
||||||
size=scalable;
|
size=scalable;
|
||||||
|
|
||||||
|
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
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
size=${size}x${size};
|
if [[ "${INSTALL_BASE_DIR}" == *ubuntu-mono-* ]]; then
|
||||||
|
install_dir=${INSTALL_DEST_DIR}${INSTALL_BASE_DIR}/$category/$size
|
||||||
|
else
|
||||||
|
size=${size}x${size};
|
||||||
|
install_dir=${INSTALL_DEST_DIR}${INSTALL_BASE_DIR}/$size/$category
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
install_dir=${INSTALL_DEST_DIR}${INSTALL_BASE_DIR}/$size/$category
|
|
||||||
install_path=$install_dir/$install_name
|
install_path=$install_dir/$install_name
|
||||||
|
|
||||||
if test "x$INSTALL" = "xyes"; then
|
if test "x$INSTALL" = "xyes"; then
|
||||||
|
|
|
@ -143,6 +143,8 @@ SparkleShare/Common/Pixmaps/Makefile
|
||||||
SparkleShare/Linux/Makefile
|
SparkleShare/Linux/Makefile
|
||||||
SparkleShare/Linux/Pixmaps/Makefile
|
SparkleShare/Linux/Pixmaps/Makefile
|
||||||
SparkleShare/Linux/Pixmaps/icons/Makefile
|
SparkleShare/Linux/Pixmaps/icons/Makefile
|
||||||
|
SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-dark/Makefile
|
||||||
|
SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-light/Makefile
|
||||||
SparkleShare/Linux/sparkleshare
|
SparkleShare/Linux/sparkleshare
|
||||||
SparkleShare/Linux/Nautilus/Makefile
|
SparkleShare/Linux/Nautilus/Makefile
|
||||||
SparkleShare/Linux/Nautilus/sparkleshare-nautilus-extension.py
|
SparkleShare/Linux/Nautilus/sparkleshare-nautilus-extension.py
|
||||||
|
|