beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

linux about: Fix background image

Browse source
This commit is contained in:
Hylke Bons 2017-08-14 16:19:04 +02:00
parent b467550004
commit db48bcdabf
3 changed files with 27 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SparkleShare/Common/BaseController.cs
View file

@ -212,7 +212,7 @@ namespace SparkleShare {
Logger.LogInfo ("Environment", "Git LFS " + Sparkles.Git.GitCommand.GitLFSVersion);
Logger.LogInfo ("Environment", "Git " + Sparkles.Git.GitCommand.GitVersion);
// TODO: ToString() with nice os version names (Mac OS X Yosemite, Fedora 24, Ubuntu 16.04, etc.)
// TODO: ToString() with nice OS version names (Mac OS X Yosemite, Fedora 24, Ubuntu 16.04, etc.)
Logger.LogInfo ("Environment", InstallationInfo.OperatingSystem + " (" + Environment.OSVersion + ")");
UserAuthenticationInfo = new SSHAuthenticationInfo ();

44
SparkleShare/Linux/About.cs
View file

@ -82,10 +82,10 @@ namespace SparkleShare {
CssProvider window_css_provider = new CssProvider ();
Image image = UserInterfaceHelpers.GetImage ("about.png");
window_css_provider.LoadFromData ("GtkWindow {" +
"background-image: url('" + image.File + "');" +
"background-repeat: no-repeat;" +
"background-position: left bottom;" +
window_css_provider.LoadFromData ("window, GtkWindow {" +
" background-image: url(\"/app/share/sparkleshare/pixmaps/about.png\");" +
" background-repeat: no-repeat;" +
" background-position: left bottom;" +
"}");
StyleContext.AddProvider (window_css_provider, 800);
@ -94,10 +94,10 @@ namespace SparkleShare {
var links_layout = new HBox (false, 16);
CssProvider label_css_provider = new CssProvider ();
label_css_provider.LoadFromData ("GtkLabel { color: #fff; font-size: 10px; background-color: rgba(0, 0, 0, 0); }");
label_css_provider.LoadFromData ("label { color: #fff; font-size: 12px; background-color: rgba(0, 0, 0, 0); }");
CssProvider label_highlight_css_provider = new CssProvider ();
label_highlight_css_provider.LoadFromData ("GtkLabel { color: #a8bbcf; font-size: 10px; }");
label_highlight_css_provider.LoadFromData ("label { color: #a8bbcf; font-size: 12px; }");
var version = new Label {
Text = "version " + Controller.RunningVersion,
@ -107,44 +107,32 @@ namespace SparkleShare {
if (InstallationInfo.Directory.StartsWith ("/app", StringComparison.InvariantCulture))
version.Text += " (Flatpak)";
version.StyleContext.AddProvider (label_css_provider, 800);
updates = new Label ("Checking for updates…") {
Xalign = 0, Xpad = 0
};
updates.StyleContext.AddProvider (label_highlight_css_provider, 800);
var copyright = new Label {
Markup = string.Format ("Copyright © 2010–{0} Hylke Bons and others", DateTime.Now.Year),
Xalign = 0, Xpad = 0
};
copyright.StyleContext.AddProvider (label_css_provider, 800);
var license = new Label ("SparkleShare is Open Source and you’re free to use,\n" +
"change, and share it under the GNU GPLv3") {
var license = new TextView {
Sensitive = false,
WrapMode = WrapMode.Word
Xalign = 0, Xpad = 0
};
var text_view_css_provider = new CssProvider ();
text_view_css_provider.LoadFromData ("GtkTextView { color: #fff; font-size: 10px; background-color: rgba(0, 0, 0, 0); }");
license.StyleContext.AddProvider (text_view_css_provider, 800);
TextBuffer license_buffer = license.Buffer;
license_buffer.Text = "SparkleShare is Open Source and you’re free to use, change, " +
"and share it under the GNU GPLv3";
license.StyleContext.AddProvider (label_css_provider, 800);
updates.StyleContext.AddProvider (label_highlight_css_provider, 800);
version.StyleContext.AddProvider (label_css_provider, 800);
copyright.StyleContext.AddProvider (label_css_provider, 800);
var website_link = new Link ("Website", Controller.WebsiteLinkAddress);
var credits_link = new Link ("Credits", Controller.CreditsLinkAddress);
var report_problem_link = new Link ("Report a problem", Controller.ReportProblemLinkAddress);
var debug_log_link = new Link ("Debug log", Controller.DebugLogLinkAddress);
layout_vertical.PackStart (new Label (""), true, true, 0);
layout_vertical.PackStart (new Label (""), true, true, 0);
layout_vertical.PackStart (version, false, false, 0);
layout_vertical.PackStart (updates, false, false, 0);
layout_vertical.PackStart (copyright, false, false, 6);
@ -155,7 +143,7 @@ namespace SparkleShare {
links_layout.PackStart (credits_link, false, false, 0);
links_layout.PackStart (report_problem_link, false, false, 0);
links_layout.PackStart (debug_log_link, false, false, 0);
var layout_horizontal = new HBox (false, 0);
layout_horizontal.PackStart (new Label (""), false, false, 149);
layout_horizontal.PackStart (layout_vertical, false, false, 0);
@ -166,14 +154,14 @@ namespace SparkleShare {
class Link : Label {
public Link (string label, string url)
{
Markup = string.Format ("<a href=\"{0}\">{1}</a>", url, label);
CanFocus = false;
CssProvider css_provider = new CssProvider ();
css_provider.LoadFromData ("GtkLabel { color: #729fcf; font-size: 10px; }");
css_provider.LoadFromData ("label { color: #729fcf; font-size: 12px; }");
StyleContext.AddProvider (css_provider, 800);
}
}

23
SparkleShare/Linux/SetupWindow.cs
View file

@ -34,7 +34,7 @@ namespace SparkleShare {
{
SetWmclass ("SparkleShare", "SparkleShare");
IconName = "org.sparkleshare.SparkleShare";
IconName = "org.sparkleshare.SparkleShare";
Resizable = false;
WindowPosition = WindowPosition.CenterAlways;
Deletable = false;
@ -42,26 +42,23 @@ namespace SparkleShare {
SetSizeRequest (400, 400);
DeleteEvent += delegate (object sender, DeleteEventArgs args) { args.RetVal = true; };
VBox layout_vertical = new VBox (false, 16);
VBox layout_vertical = new VBox (false, 16);
layout_vertical.BorderWidth = 16;
this.content_area = new EventBox ();
this.option_area = new EventBox ();
this.content_area = new EventBox ();
this.option_area = new EventBox ();
this.buttons = CreateButtonBox ();
this.buttons = CreateButtonBox ();
HBox layout_actions = new HBox (false , 16);
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, 0);
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, 0);
base.Add (layout_vertical);
}