Merge pull request #509 from scinart/master

use dconf for ubuntu launcher hide/width detection
Guake · Apr 28, 2015 · 0412cf6 · 0412cf6
2 parents e595108 + c7883b9
commit 0412cf6
Showing 1 changed file with 22 additions and 13 deletions.
diff --git a/src/guake/guake_app.py b/src/guake/guake_app.py
@@ -26,10 +26,13 @@
 import gobject
 import gtk
 import os
+import platform
+import subprocess
 import pygtk
 import sys
 import xdg.Exceptions
 
+
 from urllib import quote_plus
 from urllib import url2pathname
 from urlparse import urlsplit
@@ -693,21 +696,27 @@ def set_final_window_rect(self):
         window_rect = screen.get_monitor_geometry(monitor)
 
         if os.environ.get('DESKTOP_SESSION') == "ubuntu":
-            unity_hide = self.client.get_int(KEY('/apps/compiz-1/plugins/'
-                                                 'unityshell/screen0/options/launcher_hide_mode'))
-            # launcher_hide_mode = 1 => autohide
-            if unity_hide != 1:
-                # Size of the icons for Unity in Ubuntu <= 12.04
-                # TODO Ubuntu 12.10 use dconf :
-                # /org/compiz/profiles/unity/plugins/unityshell/icon-size
+
+            # For Ubuntu 12.10 and above, use dconf :
+            # For Ubuntu 12.04 and below, use
+            # see if unity dock is hide => unity_hide
+            # and the width of unity dock. => unity_dock
+            if float(platform.dist()[1])>=12.10:
+                unity_hide = int(subprocess.check_output(
+                    ['/usr/bin/dconf', 'read',
+                     '/org/compiz/profiles/unity/plugins/unityshell/launcher-hide-mode']))
+                unity_dock = int(subprocess.check_output(
+                    ['/usr/bin/dconf', 'read',
+                     '/org/compiz/profiles/unity/plugins/unityshell/icon-size']))
+            else:
+                unity_hide = self.client.get_int(KEY('/apps/compiz-1/plugins/'
+                                                     'unityshell/screen0/options/launcher_hide_mode'))
                 unity_icon_size = self.client.get_int(KEY(
                     '/apps/compiz-1/plugins/unityshell/screen0/options/icon_size'))
-                if not unity_icon_size:
-                    # If not found, it should be because of newer implementation of unity.
-                    # Dock is 64 pixel of width on my system, hope this is so on others...
-                    unity_dock = 64
-                else:
-                    unity_dock = unity_icon_size + 17
+                unity_dock = unity_icon_size + 17
+
+            # launcher_hide_mode = 1 => autohide
+            if unity_hide != 1:
                 print("correcting window width because of launcher width {} "
                       "(from {} to {})".format(
                           unity_dock, window_rect.width, window_rect.width - unity_dock))