[Pylint complained "paths" was unused for the OtherPage. We can either opt to show the disk paths in some column or just remove the piece of code where "paths" is defined for this page. I chose the former, but if someone prefers to just axe it altogether, that's fine.]
--- pyanaconda/ui/gui/spokes/filter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyanaconda/ui/gui/spokes/filter.py b/pyanaconda/ui/gui/spokes/filter.py index a1afb33..19663ef 100644 --- a/pyanaconda/ui/gui/spokes/filter.py +++ b/pyanaconda/ui/gui/spokes/filter.py @@ -321,7 +321,7 @@ class OtherPage(FilterPage): store.append([True, selected, not disk.protected, disk.name, "", disk.model, str(disk.size), disk.vendor, disk.bus, disk.serial, - self._long_identifier(disk), "", port, getattr(disk, "initiator", ""), + self._long_identifier(disk), "\n".join(paths), port, getattr(disk, "initiator", ""), lun, "", ""])
if not disk.vendor in vendors:
Unused import, unused variable, attrs defined outside of __init__, and fixed a call to use the enlightbox. --- pyanaconda/ui/gui/spokes/filter.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/filter.py b/pyanaconda/ui/gui/spokes/filter.py index 19663ef..9e30075 100644 --- a/pyanaconda/ui/gui/spokes/filter.py +++ b/pyanaconda/ui/gui/spokes/filter.py @@ -19,7 +19,7 @@ # Red Hat Author(s): Chris Lumens clumens@redhat.com #
-# pylint: disable-msg=E0611 +# pylint: disable=E0611 from gi.repository import Gtk
from collections import namedtuple @@ -32,7 +32,7 @@ from blivet.fcoe import has_fcoe from pyanaconda.flags import flags from pyanaconda.i18n import CN_, CP_
-from pyanaconda.ui.lib.disks import getDisks, isLocalDisk +from pyanaconda.ui.lib.disks import getDisks from pyanaconda.ui.gui.spokes import NormalSpoke from pyanaconda.ui.gui.spokes.advstorage.fcoe import FCoEDialog from pyanaconda.ui.gui.spokes.advstorage.iscsi import ISCSIDialog @@ -374,6 +374,7 @@ class ZPage(FilterPage): self._ccwEntry = self.builder.get_object("zCCWEntry") self._wwpnEntry = self.builder.get_object("zWWPNEntry") self._lunEntry = self.builder.get_object("zLUNEntry") + self._combo = self.builder.get_object("zTypeCombo")
self._isS390 = arch.isS390()
@@ -394,7 +395,6 @@ class ZPage(FilterPage): wwpns = [] luns = []
- self._combo = self.builder.get_object("zTypeCombo") self._combo.set_active(0) self._combo.emit("changed")
@@ -632,7 +632,7 @@ class FilterSpoke(NormalSpoke): def on_add_zfcp_clicked(self, widget, *args): dialog = ZFCPDialog(self.data, self.storage)
- with enlightbox(self.window, dialog.window): + with self.main_window.enlightbox(self.window, dialog.window): dialog.refresh() dialog.run()
On 01/07/2015 02:25 PM, Samantha N. Bueno wrote:
Unused import, unused variable, attrs defined outside of __init__, and fixed a call to use the enlightbox.
pyanaconda/ui/gui/spokes/filter.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/filter.py b/pyanaconda/ui/gui/spokes/filter.py index 19663ef..9e30075 100644 --- a/pyanaconda/ui/gui/spokes/filter.py +++ b/pyanaconda/ui/gui/spokes/filter.py @@ -19,7 +19,7 @@ # Red Hat Author(s): Chris Lumens clumens@redhat.com #
-# pylint: disable-msg=E0611 +# pylint: disable=E0611 from gi.repository import Gtk
The pylint disable is an artifact of darker days and you can axe it. Also we can use symbolic names now (no-name-in-module) and it should be on the same line as the import to avoid applying to the entire file. For real though, kill it.
[I don't have a better idea for what to change this to; suggestions welcome if you don't like it.]
--- pyanaconda/ui/gui/spokes/filter.glade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyanaconda/ui/gui/spokes/filter.glade b/pyanaconda/ui/gui/spokes/filter.glade index 23af702..5614bb2 100644 --- a/pyanaconda/ui/gui/spokes/filter.glade +++ b/pyanaconda/ui/gui/spokes/filter.glade @@ -1206,7 +1206,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes" context="GUI|Installation Destination|Filter|zSeries">_Filter By:</property> + <property name="label" translatable="yes" context="GUI|Installation Destination|Filter|zSeries">Filter B_y:</property> <property name="use_underline">True</property> </object> <packing>
Move markup out of a translatable string and use pango attributes instead.
Also, stock icon name changed, so fix that. --- pyanaconda/ui/gui/spokes/advstorage/zfcp.glade | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/advstorage/zfcp.glade b/pyanaconda/ui/gui/spokes/advstorage/zfcp.glade index b1ccb0a..52d3d38 100644 --- a/pyanaconda/ui/gui/spokes/advstorage/zfcp.glade +++ b/pyanaconda/ui/gui/spokes/advstorage/zfcp.glade @@ -252,7 +252,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">1</property> - <property name="stock">gtk-dialog-error</property> + <property name="icon_name">dialog-error</property> </object> <packing> <property name="left_attach">0</property> @@ -266,8 +266,10 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes"><b>Device discovery failed.</b></property> - <property name="use_markup">True</property> + <property name="label" translatable="yes">Device discovery failed.</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> </object> <packing> <property name="left_attach">1</property>
On 01/07/2015 02:25 PM, Samantha N. Bueno wrote:
All short and pretty self-explanatory. _______________________________________________ anaconda-patches mailing list anaconda-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/anaconda-patches
Other than the one comment, ack.
anaconda-patches@lists.fedorahosted.org
-
David Shea -
Samantha N. Bueno