[PATCH 4/4] Rework the layout of the storage spoke for low resolution setups.
Chris Lumens
clumens at redhat.com
Wed May 8 19:09:23 UTC 2013
Basically, I've just added a scrolled window around the contents of the
middle of the screen (the local and advanced disk boxes), but that took
a lot of rejiggering of boxes and grids to achieve.
---
pyanaconda/ui/gui/spokes/storage.glade | 364 ++++++++++++++++-----------------
1 file changed, 181 insertions(+), 183 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/storage.glade b/pyanaconda/ui/gui/spokes/storage.glade
index 7ae11e0..24c7a4b 100644
--- a/pyanaconda/ui/gui/spokes/storage.glade
+++ b/pyanaconda/ui/gui/spokes/storage.glade
@@ -806,6 +806,7 @@
<child internal-child="action_area">
<object class="GtkBox" id="storageWindow-action_area1">
<property name="can_focus">False</property>
+ <property name="margin_bottom">6</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
@@ -831,142 +832,179 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="localLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_left">24</property>
- <property name="margin_right">24</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Local Standard Disks</property>
- <property name="track_visited_links">False</property>
- <attributes>
- <attribute name="font-desc" value="Cantarell Bold 10"/>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow" id="localScrolledWindow">
+ <object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="margin_left">24</property>
- <property name="margin_right">24</property>
- <property name="hexpand">True</property>
- <property name="vscrollbar_policy">never</property>
- <property name="shadow_type">in</property>
+ <property name="hscrollbar_policy">never</property>
<child>
- <object class="GtkViewport" id="localViewport">
+ <object class="GtkViewport" id="viewport1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
+ <property name="shadow_type">none</property>
<child>
- <object class="GtkBox" id="local_disks_box">
+ <object class="GtkBox" id="box3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="events">GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
- <property name="margin_left">6</property>
- <property name="margin_right">6</property>
- <property name="hexpand">True</property>
- <property name="spacing">30</property>
- <signal name="key-release-event" handler="on_disks_key_released" swapped="no"/>
+ <property name="margin_left">24</property>
+ <property name="margin_right">24</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <placeholder/>
+ <object class="GtkLabel" id="localLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Local Standard Disks</property>
+ <property name="track_visited_links">False</property>
+ <attributes>
+ <attribute name="font-desc" value="Cantarell Bold 10"/>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label6">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_right">24</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Disks left unselected here will not be touched.</property>
- <attributes>
- <attribute name="font-desc" value="Cantarell Italic 10"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="specializedLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_left">24</property>
- <property name="margin_right">24</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Specialized & Network Disks</property>
- <property name="track_visited_links">False</property>
- <attributes>
- <attribute name="font-desc" value="Cantarell Bold 10"/>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow" id="specializedScrolledWindow">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="margin_left">24</property>
- <property name="margin_right">24</property>
- <property name="hexpand">True</property>
- <property name="vscrollbar_policy">never</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkViewport" id="specializedViewport">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <child>
- <object class="GtkBox" id="specialized_disks_box">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="events">GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
- <property name="margin_left">6</property>
- <property name="margin_right">6</property>
- <property name="margin_top">6</property>
- <property name="margin_bottom">6</property>
- <property name="hexpand">True</property>
- <property name="spacing">30</property>
- <signal name="key-release-event" handler="on_disks_key_released" swapped="no"/>
<child>
- <object class="GtkButton" id="addSpecializedButton">
- <property name="label" translatable="yes">_Add a disk...</property>
+ <object class="GtkScrolledWindow" id="localScrolledWindow">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="valign">center</property>
- <property name="image">addSpecializedImage</property>
- <property name="use_underline">True</property>
- <property name="image_position">top</property>
- <signal name="clicked" handler="on_specialized_clicked" swapped="no"/>
+ <property name="hexpand">True</property>
+ <property name="vscrollbar_policy">never</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkViewport" id="localViewport">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <child>
+ <object class="GtkBox" id="local_disks_box">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
+ <property name="margin_left">6</property>
+ <property name="margin_right">6</property>
+ <property name="hexpand">True</property>
+ <property name="spacing">30</property>
+ <signal name="key-release-event" handler="on_disks_key_released" swapped="no"/>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">Disks left unselected here will not be touched.</property>
+ <attributes>
+ <attribute name="font-desc" value="Cantarell Italic 10"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="specializedLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_right">24</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Specialized & Network Disks</property>
+ <property name="track_visited_links">False</property>
+ <attributes>
+ <attribute name="font-desc" value="Cantarell Bold 10"/>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="specializedScrolledWindow">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vscrollbar_policy">never</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkViewport" id="specializedViewport">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <child>
+ <object class="GtkBox" id="specialized_disks_box">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
+ <property name="margin_left">6</property>
+ <property name="margin_right">6</property>
+ <property name="margin_top">6</property>
+ <property name="margin_bottom">6</property>
+ <property name="hexpand">True</property>
+ <property name="spacing">30</property>
+ <signal name="key-release-event" handler="on_disks_key_released" swapped="no"/>
+ <child>
+ <object class="GtkButton" id="addSpecializedButton">
+ <property name="label" translatable="yes">_Add a disk...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="valign">center</property>
+ <property name="image">addSpecializedImage</property>
+ <property name="use_underline">True</property>
+ <property name="image_position">top</property>
+ <signal name="clicked" handler="on_specialized_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">Disks left unselected here will not be touched.</property>
+ <attributes>
+ <attribute name="font-desc" value="Cantarell Italic 10"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">5</property>
</packing>
</child>
</object>
@@ -975,87 +1013,47 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">5</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label1">
+ <object class="GtkButton" id="summary_button">
+ <property name="label" translatable="yes">_Full disk summary and bootloader...</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_right">24</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Disks left unselected here will not be touched.</property>
- <attributes>
- <attribute name="font-desc" value="Cantarell Italic 10"/>
- </attributes>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="no_show_all">True</property>
+ <property name="halign">start</property>
+ <property name="margin_left">18</property>
+ <property name="relief">none</property>
+ <property name="use_underline">True</property>
+ <property name="focus_on_click">False</property>
+ <property name="xalign">0</property>
+ <signal name="clicked" handler="on_summary_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">6</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
- <object class="GtkGrid" id="grid3">
+ <object class="GtkLabel" id="summary_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">6</property>
- <property name="margin_right">6</property>
- <property name="margin_bottom">6</property>
- <property name="hexpand">True</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">6</property>
- <child>
- <object class="GtkButton" id="summary_button">
- <property name="label" translatable="yes">_Full disk summary and bootloader...</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="no_show_all">True</property>
- <property name="halign">start</property>
- <property name="margin_left">18</property>
- <property name="relief">none</property>
- <property name="use_underline">True</property>
- <property name="focus_on_click">False</property>
- <property name="xalign">0</property>
- <signal name="clicked" handler="on_summary_clicked" swapped="no"/>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="summary_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="margin_left">18</property>
- <property name="label" translatable="yes">summary</property>
- <attributes>
- <attribute name="font-desc" value="Cantarell 10"/>
- </attributes>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
+ <property name="halign">start</property>
+ <property name="margin_left">18</property>
+ <property name="label" translatable="yes">summary</property>
+ <attributes>
+ <attribute name="font-desc" value="Cantarell 10"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">7</property>
+ <property name="position">4</property>
</packing>
</child>
</object>
--
1.8.1.2
More information about the anaconda-patches
mailing list