build: Rearrange icons
|
@ -1,4 +1,4 @@
|
||||||
|
|
||||||
Microsoft Visual Studio Solution File, Format Version 11.00
|
Microsoft Visual Studio Solution File, Format Version 11.00
|
||||||
# Visual Studio 2010
|
# Visual Studio 2010
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleShare.Mac", "SparkleShare\Mac\SparkleShare.Mac.csproj", "{CF5BC8DB-A633-4FCC-8A3E-E3AC9B59FABC}"
|
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}.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.ActiveCfg = Release|Any CPU
|
||||||
{2C914413-B31C-4362-93C7-1AE34F09112A}.ReleaseDist|Any CPU.Build.0 = 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.ActiveCfg = Debug|Any CPU
|
||||||
{CF5BC8DB-A633-4FCC-8A3E-E3AC9B59FABC}.Debug|Any CPU.Build.0 = 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.ActiveCfg = Release|Any CPU
|
||||||
{CF5BC8DB-A633-4FCC-8A3E-E3AC9B59FABC}.Release|Any CPU.Build.0 = 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.ActiveCfg = ReleaseDist|Any CPU
|
||||||
{CF5BC8DB-A633-4FCC-8A3E-E3AC9B59FABC}.ReleaseDist|Any CPU.Build.0 = 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
|
EndGlobalSection
|
||||||
GlobalSection(MonoDevelopProperties) = preSolution
|
GlobalSection(MonoDevelopProperties) = preSolution
|
||||||
Policies = $0
|
Policies = $0
|
||||||
|
@ -55,20 +55,14 @@ Global
|
||||||
$1.DirectoryNamespaceAssociation = None
|
$1.DirectoryNamespaceAssociation = None
|
||||||
$1.ResourceNamePolicy = FileFormatDefault
|
$1.ResourceNamePolicy = FileFormatDefault
|
||||||
$0.TextStylePolicy = $2
|
$0.TextStylePolicy = $2
|
||||||
$2.inheritsSet = VisualStudio
|
|
||||||
$2.scope = text/plain
|
|
||||||
$2.FileWidth = 120
|
$2.FileWidth = 120
|
||||||
|
$2.inheritsSet = VisualStudio
|
||||||
$2.inheritsScope = text/plain
|
$2.inheritsScope = text/plain
|
||||||
|
$2.scope = text/plain
|
||||||
$0.CSharpFormattingPolicy = $3
|
$0.CSharpFormattingPolicy = $3
|
||||||
$3.inheritsSet = Mono
|
$3.inheritsSet = Mono
|
||||||
$3.inheritsScope = text/x-csharp
|
$3.inheritsScope = text/x-csharp
|
||||||
$3.scope = 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 =
|
version =
|
||||||
StartupItem = SparkleShare.csproj
|
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
EndGlobal
|
EndGlobal
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<sparkleshare>
|
<sparkleshare>
|
||||||
<preset>
|
<preset>
|
||||||
<info>
|
<info>
|
||||||
<name>GitLab.com</name>
|
<name>GitLab</name>
|
||||||
<description>Open Source GitHub alternative</description>
|
<description>Open Source GitHub alternative</description>
|
||||||
<icon>gitlab.png</icon>
|
<icon>gitlab.png</icon>
|
||||||
<backend>Git</backend>
|
<backend>Git</backend>
|
||||||
|
|
|
@ -1,53 +1,4 @@
|
||||||
SUBDIRS = ubuntu-mono-dark \
|
SUBDIRS = hicolor \
|
||||||
ubuntu-mono-light\
|
ubuntu-mono-dark \
|
||||||
gnome
|
ubuntu-mono-light
|
||||||
|
|
||||||
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)
|
|
||||||
|
|
||||||
|
|
|
@ -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)
|
|
||||||
|
|
50
SparkleShare/Linux/Pixmaps/icons/hicolor/Makefile.am
Normal file
|
@ -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)
|
||||||
|
|
Before Width: | Height: | Size: 193 B After Width: | Height: | Size: 193 B |
Before Width: | Height: | Size: 117 B After Width: | Height: | Size: 117 B |
Before Width: | Height: | Size: 428 B After Width: | Height: | Size: 428 B |
Before Width: | Height: | Size: 445 B After Width: | Height: | Size: 445 B |
Before Width: | Height: | Size: 575 B After Width: | Height: | Size: 575 B |
Before Width: | Height: | Size: 689 B After Width: | Height: | Size: 689 B |
Before Width: | Height: | Size: 926 B After Width: | Height: | Size: 926 B |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 47 KiB After Width: | Height: | Size: 47 KiB |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 2.1 KiB |
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.2 KiB |
Before Width: | Height: | Size: 831 B After Width: | Height: | Size: 831 B |
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 768 B After Width: | Height: | Size: 768 B |
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 1,017 B After Width: | Height: | Size: 1,017 B |
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 2.6 KiB |
Before Width: | Height: | Size: 768 B After Width: | Height: | Size: 768 B |
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 4 KiB After Width: | Height: | Size: 4 KiB |
|
@ -23,3 +23,4 @@ uninstall-hook:
|
||||||
|
|
||||||
MAINTAINERCLEANFILES = Makefile.in
|
MAINTAINERCLEANFILES = Makefile.in
|
||||||
EXTRA_DIST = $(wildcard *.png *.svg)
|
EXTRA_DIST = $(wildcard *.png *.svg)
|
||||||
|
|
||||||
|
|
|
@ -63,7 +63,7 @@ namespace SparkleShare {
|
||||||
ColumnSpacing = 6
|
ColumnSpacing = 6
|
||||||
};
|
};
|
||||||
|
|
||||||
Label name_label = new Label ("<b>" + "Full Name:" + "</b>") {
|
Label name_label = new Label ("<b>" + "Your Name:" + "</b>") {
|
||||||
UseMarkup = true,
|
UseMarkup = true,
|
||||||
Xalign = 1
|
Xalign = 1
|
||||||
};
|
};
|
||||||
|
@ -254,7 +254,6 @@ namespace SparkleShare {
|
||||||
layout_fields.PackStart (layout_address, true, true, 0);
|
layout_fields.PackStart (layout_address, true, true, 0);
|
||||||
layout_fields.PackStart (layout_path, 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 (scrolled_window, true, true, 0);
|
||||||
layout_vertical.PackStart (layout_fields, false, false, 0);
|
layout_vertical.PackStart (layout_fields, false, false, 0);
|
||||||
|
|
||||||
|
|
|
@ -41,34 +41,29 @@ namespace SparkleShare {
|
||||||
TypeHint = Gdk.WindowTypeHint.Dialog;
|
TypeHint = Gdk.WindowTypeHint.Dialog;
|
||||||
|
|
||||||
|
|
||||||
SetSizeRequest (680, 400);
|
SetSizeRequest (400, 400);
|
||||||
|
|
||||||
DeleteEvent += delegate (object sender, DeleteEventArgs args) { args.RetVal = true; };
|
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.content_area = new EventBox ();
|
||||||
this.option_area = new EventBox ();
|
this.option_area = new EventBox ();
|
||||||
|
|
||||||
this.buttons = CreateButtonBox ();
|
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.option_area, true, true, 0);
|
||||||
layout_actions.PackStart (this.buttons, false, false, 0);
|
layout_actions.PackStart (this.buttons, false, false, 0);
|
||||||
|
|
||||||
layout_vertical.PackStart (this.content_area, true, true, 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);
|
base.Add (layout_vertical);
|
||||||
layout_horizontal.PackStart (layout_vertical, true, true, 30);
|
|
||||||
|
|
||||||
base.Add (layout_horizontal);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -97,14 +92,9 @@ namespace SparkleShare {
|
||||||
|
|
||||||
new public void Add (Widget widget)
|
new public void Add (Widget widget)
|
||||||
{
|
{
|
||||||
Label header = new Label ("<span size='large'><b>" + Header + "</b></span>") {
|
Title = Header;
|
||||||
UseMarkup = true,
|
|
||||||
Xalign = 0,
|
|
||||||
};
|
|
||||||
|
|
||||||
VBox layout_vertical = new VBox (false, 0);
|
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)) {
|
if (!string.IsNullOrEmpty (Description)) {
|
||||||
Label description = new Label (Description) {
|
Label description = new Label (Description) {
|
||||||
|
@ -113,7 +103,7 @@ namespace SparkleShare {
|
||||||
LineWrapMode = Pango.WrapMode.WordChar
|
LineWrapMode = Pango.WrapMode.WordChar
|
||||||
};
|
};
|
||||||
|
|
||||||
layout_vertical.PackStart (description, false, false, 21);
|
layout_vertical.PackStart (description, false, false, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (widget != null)
|
if (widget != null)
|
||||||
|
@ -146,6 +136,7 @@ namespace SparkleShare {
|
||||||
|
|
||||||
default_button.CanDefault = true;
|
default_button.CanDefault = true;
|
||||||
Default = default_button;
|
Default = default_button;
|
||||||
|
default_button.StyleContext.AddClass ("suggested-action");
|
||||||
}
|
}
|
||||||
|
|
||||||
Present ();
|
Present ();
|
||||||
|
|
|
@ -22,6 +22,11 @@
|
||||||
<ErrorReport>prompt</ErrorReport>
|
<ErrorReport>prompt</ErrorReport>
|
||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
<ExternalConsole>true</ExternalConsole>
|
<ExternalConsole>true</ExternalConsole>
|
||||||
|
<EnvironmentVariables>
|
||||||
|
<EnvironmentVariables>
|
||||||
|
<Variable name="GTK_DEBUG" value="interactive" />
|
||||||
|
</EnvironmentVariables>
|
||||||
|
</EnvironmentVariables>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||||
<Optimize>true</Optimize>
|
<Optimize>true</Optimize>
|
||||||
|
|
|
@ -24,6 +24,6 @@ using System.Reflection;
|
||||||
namespace Sparkles {
|
namespace Sparkles {
|
||||||
|
|
||||||
public partial class InstallationInfo {
|
public partial class InstallationInfo {
|
||||||
public const string Directory = "/app/share/sparkleshare";
|
public const string Directory = "/usr/local/share/sparkleshare";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,8 +9,8 @@ DIR_BIN = $(top_builddir)/bin
|
||||||
LINK_SYSTEM = -r:System
|
LINK_SYSTEM = -r:System
|
||||||
LINK_MONO_POSIX = -r:Mono.Posix
|
LINK_MONO_POSIX = -r:Mono.Posix
|
||||||
|
|
||||||
LINK_GLIB = $(GLIBSHARP_LIBS)
|
LINK_GLIB = $(GLIB_SHARP_LIBS)
|
||||||
LINK_GTK = $(GTKSHARP_LIBS)
|
LINK_GTK = $(GTK_SHARP_LIBS)
|
||||||
LINK_WEBKIT = $(WEBKITGTK_SHARP_LIBS)
|
LINK_WEBKIT = $(WEBKITGTK_SHARP_LIBS)
|
||||||
LINK_APP_INDICATOR = $(APP_INDICATOR_LIBS)
|
LINK_APP_INDICATOR = $(APP_INDICATOR_LIBS)
|
||||||
|
|
||||||
|
|
|
@ -123,12 +123,12 @@ for icon in $@; do
|
||||||
install_name=$(basename $install_name)
|
install_name=$(basename $install_name)
|
||||||
|
|
||||||
if test -z $size; then
|
if test -z $size; then
|
||||||
size=scalable;
|
size=symbolic
|
||||||
|
|
||||||
if [[ "${INSTALL_BASE_DIR}" == *ubuntu-mono-* ]]; then
|
if [[ "${INSTALL_BASE_DIR}" == *ubuntu-mono-* ]]; then
|
||||||
install_dir=${INSTALL_DEST_DIR}${INSTALL_BASE_DIR}/$category/$size
|
install_dir=${INSTALL_DEST_DIR}${INSTALL_BASE_DIR}/$category/$size
|
||||||
else
|
else
|
||||||
install_dir=${INSTALL_DEST_DIR}${INSTALL_BASE_DIR}/$size/$category
|
install_dir=${INSTALL_DEST_DIR}${INSTALL_BASE_DIR}/$size/$category
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
if [[ "${INSTALL_BASE_DIR}" == *ubuntu-mono-* ]]; then
|
if [[ "${INSTALL_BASE_DIR}" == *ubuntu-mono-* ]]; then
|
||||||
|
|
|
@ -1,14 +1,13 @@
|
||||||
AC_DEFUN([SPARKLESHARE_CHECK_GTK_SHARP],
|
AC_DEFUN([SPARKLESHARE_CHECK_GTK_SHARP],
|
||||||
[
|
[
|
||||||
GTKSHARP_REQUIRED=2.99.1
|
GTK_SHARP_REQUIRED=2.99.1
|
||||||
|
|
||||||
PKG_CHECK_MODULES(GTKSHARP,
|
PKG_CHECK_MODULES(GTK_SHARP,
|
||||||
gtk-sharp-3.0 >= $GTKSHARP_REQUIRED)
|
gtk-sharp-3.0 >= $GTK_SHARP_REQUIRED)
|
||||||
AC_SUBST(GTKSHARP_LIBS)
|
AC_SUBST(GTK_SHARP_LIBS)
|
||||||
|
|
||||||
PKG_CHECK_MODULES(GLIBSHARP,
|
|
||||||
glib-sharp-3.0 >= $GTKSHARP_REQUIRED)
|
|
||||||
AC_SUBST(GLIBSHARP_LIBS)
|
|
||||||
|
|
||||||
|
PKG_CHECK_MODULES(GLIB_SHARP,
|
||||||
|
glib-sharp-3.0 >= $GTK_SHARP_REQUIRED)
|
||||||
|
AC_SUBST(GLIB_SHARP_LIBS)
|
||||||
])
|
])
|
||||||
|
|
||||||
|
|
|
@ -105,6 +105,7 @@ SHAMROCK_CHECK_NUNIT
|
||||||
SHAVE_INIT([build/m4/shave], [enable])
|
SHAVE_INIT([build/m4/shave], [enable])
|
||||||
|
|
||||||
AC_OUTPUT([
|
AC_OUTPUT([
|
||||||
|
Makefile
|
||||||
build/Makefile
|
build/Makefile
|
||||||
build/m4/Makefile
|
build/m4/Makefile
|
||||||
build/m4/shave/shave
|
build/m4/shave/shave
|
||||||
|
@ -112,6 +113,7 @@ build/m4/shave/shave-libtool
|
||||||
Sparkles/InstallationInfo.Directory.cs
|
Sparkles/InstallationInfo.Directory.cs
|
||||||
Sparkles/Makefile
|
Sparkles/Makefile
|
||||||
Sparkles/Git/Makefile
|
Sparkles/Git/Makefile
|
||||||
|
SparkleShare/Makefile
|
||||||
SparkleShare/Common/Makefile
|
SparkleShare/Common/Makefile
|
||||||
SparkleShare/Common/HTML/Makefile
|
SparkleShare/Common/HTML/Makefile
|
||||||
SparkleShare/Common/Presets/Makefile
|
SparkleShare/Common/Presets/Makefile
|
||||||
|
@ -119,12 +121,10 @@ 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/gnome/Makefile
|
SparkleShare/Linux/Pixmaps/icons/hicolor/Makefile
|
||||||
SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-dark/Makefile
|
SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-dark/Makefile
|
||||||
SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-light/Makefile
|
SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-light/Makefile
|
||||||
SparkleShare/Linux/sparkleshare
|
SparkleShare/Linux/sparkleshare
|
||||||
SparkleShare/Makefile
|
|
||||||
Makefile
|
|
||||||
])
|
])
|
||||||
|
|
||||||
echo "
|
echo "
|
||||||
|
|