Fix various problems with the exn saving UI (#461129).

2 files changed, 14 insertions, 114 deletions

diff --git a/gui.py b/gui.py
index f263074f9..790844c68 100755
--- a/gui.py
+++ b/gui.py
@@ -788,8 +788,7 @@ class SaveExceptionWindow:
         dests = anaconda.id.diskset.exceptionDisks(anaconda)
 
         if flags.livecdInstall:
-            exnxml.get_widget("diskBox").hide()
-            exnxml.get_widget("localBox").show()
+            self.destCombo.remove_text(0)
             self.destCombo.set_active(0)
             self.notebook.remove_page(0)
             self.notebook.set_current_page(0)
@@ -802,10 +801,18 @@ class SaveExceptionWindow:
             self.diskCombo.set_active(0)
             self.diskCombo.set_sensitive(True)
 
+            self.destCombo.remove_text(1)
             self.destCombo.set_active(0)
             self.notebook.remove_page(1)
             self.notebook.set_current_page(0)
         else:
+            iter = store.append(None)
+            store[iter] = (None, _("No devices found"))
+
+            self.diskCombo.set_model(store)
+            self.diskCombo.set_active(0)
+            self.diskCombo.set_sensitive(False)
+
             self.destCombo.remove_text(1)
             self.destCombo.set_active(1)
             self.notebook.remove_page(1)
@@ -827,7 +834,7 @@ class SaveExceptionWindow:
     def getDest(self):
         if self.saveToDisk():
             active = self.diskCombo.get_active()
-            if active < 0:
+            if active < 0 or self.diskCombo.get_model()[active][0] is None:
                 return None
 
             return self.diskCombo.get_model()[active][0]
@@ -850,10 +857,10 @@ class SaveExceptionWindow:
         self.rc = self.window.run ()
 
     def saveToDisk(self):
-        return self.destCombo.get_active() == 0
+        return self.destCombo.get_active() == 0 and not flags.livecdInstall
 
     def saveToLocal(self):
-        return self.destCombo.get_active() == 0
+        return self.destCombo.get_active() == 0 and flags.livecdInstall
 
     def saveToRemote(self):
         return self.destCombo.get_active() == 2
diff --git a/ui/exnSave.glade b/ui/exnSave.glade
index a1b897b90..ca9106ac0 100644
--- a/ui/exnSave.glade
+++ b/ui/exnSave.glade
@@ -99,7 +99,8 @@
 	  <child>
 	    <widget class="GtkComboBox" id="destCombo">
 	      <property name="visible">True</property>
-	      <property name="items" translatable="yes">Local disk
+	      <property name="items" translatable="yes">Local storage device
+Local disk
 Remote server (scp)</property>
 	      <property name="add_tearoffs">False</property>
 	      <property name="focus_on_click">True</property>
@@ -171,33 +172,6 @@ Remote server (scp)</property>
 	      </child>
 
 	      <child>
-		<placeholder/>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label13">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes"></property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="type">tab</property>
-		</packing>
-	      </child>
-
-	      <child>
 		<widget class="GtkFileChooserButton" id="localChooser">
 		  <property name="visible">True</property>
 		  <property name="title" translatable="yes">Select A File</property>
@@ -237,33 +211,6 @@ Remote server (scp)</property>
 	      </child>
 
 	      <child>
-		<placeholder/>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label15">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes"></property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="type">tab</property>
-		</packing>
-	      </child>
-
-	      <child>
 		<widget class="GtkHBox" id="bugzillaBox">
 		  <property name="visible">True</property>
 		  <property name="homogeneous">False</property>
@@ -459,33 +406,6 @@ Remote server (scp)</property>
 	      </child>
 
 	      <child>
-		<placeholder/>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label17">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes"></property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="type">tab</property>
-		</packing>
-	      </child>
-
-	      <child>
 		<widget class="GtkHBox" id="scpBox">
 		  <property name="visible">True</property>
 		  <property name="homogeneous">False</property>
@@ -723,33 +643,6 @@ Remote server (scp)</property>
 		  <property name="type">tab</property>
 		</packing>
 	      </child>
-
-	      <child>
-		<placeholder/>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label19">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes"></property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="type">tab</property>
-		</packing>
-	      </child>
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>