[Xfce4-commits] <xfce4-panel:nick/background> Drop panel theme option for now.

[Nick Schermer]

Updating branch refs/heads/nick/background
         to 4a1ea67fde82d0db94ba3c2dddeaa75e2691dab5 (commit)
       from 3ec40df5b3f3d6dcfb6a5d421b269ad3ab3a0db8 (commit)

commit 4a1ea67fde82d0db94ba3c2dddeaa75e2691dab5
Author: Nick Schermer <nick at xfce.org>
Date:   Tue May 4 17:52:37 2010 +0200

    Drop panel theme option for now.

 panel/panel-base-window.c            |    2 +-
 panel/panel-base-window.h            |    3 +-
 panel/panel-preferences-dialog.glade |   57 +++-------------------------------
 3 files changed, 7 insertions(+), 55 deletions(-)

diff --git a/panel/panel-base-window.c b/panel/panel-base-window.c
index 90536c6..d085aac 100644
--- a/panel/panel-base-window.c
+++ b/panel/panel-base-window.c
@@ -147,7 +147,7 @@ panel_base_window_class_init (PanelBaseWindowClass *klass)
                                    g_param_spec_uint ("background-style",
                                                       NULL, NULL,
                                                       PANEL_BG_STYLE_NONE,
-                                                      PANEL_BG_STYLE_THEME,
+                                                      PANEL_BG_STYLE_IMAGE,
                                                       PANEL_BG_STYLE_NONE,
                                                       EXO_PARAM_READWRITE));
 
diff --git a/panel/panel-base-window.h b/panel/panel-base-window.h
index 9e8a8cb..ffe1ab7 100644
--- a/panel/panel-base-window.h
+++ b/panel/panel-base-window.h
@@ -49,8 +49,7 @@ enum _PanelBgStyle
 {
   PANEL_BG_STYLE_NONE,
   PANEL_BG_STYLE_COLOR,
-  PANEL_BG_STYLE_IMAGE,
-  PANEL_BG_STYLE_THEME
+  PANEL_BG_STYLE_IMAGE
 };
 
 struct _PanelBaseWindowClass
diff --git a/panel/panel-preferences-dialog.glade b/panel/panel-preferences-dialog.glade
index 122a000..f76157d 100644
--- a/panel/panel-preferences-dialog.glade
+++ b/panel/panel-preferences-dialog.glade
@@ -31,12 +31,6 @@
       <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkListStore" id="themes-store">
-    <columns>
-      <!-- column-name title -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
   <object class="GtkListStore" id="styles-store">
     <columns>
       <!-- column-name title -->
@@ -52,9 +46,6 @@
       <row>
         <col id="0" translatable="yes">Background image</col>
       </row>
-      <row>
-        <col id="0" translatable="yes">Panel theme</col>
-      </row>
     </data>
   </object>
   <object class="XfceTitledDialog" id="dialog">
@@ -581,44 +572,6 @@ ue).</property>
                                     <property name="position">3</property>
                                   </packing>
                                 </child>
-                                <child>
-                                  <object class="GtkHBox" id="bg-theme-box">
-                                    <property name="visible">True</property>
-                                    <property name="spacing">12</property>
-                                    <child>
-                                      <object class="GtkLabel" id="label20">
-                                        <property name="visible">True</property>
-                                        <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">_Theme:</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="mnemonic_widget">background-theme</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkComboBox" id="background-theme">
-                                        <property name="visible">True</property>
-                                        <property name="model">themes-store</property>
-                                        <child>
-                                          <object class="GtkCellRendererText" id="cellrenderertext5"/>
-                                          <attributes>
-                                            <attribute name="text">0</attribute>
-                                          </attributes>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="position">4</property>
-                                  </packing>
-                                </child>
                               </object>
                             </child>
                           </object>
@@ -1004,17 +957,17 @@ ue).</property>
   </object>
   <object class="GtkSizeGroup" id="display-sizegroup">
     <widgets>
-      <widget name="label1"/>
       <widget name="label13"/>
+      <widget name="label1"/>
     </widgets>
   </object>
   <object class="GtkSizeGroup" id="bg-sizegroup">
     <widgets>
-      <widget name="label20"/>
-      <widget name="label19"/>
-      <widget name="label16"/>
-      <widget name="label15"/>
       <widget name="label7"/>
+      <widget name="label15"/>
+      <widget name="label16"/>
+      <widget name="label19"/>
+      <widget name="label20"/>
     </widgets>
   </object>
 </interface>