All pastes #982489 Raw Edit

cyberorg

public diff v1 · immutable
·published 2008-04-12 16:52 UTC
rendered paste body
Index: simple-ccsm.glade===================================================================--- simple-ccsm.glade.orig+++ simple-ccsm.glade@@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">-<!--Generated with glade3 3.4.0 on Thu Mar 27 20:37:37 2008 -->+<!--Generated with glade3 3.1.5 on Thu Apr 10 16:11:15 2008 by rodrigo@panticosa--> <glade-interface>   <widget class="GtkWindow" id="mainWin">     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>@@ -13,50 +13,70 @@         <property name="border_width">10</property>         <property name="spacing">12</property>         <child>-          <widget class="GtkHBox" id="hbox3">+          <widget class="GtkVBox" id="vbox2">             <property name="visible">True</property>-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>-            <property name="spacing">5</property>+            <property name="spacing">12</property>             <child>-              <widget class="GtkLabel" id="label11">+              <widget class="GtkCheckButton" id="enableEffects">                 <property name="visible">True</property>-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>-                <property name="label" translatable="yes">Profil:</property>-              </widget>-              <packing>-                <property name="expand">False</property>-                <property name="fill">False</property>-              </packing>-            </child>-            <child>-              <widget class="GtkComboBox" id="profileChooser">-                <property name="visible">True</property>-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>+                <property name="label" translatable="yes">_Enable desktop effects</property>+                <property name="use_underline">True</property>+                <property name="draw_indicator">True</property>               </widget>               <packing>-                <property name="position">1</property>+                <property name="padding">3</property>               </packing>             </child>             <child>-              <widget class="GtkButton" id="applyButton">+              <widget class="GtkHBox" id="hbox1">                 <property name="visible">True</property>-                <property name="can_focus">True</property>-                <property name="receives_default">True</property>                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>-                <property name="response_id">0</property>-                <signal name="clicked" handler="ApplyProfile"/>+                <property name="spacing">5</property>+                <child>+                  <widget class="GtkLabel" id="label1">+                    <property name="visible">True</property>+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>+                    <property name="label" translatable="yes">Profile:</property>+                  </widget>+                  <packing>+                    <property name="expand">False</property>+                    <property name="fill">False</property>+                  </packing>+                </child>                 <child>-                  <widget class="GtkImage" id="image5">+                  <widget class="GtkComboBox" id="profileChooser1">                     <property name="visible">True</property>                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>-                    <property name="stock">gtk-apply</property>                   </widget>+                  <packing>+                    <property name="position">1</property>+                  </packing>+                </child>+                <child>+                  <widget class="GtkButton" id="applyButton1">+                    <property name="visible">True</property>+                    <property name="can_focus">True</property>+                    <property name="receives_default">True</property>+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>+                    <child>+                      <widget class="GtkImage" id="image1">+                        <property name="visible">True</property>+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>+                        <property name="stock">gtk-apply</property>+                      </widget>+                    </child>+                  </widget>+                  <packing>+                    <property name="expand">False</property>+                    <property name="fill">False</property>+                    <property name="position">2</property>+                  </packing>                 </child>               </widget>               <packing>                 <property name="expand">False</property>                 <property name="fill">False</property>-                <property name="position">2</property>+                <property name="position">1</property>               </packing>             </child>           </widget>@@ -80,7 +100,6 @@                   <widget class="GtkFrame" id="descriptionFrame">                     <property name="visible">True</property>                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>-                    <property name="label_xalign">0</property>                     <property name="shadow_type">GTK_SHADOW_NONE</property>                     <child>                       <widget class="GtkAlignment" id="descriptionAlignment">@@ -119,7 +138,6 @@                   <widget class="GtkFrame" id="animationsFrame">                     <property name="visible">True</property>                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>-                    <property name="label_xalign">0</property>                     <property name="shadow_type">GTK_SHADOW_NONE</property>                     <child>                       <widget class="GtkAlignment" id="animationsAlignment">@@ -154,7 +172,6 @@                   <widget class="GtkFrame" id="effectsFrame">                     <property name="visible">True</property>                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>-                    <property name="label_xalign">0</property>                     <property name="shadow_type">GTK_SHADOW_NONE</property>                     <child>                       <widget class="GtkAlignment" id="effectsAlignment">@@ -189,7 +206,6 @@                   <widget class="GtkFrame" id="desktopFrame">                     <property name="visible">True</property>                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>-                    <property name="label_xalign">0</property>                     <property name="shadow_type">GTK_SHADOW_NONE</property>                     <child>                       <widget class="GtkAlignment" id="desktopAlignment">@@ -228,7 +244,6 @@                   <widget class="GtkFrame" id="accessibilityFrame">                     <property name="visible">True</property>                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>-                    <property name="label_xalign">0</property>                     <property name="shadow_type">GTK_SHADOW_NONE</property>                     <child>                       <widget class="GtkAlignment" id="accessibilityAlignment">@@ -285,7 +300,6 @@                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>                     <property name="border_width">6</property>                     <property name="label" translatable="yes">Enable animations</property>-                    <property name="response_id">0</property>                     <property name="draw_indicator">True</property>                     <signal name="toggled" handler="EnableAnimationsChanged"/>                   </widget>@@ -298,7 +312,6 @@                   <widget class="GtkFrame" id="openFrame">                     <property name="visible">True</property>                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>-                    <property name="label_xalign">0</property>                     <property name="shadow_type">GTK_SHADOW_NONE</property>                     <child>                       <widget class="GtkAlignment" id="openAlignment">@@ -338,7 +351,6 @@                   <widget class="GtkFrame" id="closeFrame">                     <property name="visible">True</property>                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>-                    <property name="label_xalign">0</property>                     <property name="shadow_type">GTK_SHADOW_NONE</property>                     <child>                       <widget class="GtkAlignment" id="closeAlignment">@@ -378,7 +390,6 @@                   <widget class="GtkFrame" id="minimizeFrame">                     <property name="visible">True</property>                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>-                    <property name="label_xalign">0</property>                     <property name="shadow_type">GTK_SHADOW_NONE</property>                     <child>                       <widget class="GtkAlignment" id="minimizeAlignment">@@ -442,7 +453,6 @@                   <widget class="GtkFrame" id="switcherFrame">                     <property name="visible">True</property>                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>-                    <property name="label_xalign">0</property>                     <property name="shadow_type">GTK_SHADOW_NONE</property>                     <child>                       <widget class="GtkAlignment" id="switcherAlignment">@@ -481,7 +491,6 @@                   <widget class="GtkFrame" id="additionsFrame">                     <property name="visible">True</property>                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>-                    <property name="label_xalign">0</property>                     <property name="shadow_type">GTK_SHADOW_NONE</property>                     <child>                       <widget class="GtkAlignment" id="additionsAlignment">@@ -500,7 +509,6 @@                                 <property name="can_focus">True</property>                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>                                 <property name="label" translatable="yes">Enable Scale</property>-                                <property name="response_id">0</property>                                 <property name="draw_indicator">True</property>                                 <signal name="toggled" handler="EffectPluginChanged"/>                                 <signal name="toggled" handler="SetEffectRating"/>@@ -516,7 +524,6 @@                                 <property name="can_focus">True</property>                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>                                 <property name="label" translatable="yes">Enable Expo</property>-                                <property name="response_id">0</property>                                 <property name="draw_indicator">True</property>                                 <signal name="toggled" handler="EffectPluginChanged"/>                               </widget>@@ -532,7 +539,6 @@                                 <property name="can_focus">True</property>                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>                                 <property name="label" translatable="yes">Enable Blur</property>-                                <property name="response_id">0</property>                                 <property name="draw_indicator">True</property>                                 <signal name="toggled" handler="EffectPluginChanged"/>                                 <signal name="toggled" handler="SetEffectRating"/>@@ -549,7 +555,6 @@                                 <property name="can_focus">True</property>                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>                                 <property name="label" translatable="yes">Enable Wobbly</property>-                                <property name="response_id">0</property>                                 <property name="draw_indicator">True</property>                                 <signal name="toggled" handler="EffectPluginChanged"/>                                 <signal name="toggled" handler="SetEffectRating"/>@@ -609,7 +614,6 @@                   <widget class="GtkFrame" id="appearanceFrame">                     <property name="visible">True</property>                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>-                    <property name="label_xalign">0</property>                     <property name="shadow_type">GTK_SHADOW_NONE</property>                     <child>                       <widget class="GtkAlignment" id="appearanceAlignment">@@ -647,7 +651,6 @@                   <widget class="GtkFrame" id="desktopColumnsFrame">                     <property name="visible">True</property>                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>-                    <property name="label_xalign">0</property>                     <property name="shadow_type">GTK_SHADOW_NONE</property>                     <child>                       <widget class="GtkAlignment" id="desktopColumnsAlignment">@@ -690,7 +693,6 @@                   <widget class="GtkFrame" id="desktopRowsFrame">                     <property name="visible">True</property>                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>-                    <property name="label_xalign">0</property>                     <property name="shadow_type">GTK_SHADOW_NONE</property>                     <child>                       <widget class="GtkAlignment" id="desktopRowsAlignment">@@ -733,7 +735,6 @@                   <widget class="GtkFrame" id="previewFrame">                     <property name="visible">True</property>                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>-                    <property name="label_xalign">0</property>                     <property name="shadow_type">GTK_SHADOW_NONE</property>                     <child>                       <widget class="GtkAlignment" id="previewAlignment">@@ -791,7 +792,6 @@                   <widget class="GtkFrame" id="enableZoomFrame">                     <property name="visible">True</property>                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>-                    <property name="label_xalign">0</property>                     <property name="shadow_type">GTK_SHADOW_NONE</property>                     <child>                       <widget class="GtkAlignment" id="enableZoomAlignment">@@ -811,7 +811,6 @@                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>                                 <property name="border_width">6</property>                                 <property name="label" translatable="yes">Screen zoom</property>-                                <property name="response_id">0</property>                                 <property name="draw_indicator">True</property>                                 <signal name="toggled" handler="ZoomChanged"/>                               </widget>@@ -827,7 +826,6 @@                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>                                 <property name="border_width">6</property>                                 <property name="label" translatable="yes">Area zoom</property>-                                <property name="response_id">0</property>                                 <property name="draw_indicator">True</property>                                 <signal name="toggled" handler="ZoomChanged"/>                               </widget>@@ -862,7 +860,6 @@                   <widget class="GtkFrame" id="screenZoomFrame">                     <property name="visible">True</property>                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>-                    <property name="label_xalign">0</property>                     <property name="shadow_type">GTK_SHADOW_NONE</property>                     <child>                       <widget class="GtkAlignment" id="screenZoomAlignment">@@ -901,7 +898,6 @@                   <widget class="GtkFrame" id="areaZoomFrame">                     <property name="visible">True</property>                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>-                    <property name="label_xalign">0</property>                     <property name="shadow_type">GTK_SHADOW_NONE</property>                     <child>                       <widget class="GtkAlignment" id="areaZoomAlignment">@@ -963,7 +959,6 @@                   <widget class="GtkFrame" id="zoomInFrame2">                     <property name="visible">True</property>                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>-                    <property name="label_xalign">0</property>                     <property name="shadow_type">GTK_SHADOW_NONE</property>                     <child>                       <widget class="GtkAlignment" id="edgesAlignment">@@ -1028,7 +1023,6 @@                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>                 <property name="label" translatable="yes">gtk-help</property>                 <property name="use_stock">True</property>-                <property name="response_id">0</property>               </widget>               <packing>                 <property name="expand">False</property>@@ -1043,7 +1037,6 @@                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>                 <property name="label" translatable="yes">gtk-close</property>                 <property name="use_stock">True</property>-                <property name="response_id">0</property>                 <signal name="clicked" handler="Quit"/>               </widget>               <packing>Index: simple-ccsm.in===================================================================--- simple-ccsm.in.orig+++ simple-ccsm.in@@ -853,6 +853,11 @@ class MainWin:         )         window.set_icon_list(*iconList) +        # Enable effects button+        self.EnableEffectsButton = self.GladeXML.get_widget("enableEffects")+        self.EnableEffectsButton.connect ("toggled", EnableDesktopEffectsChanged, self)+        self.Notebook = self.GladeXML.get_widget("notebook")+                 # Profile Chooser         self.ProfileChooser = self.GladeXML.get_widget("profileChooser") @@ -867,6 +872,17 @@ class MainWin:         self.Update()         window.show_all() +        self.EnableEffectsButton.set_active(self.EnableEffectsButton.is_composited())++    def EnableAnimationsChanged(self, widget):+        if self.EnableEffectsButton.get_active():+            os.system("compiz --replace ccp")+        else:+            os.system("metacity --replace")++        self.Notebook.set_sensitive(self.EnableEffectsButton.get_active())+        self.ProfileChooser.set_sensitive(self.EnableEffectsButton.get_active())+     def Update(self):         self.Context.Read()