* updated docs

* added a schema


git-svn-id: file:///home/lennart/svn/public/service-discovery-applet/trunk@13 3be567f1-68ff-0310-b24a-ad7cc433fd2f

1 files changed, 21 insertions, 13 deletions

diff --git a/src/service-discovery-applet.in b/src/service-discovery-applet.in
index 54cb45e..14d3668 100755
--- a/src/service-discovery-applet.in
+++ b/src/service-discovery-applet.in
@@ -27,22 +27,30 @@ import sys
 import pygtk
 pygtk.require('2.0')
 
+def error_msg(msg):
+    d = gtk.MessageDialog(parent=None, flags=gtk.DIALOG_MODAL,
+                          type=gtk.MESSAGE_ERROR, buttons=gtk.BUTTONS_OK)
+    d.set_markup(msg)
+    d.show_all()
+    d.run()
+    d.destroy()
+    
 try:
-    import avahi, gobject, dbus
+    import avahi
+    import dbus
+    import gtk
+    import gnomeapplet
+    import gnome.ui
+    from gconf import client, client_get_default
 except ImportError:
-    print "Sorry, to use this tool you need to install Avahi, pygtk and python-dbus."
-    sys.exit(1)
+    error_msg("Sorry, to use this tool you need to install Avahi, pygtk and python-dbus.")
+
 
 try:
     import dbus.glib
 except ImportError, e:
     pass
 
-import gtk
-import gnomeapplet
-import gnome
-import gnome.ui
-import gconf
 
 # Gconf Paths
 gc_options = "/apps/service-discovery-applet/options"
@@ -68,7 +76,6 @@ zc_pretty_name = {'_ssh._tcp' : 'SSH Servers',
 menuZC = gtk.ImageMenuItem()
 menubar = gtk.MenuBar()
 
-
 def siocgifname(interface):
     global server
     
@@ -225,7 +232,7 @@ def on_change_background(panelapplet, backgroundtype, color, pixmap):
 #	s3.bg_pixmap[gtk.STATE_NORMAL] = pixmap
 
     if backgroundtype == gnomeapplet.COLOR_BACKGROUND:
-	print "COLOR_BACKGROUP"
+	print "COLOR_BACKGROUND"
 
     if backgroundtype == gnomeapplet.NO_BACKGROUND:
 	print "NO_BACKGROUND"
@@ -342,10 +349,10 @@ def ServiceDiscoveryApplet_factory(applet, iid):
     gc_client.notify_add (gc_services, gc_services_cb,None)
 
     # Applet MenuItem
-    menuZC = gtk.ImageMenuItem()
-    menuZC.add(gtk.Label('ZeroConf'))
     image = gtk.Image()
     image.set_from_file("@iconsdir@/24x24/service-discovery-applet.png")
+    menuZC = gtk.ImageMenuItem()
+    menuZC.add(gtk.Label('ZeroConf'))
     menuZC.set_image(image)
     menuZC.set_right_justified(True)
     menuZC.set_submenu(service_menu);
@@ -367,8 +374,9 @@ def ServiceDiscoveryApplet_factory(applet, iid):
     menubar.add(menuZC)
 
     #expand the applet with the panel
-#    applet.connect("change_background", on_change_background)
+    applet.connect("change_background", on_change_background)
     applet.set_applet_flags(gnomeapplet.EXPAND_MINOR)
+    #applet.add(menuZC)
     applet.add(menubar)
     applet.show_all()