From 5217903da12f3c554dff11d1ed4c5c3bdfb5c9f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20H=C3=A4cker?= <haecker.felix1207@gmail.com>
Date: Fri, 29 Jul 2016 14:00:37 +0200
Subject: [PATCH] fixed settings dialog; added new dark mode; only show the
 menu button in ubuntu unity

---
 data/ui/main-window.ui          |   5 +-
 data/ui/main-window.ui~         | 261 ++++++++++++++++++++++++++++++++
 data/ui/settings-dialog.ui      |  12 +-
 data/ui/settings-dialog.ui~     | 157 +++++++++++++++++++
 po/gradio.pot                   |   6 +-
 src/Widgets/MainWindow.vala     |  13 +-
 src/Widgets/SettingsDialog.vala |   6 +-
 7 files changed, 443 insertions(+), 17 deletions(-)
 create mode 100644 data/ui/main-window.ui~
 create mode 100644 data/ui/settings-dialog.ui~

diff --git a/data/ui/main-window.ui b/data/ui/main-window.ui
index e39dc4fe..fa712786 100644
--- a/data/ui/main-window.ui
+++ b/data/ui/main-window.ui
@@ -207,8 +207,6 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
             <signal name="clicked" handler="GridListButton_clicked" swapped="no"/>
             <child>
               <object class="GtkBox">
@@ -224,7 +222,6 @@
                     <property name="halign">center</property>
                     <property name="valign">center</property>
                     <property name="pixel_size">16</property>
-                    <property name="no_show_all">True</property>
                     <property name="icon_name">view-grid-symbolic</property>
                   </object>
                   <packing>
@@ -237,8 +234,8 @@
                   <object class="GtkImage" id="ListImage">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="pixel_size">16</property>
                     <property name="no_show_all">True</property>
+                    <property name="pixel_size">16</property>
                     <property name="icon_name">view-list-symbolic</property>
                   </object>
                   <packing>
diff --git a/data/ui/main-window.ui~ b/data/ui/main-window.ui~
new file mode 100644
index 00000000..e39dc4fe
--- /dev/null
+++ b/data/ui/main-window.ui~
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
+<interface>
+  <requires lib="gtk+" version="3.14"/>
+  <template class="GradioMainWindow" parent="GtkApplicationWindow">
+    <property name="width_request">870</property>
+    <property name="height_request">500</property>
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Gradio</property>
+    <property name="icon_name">gradio</property>
+    <child>
+      <object class="GtkStack" id="ContentStack">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <child>
+          <object class="GtkBox" id="ContentBox">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="GtkStack" id="DatabaseStack">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="transition_type">crossfade</property>
+                <child>
+                  <placeholder/>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSeparator">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox" id="Bottom">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <placeholder/>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">3</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="name">database</property>
+            <property name="title" translatable="yes">Database</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox" id="NoConnectionBox">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">center</property>
+            <property name="valign">center</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="GtkBox">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="margin_bottom">5</property>
+                    <property name="pixel_size">64</property>
+                    <property name="icon_name">action-unavailable-symbolic</property>
+                    <property name="icon_size">6</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Cannot connect to the database.</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="name">no_connection</property>
+            <property name="title" translatable="yes">No Connection</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox" id="MiniplayerBox">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">center</property>
+            <property name="valign">center</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="GtkBox">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="margin_bottom">10</property>
+                    <property name="icon_name">action-unavailable-symbolic</property>
+                    <property name="icon_size">6</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">MINIPLAYER</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="name">page0</property>
+            <property name="title" translatable="yes">page0</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <child type="titlebar">
+      <object class="GtkHeaderBar" id="HeaderBar">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="show_close_button">True</property>
+        <child type="title">
+          <object class="GtkStackSwitcher" id="StackSwitcher">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="no_show_all">True</property>
+            <property name="stack">DatabaseStack</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkMenuButton" id="MenuButton">
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="no_show_all">True</property>
+            <property name="use_popover">False</property>
+            <child>
+              <object class="GtkImage">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="icon_name">open-menu-symbolic</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="pack_type">end</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="GridListButton">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="halign">center</property>
+            <property name="valign">center</property>
+            <signal name="clicked" handler="GridListButton_clicked" swapped="no"/>
+            <child>
+              <object class="GtkBox">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="halign">center</property>
+                <property name="valign">center</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkImage" id="GridImage">
+                    <property name="can_focus">False</property>
+                    <property name="no_show_all">True</property>
+                    <property name="halign">center</property>
+                    <property name="valign">center</property>
+                    <property name="pixel_size">16</property>
+                    <property name="no_show_all">True</property>
+                    <property name="icon_name">view-grid-symbolic</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkImage" id="ListImage">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="pixel_size">16</property>
+                    <property name="no_show_all">True</property>
+                    <property name="icon_name">view-list-symbolic</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="pack_type">end</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </template>
+</interface>
diff --git a/data/ui/settings-dialog.ui b/data/ui/settings-dialog.ui
index c449b3af..a6423c15 100644
--- a/data/ui/settings-dialog.ui
+++ b/data/ui/settings-dialog.ui
@@ -72,9 +72,9 @@
             </child>
             <child>
               <object class="GtkSwitch" id="UseDarkDesignSwitch">
-                <property name="visible">False</property>
-                <property name="no_show_all">True</property>
+                <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="no_show_all">True</property>
                 <property name="halign">start</property>
                 <property name="hexpand">True</property>
               </object>
@@ -85,7 +85,7 @@
             </child>
             <child>
               <object class="GtkLabel" id="label4">
-                <property name="visible">false</property>
+                <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">end</property>
                 <property name="label" translatable="yes">Use dark design:</property>
@@ -100,7 +100,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">end</property>
-                <property name="label" translatable="yes">Only show playable radio stations:</property>
+                <property name="label" translatable="yes">Hide broken stations:</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -134,6 +134,7 @@
               <object class="GtkSpinButton" id="MaxItemsSpinButton">
                 <property name="can_focus">True</property>
                 <property name="no_show_all">True</property>
+                <property name="halign">start</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -149,5 +150,8 @@
         </child>
       </object>
     </child>
+    <child>
+      <placeholder/>
+    </child>
   </template>
 </interface>
diff --git a/data/ui/settings-dialog.ui~ b/data/ui/settings-dialog.ui~
new file mode 100644
index 00000000..04889e44
--- /dev/null
+++ b/data/ui/settings-dialog.ui~
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
+<interface>
+  <requires lib="gtk+" version="3.14"/>
+  <template class="GradioSettingsDialog" parent="GtkDialog">
+    <property name="can_focus">False</property>
+    <property name="type">popup</property>
+    <property name="title" translatable="yes">Settings</property>
+    <property name="resizable">False</property>
+    <property name="modal">True</property>
+    <property name="window_position">center-on-parent</property>
+    <property name="destroy_with_parent">True</property>
+    <property name="type_hint">dialog</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="skip_pager_hint">True</property>
+    <property name="urgency_hint">True</property>
+    <child internal-child="vbox">
+      <object class="GtkBox">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkGrid" id="grid2">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="margin_left">5</property>
+            <property name="margin_right">5</property>
+            <property name="margin_top">5</property>
+            <property name="margin_bottom">5</property>
+            <property name="row_spacing">4</property>
+            <property name="column_spacing">15</property>
+            <child>
+              <object class="GtkLabel" id="label5">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="halign">end</property>
+                <property name="label" translatable="yes">Load icons:</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSwitch" id="LoadPicturesSwitch">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="halign">start</property>
+                <property name="hexpand">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSwitch" id="UseDarkDesignSwitch">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="no_show_all">True</property>
+                <property name="halign">start</property>
+                <property name="hexpand">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label4">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="halign">end</property>
+                <property name="label" translatable="yes">Use dark design:</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="halign">end</property>
+                <property name="label" translatable="yes">Hide broken stations::</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSwitch" id="OnlyShowWorkingStationsSwitch">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="halign">start</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label2">
+                <property name="can_focus">False</property>
+                <property name="no_show_all">True</property>
+                <property name="halign">end</property>
+                <property name="label" translatable="yes">Maximum items to show:</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">3</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSpinButton" id="MaxItemsSpinButton">
+                <property name="can_focus">True</property>
+                <property name="no_show_all">True</property>
+                <property name="halign">start</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">3</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <child>
+      <placeholder/>
+    </child>
+  </template>
+</interface>
diff --git a/po/gradio.pot b/po/gradio.pot
index 08ad216a..254959aa 100644
--- a/po/gradio.pot
+++ b/po/gradio.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-28 13:59+0200\n"
+"POT-Creation-Date: 2016-07-29 13:59+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,10 +25,10 @@ msgstr ""
 msgid "About Gradio"
 msgstr ""
 
-#: src/Widgets/MainWindow.vala:48
+#: src/Widgets/MainWindow.vala:55
 msgid "Library"
 msgstr ""
 
-#: src/Widgets/MainWindow.vala:49
+#: src/Widgets/MainWindow.vala:56
 msgid "Discover"
 msgstr ""
diff --git a/src/Widgets/MainWindow.vala b/src/Widgets/MainWindow.vala
index 6f172ed8..43668daa 100644
--- a/src/Widgets/MainWindow.vala
+++ b/src/Widgets/MainWindow.vala
@@ -40,6 +40,13 @@ namespace Gradio{
 			this.set_default_size(width, height);
 			this.move(pos_x, pos_y);
 
+			var gtk_settings = Gtk.Settings.get_default ();
+			if (App.settings.get_boolean ("use-dark-design")) {
+				gtk_settings.gtk_application_prefer_dark_theme = true;
+			} else {
+				gtk_settings.gtk_application_prefer_dark_theme = false;
+			}
+
 	       		player_toolbar = new PlayerToolbar();
 	       		player_toolbar.set_visible(false);
 	       		discover_box = new DiscoverBox();
@@ -52,10 +59,10 @@ namespace Gradio{
 			var app_menu = builder.get_object ("app-menu") as GLib.MenuModel;
 			MenuButton.set_menu_model(app_menu);
 
- 			if(GLib.Environment.get_variable("DESKTOP_SESSION") == "gnome")
-				MenuButton.set_visible (false);
-			else
+ 			if(GLib.Environment.get_variable("DESKTOP_SESSION") == "unity")
 				MenuButton.set_visible (true);
+			else
+				MenuButton.set_visible (false);
 			message("Desktop session is: " + GLib.Environment.get_variable("DESKTOP_SESSION"));
 
 			// Load css
diff --git a/src/Widgets/SettingsDialog.vala b/src/Widgets/SettingsDialog.vala
index 97363bbb..3afa6cc9 100644
--- a/src/Widgets/SettingsDialog.vala
+++ b/src/Widgets/SettingsDialog.vala
@@ -21,19 +21,19 @@ namespace Gradio{
 			OnlyShowWorkingStationsSwitch.notify["active"].connect (() => {
 				if (OnlyShowWorkingStationsSwitch.active) {
 					settings.set_boolean ("only-show-working-stations", true);
-					gtk_settings.gtk_application_prefer_dark_theme = true;
 				} else {
 					settings.set_boolean ("only-show-working-stations", false);
-					gtk_settings.gtk_application_prefer_dark_theme = false;
 				}
-				
+
 			});
 
 			UseDarkDesignSwitch.notify["active"].connect (() => {
 				if (UseDarkDesignSwitch.active) {
 					settings.set_boolean ("use-dark-design", true);
+					gtk_settings.gtk_application_prefer_dark_theme = true;
 				} else {
 					settings.set_boolean ("use-dark-design", false);
+					gtk_settings.gtk_application_prefer_dark_theme = false;
 				}
 				
 			});