X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=recipes%2Fpandora-system%2Fpandora-scripts%2Fnubmode.glade;h=8bbd937217653f14d784a5e7e135fc9077b16fe2;hb=f6fe775bb6cf8bd1c20b8938ef2f523c5f34ebc4;hp=a77be2be088514f5c19bacee64c9fae129b94d79;hpb=e33ccc8e84e11eed4fd5eb02a67c1d2d8ce29fdd;p=openpandora.oe.git

diff --git a/recipes/pandora-system/pandora-scripts/nubmode.glade b/recipes/pandora-system/pandora-scripts/nubmode.glade
index a77be2b..8bbd937 100755
--- a/recipes/pandora-system/pandora-scripts/nubmode.glade
+++ b/recipes/pandora-system/pandora-scripts/nubmode.glade
@@ -5,6 +5,7 @@
   <object class="GtkWindow" id="window">
     <property name="title" translatable="yes">Nub configuration</property>
     <property name="window_position">center</property>
+    <signal name="destroy" handler="on_window_destroy"/>
     <child>
       <object class="GtkTable" id="table">
         <property name="visible">True</property>
@@ -24,7 +25,7 @@
                   <object class="GtkVBox" id="vbox1">
                     <property name="visible">True</property>
                     <child>
-                      <object class="GtkRadioButton" id="LeftRadio_mouse">
+                      <object class="GtkRadioButton" id="Rmouse0">
                         <property name="label" translatable="yes">mouse movement</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -37,42 +38,42 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkRadioButton" id="LeftRadio_mbuttons">
+                      <object class="GtkRadioButton" id="Rmbuttons0">
                         <property name="label" translatable="yes">mouse buttons</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="active">True</property>
                         <property name="draw_indicator">True</property>
-                        <property name="group">LeftRadio_mouse</property>
+                        <property name="group">Rmouse0</property>
                       </object>
                       <packing>
                         <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkRadioButton" id="LeftRadio_scroll">
+                      <object class="GtkRadioButton" id="Rscroll0">
                         <property name="label" translatable="yes">scrolling</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="active">True</property>
                         <property name="draw_indicator">True</property>
-                        <property name="group">LeftRadio_mouse</property>
+                        <property name="group">Rmouse0</property>
                       </object>
                       <packing>
                         <property name="position">2</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkRadioButton" id="LeftRadio_absolute">
+                      <object class="GtkRadioButton" id="Rabsolute0">
                         <property name="label" translatable="yes">joystick</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="active">True</property>
                         <property name="draw_indicator">True</property>
-                        <property name="group">LeftRadio_mouse</property>
+                        <property name="group">Rmouse0</property>
                       </object>
                       <packing>
                         <property name="position">3</property>
@@ -104,7 +105,7 @@
                   <object class="GtkVBox" id="vbox2">
                     <property name="visible">True</property>
                     <child>
-                      <object class="GtkRadioButton" id="RightRadio_mouse">
+                      <object class="GtkRadioButton" id="Rmouse1">
                         <property name="label" translatable="yes">mouse movement</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -117,42 +118,42 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkRadioButton" id="RightRadio_mbuttons">
+                      <object class="GtkRadioButton" id="Rmbuttons1">
                         <property name="label" translatable="yes">mouse buttons</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="active">True</property>
                         <property name="draw_indicator">True</property>
-                        <property name="group">RightRadio_mouse</property>
+                        <property name="group">Rmouse1</property>
                       </object>
                       <packing>
                         <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkRadioButton" id="RightRadio_scroll">
+                      <object class="GtkRadioButton" id="Rscroll1">
                         <property name="label" translatable="yes">scrolling</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="active">True</property>
                         <property name="draw_indicator">True</property>
-                        <property name="group">RightRadio_mouse</property>
+                        <property name="group">Rmouse1</property>
                       </object>
                       <packing>
                         <property name="position">2</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkRadioButton" id="RightRadio_absolute">
+                      <object class="GtkRadioButton" id="Rabsolute1">
                         <property name="label" translatable="yes">joystick</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="active">True</property>
                         <property name="draw_indicator">True</property>
-                        <property name="group">RightRadio_mouse</property>
+                        <property name="group">Rmouse1</property>
                       </object>
                       <packing>
                         <property name="position">3</property>
@@ -179,7 +180,7 @@
           <object class="GtkHScale" id="LeftButtonThreshold">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="adjustment">lbutton</property>
+            <property name="adjustment">button0</property>
             <property name="digits">0</property>
           </object>
           <packing>
@@ -191,7 +192,7 @@
           <object class="GtkHScale" id="LeftMouseSpeed">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="adjustment">lmouse</property>
+            <property name="adjustment">mouse0</property>
             <property name="digits">0</property>
           </object>
           <packing>
@@ -274,7 +275,7 @@
           <object class="GtkHScale" id="LeftScrollRate">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="adjustment">lscroll</property>
+            <property name="adjustment">rate0</property>
             <property name="digits">0</property>
           </object>
           <packing>
@@ -286,7 +287,7 @@
           <object class="GtkHScale" id="LeftScrollX">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="adjustment">lscrollx</property>
+            <property name="adjustment">scrollx0</property>
             <property name="digits">0</property>
           </object>
           <packing>
@@ -298,7 +299,7 @@
           <object class="GtkHScale" id="LeftScrollY">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="adjustment">lscrolly</property>
+            <property name="adjustment">scrolly0</property>
             <property name="digits">0</property>
           </object>
           <packing>
@@ -310,7 +311,7 @@
           <object class="GtkHScale" id="RightMouseSpeed">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="adjustment">rmouse</property>
+            <property name="adjustment">mouse1</property>
             <property name="digits">0</property>
           </object>
           <packing>
@@ -324,7 +325,7 @@
           <object class="GtkHScale" id="RightButtonThreshold">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="adjustment">rbutton</property>
+            <property name="adjustment">button1</property>
             <property name="digits">0</property>
           </object>
           <packing>
@@ -338,7 +339,7 @@
           <object class="GtkHScale" id="RightScrollRate">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="adjustment">rscroll</property>
+            <property name="adjustment">rate1</property>
             <property name="digits">0</property>
           </object>
           <packing>
@@ -352,7 +353,7 @@
           <object class="GtkHScale" id="RightScrollX">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="adjustment">rscrollx</property>
+            <property name="adjustment">scrollx1</property>
             <property name="digits">0</property>
           </object>
           <packing>
@@ -367,7 +368,7 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="update_policy">delayed</property>
-            <property name="adjustment">rscrolly</property>
+            <property name="adjustment">scrolly1</property>
             <property name="digits">0</property>
           </object>
           <packing>
@@ -389,77 +390,33 @@
           </packing>
         </child>
         <child>
-          <object class="GtkButton" id="ResetLeft">
-            <property name="label" translatable="yes">Reset left nub</property>
+          <object class="GtkComboBoxEntry" id="ProfileComboEntry">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <signal name="clicked" handler="on_ResetLeft_clicked"/>
           </object>
           <packing>
-            <property name="top_attach">8</property>
-            <property name="bottom_attach">9</property>
+            <property name="left_attach">1</property>
+            <property name="right_attach">2</property>
+            <property name="top_attach">9</property>
+            <property name="bottom_attach">10</property>
             <property name="y_padding">2</property>
           </packing>
         </child>
         <child>
-          <object class="GtkButton" id="ResetRight">
-            <property name="label" translatable="yes">Reset right nub</property>
+          <object class="GtkStatusbar" id="statusbar">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <signal name="clicked" handler="on_ResetRight_clicked"/>
+            <property name="spacing">2</property>
           </object>
           <packing>
-            <property name="left_attach">2</property>
             <property name="right_attach">3</property>
-            <property name="top_attach">8</property>
-            <property name="bottom_attach">9</property>
-            <property name="y_padding">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkButton" id="UndoChanges">
-            <property name="label" translatable="yes">Scan nub state</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="image_position">top</property>
-            <signal name="clicked" handler="on_UndoChanges_clicked"/>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="right_attach">2</property>
-            <property name="top_attach">8</property>
-            <property name="bottom_attach">9</property>
-            <property name="y_padding">2</property>
+            <property name="top_attach">10</property>
+            <property name="bottom_attach">11</property>
           </packing>
         </child>
         <child>
-          <object class="GtkVBox" id="vbox3">
+          <object class="GtkImage" id="LogoImage">
+            <property name="height_request">84</property>
             <property name="visible">True</property>
-            <child>
-              <object class="GtkImage" id="LogoImage">
-                <property name="height_request">84</property>
-                <property name="visible">True</property>
-                <property name="pixbuf">pndlogo.png</property>
-              </object>
-              <packing>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="ApplyChanges">
-                <property name="label" translatable="yes">Apply configuration</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <signal name="clicked" handler="on_ApplyChanges_clicked"/>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
+            <property name="pixbuf">pndlogo.png</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
@@ -475,117 +432,141 @@
             <signal name="clicked" handler="on_SaveProfile_clicked"/>
           </object>
           <packing>
+            <property name="left_attach">2</property>
+            <property name="right_attach">3</property>
             <property name="top_attach">9</property>
             <property name="bottom_attach">10</property>
             <property name="y_padding">2</property>
           </packing>
         </child>
         <child>
-          <object class="GtkComboBoxEntry" id="ProfileComboEntry">
+          <object class="GtkButton" id="DeleteProfile">
+            <property name="label" translatable="yes">Delete profile</property>
             <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <signal name="clicked" handler="on_DeleteProfile_clicked"/>
           </object>
           <packing>
-            <property name="left_attach">1</property>
-            <property name="right_attach">2</property>
             <property name="top_attach">9</property>
             <property name="bottom_attach">10</property>
             <property name="y_padding">2</property>
           </packing>
         </child>
         <child>
-          <object class="GtkButton" id="LoadProfile">
-            <property name="label" translatable="yes">Load profile</property>
+          <object class="GtkButton" id="WriteNubConfig">
+            <property name="label" translatable="yes">Write nub settings</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
-            <signal name="clicked" handler="on_LoadProfile_clicked"/>
+            <signal name="clicked" handler="on_WriteNubConfig_clicked"/>
           </object>
           <packing>
             <property name="left_attach">2</property>
             <property name="right_attach">3</property>
-            <property name="top_attach">9</property>
-            <property name="bottom_attach">10</property>
+            <property name="top_attach">8</property>
+            <property name="bottom_attach">9</property>
             <property name="y_padding">2</property>
           </packing>
         </child>
         <child>
-          <object class="GtkStatusbar" id="statusbar">
+          <object class="GtkButton" id="ReadNubConfig">
+            <property name="label" translatable="yes">Read nub settings</property>
             <property name="visible">True</property>
-            <property name="spacing">2</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="image_position">top</property>
+            <signal name="clicked" handler="on_ReadNubConfig_clicked"/>
           </object>
           <packing>
-            <property name="right_attach">3</property>
-            <property name="top_attach">10</property>
-            <property name="bottom_attach">11</property>
+            <property name="left_attach">1</property>
+            <property name="right_attach">2</property>
+            <property name="top_attach">8</property>
+            <property name="bottom_attach">9</property>
+            <property name="y_padding">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="ResetNubs">
+            <property name="label" translatable="yes">Reset nubs...</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <signal name="clicked" handler="on_ResetNubs_clicked"/>
+          </object>
+          <packing>
+            <property name="top_attach">8</property>
+            <property name="bottom_attach">9</property>
+            <property name="y_padding">2</property>
           </packing>
         </child>
       </object>
     </child>
   </object>
-  <object class="GtkAdjustment" id="lmouse">
+  <object class="GtkAdjustment" id="mouse0">
     <property name="value">150</property>
     <property name="lower">50</property>
     <property name="upper">300</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkAdjustment" id="rmouse">
+  <object class="GtkAdjustment" id="mouse1">
     <property name="value">150</property>
     <property name="lower">50</property>
     <property name="upper">300</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkAdjustment" id="lbutton">
+  <object class="GtkAdjustment" id="button0">
     <property name="value">20</property>
     <property name="lower">1</property>
     <property name="upper">40</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkAdjustment" id="rbutton">
+  <object class="GtkAdjustment" id="button1">
     <property name="value">20</property>
     <property name="lower">1</property>
     <property name="upper">40</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkAdjustment" id="lscroll">
+  <object class="GtkAdjustment" id="rate0">
     <property name="value">20</property>
     <property name="lower">1</property>
     <property name="upper">40</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkAdjustment" id="rscroll">
+  <object class="GtkAdjustment" id="rate1">
     <property name="value">20</property>
     <property name="lower">1</property>
     <property name="upper">40</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkAdjustment" id="lscrollx">
+  <object class="GtkAdjustment" id="scrollx0">
     <property name="value">7</property>
     <property name="lower">-32</property>
     <property name="upper">32</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkAdjustment" id="rscrollx">
+  <object class="GtkAdjustment" id="scrollx1">
     <property name="value">7</property>
     <property name="lower">-32</property>
     <property name="upper">32</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkAdjustment" id="lscrolly">
+  <object class="GtkAdjustment" id="scrolly0">
     <property name="value">7</property>
     <property name="lower">-32</property>
     <property name="upper">32</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkAdjustment" id="rscrolly">
+  <object class="GtkAdjustment" id="scrolly1">
     <property name="value">7</property>
     <property name="lower">-32</property>
     <property name="upper">32</property>