- some UI cleanupHEADmaster

- changed COMPIZ_LAUNCHER to compiz-fusion-gtk

1 files changed, 24 insertions, 15 deletions

diff --git a/fusion-desktop-effects.in b/fusion-desktop-effects.in
index c8853c5..eeab718 100755
--- a/fusion-desktop-effects.in
+++ b/fusion-desktop-effects.in
@@ -14,7 +14,7 @@ _ = gettext.gettext
 
 gettext.bindtextdomain("fusion-desktop-effects", "@prefix@/share/locale")
 gettext.textdomain("fusion-desktop-effects")
-COMPIZ_LAUNCHER = "compiz-manager"
+COMPIZ_LAUNCHER = "compiz-fusion-gtk"
 COMPIZ_WM = "compiz-fusion-gtk"
 WM_KEY = "/desktop/gnome/session/required_components/windowmanager"
 BANNER = "@datadir@/cf_logo.png"
@@ -62,17 +62,18 @@ class MainWindow:
           self.togglebutton.connect('toggled',self.on_toggle)
 
 
-          heading = gtk.Label(_("<b>Desktop Effects</b>"))
-          heading.set_use_markup(True)
-          heading.set_alignment(0,0)
-          hbox = gtk.HBox(homogeneous=False,spacing=0)
-          self.window.vbox.pack_start(hbox,padding=10)
-          vbox = gtk.VBox(homogeneous=False,spacing=0)
+          framelabel = gtk.Label(_("<b>Desktop Effects</b>"))
+          framelabel.set_use_markup(True)
+          frame = gtk.Frame()
+          frame.set_label_widget(framelabel)
+          hbox = gtk.HBox()
+          self.window.vbox.pack_start(hbox)
+          vbox = gtk.VBox()
 
           img = gtk.Image()
           img.set_from_file(BANNER)
 
-          integrationbutton = gtk.CheckButton('Enable desktop integration')
+          integrationbutton = gtk.CheckButton(_('Enable desktop integration'))
           integrationbutton.set_active(self.Context.Integration)
   
           integrationbutton.connect('toggled',self.integration_add_timeout)
@@ -87,10 +88,18 @@ class MainWindow:
           integrationbutton.set_sensitive(allow_integration)
 
           vbox.pack_start(img)
-          hbox.pack_start(vbox,padding=10)
-          vbox.pack_start(heading)
-          vbox.pack_start(self.togglebutton)
-          vbox.pack_start(integrationbutton,padding=5)
+          hbox.pack_start(vbox)
+          vbox.pack_start(frame)
+          vbox2 = gtk.VBox()
+          hbox2 = gtk.HBox()
+          
+          hbox2.pack_start(self.togglebutton,expand=False,fill=False)
+          vbox2.pack_start(hbox2)
+          vbox2.pack_start(integrationbutton,padding=5)
+          alignment = gtk.Alignment(0.5,0.5,1,1)
+          alignment.set_padding(0,0,12,0)
+          alignment.add(vbox2)
+          frame.add(alignment)
 
           prefimg = gtk.Image()
           prefimg.set_from_icon_name('gtk-preferences',1)
@@ -168,14 +177,14 @@ class TimeoutDialog:
           self.window.set_position(gtk.WIN_POS_CENTER_ALWAYS)
           self.window.set_title(_("Keep Settings"))
 
-          mainbox = gtk.HBox(homogeneous=False,spacing=0)
-          self.window.vbox.pack_start(mainbox,padding=10)
+          mainbox = gtk.HBox()
+          self.window.vbox.pack_start(mainbox)
 
           iconimg = gtk.Image()
           iconimg.set_from_icon_name('gtk-dialog-question',6)
           mainbox.pack_start(iconimg,padding=5)
 
-          vbox = gtk.VBox(homogeneous=False,spacing=0)
+          vbox = gtk.VBox()
           heading = gtk.Label(_("<b>Do you want to keep these settings?</b>"))
           heading.set_use_markup(True)
           vbox.pack_start(heading)