From f8dbd8090f6a1663260dd9a19f0e84d299fab12d Mon Sep 17 00:00:00 2001
From: Bradford Hovinen <hovinen@ximian.com>
Date: Mon, 17 Dec 2001 17:28:23 +0000
Subject: [PATCH] Don't hide opacity controls

2001-12-17  Bradford Hovinen  <hovinen@ximian.com>

	* background-properties-capplet.c (setup_dialog): Don't hide
	opacity controls

	* background-properties.glade: Remove opacity controls
---
 capplets/background/ChangeLog                 |  3 +
 .../background-properties-capplet.c           |  4 -
 .../background/background-properties.glade    | 84 +---------------
 .../background/background-properties.glade1   | 97 +------------------
 4 files changed, 7 insertions(+), 181 deletions(-)

diff --git a/capplets/background/ChangeLog b/capplets/background/ChangeLog
index 7c5c6657f..ce122e34c 100644
--- a/capplets/background/ChangeLog
+++ b/capplets/background/ChangeLog
@@ -1,5 +1,8 @@
 2001-12-17  Bradford Hovinen  <hovinen@ximian.com>
 
+	* background-properties-capplet.c (setup_dialog): Don't hide
+	opacity controls
+
 	* background.schema: Added wallpaper-enabled
 
 	* background-properties-capplet.c (create_dialog): Use
diff --git a/capplets/background/background-properties-capplet.c b/capplets/background/background-properties-capplet.c
index df274eeaa..49f13d241 100644
--- a/capplets/background/background-properties-capplet.c
+++ b/capplets/background/background-properties-capplet.c
@@ -200,10 +200,6 @@ setup_dialog (GtkWidget *widget, GConfChangeSet *changeset)
 					"/background-properties/wallpaper-enabled");
 #endif
 		
-	/* Disable opacity controls */
-	gtk_widget_hide (WID ("opacity_spin"));
-	gtk_widget_hide (WID ("opacity_label"));
-
 	engine = gconf_engine_get_default ();
 	gconf_engine_set_bool (engine, "enabled", TRUE, NULL);
 
diff --git a/capplets/background/background-properties.glade b/capplets/background/background-properties.glade
index c2a2253ff..156493dfd 100644
--- a/capplets/background/background-properties.glade
+++ b/capplets/background/background-properties.glade
@@ -35,7 +35,7 @@
                 <property name="row_spacing">10</property>
                 <property name="column_spacing">3</property>
                 <property name="n-rows">2</property>
-                <property name="n-columns">5</property>
+                <property name="n-columns">2</property>
                 <property name="visible">yes</property>
 
                 <child>
@@ -201,7 +201,7 @@
                   </widget>
                   <packing>
                     <property name="left_attach">1</property>
-                    <property name="right_attach">5</property>
+                    <property name="right_attach">2</property>
                     <property name="top_attach">0</property>
                     <property name="bottom_attach">1</property>
                     <property name="x_padding">0</property>
@@ -210,86 +210,6 @@
                     <property name="y_options"></property>
                   </packing>
                 </child>
-
-                <child>
-                  <widget class="GtkLabel" id="opacity_label">
-                    <property name="label" translatable="yes">Opacity (percent):</property>
-                    <property name="justify">GTK_JUSTIFY_CENTER</property>
-                    <property name="wrap">no</property>
-                    <property name="xalign">1</property>
-                    <property name="yalign">0.5</property>
-                    <property name="xpad">0</property>
-                    <property name="ypad">0</property>
-                    <property name="visible">yes</property>
-                  </widget>
-                  <packing>
-                    <property name="left_attach">2</property>
-                    <property name="right_attach">3</property>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                    <property name="x_padding">0</property>
-                    <property name="y_padding">0</property>
-                    <property name="x_options">fill</property>
-                    <property name="y_options"></property>
-                  </packing>
-                </child>
-
-                <child>
-                  <widget class="GtkAlignment" id="alignment2">
-                    <property name="xalign">7.45058e-09</property>
-                    <property name="yalign">0.5</property>
-                    <property name="xscale">0.5</property>
-                    <property name="yscale">1</property>
-                    <property name="visible">yes</property>
-
-                    <child>
-                      <widget class="GtkSpinButton" id="opacity_spin">
-                        <property name="can_focus">yes</property>
-                        <property name="climb_rate">1</property>
-                        <property name="digits">0</property>
-                        <property name="numeric">yes</property>
-                        <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-                        <property name="wrap">no</property>
-                        <property name="snap_to_ticks">no</property>
-                        <property name="visible">yes</property>
-                        <property name="adjustment">100 0 10000 1 10 10</property>
-                      </widget>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="left_attach">3</property>
-                    <property name="right_attach">4</property>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                    <property name="x_padding">0</property>
-                    <property name="y_padding">0</property>
-                    <property name="x_options">expand|fill</property>
-                    <property name="y_options"></property>
-                  </packing>
-                </child>
-
-                <child>
-                  <widget class="GtkLabel" id="label18">
-                    <property name="label" translatable="yes"></property>
-                    <property name="justify">GTK_JUSTIFY_CENTER</property>
-                    <property name="wrap">no</property>
-                    <property name="xalign">0</property>
-                    <property name="yalign">0.5</property>
-                    <property name="xpad">0</property>
-                    <property name="ypad">0</property>
-                    <property name="visible">yes</property>
-                  </widget>
-                  <packing>
-                    <property name="left_attach">4</property>
-                    <property name="right_attach">5</property>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                    <property name="x_padding">0</property>
-                    <property name="y_padding">0</property>
-                    <property name="x_options">fill</property>
-                    <property name="y_options"></property>
-                  </packing>
-                </child>
               </widget>
             </child>
           </widget>
diff --git a/capplets/background/background-properties.glade1 b/capplets/background/background-properties.glade1
index 67245aef9..8fa7e407f 100644
--- a/capplets/background/background-properties.glade1
+++ b/capplets/background/background-properties.glade1
@@ -49,7 +49,7 @@
 	<name>table1</name>
 	<border_width>10</border_width>
 	<rows>2</rows>
-	<columns>5</columns>
+	<columns>2</columns>
 	<homogeneous>False</homogeneous>
 	<row_spacing>10</row_spacing>
 	<column_spacing>3</column_spacing>
@@ -149,7 +149,7 @@ Stretched
 	  <modal>False</modal>
 	  <child>
 	    <left_attach>1</left_attach>
-	    <right_attach>5</right_attach>
+	    <right_attach>2</right_attach>
 	    <top_attach>0</top_attach>
 	    <bottom_attach>1</bottom_attach>
 	    <xpad>0</xpad>
@@ -173,99 +173,6 @@ Stretched
 	    <text></text>
 	  </widget>
 	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>opacity_label</name>
-	  <label>Opacity (percent):</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>1</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment2</name>
-	  <xalign>7.45058e-09</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>0.5</xscale>
-	  <yscale>1</yscale>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkSpinButton</class>
-	    <name>opacity_spin</name>
-	    <can_focus>True</can_focus>
-	    <climb_rate>1</climb_rate>
-	    <digits>0</digits>
-	    <numeric>True</numeric>
-	    <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-	    <snap>False</snap>
-	    <wrap>False</wrap>
-	    <value>100</value>
-	    <lower>0</lower>
-	    <upper>10000</upper>
-	    <step>1</step>
-	    <page>10</page>
-	    <page_size>10</page_size>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label18</name>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>5</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
       </widget>
     </widget>