Merge lp:~guitarhunter92/unity-window-quicklists/small-titles into lp:unity-window-quicklists

[Hunter VanHorn]

Truncates length of titles in the quicklist to show <first 15 char> ... <last 15 char>. For instance,
Propose branch ... Mozilla Firefox

It might be better to package this seperately, that way those who want the whole title
can have it.

[Alan Bell (alanbell)]

can you set your editor to use 4 spaces instead of tab characters please, that is the python standard. I will accept the merge with the spacing fixed.

review: Needs Fixing

[Hunter VanHorn (guitarhunter92)]

> can you set your editor to use 4 spaces instead of tab characters please, that
> is the python standard. I will accept the merge with the spacing fixed.

For some reason thought it was 4-space length tabs, rather than 4 spaces. Fixed now.

[Alan Bell (alanbell)]

yeah, that looks good

review: Approve

[lp:~guitarhunter92/unity-window-quicklists/small-titles]

2. By Hunter VanHorn on 2012-06-20

Change to new local directory,
Changed .desktop to read as Unity, not UNITY

3. By Hunter VanHorn on 2012-06-20

More local housekeeping

Unmerged revisions

3. By Hunter VanHorn on 2012-06-20

More local housekeeping

2. By Hunter VanHorn on 2012-06-20

Change to new local directory,
Changed .desktop to read as Unity, not UNITY

=== modified file 'quicklists'
--- quicklists	2012-06-15 23:14:12 +0000
+++ quicklists	2012-06-20 13:41:19 +0000
@@ -12,6 +12,7 @@
 bamf = bus.get_object('org.ayatana.bamf','/org/ayatana/bamf/matcher')
 loop = GObject.MainLoop()
 timestamp = int(time.time())
+name_length = 35
 
 launcher={}
 sighandlers={}
@@ -38,7 +39,7 @@
         sighandlers[desktoppath+'windowadd']=bus.add_signal_receiver(window_add,"WindowAdded",dbus_interface='org.ayatana.bamf.application',path=path,path_keyword='applicationpath')
         sighandlers[desktoppath+'windowremove']=bus.add_signal_receiver(window_remove,"WindowRemoved",dbus_interface='org.ayatana.bamf.application',path=path,path_keyword='applicationpath')
         for w in windows:
-             window_add(w,applicationpath=path)
+            window_add(w,applicationpath=path)
     for desktoppath in removed_apps:
         #we need to listen for new or removed windows in this app
         #path=launcher[desktoppath]
@@ -58,7 +59,10 @@
         ql = Dbusmenu.Menuitem.new ()
         launcher[applicationpath].set_property("quicklist", ql)
     windowitem = Dbusmenu.Menuitem.new ()
-    windowitem.property_set (Dbusmenu.MENUITEM_PROP_LABEL, window.Name(dbus_interface='org.ayatana.bamf.view'))
+    window_name = window.Name(dbus_interface='org.ayatana.bamf.view')
+    if len(window_name) > name_length:
+        window_name = window_name[:(name_length-5)/2] + ' ... ' + window_name[-(name_length-5)/2:]
+    windowitem.property_set (Dbusmenu.MENUITEM_PROP_LABEL, window_name)
     windowitem.property_set_int('xid',window.GetXid(dbus_interface='org.ayatana.bamf.window'))#store this for later
     windowitem.property_set('windowpath',windowpath)#store this for later
     windowitem.property_set_bool (Dbusmenu.MENUITEM_PROP_VISIBLE, True)
@@ -91,6 +95,9 @@
     application = bus.get_object('org.ayatana.bamf',applicationpath)
     #lets see if we can get an existing quicklist
     ql = launcher[applicationpath].get_property("quicklist")
+    #make sure the new window name is not too long
+    if len(newname) > name_length:
+        newname = newname[:(name_length-5)/2] + ' ... ' + newname[-(name_length-5)/2:]
     if not ql:
         #well, not much to do really, kind of surprised to be here
         return
 
=== modified file 'unity-window-quicklists.desktop'
--- unity-window-quicklists.desktop	2012-06-15 23:14:12 +0000
+++ unity-window-quicklists.desktop	2012-06-20 13:41:19 +0000
@@ -6,7 +6,7 @@
 Terminal=false
 Type=Application
 Categories=
-OnlyShowIn=UNITY;
+OnlyShowIn=Unity;
 AutostartCondition=
 NoDisplay=true
 X-Ubuntu-Gettext-Domain=unity-window-quicklists