pyhoca-gui.git - master (branch) updated: 0.1.0.10-96-gd76502f - x2go-commits

13 Mar 2012

The branch, master has been updated
       via  d76502f0d36e30fc60abc8b33706ecac0e3fb51e (commit)
      from  790e8a8264159ed12cfd132d5cdfc42a457a420d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d76502f0d36e30fc60abc8b33706ecac0e3fb51e
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Tue Mar 13 12:33:00 2012 +0100

    Provide icons for category submenus.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                |    1 +
 icons/PyHoca/22x22/applications-development.png |  Bin 0 -> 977 bytes
 icons/PyHoca/22x22/applications-education.png   |  Bin 0 -> 644 bytes
 icons/PyHoca/22x22/applications-games.png       |  Bin 0 -> 688 bytes
 icons/PyHoca/22x22/applications-graphics.png    |  Bin 0 -> 1523 bytes
 icons/PyHoca/22x22/applications-internet.png    |  Bin 0 -> 1355 bytes
 icons/PyHoca/22x22/applications-multimedia.png  |  Bin 0 -> 1353 bytes
 icons/PyHoca/22x22/applications-office.png      |  Bin 0 -> 804 bytes
 icons/PyHoca/22x22/applications-other.png       |  Bin 0 -> 775 bytes
 icons/PyHoca/22x22/applications-system.png      |  Bin 0 -> 1403 bytes
 icons/PyHoca/22x22/applications-utilities.png   |  Bin 0 -> 888 bytes
 pyhoca/wxgui/menus_taskbar.py                   |   48 ++++++++++-------------
 12 files changed, 22 insertions(+), 27 deletions(-)
 create mode 100644 icons/PyHoca/22x22/applications-development.png
 create mode 100644 icons/PyHoca/22x22/applications-education.png
 create mode 100644 icons/PyHoca/22x22/applications-games.png
 create mode 100644 icons/PyHoca/22x22/applications-graphics.png
 create mode 100644 icons/PyHoca/22x22/applications-internet.png
 create mode 100644 icons/PyHoca/22x22/applications-multimedia.png
 create mode 100644 icons/PyHoca/22x22/applications-office.png
 create mode 100644 icons/PyHoca/22x22/applications-other.png
 create mode 100644 icons/PyHoca/22x22/applications-system.png
 create mode 100644 icons/PyHoca/22x22/applications-utilities.png

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index 5dd651c..b35a34c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -57,6 +57,7 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
     - Add icon support for the published applications menu (any icon
       type except SVGs works).
     - On exit only suspend running sessions we are associated with.
+    - Provide icons for category submenus.
   * Depend on Python X2Go 0.1.2.0.
   * Install GNOME icons via dh_links.
   * Install X2Go icons with explicit install paths.
diff --git a/icons/PyHoca/22x22/applications-development.png b/icons/PyHoca/22x22/applications-development.png
new file mode 100644
index 0000000..656ac3d
Binary files /dev/null and b/icons/PyHoca/22x22/applications-development.png differ
diff --git a/icons/PyHoca/22x22/applications-education.png b/icons/PyHoca/22x22/applications-education.png
new file mode 100644
index 0000000..7c1d933
Binary files /dev/null and b/icons/PyHoca/22x22/applications-education.png differ
diff --git a/icons/PyHoca/22x22/applications-games.png b/icons/PyHoca/22x22/applications-games.png
new file mode 100644
index 0000000..50f62a1
Binary files /dev/null and b/icons/PyHoca/22x22/applications-games.png differ
diff --git a/icons/PyHoca/22x22/applications-graphics.png b/icons/PyHoca/22x22/applications-graphics.png
new file mode 100644
index 0000000..162b10f
Binary files /dev/null and b/icons/PyHoca/22x22/applications-graphics.png differ
diff --git a/icons/PyHoca/22x22/applications-internet.png b/icons/PyHoca/22x22/applications-internet.png
new file mode 100644
index 0000000..0348b21
Binary files /dev/null and b/icons/PyHoca/22x22/applications-internet.png differ
diff --git a/icons/PyHoca/22x22/applications-multimedia.png b/icons/PyHoca/22x22/applications-multimedia.png
new file mode 100644
index 0000000..3213ad5
Binary files /dev/null and b/icons/PyHoca/22x22/applications-multimedia.png differ
diff --git a/icons/PyHoca/22x22/applications-office.png b/icons/PyHoca/22x22/applications-office.png
new file mode 100644
index 0000000..ae877d5
Binary files /dev/null and b/icons/PyHoca/22x22/applications-office.png differ
diff --git a/icons/PyHoca/22x22/applications-other.png b/icons/PyHoca/22x22/applications-other.png
new file mode 100644
index 0000000..c68db38
Binary files /dev/null and b/icons/PyHoca/22x22/applications-other.png differ
diff --git a/icons/PyHoca/22x22/applications-system.png b/icons/PyHoca/22x22/applications-system.png
new file mode 100644
index 0000000..9ab8c04
Binary files /dev/null and b/icons/PyHoca/22x22/applications-system.png differ
diff --git a/icons/PyHoca/22x22/applications-utilities.png b/icons/PyHoca/22x22/applications-utilities.png
new file mode 100644
index 0000000..5b44ae1
Binary files /dev/null and b/icons/PyHoca/22x22/applications-utilities.png differ
diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py
index b0aebea..11731b8 100644
--- a/pyhoca/wxgui/menus_taskbar.py
+++ b/pyhoca/wxgui/menus_taskbar.py
@@ -332,19 +332,17 @@ def _generate_Menu_PublishedApplications(_PyHocaGUI, caller=None, profile_name=N
     _lang = _PyHocaGUI.lang
 
     _category_map = {
-        _(u'Multimedia'): wx.Menu(),
-        _(u'Development'): wx.Menu(),
-        _(u'Education'): wx.Menu(),
-        _(u'Games'): wx.Menu(),
-        _(u'Graphics'): wx.Menu(),
-        _(u'Network'): wx.Menu(),
-        _(u'Office Applications'): wx.Menu(),
-        _(u'Settings'): wx.Menu(),
-        _(u'System'): wx.Menu(),
-        _(u'Utilities'): wx.Menu(),
-        _(u'Other applications'): wx.Menu(),
+        _(u'Multimedia'): (wx.Menu(), '%s/PyHoca/22x22/applications-multimedia.png' % _icons_location),
+        _(u'Development'): (wx.Menu(), '%s/PyHoca/22x22/applications-development.png' % _icons_location),
+        _(u'Education'): (wx.Menu(), '%s/PyHoca/22x22/applications-education.png' % _icons_location),
+        _(u'Games'): (wx.Menu(), '%s/PyHoca/22x22/applications-games.png' % _icons_location),
+        _(u'Graphics'): (wx.Menu(), '%s/PyHoca/22x22/applications-graphics.png' % _icons_location),
+        _(u'Internet'): (wx.Menu(), '%s/PyHoca/22x22/applications-internet.png' % _icons_location),
+        _(u'Office Applications'): (wx.Menu(), '%s/PyHoca/22x22/applications-office.png' % _icons_location),
+        _(u'System'): (wx.Menu(), '%s/PyHoca/22x22/applications-system.png' % _icons_location),
+        _(u'Utilities'): (wx.Menu(), '%s/PyHoca/22x22/applications-utilities.png' % _icons_location),
+        _(u'Other Applications'): (wx.Menu(), '%s/PyHoca/22x22/applications-other.png' % _icons_location),
     }
-
     _empty_menus = _category_map.keys()
 
     _PyHocaGUI._eventid_pubapp_execmap[profile_name] = {}
@@ -385,17 +383,17 @@ def _generate_Menu_PublishedApplications(_PyHocaGUI, caller=None, profile_name=N
                     elif 'Graphics' in line:
                         _menu_entry_cat = _(u'Graphics')
                     elif 'Network' in line:
-                        _menu_entry_cat = _(u'Network')
+                        _menu_entry_cat = _(u'Internet')
                     elif 'Office' in line:
                         _menu_entry_cat = _(u'Office Applications')
                     elif 'Settings' in line:
-                            _menu_entry_cat = _(u'Settings')
+                            continue
                     elif 'System' in line:
                         _menu_entry_cat = _(u'System')
                     elif 'Utilities' in line:
                             _menu_entry_cat = _(u'Utilities')
                     else:
-                        _menu_entry_cat = _(u'Other applications')
+                        _menu_entry_cat = _(u'Other Applications')
 
             if not _menu_entry_exec:
                 continue
@@ -404,7 +402,7 @@ def _generate_Menu_PublishedApplications(_PyHocaGUI, caller=None, profile_name=N
                 _menu_entry_exec = _menu_entry_exec.replace('%f', '').replace('%F','').replace('%u','').replace('%U','')
 
             if not _menu_entry_cat:
-                _menu_entry_cat = _(u'Other applications')
+                _menu_entry_cat = _(u'Other Applications')
 
             if _menu_entry_cat in _empty_menus:
                 _empty_menus.remove(_menu_entry_cat)
@@ -420,7 +418,7 @@ def _generate_Menu_PublishedApplications(_PyHocaGUI, caller=None, profile_name=N
             _PyHocaGUI._eventid_sessionnames_map[_pubapp_id] = session_name
             _PyHocaGUI._eventid_pubapp_execmap[profile_name][_pubapp_id] = _menu_entry_exec
 
-            _menu_item = wx.MenuItem(_category_map[_menu_entry_cat], id=_pubapp_id, text=_menu_entry_name, help=_menu_entry_comment)
+            _menu_item = wx.MenuItem(_category_map[_menu_entry_cat][0], id=_pubapp_id, text=_menu_entry_name, help=_menu_entry_comment)
             if not _menu_entry_icon:
                 _menu_item.SetBitmap(wx.Bitmap('%s/PyHoca/22x22/x2go-logo-grey.png' % _icons_location))
             else:
@@ -429,20 +427,14 @@ def _generate_Menu_PublishedApplications(_PyHocaGUI, caller=None, profile_name=N
                     _icon_image = wx.ImageFromStream(StringIO.StringIO(_menu_entry_icon_decoded))
                     _icon_bitmap = wx.BitmapFromImage(_icon_image.Scale(22,22))
                     _menu_item.SetBitmap(_icon_bitmap)
-            _category_map[_menu_entry_cat].AppendItem(_menu_item)
+            _category_map[_menu_entry_cat][0].AppendItem(_menu_item)
 
             _PyHocaGUI.Bind(wx.EVT_MENU, _PyHocaGUI.OnPubAppExecution, id=_pubapp_id)
 
         for _menu in _empty_menus:
             del _category_map[_menu]
 
-        _cat_names = _category_map.keys()
-        _cat_names.sort()
-        _sorted_category_map = {}
-        for _cat_name in _cat_names:
-            _sorted_category_map[_cat_name] = _category_map[_cat_name]
-
-        return _sorted_category_map
+        return _category_map
 
     else:
         _dummy_menu = wx.Menu()
@@ -508,7 +500,8 @@ class PyHocaGUI_Menu_TaskbarSessionProfile(wx.Menu):
                 _category_names = _category_map.keys()
                 _category_names.sort()
                 for cat_name in _category_names:
-                    _submenu = self.AppendMenu(id=wx.NewId(), text=cat_name, submenu=_category_map[cat_name])
+                    _submenu = self.AppendMenu(id=wx.NewId(), text=cat_name, submenu=_category_map[cat_name][0])
+                    _submenu.SetBitmap(wx.Bitmap(_category_map[cat_name][1]))
                     if _session_name_disabled:
                         _submenu.Enable(False)
                 self.AppendSeparator()
@@ -558,7 +551,8 @@ class PyHocaGUI_Menu_TaskbarSessionProfile(wx.Menu):
                     _category_names = _category_map.keys()
                     _category_names.sort()
                     for cat_name in _category_names:
-                        _submenu = self.AppendMenu(id=wx.NewId(), text=cat_name, submenu=_category_map[cat_name])
+                        _submenu = self.AppendMenu(id=wx.NewId(), text=cat_name, submenu=_category_map[cat_name][0])
+                        _submenu.SetBitmap(wx.Bitmap(_category_map[cat_name][1]))
                         if _session_name_disabled:
                             _submenu.Enable(False)
 


hooks/post-receive
-- 
pyhoca-gui.git (Python X2Go Client (wxPython GUI))

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

    