[gnome-control-center] printers: don't expand switch vertically
- From: William Jon McCann <mccann src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] printers: don't expand switch vertically
- Date: Wed, 2 Feb 2011 02:53:40 +0000 (UTC)
commit b65017536eca4d0295b0c8cc96396bcb95bde4d5
Author: William Jon McCann <jmccann redhat com>
Date: Tue Feb 1 18:36:28 2011 -0500
printers: don't expand switch vertically
panels/printers/printers.ui | 119 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 107 insertions(+), 12 deletions(-)
---
diff --git a/panels/printers/printers.ui b/panels/printers/printers.ui
index 8527d84..e12c975 100644
--- a/panels/printers/printers.ui
+++ b/panels/printers/printers.ui
@@ -71,6 +71,7 @@
</child>
</object>
<packing>
+ <property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
@@ -125,7 +126,6 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">3</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="y_options">GTK_FILL</property>
@@ -140,7 +140,6 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">3</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="y_options">GTK_FILL</property>
@@ -159,6 +158,7 @@
<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>
</packing>
</child>
<child>
@@ -179,9 +179,9 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">3</property>
<property name="top_attach">7</property>
<property name="bottom_attach">8</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -205,6 +205,8 @@
<packing>
<property name="top_attach">6</property>
<property name="bottom_attach">7</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -215,9 +217,9 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">6</property>
<property name="bottom_attach">7</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -232,6 +234,8 @@
<property name="right_attach">3</property>
<property name="top_attach">6</property>
<property name="bottom_attach">7</property>
+ <property name="x_options">GTK_SHRINK</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -248,17 +252,20 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
- <property name="pixel_size">64</property>
<property name="xalign">1</property>
+ <property name="pixel_size">64</property>
<property name="icon_name">printer</property>
</object>
<packing>
<property name="bottom_attach">2</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -270,6 +277,8 @@
<packing>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -281,6 +290,8 @@
<packing>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -288,12 +299,13 @@
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">---</property>
+ <property name="ellipsize">end</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">3</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -304,16 +316,26 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">3</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
- <object class="GtkSwitch" id="printer-disable-switch">
+ <object class="GtkVBox" id="disable-switch-vbox">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <child>
+ <object class="GtkSwitch" id="printer-disable-switch">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="left_attach">2</property>
@@ -323,8 +345,69 @@
<property name="y_options"></property>
</packing>
</child>
+ <child>
+ <object class="GtkLabel" id="label16">
+ <property name="visible">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label17">
+ <property name="visible">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label18">
+ <property name="visible">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label19">
+ <property name="visible">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label20">
+ <property name="visible">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">7</property>
+ <property name="bottom_attach">8</property>
+ <property name="x_options"></property>
+ </packing>
+ </child>
</object>
<packing>
+ <property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
@@ -362,10 +445,14 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
</object>
+ <packing>
+ <property name="tab_expand">True</property>
+ </packing>
</child>
<child type="tab">
<object class="GtkLabel" id="label2">
@@ -396,7 +483,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">3</property>
+ <property name="x_options"></property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
@@ -407,6 +494,7 @@
<packing>
<property name="left_attach">3</property>
<property name="right_attach">4</property>
+ <property name="x_options"></property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
@@ -430,6 +518,9 @@
<property name="y_options">GTK_FILL</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -547,7 +638,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">3</property>
+ <property name="x_options"></property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
@@ -558,6 +649,7 @@
<packing>
<property name="left_attach">3</property>
<property name="right_attach">4</property>
+ <property name="x_options"></property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
@@ -581,6 +673,9 @@
<property name="y_options">GTK_FILL</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="expand">False</property>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
