Merge lp:~onox/awn-extras/common-folder-applet into lp:awn-extras

[onox]

New applet called Common Folder Launcher. Currently it displays an icon that links to the Home Folder, to Desktop, and to all bookmarks. The appropriate icon is used for XDG directories. I wrote this applet because file-browser-launcher didn't show the appropriate icons for XDG folders, is too much code and requires configuration. Although this applet has less features, it has much less code (98 SLOC compared to f-b-l's 1255 SLOC) and needs no configuration.

- Currently assumes ~/Desktop exists (should treat it as an XDG folder)
- Also does not handle custom icons (people rarely use this, and nautilus does not handle it either in the side pane, only in the main pane) I could add support for it
- If the folder of a local location is created/removed the whole applet gets rebuild instead of inserting/removing the specific icon. This is a minor thing, and the rebuilding process looks OK already. Changing it requires keeping track of positions of icons in the icon box in awnlib, so it could be high cost for little gain if this gets added. The applet also gets rebuild completely when ~/.gtk-bookmarks is modified, and both events rarely occur

[Alberto Aldegheri (albyrock87)]

- class Icons is an awnlib's feature, so (imho) it should implement a "remove(icon)" method

- class Icons: add(self, icon_name, tooltip_text) should be add(self, icon_name, tooltip_text, connect_applet_context_menu = True), for example IndicatorApplet has multiple icons, but different popups menu.

[Gabor Karsay (gabor-karsay)]

I'm not in the position to review python code, just installed it and it works fine. There is an error though on command line:

/usr/local/lib/python2.6/dist-packages/awn/extras/awnlib.py:1478: Warning: g_object_unref: assertion `G_IS_OBJECT (object)' failed
  gtk.main()

Is this the reason for the TODO you added in awnlibs init_start (line 1468)?

Is this applet meant as a replacement for the Places applet? Just asking, because a while ago I did some experiments with Cairo Menu that allow a standalone Places menu (haven't uploaded it yet).

[Gabor Karsay (gabor-karsay)]

One more thing: Clicking on remote bookmarks (ftp in this case) gives me:
Error when opening: The specified location is not mounted

[onox (onox)]

> - class Icons is an awnlib's feature, so (imho) it should implement a
> "remove(icon)" method
>
> - class Icons: add(self, icon_name, tooltip_text) should be add(self,
> icon_name, tooltip_text, connect_applet_context_menu = True), for example
> IndicatorApplet has multiple icons, but different popups menu.

Good point, I'll see about adding it.

> I'm not in the position to review python code, just installed it and it works
> fine. There is an error though on command line:
>
> /usr/local/lib/python2.6/dist-packages/awn/extras/awnlib.py:1478: Warning:
> g_object_unref: assertion `G_IS_OBJECT (object)' failed
> gtk.main()

I don't know what's causing that warning. Seems to be generated somewhere deep in C code.

> Is this the reason for the TODO you added in awnlibs init_start (line 1468)?

No, the TODO is about that for single icon applets you can set the icon to the name "dialog-error". With multiple-icons applets, this is not so simple, perhaps I could remove all icons in the icon box and then add a new icon with the name "dialog-error"

> Is this applet meant as a replacement for the Places applet? Just asking,
> because a while ago I did some experiments with Cairo Menu that allow a
> standalone Places menu (haven't uploaded it yet).

You could see it as something similar to Places. Places shows one icon here though (and an ugly pop-up menu if you click on the icon), and an ugly preferences window.

> One more thing: Clicking on remote bookmarks (ftp in this case) gives me:
> Error when opening: The specified location is not mounted

This is the same as with yama, because lda doesn't mount automatically like pyxdg did (which yama used to use). mhr3 has a potential fix for the gio vfs backend of lda.

[Alberto Aldegheri (albyrock87)]

> With multiple-icons applets, this is not so simple,
> perhaps I could remove all icons in the icon box and then add a new icon with
> the name "dialog-error"
Yes, this is a good idea! :D

> You could see it as something similar to Places. Places shows one icon here
> though (and an ugly pop-up menu if you click on the icon), and an ugly
> preferences window.
I like f-b-l!!!!
I'll switch to "Common Folders" only if it'll have the possibility to choose which icons to show..

[Michal Hruby (mhr3)]

As always with applets that duplicate functionality of other applets I don't like it. As you alone said, currently the applet doesn't really provide any benefits to f-b-l, besides that it doesn't do configuration (which is a questionable "benefit"). IMO it'd be much better to fix fbl issues, than to write completely new applet, and when you do write completely new applet, it should try to replace said applet, ie. provide feature-parity or at least other significant benefits (like being faster/more mem efficient etc)...

But ultimately this has been practised for quite some time in extras, so I'll leave the merging up to you...

review: Abstain

[lp:~onox/awn-extras/common-folder-applet]

1392. By onox on 2010-09-16

Merge from trunk

1393. By onox on 2010-09-16

awnlib: add utility function is_required_version

1394. By onox on 2010-09-16

common-folder: display XDG user special folders (if python glib version is at least 2.18.0)

[onox (onox)]

The applet now displays the XDG user special folders if they exist. Desktop folder is now also treated as an XDG special folder.

> > You could see it as something similar to Places. Places shows one icon here
> > though (and an ugly pop-up menu if you click on the icon), and an ugly
> > preferences window.
> I like f-b-l!!!!
> I'll switch to "Common Folders" only if it'll have the possibility to choose
> which icons to show..

It's purpose is to show icons for the XDG user special folders and the bookmarks.

[lp:~onox/awn-extras/common-folder-applet]

1395. By onox on 2010-09-17

awnlib: add documentation to is_required_version

1396. By onox on 2010-09-17

awnlib: add remove procedure in class Icons and add context_menu parameter to add procedure

1397. By onox on 2010-09-17

Merge from trunk

=== modified file 'applets/Makefile.am'
--- applets/Makefile.am	2010-07-04 19:43:41 +0000
+++ applets/Makefile.am	2010-09-17 17:39:43 +0000
@@ -65,6 +65,7 @@
 	maintained/battery \
 	maintained/cairo-clock \
 	maintained/comics \
+	maintained/common-folder \
 	maintained/cpufreq \
 	maintained/dialect \
 	maintained/digital-clock \

=== added directory 'applets/maintained/common-folder'
=== added file 'applets/maintained/common-folder/Makefile.am'
--- applets/maintained/common-folder/Makefile.am	1970-01-01 00:00:00 +0000
+++ applets/maintained/common-folder/Makefile.am	2010-09-17 17:39:43 +0000
@@ -0,0 +1,3 @@
+APPLET_NAME = common-folder
+APPLET_MAIN_FILE = common-folder.py
+include $(top_srcdir)/Makefile.python-applet

=== added file 'applets/maintained/common-folder/common-folder.desktop.in'
--- applets/maintained/common-folder/common-folder.desktop.in	1970-01-01 00:00:00 +0000
+++ applets/maintained/common-folder/common-folder.desktop.in	2010-09-17 17:39:43 +0000
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+X-AWN-Type=Applet
+X-AWN-AppletType=Python
+_Name=Common Folder Launcher
+_Comment=Launcher for common folders and bookmarks
+Exec=awn-applet -p %k
+X-AWN-AppletExec=common-folder/common-folder.py
+Icon=folder
+X-AWN-AppletCategory=Utility

=== added file 'applets/maintained/common-folder/common-folder.py'
--- applets/maintained/common-folder/common-folder.py	1970-01-01 00:00:00 +0000
+++ applets/maintained/common-folder/common-folder.py	2010-09-17 17:39:43 +0000
@@ -0,0 +1,176 @@
+#!/usr/bin/python
+# Copyright (C) 2010  onox <[e-mail]>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, version 3 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import with_statement
+
+import os
+import re
+from urllib import unquote
+
+import pygtk
+pygtk.require("2.0")
+import gtk
+
+from awn.extras import _, awnlib, __version__
+from desktopagnostic import fdo, vfs
+
+import gio
+import glib
+
+applet_name = _("Common Folder Launcher")
+applet_description = _("Applet to launch common folders and bookmarks")
+
+# Applet's themed icon, also shown in the GTK About dialog
+applet_logo = "folder"
+
+# Describes the pattern used to try to decode URLs
+url_pattern = re.compile("^[a-z]+://(?:[^@]+@)?([^/]+)/(.*)$")
+
+user_path = os.path.expanduser("~/")
+bookmarks_file = os.path.expanduser("~/.gtk-bookmarks")
+
+pyglib_ok = awnlib.is_required_version(glib.pyglib_version, (2, 18, 0))
+
+if pyglib_ok:
+    # Ordered sequence of XDG user special folders
+    user_dirs = [glib.USER_DIRECTORY_DOCUMENTS,
+                 glib.USER_DIRECTORY_MUSIC,
+                 glib.USER_DIRECTORY_PICTURES,
+                 glib.USER_DIRECTORY_VIDEOS,
+                 glib.USER_DIRECTORY_DOWNLOAD,
+                 glib.USER_DIRECTORY_PUBLIC_SHARE,
+                 glib.USER_DIRECTORY_TEMPLATES]
+    xdg_user_uris = ["file://%s" % glib.get_user_special_dir(dir) for dir in user_dirs]
+else:
+    xdg_user_uris = []
+
+
+class CommonFolderApplet:
+
+    """Applet to launch common folders and bookmarks.
+
+    """
+
+    def __init__(self, applet):
+        self.applet = applet
+
+        self.__monitors = []
+
+        self.icon_theme = gtk.icon_theme_get_default()
+
+        # Monitor bookmarks file for changes
+        self.__bookmarks_monitor = gio.File(bookmarks_file).monitor_file()  # keep a reference to avoid getting it garbage collected
+        def bookmarks_changed_cb(monitor, file, other_file, event):
+            if event == gio.FILE_MONITOR_EVENT_CHANGES_DONE_HINT:
+                self.rebuild_icons()
+        self.__bookmarks_monitor.connect("changed", bookmarks_changed_cb)
+
+        self.rebuild_icons()
+
+    def rebuild_icons(self):
+        glib.idle_add(self.add_folders_and_bookmarks)
+
+    def add_folders_and_bookmarks(self):
+        self.applet.icons.destroy_all()
+
+        # Destroy all current local bookmark monitors
+        for monitor in self.__monitors:
+            monitor.cancel()
+        self.__monitors = []
+
+        self.add_folder_icon(_("Home Folder"), "user-home", "file://%s" % user_path)
+
+        if pyglib_ok:
+            # Add Desktop
+            desktop_path = glib.get_user_special_dir(glib.USER_DIRECTORY_DESKTOP)
+            if desktop_path != user_path:
+                self.add_folder_icon(glib.filename_display_basename(desktop_path), "user-desktop", "file://%s" % desktop_path)
+
+        # Add XDG user special folders
+        for uri in xdg_user_uris:
+            self.add_url_name(uri)
+
+        # Add bookmarks
+        if os.path.isfile(bookmarks_file):
+            with open(bookmarks_file) as f:
+                for url_name in (i.rstrip().split(" ", 1) for i in f):
+                    if url_name[0] not in xdg_user_uris:
+                        self.add_url_name(*url_name)
+
+    def add_url_name(self, uri, name=None):
+        if name is None:
+            match = url_pattern.match(uri)
+            if match is not None:
+                name = "/%s on %s" % (match.group(2), match.group(1))
+            else:
+                basename = glib.filename_display_basename(uri)
+                name = unquote(str(basename))
+
+        if uri.startswith("file://"):
+            file = vfs.File.for_uri(uri)
+            monitor = file.monitor()
+            self.__monitors.append(monitor)
+            monitor.connect("changed", self.file_changed_cb)
+
+            if not file.exists():
+                return
+
+            file = gio.File(uri)
+            info = file.query_info(gio.FILE_ATTRIBUTE_STANDARD_ICON, gio.FILE_QUERY_INFO_NONE)
+            icon = self.get_icon_name(info.get_attribute_object(gio.FILE_ATTRIBUTE_STANDARD_ICON))
+        else:
+            icon = "folder-remote"
+
+        self.add_folder_icon(name, icon, uri)
+
+    def add_folder_icon(self, label, icon_name, uri):
+        icon = self.applet.icons.add(icon_name, label)
+        icon.connect("clicked", self.icon_clicked_cb, uri)
+
+    def icon_clicked_cb(self, widget, uri):
+        file = vfs.File.for_uri(uri)
+
+        if file is not None and (not uri.startswith("file://") or file.exists()):
+            try:
+                file.launch()
+            except glib.GError, e:
+                print "Error when opening: %s" % e
+        else:
+            print "File at URI not found (%s)" % uri
+
+    def get_icon_name(self, icon):
+        if gio.pygio_version >= (2, 17, 0) and isinstance(icon, gio.EmblemedIcon):
+            icon = icon.get_icon()
+
+        if isinstance(icon, gio.ThemedIcon):
+            return filter(self.icon_theme.has_icon, icon.get_names())[0]
+        elif isinstance(icon, gio.FileIcon):
+            return icon.get_file().get_path()
+
+    def file_changed_cb(self, monitor, file, other_file, event):
+        if event in (vfs.FILE_MONITOR_EVENT_CREATED, vfs.FILE_MONITOR_EVENT_DELETED):
+            self.rebuild_icons()
+
+
+if __name__ == "__main__":
+    awnlib.init_start(CommonFolderApplet, {"name": applet_name,
+        "short": "common-folder",
+        "version": __version__,
+        "description": applet_description,
+        "theme": applet_logo,
+        "author": "onox",
+        "copyright-year": 2010,
+        "authors": ["onox <[e-mail]>"]},
+        ["multiple-icons"])

=== modified file 'applets/maintained/hardware-sensors/hardware-sensors.py'
--- applets/maintained/hardware-sensors/hardware-sensors.py	2010-08-19 20:27:00 +0000
+++ applets/maintained/hardware-sensors/hardware-sensors.py	2010-09-17 17:39:43 +0000
@@ -88,7 +88,7 @@
             print subject + ".", message
 
             # Show massage with awn notify
-            self.applet.notify.send(subject=subject, body=message, icon=applet_logo)
+            self.applet.notification.send(subject=subject, body=message, icon=applet_logo)
             # Show "no sensors found" icon
             self.applet.icon.file(no_sensors_icon, size=applet.get_size())
             self.applet.tooltip.set(message)
@@ -606,7 +606,7 @@
     # === Event handlers === #
     def alarm_cb(self, sensor, message):
         """Show alarm message with awn notify."""
-        self.applet.notify.send(subject=None, body=message, icon=applet_logo)
+        self.applet.notification.send(subject=None, body=message, icon=applet_logo)
 
     def height_changed_cb(self):
         """Update the applet's icon to reflect the new height."""

=== modified file 'applets/maintained/mail/mail.py'
--- applets/maintained/mail/mail.py	2010-09-15 19:35:16 +0000
+++ applets/maintained/mail/mail.py	2010-09-17 17:39:43 +0000
@@ -135,7 +135,7 @@
             else:
                 self.awn.dialog.toggle("main", "hide")
 
-                self.awn.notify.send(_("Mail Applet"),
+                self.awn.notification.send(_("Mail Applet"),
                     _("Logging in as %s") % key.attrs["username"],
                     self.__getIconPath("login"))
 
@@ -157,7 +157,7 @@
             self.awn.theme.icon("error")
 
             if self.awn.settings["show-network-errors"]:
-                self.awn.notify.send(_("Network error - Mail Applet"), str(e), "")
+                self.awn.notification.send(_("Network error - Mail Applet"), str(e), "")
             return
 
         diffSubjects = [i for i in self.mail.subjects if i not in oldSubjects]
@@ -166,7 +166,7 @@
             msg = strMailMessages(len(diffSubjects)) + ":\n" + \
                                                         "\n".join(diffSubjects)
 
-            self.awn.notify.send(_("New Mail - Mail Applet"), msg,
+            self.awn.notification.send(_("New Mail - Mail Applet"), msg,
                                  self.__getIconPath("mail-unread"))
 
         self.awn.tooltip.set(strMessages(len(self.mail.subjects)))

=== modified file 'applets/maintained/weather/weather.py'
--- applets/maintained/weather/weather.py	2010-08-22 20:52:26 +0000
+++ applets/maintained/weather/weather.py	2010-09-17 17:39:43 +0000
@@ -202,7 +202,7 @@
         self.reset_weather_data()
 
         self.network_handler = self.NetworkHandler()
-        self.notification = applet.notify.create_notification(_("Network error in Weather"), network_error_message, "dialog-warning", 20)
+        self.notification = applet.notification.create(_("Network error in Weather"), network_error_message, "dialog-warning", 20)
 
         self.setup_context_menu()
 

=== modified file 'configure.ac'
--- configure.ac	2010-09-14 23:02:26 +0000
+++ configure.ac	2010-09-17 17:39:43 +0000
@@ -319,6 +319,7 @@
 applets/maintained/cairo-menu/cairo-menu.desktop.in
 applets/maintained/calendar/Makefile
 applets/maintained/comics/Makefile
+applets/maintained/common-folder/Makefile
 applets/maintained/cpufreq/Makefile
 applets/maintained/dialect/Makefile
 applets/maintained/digital-clock/Makefile

=== modified file 'shared/python/awnlib.py'
--- shared/python/awnlib.py	2010-09-15 19:32:37 +0000
+++ shared/python/awnlib.py	2010-09-17 17:39:43 +0000
@@ -73,6 +73,19 @@
     combobox.add_attribute(text, "text", 0)
 
 
+def is_required_version(version, required_version):
+    """Return True if version is higher than or equal to
+    required_version, False otherwise.
+
+    """
+    for i, j in zip(version, required_version):
+        if i > j:
+            return True
+        elif i < j:
+            return False
+    return True
+
+
 class KeyRingError:
 
     def __init__(self, str):
@@ -114,6 +127,7 @@
             self.menu.append(about_item)
             about_item.connect("activate", lambda w: self.toggle("about"))
 
+    def connect_signals(self, parent):
         def popup_menu_cb(widget, event):
             self.toggle("menu", once=True, event=event)
         parent.connect("context-menu-popup", popup_menu_cb)
@@ -223,8 +237,7 @@
         assert dialog in self.__register, "Dialog '%s' must be registered" % dialog
 
         if dialog == "menu":
-            self.__register["menu"].show_all()
-            self.__parent.popup_gtk_menu(self.__register["menu"], event.button, event.time)
+            self.show_menu(self.__parent, event)
         elif dialog == "about":
             self.__register["about"].show()
             self.__register["about"].deiconify()
@@ -253,6 +266,10 @@
                 if dialog == "preferences":
                     self.__register[dialog].deiconify()
 
+    def show_menu(self, parent, event):
+        self.__register["menu"].show_all()
+        parent.popup_gtk_menu(self.__register["menu"], event.button, event.time)
+
     def hide(self):
         """Hide the currently visible dialog.
 
@@ -283,8 +300,16 @@
                 self.update_logo_icon()
                 parent.connect_size_changed(self.update_logo_icon)
             elif "theme" in parent.meta:
-                self.update_theme_icon()
-                parent.connect_size_changed(self.update_theme_icon)
+                if parent.meta.has_option("multiple-icons"):
+                    self._logo_icon = awn.ThemedIcon()
+                    self._logo_icon.set_info_simple(parent.meta["short"], \
+                        parent.get_uid(), parent.meta["theme"])
+
+                    self.update_theme_icons()
+                    parent.connect_size_changed(self.update_theme_icons)
+                else:
+                    self.update_theme_icon()
+                    parent.connect_size_changed(self.update_theme_icon)
 
             # Connect some signals to be able to hide the window
             self.connect("response", self.response_event)
@@ -312,6 +337,13 @@
             self.set_icon(self.__parent.get_icon() \
                 .get_icon_at_size(self.__parent.get_size()))
 
+        def update_theme_icons(self):
+            """Updates the logo to be of the same height as the panel.
+
+            """
+            self.set_icon(self._logo_icon \
+                .get_icon_at_size(self.__parent.get_size()))
+
     class AboutDialog(BaseDialog, gtk.AboutDialog):
 
         """Applet's About dialog.
@@ -345,7 +377,10 @@
             elif "theme" in parent.meta:
                 # It is assumed that the C{awn.Icons}
                 # object has been set via set_awn_icon() in C{Icon}
-                self.set_logo(parent.get_icon().get_icon_at_size(48))
+                if parent.meta.has_option("multiple-icons"):
+                    self.set_logo(self._logo_icon.get_icon_at_size(48))
+                else:
+                    self.set_logo(parent.get_icon().get_icon_at_size(48))
 
     class PreferencesDialog(BaseDialog, gtk.Dialog):
 
@@ -407,7 +442,7 @@
     def set(self, text):
         """Set the applet tooltip.
 
-        @param text: The new tooltip text. Defaults to "".
+        @param text: The new tooltip text.
         @type text: C{string}
 
         """
@@ -435,7 +470,6 @@
 
         # Set the themed icon to set the C{awn.Icons} object
         if "theme" in parent.meta:
-            # TODO does not handle multiple icons yet
             self.theme(parent.meta["theme"])
 
     def file(self, file, set=True, size=None):
@@ -532,6 +566,85 @@
         self.__parent.get_icon().override_gtk_theme(theme)
 
 
+class Icons:
+
+    def __init__(self, parent):
+        """Create a new Icons object.
+
+        @param parent: The parent applet of the icons instance.
+        @type parent: L{Applet}
+
+        """
+        self.__parent = parent
+
+        self.__icon_box = awn.IconBox(parent)
+        parent.add(self.__icon_box)
+
+        def update_size():
+            size = self.__parent.get_size()
+            for icon in self.__icon_box.get_children():
+                icon.set_size(size)
+
+        parent.connect_size_changed(update_size)
+
+    def add(self, icon_name, tooltip_text, context_menu=None):
+        """Set an icon from the default icon theme and set the applet
+        tooltip. Optionally provide a context menu that should be
+        displayed instead of the applet's standard context menu. The
+        resultant themed icon will be returned.
+
+        @param icon_name: The name of the theme icon.
+        @type icon_name: C{string}
+        @param tooltip_text: The new tooltip text.
+        @type tooltip_text: C{string}
+        @param context_menu: Optional context menu.
+        @type context_menu: C{gtk.Menu} or C{None}
+        @return: The resultant themed icon
+        @rtype: C{awn.ThemedIcon}
+
+        """
+        icon = awn.ThemedIcon()
+        icon.set_info_simple(self.__parent.meta["short"], self.__parent.get_uid(), icon_name)
+        icon.set_tooltip_text(tooltip_text)
+        icon.set_size(self.__parent.get_size())
+
+        # Callback context menu
+        if context_menu is None:
+            def popup_menu_cb(widget, event):
+                self.__parent.dialog.show_menu(widget, event)
+            icon.connect("context-menu-popup", popup_menu_cb)
+        else:
+            assert isinstance(context_menu, gtk.Menu)
+
+            def popup_menu_cb(widget, event, menu):
+                menu.show_all()
+                widget.popup_gtk_menu(menu, event.button, event.time)
+            icon.connect("context-menu-popup", popup_menu_cb, context_menu)
+
+        icon.show_all()
+        self.__icon_box.add(icon)
+        return icon
+
+    def remove(self, icon):
+        """Remove the specified icon from the applet. The icon will not
+        be destroyed.
+
+        @param icon: The icon to be removed.
+        @type icon: C{awn.ThemedIcon}
+
+        """
+        assert isinstance(icon, awn.ThemedIcon)
+
+        self.__icon_box.remove(icon)
+
+    def destroy_all(self):
+        """Remove and destroy all icons in the applet.
+
+        """
+        for icon in self.__icon_box.get_children():
+            icon.destroy()
+
+
 class Errors:
 
     def __init__(self, parent):
@@ -694,7 +807,7 @@
 
         """
         type_parent = type(parent)
-        if type_parent in (Applet, config.Client):
+        if type_parent in (AppletSimple, AppletMultiple, config.Client):
             self.__folder = config.GROUP_DEFAULT
         elif type_parent is str:
             self.__folder = parent
@@ -788,7 +901,7 @@
             type_client = type(client)
             if client is None:
                 self.__client = awn.config_get_default(awn.PANEL_ID_DEFAULT)
-            elif type_client is Applet:
+            elif type_client is AppletSimple or type_client is AppletMultiple:
                 self.__client = awn.config_get_default_for_applet(client)
 
                 def applet_deleted_cb(applet):
@@ -1220,7 +1333,7 @@
         notification = self.Notification(self.__parent, *args, **kwargs)
         notification.show()
 
-    def create_notification(self, *args, **kwargs):
+    def create(self, *args, **kwargs):
         """Return a notification that can be shown via show().
 
         @param subject: The subject of your message. If blank, "Message from
@@ -1310,56 +1423,87 @@
         return key in self.__info
 
 
-class Applet(awn.AppletSimple, object):
-
-    def __init__(self, uid, panel_id, meta={}, options=[]):
+def _getmodule(module):
+    """Return a getter that lazy-loads a module, represented by a
+    single instantiated class.
+
+    @param module: The class of the module to initialize and get
+    @type module: C{class}
+
+    """
+    instance = {}
+
+    def getter(self):
+        key = (self, module)
+        if key not in instance:
+            instance[key] = module(self)
+        return instance[key]
+    return property(getter)
+
+
+class Applet(object):
+
+    def __init__(self, meta, options):
         """Create a new instance of the Applet object.
 
-        @param uid: The unique identifier of the applet
-        @type uid: C{string}
-        @param orient: The orientation of the applet. 0 means that the AWN bar
-            is on the bottom of the screen.
-        @type orient: C{int}
-        @param height: The height of the applet.
-        @type height: C{int}
         @param meta: The meta information to be passed to the Meta constructor
         @type meta: C{dict}
 
         """
+        # Create all required child-objects, others will be lazy-loaded
+        self.meta = Meta(self, meta, options)
+
+    def connect_size_changed(self, callback):
+        self.connect("size-changed", lambda w, e: callback())
+
+    settings = _getmodule(Settings)
+    timing = _getmodule(Timing)
+    keyring = _getmodule(Keyring)
+    notification = _getmodule(Notify)
+
+
+class AppletSimple(awn.AppletSimple, Applet):
+
+    def __init__(self, uid, panel_id, meta={}, options=[]):
+        """Create a new instance of the AppletSimple object.
+
+        @param uid: The unique identifier of the applet
+        @type uid: C{string}
+        @param panel_id: Identifier of the panel in which the applet resides.
+        @type panel_id: C{int}
+
+        """
         awn.AppletSimple.__init__(self, meta["short"], uid, panel_id)
+        Applet.__init__(self, meta, options)
 
         # Create all required child-objects, others will be lazy-loaded
-        self.meta = Meta(self, meta, options)
         self.icon = Icon(self)
         self.tooltip = Tooltip(self)
         self.dialog = Dialogs(self)
 
-    def connect_size_changed(self, callback):
-        self.connect("size-changed", lambda w, e: callback())
-
-    def __getmodule(module):
-        """Return a getter that lazy-loads a module, represented by a
-        single instantiated class.
-
-        @param module: The class of the module to initialize and get
-        @type module: C{class}
+        self.dialog.connect_signals(self)
+
+    theme = _getmodule(Theme)
+    errors = _getmodule(Errors)
+
+
+class AppletMultiple(awn.Applet, Applet):
+
+    def __init__(self, uid, panel_id, meta={}, options=[]):
+        """Create a new instance of the AppletMultiple object.
+
+        @param uid: The unique identifier of the applet
+        @type uid: C{string}
+        @param panel_id: Identifier of the panel in which the applet resides.
+        @type panel_id: C{int}
 
         """
-        instance = {}
-
-        def getter(self):
-            key = (self, module)
-            if key not in instance:
-                instance[key] = module(self)
-            return instance[key]
-        return property(getter)
-
-    settings = __getmodule(Settings)
-    theme = __getmodule(Theme)
-    timing = __getmodule(Timing)
-    errors = __getmodule(Errors)
-    keyring = __getmodule(Keyring)
-    notify = __getmodule(Notify)
+        awn.Applet.__init__(self, meta["short"], uid, panel_id)
+        Applet.__init__(self, meta, options)
+
+        # Create all required child-objects, others will be lazy-loaded
+        self.icons = Icons(self)
+        self.dialog = Dialogs(self)
 
 
 def init_start(applet_class, meta={}, options=[]):
@@ -1385,15 +1529,22 @@
     gobject.threads_init()
 
     awn.init(sys.argv[1:])
-    applet = Applet(awn.uid, awn.panel_id, meta, options)
+    if "multiple-icons" in options:
+        applet = AppletMultiple(awn.uid, awn.panel_id, meta, options)
+    else:
+        applet = AppletSimple(awn.uid, awn.panel_id, meta, options)
 
     try:
         applet_class(applet)
     except Exception, e:
-        applet.errors.set_error_icon_and_click_to_restart()
-        import traceback
-        traceback = traceback.format_exception(type(e), e, sys.exc_traceback)
-        applet.errors.general(e, traceback=traceback, callback=gtk.main_quit)
+        # TODO don't know what to do for multiple-icons applets
+        if "multiple-icons" not in options:
+            applet.errors.set_error_icon_and_click_to_restart()
+            import traceback
+            traceback = traceback.format_exception(type(e), e, sys.exc_traceback)
+            applet.errors.general(e, traceback=traceback, callback=gtk.main_quit)
+        else:
+            raise
 
     awn.embed_applet(applet)
     gtk.main()