---
pyanaconda/ui/gui/spokes/storage.glade | 31 +------------------------------
pyanaconda/ui/gui/spokes/storage.py | 27 +++++++++++++++++++++++++++
2 files changed, 28 insertions(+), 30 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/storage.glade
b/pyanaconda/ui/gui/spokes/storage.glade
index 16fa402..079712a 100644
--- a/pyanaconda/ui/gui/spokes/storage.glade
+++ b/pyanaconda/ui/gui/spokes/storage.glade
@@ -351,21 +351,6 @@
<property name="height">1</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
</object>
<packing>
<property name="expand">False</property>
@@ -595,21 +580,6 @@
<property name="height">1</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
</object>
<packing>
<property name="expand">False</property>
@@ -659,6 +629,7 @@
<property name="mnemonics_visible">False</property>
<property name="window_name">INSTALLATION
DESTINATION</property>
<signal name="back-clicked" handler="on_back_clicked"
swapped="no"/>
+ <signal name="info-bar-clicked" handler="on_info_bar_clicked"
swapped="no"/>
<child internal-child="main_box">
<object class="GtkBox"
id="AnacondaSpokeWindow-main_box1">
<property name="can_focus">False</property>
diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py
index b560f55..4916a3b 100644
--- a/pyanaconda/ui/gui/spokes/storage.py
+++ b/pyanaconda/ui/gui/spokes/storage.py
@@ -44,6 +44,7 @@ from gi.repository import AnacondaWidgets
from pyanaconda.ui.gui import GUIObject, communication
from pyanaconda.ui.gui.spokes import NormalSpoke
from pyanaconda.ui.gui.spokes.lib.cart import SelectedDisksDialog
+from pyanaconda.ui.gui.spokes.lib.detailederror import DetailedErrorDialog
from pyanaconda.ui.gui.categories.storage import StorageCategory
from pyanaconda.ui.gui.utils import enlightbox, gdk_threaded
@@ -55,6 +56,7 @@ from pyanaconda.flags import flags
from pykickstart.constants import *
import gettext
+import sys
_ = lambda x: gettext.ldgettext("anaconda", x)
N_ = lambda x: x
@@ -382,6 +384,9 @@ class StorageSpoke(NormalSpoke, StorageChecker):
self._update_summary()
+ if self.errors:
+ self.window.set_info(Gtk.MessageType.WARNING, _("Error checking storage
configuration. Click for details."))
+
def initialize(self):
from pyanaconda.threads import threadMgr, AnacondaThread
from pyanaconda.ui.gui.utils import setViewportBackground
@@ -568,3 +573,25 @@ class StorageSpoke(NormalSpoke, StorageChecker):
def on_add_disk_clicked(self, button):
print "ADD DISK CLICKED"
+
+ def on_info_bar_clicked(self, *args):
+ if not self.errors:
+ return
+
+ label = _("The following errors were encountered when checking your storage
"
+ "configuration. You can modify your storage layout\nor quit the
"
+ "installer.")
+ dialog = DetailedErrorDialog(self.data, buttons=[_("_Quit")],
label=label)
+ with enlightbox(self.window, dialog.window):
+ errors = "\n".join(self.errors)
+ dialog.refresh(errors)
+ rc = dialog.run()
+
+ dialog.window.destroy()
+
+ if rc == 0:
+ # Close the dialog so the user can change selections.
+ pass
+ elif rc == 1:
+ # Quit.
+ sys.exit(0)
--
1.7.11.2