Merge lp:~elementary-apps/switchboard/cleanup into lp:~elementary-pantheon/switchboard/switchboard

[Raphael Isemann]

Fixing codestyle.

[Julián Unrrein (junrrein)]

Code style

Diff lines 244-245, 262, 265, 310, 445: Put the blocks of code in separate lines from the "try" and "catch" statements:

try {
    //...
} catch (Error e) {
    //...
}

Diff line 303: A space after "else if" and before the parenthesis.

Diff line 320: A space on the other side of the parenthesis :)

Diff line 380: A space before the opening parenthesis.

Diff line 450: A space after the opening curly brace.

[Julián Unrrein (junrrein)]

I would offer to submit the changes myself (since I'm in ~elementary-apps too) but I am not able to compile this on Luna (GTK >= 3.6 required).

[lp:~elementary-apps/switchboard/cleanup]

406. By David Gomes on 2013-12-03

More fixes.

[David Gomes (davidgomes)]

Junrrein, I fixed the stuff. Care to re-review?

review: Needs Fixing

[Julián Unrrein (junrrein)]

Re-indent diff lines 150, 153, 163-164, 391, they are part of foreach blocks.

You can close lines 163-164 in curly braces for clarity.

Diff line 225: Move the warning to its own line.

Diff line 373: Space after get_file_type.

Diff line 475: Space after search_box_activated.

I see you also fixed stuff I didn't catch, nice!

review: Needs Fixing

[lp:~elementary-apps/switchboard/cleanup]

407. By David Gomes on 2013-12-03

Fixed yet more code style.

[Julián Unrrein (junrrein)]

It's ready to go.

Good work Raphael and Munchor!

review: Approve

[Julián Unrrein (junrrein)]

Rejecting this branch because there are major changes coming to Switchboard (see https://code.launchpad.net/~elementary-apps/switchboard/libpeas-isis/+merge/195417).

We should review that branch for code style later instead.

review: Disapprove

Unmerged revisions

407. By David Gomes on 2013-12-03

Fixed yet more code style.

406. By David Gomes on 2013-12-03

More fixes.

405. By Raphael Isemann on 2013-09-27

cleaning CategoryView.vala

404. By Raphael Isemann on 2013-09-27

cleaning EmbeddedAlert.vala

403. By Raphael Isemann on 2013-09-27

cleaning Switchboard.vala

=== modified file 'src/CategoryView.vala'
--- src/CategoryView.vala	2013-09-29 19:41:03 +0000
+++ src/CategoryView.vala	2013-12-03 21:13:09 +0000
@@ -53,7 +53,7 @@
                 category_label.margin_left = 12;
                 category_label.margin_right = 8;
                 var filtered = new Gtk.TreeModelFilter (store, null);
-                filtered.set_visible_column(3);
+                filtered.set_visible_column (3);
                 filtered.refilter ();
                 
                 var category_plugs = new Gtk.IconView.with_model (filtered);
 
=== modified file 'src/EmbeddedAlert.vala'
--- src/EmbeddedAlert.vala	2013-01-08 15:21:51 +0000
+++ src/EmbeddedAlert.vala	2013-12-03 21:13:09 +0000
@@ -113,7 +113,7 @@
             primary_text_label.halign = secondary_text_label.halign = Gtk.Align.START;
             primary_text_label.justify = Gtk.Justification.LEFT;
             secondary_text_label.justify = Gtk.Justification.FILL;
-            image.set_pixel_size(64);
+            image.set_pixel_size (64);
 
             // TODO: More intelligent icon support, I guess. Or support all the
             // MessageType flags.
 
=== modified file 'src/Switchboard.vala'
--- src/Switchboard.vala	2013-09-26 08:05:15 +0000
+++ src/Switchboard.vala	2013-12-03 21:13:09 +0000
@@ -1,18 +1,18 @@
 /***
-BEGIN LICENSE
-Copyright (C) 2011-2012 Avi Romanoff <[e-mail]>
-This program is free software: you can redistribute it and/or modify it
-under the terms of the GNU Lesser General Public License version 3, as published
-by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranties of
-MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along
-with this program.  If not, see <http://www.gnu.org/licenses/>.
-END LICENSE
+    BEGIN LICENSE
+    Copyright (C) 2011-2012 Avi Romanoff <[e-mail]>
+    This program is free software: you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License version 3, as published
+    by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranties of
+    MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+    PURPOSE.  See the GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program.  If not, see <http://www.gnu.org/licenses/>.
+    END LICENSE
 ***/
 
 namespace Switchboard {
@@ -21,13 +21,13 @@
 
     [DBus (name = "org.elementary.switchboard")]
     public class SwitchboardApp : Granite.Application {
-        
+
         construct {
             application_id = "org.elementary.Switchboard";
             program_name = "Switchboard";
             app_years = "2011-2012";
             exec_name = "switchboard";
-            app_launcher = exec_name+".desktop";
+            app_launcher = exec_name + ".desktop";
 
             build_version = VERSION;
             app_icon = APP_ICON;
@@ -51,9 +51,9 @@
         // These two wrap the progress bar
         Gtk.ToolItem lspace = new Gtk.ToolItem ();
         Gtk.ToolItem rspace = new Gtk.ToolItem ();
-        
+
         Gtk.Spinner loading;
-        
+
         Gtk.Window main_window;
 
         // Content area widgets
@@ -65,12 +65,12 @@
 
         // Plug data
         bool socket_shown;
-        Gee.HashMap<string, string> current_plug = new Gee.HashMap<string, string>();
+        Gee.HashMap<string, string> current_plug = new Gee.HashMap<string, string> ();
         Gee.HashMap<string, string>[] plugs;
 
         string[] plug_places = {"/usr/share/plugs/",
                                 "/usr/lib/plugs/",
-                                "/usr/local/share/plugs/", 
+                                "/usr/local/share/plugs/",
                                 "/usr/local/lib/plugs/"};
         string search_box_buffer = "";
 
@@ -78,9 +78,9 @@
 
         public SwitchboardApp () {
         }
-        
+
         void build () {
-            main_window = new Gtk.Window();
+            main_window = new Gtk.Window ();
 
             // Set up defaults
             main_window.title = APP_TITLE;
@@ -95,8 +95,8 @@
 
             // Set up socket
             socket = new Gtk.Socket ();
-            socket.set_hexpand(true);
-            socket.set_vexpand(true);
+            socket.set_hexpand (true);
+            socket.set_vexpand (true);
 
             socket.plug_removed.connect (() => {
                 plug_closed ();
@@ -108,11 +108,12 @@
             uint accel_key;
             Gdk.ModifierType accel_mod;
             var accel_flags = Gtk.AccelFlags.LOCKED;
-            Gtk.accelerator_parse("<Control>q", out accel_key, out accel_mod);
-            accel_group.connect(accel_key, accel_mod, accel_flags, () => {
-                main_window.destroy();
+            Gtk.accelerator_parse ("<Control>q", out accel_key, out accel_mod);
+            accel_group.connect (accel_key, accel_mod, accel_flags, () => {
+                main_window.destroy ();
                 return true;
             });
+
             main_window.add_accel_group (accel_group);
 
             // ??? Why?
@@ -151,6 +152,7 @@
 
             foreach (var label in category_view.category_labels.values)
                 label.hide ();
+
             foreach (var view in category_view.category_views.values)
                 view.hide ();
 
@@ -178,17 +180,19 @@
                 }
             });
 
-            foreach (string place in plug_places)
-                if (enumerate_plugs (place))
+            foreach (string place in plug_places) {
+                if (enumerate_plugs (place)) {
                     any_plugs = true;
+                }
+            }
 
             if (!any_plugs) {
-                show_alert(_("No settings found"), _("Install some and re-launch Switchboard"), Gtk.MessageType.WARNING);
+                show_alert (_("No settings found"), _("Install some and re-launch Switchboard"), Gtk.MessageType.WARNING);
                 search_box.sensitive = false;
             } else {
                 update_libunity_quicklist ();
             }
-            
+
             bool found = false;
             if (plug_to_open != null) {
                 foreach (var plug in plugs) {
@@ -201,17 +205,17 @@
                     critical ("Couldn't find %s among the loaded settings.", plug_to_open);
                 }
             }
-            
+
             foreach (var store in category_view.category_store.values) {
                 store.foreach ((model, path, iter) => {
                     store.set_value (iter, 3, true);
                     return false;
                 });
             }
-            
+
             progress_toolitem.hide ();
         }
-        
+
         void shut_down () {
             plug_closed ();
         }
@@ -234,28 +238,30 @@
             if (current_plug["title"] != title || !socket.visible) {
                 try {
                     // The plug is already selected
-                    debug(_("Closing plug \"%s\" in Switchboard controller..."), current_plug["title"]);
+                    debug (_("Closing plug \"%s\" in Switchboard controller..."), current_plug["title"]);
                     plug_closed ();
-                    
+
                     string[] cmd_exploded = (executable!=null)?executable.split (" "):null;
                     GLib.Process.spawn_async (File.new_for_path (cmd_exploded[0]).get_parent ().
-                        get_path (), cmd_exploded, null, SpawnFlags.SEARCH_PATH, null, null);
-                    
+                                              get_path (), cmd_exploded, null, SpawnFlags.SEARCH_PATH, null, null);
+
                     // ensure the button is sensitive; it might be the first plug loaded
                     if (!@extern) {
-                        navigation_button.set_sensitive(true);
+                        navigation_button.set_sensitive (true);
                         navigation_button.set_icon_name ("go-home");
                         current_plug["title"] = title;
                         current_plug["executable"] = executable;
                         switch_to_socket ();
                         main_window.title = @"$APP_TITLE - $title";
                     }
-                } catch {  warning(_("Failed to launch plug: title %s | executable %s"), title, executable); }
+                } catch {
+                    warning (_("Failed to launch plug: title %s | executable %s"), title, executable);
+                }
             } else {
-                navigation_button.set_sensitive(true);
+                navigation_button.set_sensitive (true);
                 navigation_button.set_icon_name ("go-home");
             }
-            
+
             if (@extern) {
                 switch_to_icons ();
             }
@@ -270,7 +276,7 @@
         void handle_navigation_button_clicked () {
             string icon_name = navigation_button.get_icon_name ();
             if (icon_name == "go-home") {
-                switch_to_icons();
+                switch_to_icons ();
                 navigation_button.set_icon_name ("go-previous");
             }
             else {
@@ -289,25 +295,25 @@
             socket.hide ();
             loading.show_all ();
         }
-        
+
         // Switches back to the icons
         bool switch_to_icons () {
             socket.hide ();
             loading.hide ();
             category_view.show ();
-            
+
             socket_shown = false;
 
             // Reset state
             reset_title ();
-            search_box.set_text("");
-            search_box.sensitive = count_plugs() > 0;
-            progress_label.set_text("");
+            search_box.set_text ("");
+            search_box.sensitive = count_plugs () > 0;
+            progress_label.set_text ("");
             progress_bar.fraction = 0.0;
             progress_toolitem.visible = false;
-            
+
             plug_closed ();
-            
+
             return true;
         }
 
@@ -318,19 +324,24 @@
 
             // <keyfile's absolute path, keyfile's directory>
             List<string> keyfiles = find_plugs (plug_root_dir);
-            if (keyfiles.length() == 0) {
+            if (keyfiles.length () == 0) {
                 return false;
             } else {
                 foreach (string keyfile in keyfiles) {
-                    KeyFile kf = new KeyFile();
+                    KeyFile kf = new KeyFile ();
 
-                    string head = File.new_for_path(keyfile).get_basename();
-                    string parent = File.new_for_path(keyfile).get_parent().get_path();
+                    string head = File.new_for_path (keyfile).get_basename ();
+                    string parent = File.new_for_path (keyfile).get_parent ().get_path ();
 
                     Gee.HashMap<string, string> plug = new Gee.HashMap<string, string> ();
-                    try { kf.load_from_file(keyfile, KeyFileFlags.NONE);
-                    } catch (Error e) { warning("Couldn't load this keyfile, %s (path: %s)", e.message, keyfile); }
-                    plug["id"] = kf.get_start_group();
+                    try {
+                        kf.load_from_file (keyfile, KeyFileFlags.NONE);
+                    } catch (Error e) {
+                        warning ("Couldn't load this keyfile, %s (path: %s)", e.message, keyfile);
+                    }
+
+                    plug["id"] = kf.get_start_group ();
+
                     try {
                         var exec = kf.get_string (head, "exec");
                         //if a path starts with a double slash, we take it as an absolute path
@@ -338,14 +349,21 @@
                             exec = exec.substring (1);
                             plug["extern"] = "1";
                         } else {
-                            exec = Path.build_filename(parent, exec);
+                            exec = Path.build_filename (parent, exec);
                             plug["extern"] = "0";
                         }
-                        
+
                         plug["exec"] = exec;
-                    } catch (Error e) { warning("Couldn't read exec field in file %s, %s", keyfile, e.message); }
-                    try { plug["icon"] = kf.get_string (head, "icon");
-                    } catch (Error e) { warning("Couldn't read icon field in file %s, %s", keyfile, e.message); }
+                    } catch (Error e) {
+                        warning ("Couldn't read exec field in file %s, %s", keyfile, e.message);
+                    }
+
+                    try {
+                        plug["icon"] = kf.get_string (head, "icon");
+                    } catch (Error e) {
+                        warning ("Couldn't read icon field in file %s, %s", keyfile, e.message);
+                    }
+
                     try {
                         plug["title"] = kf.get_locale_string (head, "title");
                         string? textdomain = null;
@@ -371,7 +389,7 @@
 
         // Checks if the file is a .plug file
         bool is_plug_file (string filename) {
-            return (filename.down().has_suffix(".plug"));
+            return (filename.down ().has_suffix (".plug"));
         }
 
         // Find all .plug files
@@ -382,10 +400,10 @@
             } else {
                 keyfiles = new List<string> ();
                 foreach(var keyfile in keyfiles_list) {
-                    keyfiles.append(keyfile);
+                    keyfiles.append (keyfile);
                 }
             }
-            
+
             var directory = File.new_for_path (path);
             if (!directory.query_exists ()) {
                 return null;
@@ -395,30 +413,33 @@
                     FileAttribute.STANDARD_NAME + "," + FileAttribute.STANDARD_TYPE, 0);
                 FileInfo file_info;
                 while ((file_info = enumerator.next_file ()) != null) {
-                    string file_path = Path.build_filename(path, file_info.get_name());
-                    if (file_info.get_file_type() == GLib.FileType.REGULAR && 
-                        is_plug_file(file_info.get_name())) {
-                        keyfiles.append(file_path);
-                    } else if(file_info.get_file_type() == GLib.FileType.DIRECTORY) {
-                        keyfiles = find_plugs(file_path, keyfiles);
+                    string file_path = Path.build_filename (path, file_info.get_name ());
+                    if (file_info.get_file_type () == GLib.FileType.REGULAR &&
+                        is_plug_file (file_info.get_name ())) {
+                        keyfiles.append (file_path);
+                    } else if (file_info.get_file_type () == GLib.FileType.DIRECTORY) {
+                        keyfiles = find_plugs (file_path, keyfiles);
                     }
                 }
-            } catch { warning(_(@"Unable to iterate over enumerated plug directory \"$path\"'s contents")); }
-            
+            } catch {
+                warning (_(@"Unable to iterate over enumerated plug directory \"$path\"'s contents"));
+            }
+
             return keyfiles;
         }
 
         // Counts how many plugs exist at the moment
         int count_plugs () {
-
             uint count = 0;
+
             foreach (string place in plug_places)
                 count += find_plugs (place).length ();
+
             return (int) count;
         }
 
         /*
-            D-Bus ONLY methods
+          D-Bus ONLY methods
         */
 
         public int get_socket_wid () {
@@ -430,12 +451,12 @@
 
         public void progress_bar_set_visible (bool visibility) {
 
-            progress_toolitem.set_visible(visibility);
+            progress_toolitem.set_visible (visibility);
         }
 
         public void progress_bar_set_text (string text) {
 
-            progress_label.set_text(text);
+            progress_label.set_text (text);
         }
 
         public void progress_bar_set_fraction (double fraction) {
@@ -445,7 +466,7 @@
 
         public void progress_bar_pulse () {
 
-            progress_bar.pulse();
+            progress_bar.pulse ();
         }
 
         public signal void search_box_activated ();
@@ -458,7 +479,7 @@
 
         public void search_box_set_text (string text) {
 
-            plug_closed();
+            plug_closed ();
             search_box.set_text (text);
         }
 
@@ -468,7 +489,7 @@
         }
 
         /*
-           End D-Bus ONLY methods
+          End D-Bus ONLY methods
         */
 
         // Sets up the toolbar for the Switchboard app
@@ -479,28 +500,30 @@
             toolbar.get_style_context ().add_class ("primary-toolbar");
 
             // Spacing
-            lspace.set_expand(true);
-            rspace.set_expand(true);
+            lspace.set_expand (true);
+            rspace.set_expand (true);
 
             // Progressbar
             var progress_vbox = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
             progress_label = new Gtk.Label ("");
-            progress_label.set_use_markup(true);
+            progress_label.set_use_markup (true);
             progress_bar = new Gtk.ProgressBar ();
             progress_toolitem = new Gtk.ToolItem ();
-            progress_vbox.pack_start(progress_label, true, false, 0);
-            progress_vbox.pack_end(progress_bar, false, false, 0);
-            progress_toolitem.add(progress_vbox);
-            progress_toolitem.set_expand(true);
+            progress_vbox.pack_start (progress_label, true, false, 0);
+            progress_vbox.pack_end (progress_bar, false, false, 0);
+            progress_toolitem.add (progress_vbox);
+            progress_toolitem.set_expand (true);
 
             // Searchbar
             search_box = new Gtk.SearchEntry ();
             search_box.set_placeholder_text (_("Search Settings"));
-            search_box.activate.connect(() => search_box_activated());
-            search_box.changed.connect(() => {
-                category_view.filter_plugs(search_box.get_text (), this);
-                search_box_text_changed();
+            search_box.activate.connect (() => search_box_activated ());
+
+            search_box.changed.connect (() => {
+                category_view.filter_plugs (search_box.get_text (), this);
+                search_box_text_changed ();
             });
+
             search_box.sensitive = (count_plugs () > 0);
             var find_toolitem = new Gtk.ToolItem ();
             find_toolitem.add(search_box);
@@ -519,7 +542,7 @@
             navigation_button = new Gtk.ToolButton (null, null);
             navigation_button.set_icon_name ("go-previous");
             navigation_button.clicked.connect (handle_navigation_button_clicked);
-            navigation_button.set_sensitive(false);
+            navigation_button.set_sensitive (false);
 
             // Add everything to the toolbar
             toolbar.insert (navigation_button, -1);
@@ -528,7 +551,7 @@
             toolbar.insert (rspace, -1);
             toolbar.insert (find_toolitem, -1);
         }
-        
+
         public override void activate () {
             // If app is already running, present the current window.
             if (get_windows () != null) {
@@ -582,41 +605,46 @@
     }
 
     static const OptionEntry[] entries = {
-            { "open-plug", 'o', 0, OptionArg.STRING, ref plug_to_open, N_("Open a plug"), "PLUG_NAME" },
-            { null }
+        { "open-plug", 'o', 0, OptionArg.STRING, ref plug_to_open, N_("Open a plug"), "PLUG_NAME" },
+        { null }
     };
 
     public static int main (string[] args) {
-
         var logger = new Granite.Services.Logger ();
-        logger.initialize(APP_TITLE);
+        logger.initialize (APP_TITLE);
         logger.DisplayLevel = Granite.Services.LogLevel.INFO;
-        message(_(@"Welcome to $APP_TITLE"));
-        message(_(@"Version: $VERSION"));
-        message(_("Report any issues/bugs you mind find to lp:switchboard"));
-        
+        message (_(@"Welcome to $APP_TITLE"));
+        message (_(@"Version: $VERSION"));
+        message (_("Report any issues/bugs you mind find to lp:switchboard"));
+
         Gtk.init (ref args);
-        
-        var context = new OptionContext("");
-        context.add_main_entries(entries, "switchboard ");
-        context.add_group(Gtk.get_option_group(true));
+
+        var context = new OptionContext ("");
+        context.add_main_entries (entries, "switchboard ");
+        context.add_group (Gtk.get_option_group (true));
+
         try {
-            context.parse(ref args);
-        } catch(Error e) { warning (e.message); }
-        
+            context.parse (ref args);
+        } catch(Error e) {
+            warning (e.message);
+        }
+
         // In the future, the plug_root_dir should be overridable by CLI flags.
         var switchboard_app = new SwitchboardApp ();
-        
+
         GLib.Bus.own_name (BusType.SESSION, "org.elementary.switchboard",
-                BusNameOwnerFlags.NONE,
-                (conn) => { 
-                    try {
-                        conn.register_object("/org/elementary/switchboard", switchboard_app);
-                    } catch (IOError e) { warning (e.message); }
-                },
-                () => {},
-                () => {logger.notification(_("Switchboard already running. Exiting..")); Process.exit(1);});
-        
+                           BusNameOwnerFlags.NONE,
+                           (conn) => {
+                               try {
+                                   conn.register_object ("/org/elementary/switchboard", switchboard_app);
+                               } catch (IOError e) {
+                                   warning (e.message);
+                               }
+                           },
+
+                           () => {},
+                           () => { logger.notification (_("Switchboard already running. Exiting..")); Process.exit (1); });
+
         return switchboard_app.run (args);
     }
 }