diff options
| -rw-r--r-- | cpufreq/cpufreq-preferences.ui | 286 | ||||
| -rw-r--r-- | cpufreq/src/cpufreq-prefs.c | 8 |
2 files changed, 153 insertions, 141 deletions
diff --git a/cpufreq/cpufreq-preferences.ui b/cpufreq/cpufreq-preferences.ui index 33d719e0..f155f73e 100644 --- a/cpufreq/cpufreq-preferences.ui +++ b/cpufreq/cpufreq-preferences.ui @@ -1,65 +1,103 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.36.0 --> <interface> - <requires lib="gtk+" version="2.16"/> - <!-- interface-naming-policy toplevel-contextual --> + <requires lib="gtk+" version="3.22"/> + <object class="GtkImage" id="close_img"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">window-close</property> + </object> + <object class="GtkImage" id="help_img"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">help-browser</property> + </object> <object class="GtkDialog" id="prefs_dialog"> + <property name="can_focus">False</property> <property name="border_width">5</property> <property name="title" translatable="yes">CPU Frequency Monitor Preferences</property> - <property name="resizable">False</property> - <property name="destroy_with_parent">True</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> - <object class="GtkVBox" id="prefs_dialog_vbox"> - <property name="visible">True</property> + <object class="GtkBox"> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> <property name="spacing">2</property> + <child internal-child="action_area"> + <object class="GtkButtonBox"> + <property name="can_focus">False</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="button2"> + <property name="label" translatable="yes">_Help</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="image">help_img</property> + <property name="use_underline">True</property> + <property name="always_show_image">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="button1"> + <property name="label" translatable="yes">_Close</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="image">close_img</property> + <property name="use_underline">True</property> + <property name="always_show_image">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> <child> - <object class="GtkVBox" id="vbox4"> + <object class="GtkBox"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="border_width">5</property> + <property name="orientation">vertical</property> <property name="spacing">18</property> <child> - <object class="GtkVBox" id="monitor_settings_box"> + <object class="GtkFrame" id="monitor_settings_frame"> <property name="visible">True</property> - <property name="spacing">6</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> <child> - <object class="GtkLabel" id="label12"> + <object class="GtkAlignment"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Monitor Settings</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox9"> - <property name="visible">True</property> - <child> - <object class="GtkLabel" id="label18"> - <property name="visible">True</property> - <property name="label"> </property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="can_focus">False</property> + <property name="left_padding">12</property> <child> - <object class="GtkHBox" id="hbox6"> + <object class="GtkBox"> <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">6</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="label14"> <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes">_Monitored CPU:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">prefs_cpu_number</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -70,91 +108,89 @@ <child> <object class="GtkComboBox" id="prefs_cpu_number"> <property name="visible">True</property> + <property name="can_focus">False</property> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> - <packing> - <property name="position">1</property> - </packing> </child> </object> - <packing> - <property name="position">1</property> - </packing> + </child> + <child type="label"> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Monitor Settings</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> </child> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkVBox" id="display_settings_box"> + <object class="GtkFrame"> <property name="visible">True</property> - <property name="spacing">6</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> <child> - <object class="GtkLabel" id="label13"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Display Settings</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox11"> + <object class="GtkAlignment"> <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="left_padding">12</property> <child> - <object class="GtkLabel" id="label20"> - <property name="visible">True</property> - <property name="label"> </property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkVBox" id="vbox5"> + <object class="GtkBox"> <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkHBox" id="hbox7"> + <object class="GtkBox"> <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">6</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="label15"> <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes">_Appearance:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">prefs_show_mode</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkComboBox" id="prefs_show_mode"> <property name="visible">True</property> + <property name="can_focus">False</property> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -164,31 +200,31 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="halign">start</property> <property name="use_underline">True</property> + <property name="active">True</property> <property name="draw_indicator">True</property> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> - <object class="GtkAlignment" id="alignment3"> + <object class="GtkCheckButton" id="prefs_show_unit"> + <property name="label" translatable="yes">Show frequency _units</property> <property name="visible">True</property> - <property name="left_padding">18</property> - <child> - <object class="GtkCheckButton" id="prefs_show_unit"> - <property name="label" translatable="yes">Show frequency _units</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> - </child> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">start</property> + <property name="margin_start">18</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">2</property> </packing> </child> @@ -198,83 +234,59 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="halign">start</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> <property name="group">prefs_show_freq</property> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">3</property> </packing> </child> </object> - <packing> - <property name="position">1</property> - </packing> </child> </object> - <packing> - <property name="position">1</property> - </packing> + </child> + <child type="label"> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Display Settings</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> </child> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - <child internal-child="action_area"> - <object class="GtkHButtonBox" id="dialog-action_area2"> - <property name="visible">True</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="helpbutton2"> - <property name="label">gtk-help</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="closebutton2"> - <property name="label">gtk-close</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="pack_type">end</property> - <property name="position">0</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> </child> <action-widgets> - <action-widget response="-11">helpbutton2</action-widget> - <action-widget response="-7">closebutton2</action-widget> + <action-widget response="-11">button2</action-widget> + <action-widget response="-7">button1</action-widget> </action-widgets> + <child type="titlebar"> + <placeholder/> + </child> + </object> + <object class="GtkSizeGroup"> + <widgets> + <widget name="label14"/> + <widget name="label15"/> + </widgets> </object> </interface> diff --git a/cpufreq/src/cpufreq-prefs.c b/cpufreq/src/cpufreq-prefs.c index 0f425021..e7804f80 100644 --- a/cpufreq/src/cpufreq-prefs.c +++ b/cpufreq/src/cpufreq-prefs.c @@ -50,7 +50,7 @@ struct _CPUFreqPrefsPrivate { GtkWidget *show_unit; GtkWidget *show_perc; GtkWidget *cpu_combo; - GtkWidget *monitor_settings_box; + GtkWidget *monitor_settings_frame; GtkWidget *show_mode_combo; }; @@ -369,9 +369,9 @@ static void cpufreq_prefs_dialog_update_visibility (CPUFreqPrefs *prefs) { if (cpufreq_utils_get_n_cpus () > 1) - gtk_widget_show (prefs->priv->monitor_settings_box); + gtk_widget_show (prefs->priv->monitor_settings_frame); else - gtk_widget_hide (prefs->priv->monitor_settings_box); + gtk_widget_hide (prefs->priv->monitor_settings_frame); } static void @@ -532,7 +532,7 @@ cpufreq_prefs_dialog_create (CPUFreqPrefs *prefs) prefs->priv->show_unit = GTK_WIDGET (gtk_builder_get_object (builder, "prefs_show_unit")); prefs->priv->show_perc = GTK_WIDGET (gtk_builder_get_object (builder, "prefs_show_perc")); - prefs->priv->monitor_settings_box = GTK_WIDGET (gtk_builder_get_object (builder, "monitor_settings_box")); + prefs->priv->monitor_settings_frame = GTK_WIDGET (gtk_builder_get_object (builder, "monitor_settings_frame")); g_object_unref (builder); |