--- pyanaconda/ui/gui/spokes/advstorage/iscsi.py | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/pyanaconda/ui/gui/spokes/advstorage/iscsi.py b/pyanaconda/ui/gui/spokes/advstorage/iscsi.py index abc51c0..542d7a4 100644 --- a/pyanaconda/ui/gui/spokes/advstorage/iscsi.py +++ b/pyanaconda/ui/gui/spokes/advstorage/iscsi.py @@ -230,6 +230,11 @@ class ISCSIDialog(GUIObject): self._iscsiNotebook.set_current_page(1) self._okButton.set_sensitive(True)
+ # If some form of login credentials were used for discovery, + # default to using the same for login. + if self._authTypeCombo.get_active() != 0: + self._loginAuthTypeCombo.set_active(3) + # We always want to enable this button, in case the user's had enough. self._cancelButton.set_sensitive(True) return False
This makes it look a little closer to other dialogs we have - especially where spacing and borders are concerned. --- pyanaconda/ui/gui/spokes/datetime_spoke.glade | 258 +++++++++++--------------- 1 file changed, 109 insertions(+), 149 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/datetime_spoke.glade b/pyanaconda/ui/gui/spokes/datetime_spoke.glade index 393f886..39ca906 100644 --- a/pyanaconda/ui/gui/spokes/datetime_spoke.glade +++ b/pyanaconda/ui/gui/spokes/datetime_spoke.glade @@ -255,7 +255,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">1</property> - <property name="xscale">1</property> <property name="left_padding">24</property> <child> <object class="GtkBox" id="footerBox"> @@ -266,7 +265,6 @@ <object class="GtkGrid" id="grid2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="n_columns">5</property> <child> <object class="GtkLabel" id="hoursLabel"> <property name="visible">True</property> @@ -669,173 +667,136 @@ <object class="GtkBox" id="dialog-vbox1"> <property name="can_focus">False</property> <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkAlignment" id="alignment3"> + <object class="GtkLabel" id="configHeadingLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Add and mark for usage NTP servers</property> + <attributes> + <attribute name="font-desc" value="Sans Bold 12"/> + </attributes> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="yscale">0.80000001192092896</property> <child> - <object class="GtkBox" id="box7"> + <object class="GtkEntry" id="serverEntry"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> + <property name="invisible_char_set">True</property> + <signal name="activate" handler="on_entry_activated" swapped="no"/> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="addButton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="image">addImage</property> + <signal name="clicked" handler="on_add_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">4</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="scrolledWindow"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">never</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTreeView" id="serversView"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="model">serversStore</property> + <property name="headers_clickable">False</property> + <property name="search_column">0</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection"/> + </child> <child> - <object class="GtkLabel" id="configHeadingLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Add and mark for usage NTP servers</property> - <attributes> - <attribute name="font-desc" value="Sans Bold 12"/> - </attributes> + <object class="GtkTreeViewColumn" id="hostnameColumn"> + <property name="title" translatable="yes">Hostname</property> + <property name="expand">True</property> + <child> + <object class="GtkCellRendererText" id="hostnameRenderer"> + <property name="editable">True</property> + <signal name="edited" handler="on_server_edited" swapped="no"/> + </object> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> </child> <child> - <object class="GtkAlignment" id="alignment1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xscale">0.80000001192092896</property> - <property name="yscale">0.80000001192092896</property> + <object class="GtkTreeViewColumn" id="workingColumn"> + <property name="title" translatable="yes">Working</property> <child> - <object class="GtkBox" id="box2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkBox" id="box3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkEntry" id="serverEntry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">●</property> - <property name="invisible_char_set">True</property> - <signal name="activate" handler="on_entry_activated" swapped="no"/> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="addButton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="image">addImage</property> - <signal name="clicked" handler="on_add_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">4</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow" id="scrolledWindow"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">never</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkTreeView" id="serversView"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="model">serversStore</property> - <property name="headers_clickable">False</property> - <property name="search_column">0</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection"/> - </child> - <child> - <object class="GtkTreeViewColumn" id="hostnameColumn"> - <property name="title" translatable="yes">Hostname</property> - <property name="expand">True</property> - <child> - <object class="GtkCellRendererText" id="hostnameRenderer"> - <property name="editable">True</property> - <signal name="edited" handler="on_server_edited" swapped="no"/> - </object> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - </child> - <child> - <object class="GtkTreeViewColumn" id="workingColumn"> - <property name="title" translatable="yes">Working</property> - <child> - <object class="GtkCellRendererPixbuf" id="workingRenderer"/> - </child> - </object> - </child> - <child> - <object class="GtkTreeViewColumn" id="removeColumn"> - <property name="title" translatable="yes">Use</property> - <child> - <object class="GtkCellRendererToggle" id="removeRenderer"> - <signal name="toggled" handler="on_use_server_toggled" swapped="no"/> - </object> - <attributes> - <attribute name="active">2</attribute> - </attributes> - </child> - </object> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> + <object class="GtkCellRendererPixbuf" id="workingRenderer"/> </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> </child> <child> - <object class="GtkLabel" id="poolsNote"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <attributes> - <attribute name="font-desc" value="Sans Italic 9"/> - </attributes> + <object class="GtkTreeViewColumn" id="removeColumn"> + <property name="title" translatable="yes">Use</property> + <child> + <object class="GtkCellRendererToggle" id="removeRenderer"> + <signal name="toggled" handler="on_use_server_toggled" swapped="no"/> + </object> + <attributes> + <attribute name="active">2</attribute> + </attributes> + </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> </child> </object> </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="poolsNote"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <attributes> + <attribute name="font-desc" value="Sans Italic 9"/> + </attributes> + </object> + <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">3</property> </packing> </child> <child internal-child="action_area"> @@ -874,8 +835,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack_type">end</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> </object>
--- pyanaconda/kickstart.py | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py index cd6713d..be99ac2 100644 --- a/pyanaconda/kickstart.py +++ b/pyanaconda/kickstart.py @@ -1125,6 +1125,9 @@ class RepoData(commands.repo.F15_RepoData):
class RootPw(commands.rootpw.F18_RootPw): def execute(self, storage, ksdata, instClass, users): + if not self.password and not flags.automatedInstall: + self.lock = True + algo = getPassAlgo(ksdata.authconfig.authconfig) users.setRootPassword(self.password, self.isCrypted, self.lock, algo)
On Wed, 2013-04-24 at 15:55 -0400, Chris Lumens wrote:
pyanaconda/ui/gui/spokes/advstorage/iscsi.py | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/pyanaconda/ui/gui/spokes/advstorage/iscsi.py b/pyanaconda/ui/gui/spokes/advstorage/iscsi.py index abc51c0..542d7a4 100644 --- a/pyanaconda/ui/gui/spokes/advstorage/iscsi.py +++ b/pyanaconda/ui/gui/spokes/advstorage/iscsi.py @@ -230,6 +230,11 @@ class ISCSIDialog(GUIObject): self._iscsiNotebook.set_current_page(1) self._okButton.set_sensitive(True)
# If some form of login credentials were used for discovery,# default to using the same for login.if self._authTypeCombo.get_active() != 0:self._loginAuthTypeCombo.set_active(3)# We always want to enable this button, in case the user's had enough. self._cancelButton.set_sensitive(True) return False
These all look good to me.
anaconda-patches@lists.fedorahosted.org
-
Chris Lumens -
Vratislav Podzimek