# HG changeset patch
# User Cole Robinson <crobinso@redhat.com>
# Date 1234829084 18000
# Node ID ae434ddf4b7073773347f3d1cc449385db7267fd
# Parent 7238b8b438bc3311b744debfb576849dbc262cda
Fix regression for pre existing vm and stats preferences not keeping new values.
diff -r 7238b8b438bc -r ae434ddf4b70 src/vmm-preferences.glade
--- a/src/vmm-preferences.glade Mon Feb 16 09:35:21 2009 -0500
+++ b/src/vmm-preferences.glade Mon Feb 16 19:04:44 2009 -0500
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Mon Jan 12 09:31:21 2009 -->
+<!--Generated with glade3 3.4.5 on Thu Feb 12 11:56:15 2009 -->
<glade-interface>
<widget class="GtkWindow" id="vmm-preferences">
<property name="title" translatable="yes">Preferences</property>
@@ -37,19 +37,53 @@
<property name="column_spacing">3</property>
<property name="row_spacing">3</property>
<child>
- <widget class="GtkLabel" id="label9">
+ <widget class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">samples</property>
+ <property name="label" translatable="yes">Update status every</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label7">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Maintain history of</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>
</packing>
</child>
<child>
+ <widget class="GtkSpinButton" id="prefs-stats-update-interval">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">0 0 60 1 5 0</property>
+ <signal name="value_changed" handler="on_prefs_stats_update_interval_changed"/>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkSpinButton" id="prefs-stats-history-len">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">0 0 300 5 5 0</property>
+ <property name="climb_rate">0.01</property>
+ <signal name="value_changed" handler="on_prefs_stats_history_length_changed"/>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkLabel" id="label8">
<property name="visible">True</property>
<property name="xalign">0</property>
@@ -61,50 +95,18 @@
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="prefs-stats-history-len">
+ <widget class="GtkLabel" id="label9">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">0 0 300 5 5 0</property>
- <property name="climb_rate">0.01</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">samples</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkSpinButton" id="prefs-stats-update-interval">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">0 0 60 1 5 0</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label7">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Maintain history of</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>
</packing>
</child>
- <child>
- <widget class="GtkLabel" id="label6">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Update status every</property>
- </widget>
- </child>
</widget>
</child>
</widget>
@@ -141,18 +143,79 @@
<property name="column_spacing">3</property>
<property name="row_spacing">3</property>
<child>
- <widget class="GtkCheckButton" id="prefs-stats-enable-net">
+ <widget class="GtkLabel" id="label11">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">CPU Usage</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label12">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Memory Usage</property>
+ </widget>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label13">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Disk I/O</property>
+ </widget>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label14">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Network I/O</property>
+ </widget>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkCheckButton" id="prefs-stats-enable-cpu">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_prefs_stats_enable_net_toggled"/>
+ <signal name="toggled" handler="on_prefs_stats_enable_cpu_toggled"/>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_EXPAND</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkCheckButton" id="prefs-stats-enable-mem">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_prefs_stats_enable_mem_toggled"/>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_EXPAND</property>
</packing>
</child>
@@ -173,80 +236,19 @@
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="prefs-stats-enable-mem">
+ <widget class="GtkCheckButton" id="prefs-stats-enable-net">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_prefs_stats_enable_mem_toggled"/>
+ <signal name="toggled" handler="on_prefs_stats_enable_net_toggled"/>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="prefs-stats-enable-cpu">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_prefs_stats_enable_cpu_toggled"/>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_EXPAND</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label14">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Network I/O</property>
- </widget>
- <packing>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label13">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Disk I/O</property>
- </widget>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label12">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Memory Usage</property>
- </widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label11">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">CPU Usage</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
+ <property name="x_options">GTK_EXPAND</property>
</packing>
</child>
</widget>
@@ -302,19 +304,27 @@
<property name="n_columns">1</property>
<property name="row_spacing">2</property>
<child>
- <widget class="GtkComboBox" id="prefs-console-keygrab">
+ <widget class="GtkComboBox" id="prefs-console-popup">
<property name="visible">True</property>
<property name="items" translatable="yes">Never
-When fullscreen
-On mouse over</property>
+For all new domains
+For all domains</property>
+ <signal name="changed" handler="on_prefs_console_popup_changed"/>
</widget>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_padding">5</property>
</packing>
</child>
<child>
+ <widget class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Automatically open consoles:</property>
+ </widget>
+ </child>
+ <child>
<widget class="GtkLabel" id="label15">
<property name="visible">True</property>
<property name="xalign">0</property>
@@ -326,22 +336,16 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label5">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Automatically open consoles:</property>
- </widget>
- </child>
- <child>
- <widget class="GtkComboBox" id="prefs-console-popup">
+ <widget class="GtkComboBox" id="prefs-console-keygrab">
<property name="visible">True</property>
<property name="items" translatable="yes">Never
-For all new domains
-For all domains</property>
+When fullscreen
+On mouse over</property>
+ <signal name="changed" handler="on_prefs_console_keygrab_changed"/>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_padding">5</property>
</packing>
</child>
@@ -380,6 +384,13 @@
<property name="n_columns">1</property>
<property name="column_spacing">8</property>
<child>
+ <widget class="GtkLabel" id="label16">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Install Audio Device:</property>
+ </widget>
+ </child>
+ <child>
<widget class="GtkAlignment" id="alignment6">
<property name="visible">True</property>
<property name="left_padding">12</property>
@@ -417,13 +428,6 @@
<property name="bottom_attach">2</property>
</packing>
</child>
- <child>
- <widget class="GtkLabel" id="label16">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Install Audio Device:</property>
- </widget>
- </child>
</widget>
</child>
</widget>
@@ -470,7 +474,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="label" translatable="no">gtk-help</property>
+ <property name="label">gtk-help</property>
<property name="use_stock">True</property>
<property name="response_id">0</property>
<signal name="clicked" handler="on_prefs_help_clicked"/>
@@ -500,7 +504,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="label" translatable="no">gtk-close</property>
+ <property name="label">gtk-close</property>
<property name="use_stock">True</property>
<property name="response_id">0</property>
<signal name="clicked" handler="on_prefs_close_clicked"/>