[gnome-power-manager/polkit1] Remove some UI elements after UI review



commit 9e464956f12c280dff0769aeed95741c25ea788a
Author: Richard Hughes <richard hughsie com>
Date:   Fri Jun 19 08:53:37 2009 +0100

    Remove some UI elements after UI review

 data/gpm-prefs.ui    |  113 --------------------------------------------------
 src/gpm-prefs-core.c |   16 -------
 2 files changed, 0 insertions(+), 129 deletions(-)
---
diff --git a/data/gpm-prefs.ui b/data/gpm-prefs.ui
index f381f85..ea96e50 100644
--- a/data/gpm-prefs.ui
+++ b/data/gpm-prefs.ui
@@ -700,21 +700,6 @@
                                 <property name="position">2</property>
                               </packing>
                             </child>
-                            <child>
-                              <object class="GtkCheckButton" id="checkbutton_actions_ups_alarm">
-                                <property name="label" translatable="yes">Enable UPS discharge _alarm</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="use_underline">True</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">3</property>
-                              </packing>
-                            </child>
                           </object>
                         </child>
                       </object>
@@ -1040,104 +1025,6 @@
                     <property name="position">1</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkVBox" id="vbox_notification_sounds">
-                    <property name="visible">True</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkLabel" id="label_notification_sound_sect">
-                        <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Extras&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkAlignment" id="alignment40">
-                        <property name="visible">True</property>
-                        <property name="left_padding">12</property>
-                        <child>
-                          <object class="GtkVBox" id="vbox74">
-                            <property name="visible">True</property>
-                            <property name="spacing">5</property>
-                            <child>
-                              <object class="GtkCheckButton" id="checkbutton_notification_sound">
-                                <property name="label" translatable="yes">Use _sound to notify in event of an error</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="use_underline">True</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkCheckButton" id="checkbutton_general_ambient">
-                                <property name="label" translatable="yes">Use _ambient light to adjust LCD brightness</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="use_underline">True</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkCheckButton" id="checkbutton_general_always_sleep">
-                                <property name="label" translatable="yes">Always sleep when the lid is _closed</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="use_underline">True</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkCheckButton" id="checkbutton_light_keyboard">
-                                <property name="label" translatable="yes">Turn on keyboard light when light level is low</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="use_underline">True</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">3</property>
-                              </packing>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="fill">False</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
               </object>
               <packing>
                 <property name="position">3</property>
diff --git a/src/gpm-prefs-core.c b/src/gpm-prefs-core.c
index ba09df0..5537d94 100644
--- a/src/gpm-prefs-core.c
+++ b/src/gpm-prefs-core.c
@@ -716,10 +716,6 @@ prefs_setup_notification (GpmPrefs *prefs)
 	g_signal_connect (radiobutton_icon_never, "clicked",
 			  G_CALLBACK (gpm_prefs_icon_radio_cb), prefs);
 
-	/* set up the sound checkbox */
-	gpm_prefs_setup_checkbox (prefs, "checkbutton_notification_sound",
-				  GPM_CONF_UI_ENABLE_SOUND);
-
 	if (prefs->priv->has_batteries) {
 		/* there's no use case for displaying this option */
 		gtk_widget_hide_all (radiobutton_icon_never);
@@ -821,11 +817,6 @@ prefs_setup_battery (GpmPrefs *prefs)
 	gpm_prefs_setup_checkbox (prefs, "checkbutton_battery_display_dim",
 				  GPM_CONF_BACKLIGHT_IDLE_DIM_BATT);
 
-	if (prefs->priv->has_ambient == FALSE) {
-		widget = GTK_WIDGET (gtk_builder_get_object (prefs->priv->builder, "checkbutton_general_ambient"));
-		gtk_widget_hide_all (widget);
-	}
-
 	set_idle_hscale_stops (prefs, "hscale_battery_computer", prefs->priv->idle_delay);
 
 	if (prefs->priv->has_button_lid == FALSE) {
@@ -892,13 +883,6 @@ prefs_setup_general (GpmPrefs *prefs)
 	gpm_prefs_setup_action_combo (prefs, "combobox_general_suspend",
 				      GPM_CONF_BUTTON_SUSPEND,
 				      suspend_button_actions);
-	gpm_prefs_setup_checkbox (prefs, "checkbutton_general_ambient",
-				  GPM_CONF_AMBIENT_ENABLE);
-
-	if (prefs->priv->has_ambient == FALSE) {
-		widget = GTK_WIDGET (gtk_builder_get_object (prefs->priv->builder, "checkbutton_general_ambient"));
-		gtk_widget_hide_all (widget);
-	}
 
 	if (prefs->priv->has_button_suspend == FALSE) {
 		widget = GTK_WIDGET (gtk_builder_get_object (prefs->priv->builder, "hbox_general_suspend"));



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]