diff options
| author | Sebastien Estienne <sebastien.estienne@gmail.com> | 2005-09-02 16:16:06 +0000 |
|---|---|---|
| committer | Sebastien Estienne <sebastien.estienne@gmail.com> | 2005-09-02 16:16:06 +0000 |
| commit | cc47eb76e4ab296367f4e200e769c2a0f2efb5e8 (patch) | |
| tree | c2d922cb6ff2b4f973f80244264084c8c6ed5379 | |
| parent | 06e3c9cd349fbeb0ab9be97146bd8498feacdc26 (diff) | |
* added support for right click menu in the panel
git-svn-id: file:///home/lennart/svn/public/service-discovery-applet/trunk@7 3be567f1-68ff-0310-b24a-ad7cc433fd2f
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rwxr-xr-x | src/service-discovery-applet.in | 26 |
3 files changed, 29 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 3d9ad87..f55e52c 100644 --- a/configure.ac +++ b/configure.ac @@ -4,6 +4,8 @@ AC_CONFIG_SRCDIR([src/service-discovery-applet.in]) AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE([foreign 1.9 -Wall]) +AC_SUBST(VERSION) + AM_MAINTAINER_MODE AM_PATH_PYTHON([2.4]) @@ -17,7 +19,6 @@ AC_SUBST(SCRIPTSDIR) ICONSDIR="${datadir}/${PACKAGE}/icons/" AC_SUBST(ICONSDIR) - AC_CONFIG_FILES([ Makefile common/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 3e6695a..8885425 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -9,6 +9,7 @@ bin_SCRIPTS = $(pythonscripts) service-discovery-applet: service-discovery-applet.in sed \ -e 's,@PYTHON\@,$(PYTHON),g' \ + -e 's,@version\@,$(VERSION),g' \ -e 's,@iconsdir\@,$(ICONSDIR),g' \ -e 's,@scriptsdir\@,$(SCRIPTSDIR),g' \ $< > $@ diff --git a/src/service-discovery-applet.in b/src/service-discovery-applet.in index bb71b9d..d773bfe 100755 --- a/src/service-discovery-applet.in +++ b/src/service-discovery-applet.in @@ -42,6 +42,9 @@ except ImportError, e: import gtk import gnomeapplet import gnome +import gnome.ui + +#from gettext import gettext as _ domain = None @@ -183,6 +186,19 @@ def on_menubar_click(widget, event): return False +def on_about(component, verb, applet): + icon = gtk.Image() + icon.set_from_file("@iconsdir@/service-discovery-applet.png") + + fullname = "Service Discovery Applet" + copyright = "Copyright (C) 2005 Sebastien Estienne" + description = "An applet to quickly access your zeroconf services." + authors = ["Sebastien Estienne <sebastien.estienne@gmail.com>"] + + about = gnome.ui.About(fullname, "@version@", copyright, description, authors, None, None, icon.get_pixbuf()) + about.set_icon(icon.get_pixbuf()) + about.show() + def ServiceDiscoveryApplet_factory(applet, iid): global menuZC, system_bus, server, session_bus, domain, notif @@ -204,7 +220,17 @@ def ServiceDiscoveryApplet_factory(applet, iid): applet.add(menubar) applet.show_all() + # funky right-click menu + menuXml = """ + <popup name="button3"> + <menuitem name="Service Discovery Applet About Item" verb="SDA About" _label="_About" pixtype="stock" pixname="gnome-stock-about"/> + <menuitem name="Service Discovery Applet Configuration Item" verb="SDA Config" _label="_Config" pixtype="stock" pixname="gtk-preferences"/> + </popup> + """ + applet.setup_menu(menuXml, [("SDA About", on_about)], applet) + applet.setup_menu(menuXml, [("SDA Config", on_about)], applet) + system_bus = dbus.SystemBus() server = dbus.Interface(system_bus.get_object(avahi.DBUS_NAME, avahi.DBUS_PATH_SERVER), avahi.DBUS_INTERFACE_SERVER) |