Attachment 146500 Details for Bug 222521 – Modified icemw-xdg-menu patch

[patch] Modified icemw-xdg-menu patch

icewm-xdg-menu.patch (text/plain), 4.85 KB, created by Gilboa Davara on 2007-01-25 06:22:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gilboa Davara

Created: 2007-01-25 06:22:08 UTC

Size: 4.85 KB

patch

obsolete

>--- icewm-xdg-menu.old	2007-01-25 07:45:44.000000000 +0200
>+++ icewm-xdg-menu	2007-01-25 08:16:38.000000000 +0200
>@@ -2,7 +2,7 @@
> """
> This script generates FreeDesktop application menu for IceWM window manager.
> 
>-Written by Konstantin Korikov <lostclus@ua.fm>, put in the public domain
>+Written by Konstantin Korikov <lostclus@ua.fm>
> 
> Requires pyxdg http://cvs.freedesktop.org/cgi-bin/viewcvs.cgi/pyxdg/
> 
>@@ -22,9 +22,8 @@
> import xdg.Menu
> import xdg.DesktopEntry
> import xdg.IconTheme
>-import xdg.Config
> 
>-version = "0.2"
>+version = "0.1 patch 2"
> 
> def print_usage(exit_code = 1):
>   print """Usage: %s [options]
>@@ -34,10 +33,10 @@
>   --terminal command            set terminal emulator command (default: xterm -e %%s)
>   --default-folder-icon icon    icon for folders that not provide Icon option
>   --default-entry-icon icon     icon for entries that not provide Icon option
>-  --with-theme-paths            convert icon base names to icon absolute paths
>-                                using icon theme
>+  --with-icons                  put icons for applications in the menu
>+  --icon-size					set default icon size
>   --entire-menu                 print entire menu
>-  --theme theme                 set icon theme
>+  --theme theme                 what icon theme you want to use
>   --help                        print this help and exit
>   --version                     print version and exit
> """ % sys.argv[0]
>@@ -52,26 +51,36 @@
> terminal = "xterm -e %s"
> default_folder_icon = "folder"
> default_entry_icon = "-"
>-entire_menu = False
>-with_theme_paths = False
>+entire_menu = 0
>+theme = "gnome"
>+use_icons = 0
>+icon_size = 16
> 
> exec_clean1_re = re.compile(r'%[a-zA-Z]')
> exec_clean2_re = re.compile(r'%%')
> encoding = None
> locale_str = None
> 
>-def find_icon(entry):
>-  icon = entry.getIcon()
>-  if icon and with_theme_paths:
>-    icon = xdg.IconTheme.getIconPath(icon, 48) or icon
>-  return icon
>+def findIcon(icon, theme):
>+    """Finds the path and filename for the given icon name
>+        e.g. gaim --> /usr/share/pixmaps/gaim.png
>+        e.g. fart.png --> /usr/share/pixmaps/fart.png
>+    """
>+    retval=str(xdg.IconTheme.getIconPath(icon, icon_size, theme))
>+    if retval == "None":
>+        retval=""
>+
>+    return (retval + "").encode('utf8')
>+
> 
> def process_menu(menu):
>   for entry in menu.getEntries():
>     if isinstance(entry, xdg.Menu.Menu):
>       name = entry.getName() or entry.DesktopFileID
>-      icon = find_icon(entry) or default_folder_icon
>-
>+      if use_icons:
>+        icon = findIcon(entry.getIcon(), theme) or default_folder_icon
>+      else:
>+        icon = entry.getIcon() or default_folder_icon
>       if entire_menu:
>         print ("menu \"%s\" \"%s\" {" % (name, icon)).encode(encoding)
>         process_menu(entry)
>@@ -81,16 +90,17 @@
>             (" --root-folder \"%s\"" % entry.getPath(org=True)) +
>             (" --terminal \"%s\"" % terminal) +
>             (" --default-folder-icon \"%s\"" % default_folder_icon) +
>-            (" --default-entry-icon \"%s\"" % default_entry_icon) +
>-            (" --theme \"%s\"" % xdg.Config.icon_theme) +
>-            (with_theme_paths and " --with-theme-paths" or "")).encode(encoding),
>+            (" --default-entry-icon \"%s\"" % default_entry_icon)).encode(encoding),
>         if locale_str:
>           print (" --locale \"%s\"" % locale_str).encode(encoding),
>         print
>     elif isinstance(entry, xdg.Menu.MenuEntry):
>       de = entry.DesktopEntry
>       name = de.getName() or entry.DesktopFileID
>-      icon = find_icon(de) or default_entry_icon
>+      if use_icons:
>+        icon = findIcon(de.getIcon(), theme) or default_entry_icon
>+      else:
>+        icon = de.getIcon() or default_entry_icon
>       execute = exec_clean2_re.sub('%', exec_clean1_re.sub('', de.getExec()))
>       if de.getTerminal(): execute = terminal % execute      
>       print ("prog \"%s\" \"%s\" %s" % (name, icon, execute)).encode(encoding)
>@@ -98,7 +108,8 @@
> try: opts, args = getopt.getopt(sys.argv[1:], "", 
>   ("help", "version", "locale=",
>    "root-folder=", "terminal=", "default-folder-icon=", 
>-   "default-entry-icon=", "entire-menu", "theme=", "with-theme-paths"))
>+   "default-entry-icon=", "entire-menu", "theme=", "with-icons",
>+   "icon-size="))
> except getopt.GetoptError: print_usage()
> 
> locale.setlocale(locale.LC_ALL, "")
>@@ -111,9 +122,10 @@
>   elif o == "--terminal": terminal = v
>   elif o == "--default-folder-icon": default_folder_icon = v
>   elif o == "--default-entry-icon": default_entry_icon = v
>-  elif o == "--entire-menu" : entire_menu = True
>-  elif o == "--with-theme-paths" : with_theme_paths = True
>-  elif o == "--theme" : xdg.Config.setIconTheme(v)
>+  elif o == "--entire-menu" : entire_menu = 1
>+  elif o == "--with-icons" : use_icons = 1
>+  elif o == "--icon-size" : icon_size = int(v)
>+  elif o == "--theme" : theme = v
>   elif o in ("-h", "-?", "--help"): print_usage(0)
>   elif o in ("-v", "--version"): print_version()
>

Actions: View | Diff

Attachments on bug 222521: 145738 | 145744 | 146086 | 146500 | 146523