---
.gitignore | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.gitignore b/.gitignore
index 754631c..2b53f5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,7 @@ config.log
config.status
config.sub
configure
+data/liveinst/gnome/fedora-welcome.desktop
depcomp
dirbrowser
gtk-doc.m4
@@ -57,6 +58,8 @@ py-compile
stamp-h1
tags
updates.img
+utils/dd/dd_extract
+utils/dd/dd_list
widgets/doc/AnacondaWidgets-*.txt
widgets/doc/AnacondaWidgets.*
widgets/doc/*.stamp
--
1.8.1.2
Show replies by date
---
pyanaconda/ui/gui/spokes/advstorage/iscsi.glade | 12 ------------
pyanaconda/ui/gui/spokes/advstorage/iscsi.py | 10 ----------
2 files changed, 22 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/advstorage/iscsi.glade
b/pyanaconda/ui/gui/spokes/advstorage/iscsi.glade
index abe5d1e..0d63450 100644
--- a/pyanaconda/ui/gui/spokes/advstorage/iscsi.glade
+++ b/pyanaconda/ui/gui/spokes/advstorage/iscsi.glade
@@ -308,8 +308,6 @@
<property
name="visibility">False</property>
<property
name="invisible_char">●</property>
<signal name="changed"
handler="on_discover_field_changed" swapped="no"/>
- <signal name="focus-in-event"
handler="on_password_focused" swapped="no"/>
- <signal name="focus-out-event"
handler="on_password_unfocused" swapped="no"/>
</object>
<packing>
<property
name="left_attach">1</property>
@@ -355,8 +353,6 @@
<property
name="visibility">False</property>
<property
name="invisible_char">●</property>
<signal name="changed"
handler="on_discover_field_changed" swapped="no"/>
- <signal name="focus-in-event"
handler="on_password_focused" swapped="no"/>
- <signal name="focus-out-event"
handler="on_password_unfocused" swapped="no"/>
</object>
<packing>
<property
name="left_attach">1</property>
@@ -388,8 +384,6 @@
<property
name="visibility">False</property>
<property
name="invisible_char">●</property>
<signal name="changed"
handler="on_discover_field_changed" swapped="no"/>
- <signal name="focus-in-event"
handler="on_password_focused" swapped="no"/>
- <signal name="focus-out-event"
handler="on_password_unfocused" swapped="no"/>
</object>
<packing>
<property
name="left_attach">1</property>
@@ -878,8 +872,6 @@
<property
name="invisible_char">●</property>
<property
name="invisible_char_set">True</property>
<signal name="changed"
handler="on_login_field_changed" swapped="no"/>
- <signal name="focus-in-event"
handler="on_password_focused" swapped="no"/>
- <signal name="focus-out-event"
handler="on_password_unfocused" swapped="no"/>
</object>
<packing>
<property
name="left_attach">1</property>
@@ -926,8 +918,6 @@
<property
name="invisible_char">●</property>
<property
name="invisible_char_set">True</property>
<signal name="changed"
handler="on_login_field_changed" swapped="no"/>
- <signal name="focus-in-event"
handler="on_password_focused" swapped="no"/>
- <signal name="focus-out-event"
handler="on_password_unfocused" swapped="no"/>
</object>
<packing>
<property
name="left_attach">1</property>
@@ -960,8 +950,6 @@
<property
name="invisible_char">●</property>
<property
name="invisible_char_set">True</property>
<signal name="changed"
handler="on_login_field_changed" swapped="no"/>
- <signal name="focus-in-event"
handler="on_password_focused" swapped="no"/>
- <signal name="focus-out-event"
handler="on_password_unfocused" swapped="no"/>
</object>
<packing>
<property
name="left_attach">1</property>
diff --git a/pyanaconda/ui/gui/spokes/advstorage/iscsi.py
b/pyanaconda/ui/gui/spokes/advstorage/iscsi.py
index 89ce317..be3a526 100644
--- a/pyanaconda/ui/gui/spokes/advstorage/iscsi.py
+++ b/pyanaconda/ui/gui/spokes/advstorage/iscsi.py
@@ -438,13 +438,3 @@ class ISCSIDialog(GUIObject):
credentials = loginMap[page](self.builder)
self._loginButton.set_sensitive(credentials_valid(credentials))
-
- ##
- ## GLOBAL SIGNAL HANDLERS
- ##
-
- def on_password_focused(self, entry, event, *args):
- entry.set_visibility(True)
-
- def on_password_unfocused(self, entry, event, *args):
- entry.set_visibility(False)
--
1.8.1.2
---
pyanaconda/ui/gui/spokes/filter.glade | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/filter.glade
b/pyanaconda/ui/gui/spokes/filter.glade
index 5a324a2..8939257 100644
--- a/pyanaconda/ui/gui/spokes/filter.glade
+++ b/pyanaconda/ui/gui/spokes/filter.glade
@@ -75,10 +75,11 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
+ <property name="xalign">0</property>
<property name="yalign">0</property>
<property name="bottom_padding">6</property>
- <property name="left_padding">24</property>
- <property name="right_padding">24</property>
+ <property name="left_padding">6</property>
+ <property name="right_padding">6</property>
<child internal-child="action_area">
<object class="GtkBox"
id="AnacondaSpokeWindow-action_area1">
<property name="can_focus">False</property>
@@ -349,7 +350,9 @@
<property name="title"
translatable="yes">WWID</property>
<property
name="clickable">True</property>
<child>
- <object class="GtkCellRendererText"
id="searchWWIDRenderer"/>
+ <object class="GtkCellRendererText"
id="searchWWIDRenderer">
+ <property
name="wrap_width">50</property>
+ </object>
<attributes>
<attribute
name="sensitive">2</attribute>
<attribute
name="visible">0</attribute>
@@ -429,7 +432,7 @@
</object>
</child>
<child>
- <object class="GtkTreeViewColumn"
id="searchTargetRenderer2">
+ <object class="GtkTreeViewColumn"
id="searchTargetCol">
<property name="title"
translatable="yes">Target</property>
<property
name="clickable">True</property>
<child>
--
1.8.1.2
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
These all look good to me.
--
Vratislav Podzimek
Anaconda Rider | Red Hat, Inc. | Brno - Czech Republic