Merge lp:~yifengzhan-sysu/screenshot-tool/screenshot-tool into lp:~elementary-apps/screenshot-tool/trunk

[ethan]

add the theme switch

[lp:~yifengzhan-sysu/screenshot-tool/screenshot-tool]

108. By ethan on 2015-10-23

change initial theme

[Danielle Foré (danrabbit)]

I'm going to reject this. For a utility which displays no content and that you will only interact with momentarily, this seems silly.

review: Disapprove

Unmerged revisions

108. By ethan on 2015-10-23

change initial theme

107. By ethan on 2015-10-23

add theme switch

=== modified file 'src/Screenshot.vala'
--- src/Screenshot.vala	2015-01-21 18:58:11 +0000
+++ src/Screenshot.vala	2015-10-23 06:38:54 +0000
@@ -87,7 +87,7 @@
             Intl.textdomain (Build.GETTEXT_PACKAGE);
 
             Gtk.init (ref args);
-            Gtk.Settings.get_default ().gtk_application_prefer_dark_theme = true;
+            Gtk.Settings.get_default ().gtk_application_prefer_dark_theme = false;
 
             app = new ScreenshotApp ();  
 

=== modified file 'src/ScreenshotWindow.vala'
--- src/ScreenshotWindow.vala	2015-10-08 16:31:13 +0000
+++ src/ScreenshotWindow.vala	2015-10-23 06:38:54 +0000
@@ -96,7 +96,13 @@
             /**
              *  Effects area selection
              */
+            var theme_label = new Gtk.Label(_("Change theme:"));
             var pointer_label = new Gtk.Label (_("Grab mouse pointer:"));
+
+            theme_label.halign = Gtk.Align.END;
+            var theme_switch = new Gtk.Switch();
+            theme_switch.halign = Gtk.Align.START;
+
             pointer_label.halign = Gtk.Align.END;
             var pointer_switch = new Gtk.Switch ();
             pointer_switch.halign = Gtk.Align.START;
@@ -118,12 +124,14 @@
 
             // Pack second part of the grid
             grid.attach (prop_label, 0, 3, 1, 1);
-            grid.attach (pointer_label, 0, 4, 1, 1);
-            grid.attach (pointer_switch, 1, 4, 1, 1);
-            grid.attach (close_label, 0, 5, 1, 1);
-            grid.attach (close_switch, 1, 5, 1, 1);
-            grid.attach (delay_label, 0, 6, 1, 1);
-            grid.attach (delay_spin, 1, 6, 1, 1);
+            grid.attach (theme_label, 0, 4, 1, 1);
+            grid.attach (theme_switch, 1, 4, 1, 1);
+            grid.attach (pointer_label, 0, 5, 1, 1);
+            grid.attach (pointer_switch, 1, 5, 1, 1);
+            grid.attach (close_label, 0, 6, 1, 1);
+            grid.attach (close_switch, 1, 6, 1, 1);
+            grid.attach (delay_label, 0, 7, 1, 1);
+            grid.attach (delay_spin, 1, 7, 1, 1);
 
             // Take button
             var take_btn = new Gtk.Button.with_label (_("Take Screenshot"));
@@ -170,6 +178,14 @@
                 present();
             });
 
+            theme_switch.notify["active"].connect(() => {
+                if(theme_switch.active){
+                    Gtk.Settings.get_default().gtk_application_prefer_dark_theme = true;
+                }else{
+                    Gtk.Settings.get_default().gtk_application_prefer_dark_theme = false;
+                }
+            });
+
             pointer_switch.notify["active"].connect (() => {
 			    if (pointer_switch.active) {
 				    settings.set_boolean ("mouse-pointer", true);