gnome-packagekit r126 - in trunk: data src
- From: rhughes svn gnome org
- To: svn-commits-list gnome org
- Subject: gnome-packagekit r126 - in trunk: data src
- Date: Mon, 24 Mar 2008 22:33:39 +0000 (GMT)
Author: rhughes
Date: Mon Mar 24 22:33:39 2008
New Revision: 126
URL: http://svn.gnome.org/viewvc/gnome-packagekit?rev=126&view=rev
Log:
from git
Modified:
trunk/data/pk-prefs.glade
trunk/data/pk-repo.glade
trunk/src/pk-prefs.c
trunk/src/pk-repo.c
Modified: trunk/data/pk-prefs.glade
==============================================================================
--- trunk/data/pk-prefs.glade (original)
+++ trunk/data/pk-prefs.glade Mon Mar 24 22:33:39 2008
@@ -48,56 +48,56 @@
<property name="column_spacing">20</property>
<property name="row_spacing">5</property>
<child>
- <widget class="GtkLabel" id="label_check">
+ <widget class="GtkComboBox" id="combobox_check">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">C_heck for updates:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">combobox_check</property>
+ <property name="items"></property>
</widget>
<packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_install">
+ <widget class="GtkComboBox" id="combobox_install">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Automatically install:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">combobox_install</property>
+ <property name="items"></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>
- <property name="y_options"></property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="combobox_install">
+ <widget class="GtkLabel" id="label_install">
<property name="visible">True</property>
- <property name="items"></property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Automatically install:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">combobox_install</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="y_options">GTK_FILL</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="combobox_check">
+ <widget class="GtkLabel" id="label_check">
<property name="visible">True</property>
- <property name="items"></property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">C_heck for updates:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">combobox_check</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
</widget>
@@ -203,6 +203,7 @@
<widget class="GtkHButtonBox" id="hbuttonbox1">
<property name="visible">True</property>
<property name="spacing">5</property>
+ <property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
<widget class="GtkButton" id="button_help">
<property name="visible">True</property>
@@ -212,6 +213,9 @@
<property name="use_stock">True</property>
<property name="response_id">0</property>
</widget>
+ <packing>
+ <property name="secondary">True</property>
+ </packing>
</child>
<child>
<widget class="GtkButton" id="button_close">
Modified: trunk/data/pk-repo.glade
==============================================================================
--- trunk/data/pk-repo.glade (original)
+++ trunk/data/pk-repo.glade Mon Mar 24 22:33:39 2008
@@ -32,7 +32,7 @@
<widget class="GtkHButtonBox" id="hbuttonbox1">
<property name="visible">True</property>
<property name="spacing">5</property>
- <property name="layout_style">GTK_BUTTONBOX_EDGE</property>
+ <property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
<widget class="GtkButton" id="button_help">
<property name="visible">True</property>
@@ -42,6 +42,9 @@
<property name="use_stock">True</property>
<property name="response_id">0</property>
</widget>
+ <packing>
+ <property name="secondary">True</property>
+ </packing>
</child>
<child>
<widget class="GtkButton" id="button_close">
Modified: trunk/src/pk-prefs.c
==============================================================================
--- trunk/src/pk-prefs.c (original)
+++ trunk/src/pk-prefs.c Mon Mar 24 22:33:39 2008
@@ -359,6 +359,8 @@
widget = glade_xml_get_widget (glade_xml, "button_help");
g_signal_connect (widget, "clicked",
G_CALLBACK (pk_button_help_cb), NULL);
+ /* no help yet */
+ gtk_widget_hide (widget);
/* update the combo boxes */
pk_prefs_freq_combo_setup ();
Modified: trunk/src/pk-repo.c
==============================================================================
--- trunk/src/pk-repo.c (original)
+++ trunk/src/pk-repo.c Mon Mar 24 22:33:39 2008
@@ -279,6 +279,8 @@
widget = glade_xml_get_widget (glade_xml, "button_help");
g_signal_connect (widget, "clicked",
G_CALLBACK (pk_button_help_cb), NULL);
+ /* no help yet */
+ gtk_widget_hide (widget);
gtk_widget_set_size_request (main_window, 500, 300);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]