Merge lp:~oria/slingshot/slingshot into lp:~elementary-pantheon/slingshot/trunk

[Franck Dugué]

Add options to customize Slingshot

I added an option to place Slingshot with x and y axis.
This allows to user to customize Slingshot and to place it like it wants.
And I added a function to choose its own file applications menu.
The user can change these settings with gsettings or dconf-editor e.g

[lp:~oria/slingshot/slingshot]

409. By Franck Dugué on 2014-02-27

Add function to choose menu file

[David Gomes (davidgomes)]

You've got some messy indentation in your Vala code and are mixing tabs with spaces in your XML code.

This needs design approval too.

review: Needs Fixing

[Danielle Foré (danrabbit)]

Sadly, my primary objection to this branch is political. For Isis+1, to use a Gtk.Popover here Slingshot will have to be a child of Wingpanel and not its own window. So I believe it will no longer be possible to set a different x or y position. Then we'll have to explain to users why a more robust codebase is more important than the feature they liked and that's never fun.

But as for choosing the applications menu file, I guess some people might find that valuable if they're running multiple desktop environments. As long as there isn't a performance impact, I'm indifferent to that change.

So, in my personal opinion, OP should drop the X Y position stuff or at least have it evaluated in a separate branch.

[Avi Romanoff (aroman)]

(See Dan's comments for the UX perspective)

review: Needs Fixing

Unmerged revisions

409. By Franck Dugué on 2014-02-27

Add function to choose menu file

408. By Franck Dugué on 2014-02-24

Can be placed with x, y axis

=== modified file 'org.pantheon.desktop.slingshot.gschema.xml'
--- org.pantheon.desktop.slingshot.gschema.xml	2013-01-09 16:24:00 +0000
+++ org.pantheon.desktop.slingshot.gschema.xml	2014-02-27 02:52:58 +0000
@@ -15,6 +15,16 @@
             <summary>The default icon size of apps</summary>
             <description>This value manages the size of the icons in Slingshot.</description>
         </key>
+        <key name="posx" type="i">
+			<default>100</default>
+            <summary>The default x axis</summary>
+            <description>This value needs to be greater than 1 to be effective.</description>
+        </key>
+        <key name="posy" type="i">
+            <default>30</default>
+            <summary>The default y axis</summary>
+            <description>This value needs to be greater than 1 to be effective.</description>
+        </key>
         <key name="show-category-filter" type="b">
             <default>true</default>
             <summary>Show the category switcher or not</summary>
@@ -30,5 +40,10 @@
             <summary>The last resolution of the screen</summary>
             <description>This value makes slingshot able to adapt to each screen.</description>
         </key>
-	</schema>
+        <key name="menufile" type="s">
+            <default>"pantheon-applications.menu"</default>
+            <summary>The default filename menu</summary>
+            <description>This value can be to find in /etc/xdg/menus/ or $HOME/.config/menus/</description>
+        </key>
+</schema>
 </schemalist>
 
=== modified file 'src/Backend/AppSystem.vala'
--- src/Backend/AppSystem.vala	2013-01-10 16:53:50 +0000
+++ src/Backend/AppSystem.vala	2014-02-27 02:52:58 +0000
@@ -21,6 +21,7 @@
     private Gee.ArrayList<GMenu.TreeDirectory> categories = null;
     private Gee.HashMap<string, Gee.ArrayList<App>> apps = null;
     private GMenu.Tree apps_menu = null;
+    private string menu_file;
 
 #if HAVE_ZEITGEIST
     private RelevancyService rl_service;
@@ -35,7 +36,12 @@
         rl_service.update_complete.connect (update_popularity);
 #endif
 
-        apps_menu = new GMenu.Tree ("pantheon-applications.menu", GMenu.TreeFlags.INCLUDE_EXCLUDED | GMenu.TreeFlags.SORT_DISPLAY_NAME);
+        if (Slingshot.settings.menufile != "") // if menufile exist
+            menu_file = Slingshot.settings.menufile;
+        else
+            menu_file = "pantheon-applications.menu";
+
+        apps_menu = new GMenu.Tree (menu_file, GMenu.TreeFlags.INCLUDE_EXCLUDED | GMenu.TreeFlags.SORT_DISPLAY_NAME);
         apps_menu.changed.connect (update_app_system);
         
         apps = new Gee.HashMap<string, Gee.ArrayList<App>> ();
 
=== modified file 'src/Settings.vala'
--- src/Settings.vala	2013-12-26 00:08:04 +0000
+++ src/Settings.vala	2014-02-27 02:52:58 +0000
@@ -34,6 +34,10 @@
     public bool use_category { get; set; }
     public string screen_resolution { get; set; }
     public GalaSettings gala_settings;
+    public int posx { get; set; }
+    public int posy { get; set; }
+    public string menufile { get; set; }
+
 
     public Settings () {
         base ("org.pantheon.desktop.slingshot");
 
=== modified file 'src/SlingshotView.vala'
--- src/SlingshotView.vala	2013-12-26 00:08:04 +0000
+++ src/SlingshotView.vala	2014-02-27 02:52:58 +0000
@@ -53,6 +53,10 @@
         private Modality modality;
         private bool can_trigger_hotcorner = true;
 
+        // Positions
+        private int default_posx;
+        private int default_posy;
+
         // Sizes
         public int columns {
             get {
@@ -361,8 +365,8 @@
             screen.get_monitor_geometry (this.screen.get_primary_monitor(), out monitor_dimensions);
             app_launcher_pos = Gdk.Rectangle () { x = monitor_dimensions.x,
                                                   y = monitor_dimensions.y,
-                                                  width = 100,
-                                                  height = 30
+                                                  width = default_posx, // default 100
+                                                  height = default_posy // default 30
                                                  };
             move_to_rect (app_launcher_pos, show);
         }
@@ -839,7 +843,21 @@
 
         }
 
-        private void read_settings (bool first_start = false, bool check_columns = true, bool check_rows = true) {
+        private void read_settings (bool first_start = false, bool check_columns = true, bool check_rows = true, bool check_posx = true, bool check_posy = true) {
+
+            if (check_posx) {
+                if (Slingshot.settings.posx > 99)
+                    default_posx = Slingshot.settings.posx;
+                else
+                    default_posx = Slingshot.settings.posx = 100;
+            }
+
+            if (check_posy) {
+                if (Slingshot.settings.posy > 29)
+                    default_posy = Slingshot.settings.posy;
+            else
+                    default_posy = Slingshot.settings.posy = 30;
+            }
 
             if (check_columns) {
                 if (Slingshot.settings.columns > 3)
@@ -950,4 +968,4 @@
         }
     }
 
-}
 \ No newline at end of file
+}