From 45b7c3230c00eacae5c5396da82de6e5cda98c3e Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Sun, 6 Mar 2016 14:37:21 +0000 Subject: [PATCH] about: Fix background image --- SparkleShare/Linux/SparkleAbout.cs | 45 ++++++++---------------- SparkleShare/Linux/SparkleEventLog.cs | 14 +++++--- SparkleShare/Linux/SparkleNote.cs | 2 +- SparkleShare/Linux/SparkleSetupWindow.cs | 5 +-- 4 files changed, 29 insertions(+), 37 deletions(-) diff --git a/SparkleShare/Linux/SparkleAbout.cs b/SparkleShare/Linux/SparkleAbout.cs index 046251eb..1aa5190a 100755 --- a/SparkleShare/Linux/SparkleAbout.cs +++ b/SparkleShare/Linux/SparkleAbout.cs @@ -33,7 +33,8 @@ namespace SparkleShare { IconName = "sparkleshare"; Resizable = false; - WindowPosition = WindowPosition.Center; + WindowPosition = WindowPosition.CenterAlways; + TypeHint = Gdk.WindowTypeHint.Dialog; SetSizeRequest (600, 260); @@ -76,54 +77,45 @@ namespace SparkleShare { private void CreateAbout () { - Gdk.RGBA white = new Gdk.RGBA (); - white.Parse ("#ffffff"); - - Gdk.RGBA highlight = new Gdk.RGBA (); - highlight.Parse ("#a8bbcf"); - - Pango.FontDescription font = StyleContext.GetFont (StateFlags.Normal); - font.Size = 9 * 1024; - - CssProvider css_provider = new CssProvider (); + CssProvider window_css_provider = new CssProvider (); Image image = SparkleUIHelpers.GetImage("about.png"); - css_provider.LoadFromData ("GtkWindow {" + + window_css_provider.LoadFromData ("GtkWindow {" + "background-image: url('" + image.File + "');" + "background-repeat: no-repeat;" + "background-position: left bottom;" + "}"); - StyleContext.AddProvider (css_provider, 800); + StyleContext.AddProvider (window_css_provider, 800); VBox layout_vertical = new VBox (false, 0); HBox 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); }"); + + CssProvider label_highlight_css_provider = new CssProvider (); + label_highlight_css_provider.LoadFromData ("GtkLabel { color: #a8bbcf; font-size: 10px; }"); Label version = new Label () { Text = "version " + Controller.RunningVersion, Xalign = 0, Xpad = 0 }; - version.OverrideFont (font); - version.OverrideColor (StateFlags.Normal, white); - + version.StyleContext.AddProvider (label_css_provider, 800); this.updates = new Label ("Checking for updates…") { Xalign = 0, Xpad = 0 }; - this.updates.OverrideFont (font); - this.updates.OverrideColor (StateFlags.Normal, highlight); - + this.updates.StyleContext.AddProvider (label_highlight_css_provider, 800); Label copyright = new Label () { Markup = string.Format ("Copyright © 2010–{0} Hylke Bons and others.", DateTime.Now.Year), Xalign = 0, Xpad = 0 }; - copyright.OverrideFont (font); - copyright.OverrideColor (StateFlags.Normal, white); + copyright.StyleContext.AddProvider (label_css_provider, 800); TextView license = new TextView (); @@ -134,9 +126,7 @@ namespace SparkleShare { license_buffer.Text = "SparkleShare is Open Source and you’re free to use, change, " + "and share it under the GNU GPLv3."; - license.OverrideBackgroundColor (StateFlags.Normal, new Gdk.RGBA () { Alpha = 0 }); - license.OverrideFont (font); - license.OverrideColor (StateFlags.Normal, white); + version.StyleContext.AddProvider (label_css_provider, 800); SparkleLink website_link = new SparkleLink ("Website", Controller.WebsiteLinkAddress); @@ -174,12 +164,7 @@ namespace SparkleShare { CanFocus = false; CssProvider css_provider = new CssProvider (); - - css_provider.LoadFromData ("GtkLabel {" + - "color: #729fcf;" + - "cursor: pointer;" + - "}"); - + css_provider.LoadFromData ("GtkLabel { color: #729fcf; font-size: 10px; }"); StyleContext.AddProvider (css_provider, 800); } } diff --git a/SparkleShare/Linux/SparkleEventLog.cs b/SparkleShare/Linux/SparkleEventLog.cs index 6bbaac1f..0b5e950d 100755 --- a/SparkleShare/Linux/SparkleEventLog.cs +++ b/SparkleShare/Linux/SparkleEventLog.cs @@ -44,6 +44,8 @@ namespace SparkleShare { { SetWmclass ("SparkleShare", "SparkleShare"); + TypeHint = Gdk.WindowTypeHint.Dialog; + Gdk.Rectangle monitor_0_rect = Gdk.Screen.Default.GetMonitorGeometry (0); SetSizeRequest (480, (int) (monitor_0_rect.Height * 0.8)); @@ -66,8 +68,9 @@ namespace SparkleShare { this.content_wrapper = new EventBox (); this.scrolled_window = new ScrolledWindow (); - this.content_wrapper.OverrideBackgroundColor (StateFlags.Normal, - new Gdk.RGBA () { Red = 1, Green = 1, Blue=1, Alpha = 1 }); + CssProvider css_provider = new CssProvider (); + css_provider.LoadFromData ("GtkEventBox { background-color: #ffffff; }"); + this.content_wrapper.StyleContext.AddProvider (css_provider, 800); // this.web_view = new WebView () { Editable = false }; // this.web_view.Settings.EnablePlugins = false; @@ -245,8 +248,11 @@ namespace SparkleShare { html = html.Replace ("", StyleContext.GetFont (StateFlags.Normal).Family); html = html.Replace ("", (double) (StyleContext.GetFont (StateFlags.Normal).Size / 1024 + 3) + "px"); html = html.Replace ("", SparkleUIHelpers.RGBAToHex (StyleContext.GetColor (StateFlags.Normal))); - html = html.Replace ("", - SparkleUIHelpers.RGBAToHex (new TreeView ().StyleContext.GetBackgroundColor (StateFlags.Normal))); + // html = html.Replace ("", + // SparkleUIHelpers.RGBAToHex (new TreeView ().StyleContext.GetStyleProperty ("background-color"))); + +Console.WriteLine(new TreeView ().StyleContext.GetStyleProperty ("background-color")); +Console.WriteLine(StyleContext.GetStyleProperty ("color")); html = html.Replace ("", (StyleContext.GetFont (StateFlags.Normal).Size / 1024 + 3) + "px"); html = html.Replace ("", diff --git a/SparkleShare/Linux/SparkleNote.cs b/SparkleShare/Linux/SparkleNote.cs index 451422b6..86f5ba74 100755 --- a/SparkleShare/Linux/SparkleNote.cs +++ b/SparkleShare/Linux/SparkleNote.cs @@ -31,7 +31,7 @@ namespace SparkleShare { IconName = "sparkleshare"; Resizable = false; - WindowPosition = WindowPosition.Center; + WindowPosition = WindowPosition.CenterAlways; BorderWidth = 16; SetSizeRequest (480, 120); diff --git a/SparkleShare/Linux/SparkleSetupWindow.cs b/SparkleShare/Linux/SparkleSetupWindow.cs index 77b69f89..dc097ba2 100755 --- a/SparkleShare/Linux/SparkleSetupWindow.cs +++ b/SparkleShare/Linux/SparkleSetupWindow.cs @@ -36,7 +36,7 @@ namespace SparkleShare { IconName = "sparkleshare"; Resizable = false; - WindowPosition = WindowPosition.Center; + WindowPosition = WindowPosition.CenterAlways; Deletable = false; TypeHint = Gdk.WindowTypeHint.Dialog; @@ -147,9 +147,10 @@ namespace SparkleShare { default_button.CanDefault = true; Default = default_button; } - + Present (); base.ShowAll (); } } } +