From 4de7b5c16a98fcc5e6d9ff4d32ca289c44a5192b Mon Sep 17 00:00:00 2001
From: Sebastian Heinlein <sebi@sebi-pc>
Date: Sun, 24 Sep 2006 14:22:27 +0200
Subject: * place the cancel button into the changes textview

---
 UpdateManager/UpdateManager.py |  7 +++-
 data/glade/UpdateManager.glade | 90 +-----------------------------------------
 2 files changed, 7 insertions(+), 90 deletions(-)

diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py
index 7f62d0f0..f4c34ada 100644
--- a/UpdateManager/UpdateManager.py
+++ b/UpdateManager/UpdateManager.py
@@ -507,8 +507,11 @@ class UpdateManager(SimpleGladeApp):
         lock = thread.allocate_lock()
         lock.acquire()
         t=thread.start_new_thread(self.cache.get_changelog,(name,lock))
-        changes_buffer.set_text(_("Downloading the list of changes..."))
-        button = self.button_cancel_dl_changelog
+        changes_buffer.set_text("%s\n" % _("Downloading list of changes..."))
+        iter = changes_buffer.get_iter_at_line(1)
+        anchor = changes_buffer.create_child_anchor(iter)
+        button = gtk.Button(stock="gtk-cancel")
+        self.textview_changes.add_child_at_anchor(button, anchor)
         button.show()
         id = button.connect("clicked",
                             lambda w,lock: lock.release(), lock)
diff --git a/data/glade/UpdateManager.glade b/data/glade/UpdateManager.glade
index 2a4965fd..a11a5a43 100644
--- a/data/glade/UpdateManager.glade
+++ b/data/glade/UpdateManager.glade
@@ -468,7 +468,7 @@
 	    <widget class="GtkExpander" id="expander_details">
 	      <property name="visible">True</property>
 	      <property name="can_focus">True</property>
-	      <property name="expanded">False</property>
+	      <property name="expanded">True</property>
 	      <property name="spacing">6</property>
 	      <signal name="activate" handler="on_expander_details_activate" last_modification_time="Mon, 31 Jan 2005 17:55:19 GMT"/>
 
@@ -533,92 +533,6 @@
 			      <property name="fill">True</property>
 			    </packing>
 			  </child>
-
-			  <child>
-			    <widget class="GtkHButtonBox" id="hbuttonbox3">
-			      <property name="visible">True</property>
-			      <property name="layout_style">GTK_BUTTONBOX_END</property>
-			      <property name="spacing">0</property>
-
-			      <child>
-				<widget class="GtkButton" id="button_cancel_dl_changelog">
-				  <property name="can_default">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
-
-				  <child>
-				    <widget class="GtkAlignment" id="alignment2">
-				      <property name="visible">True</property>
-				      <property name="xalign">0.5</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xscale">0</property>
-				      <property name="yscale">0</property>
-				      <property name="top_padding">0</property>
-				      <property name="bottom_padding">0</property>
-				      <property name="left_padding">0</property>
-				      <property name="right_padding">0</property>
-
-				      <child>
-					<widget class="GtkHBox" id="hbox8">
-					  <property name="visible">True</property>
-					  <property name="homogeneous">False</property>
-					  <property name="spacing">2</property>
-
-					  <child>
-					    <widget class="GtkImage" id="image7">
-					      <property name="visible">True</property>
-					      <property name="stock">gtk-cancel</property>
-					      <property name="icon_size">4</property>
-					      <property name="xalign">0.5</property>
-					      <property name="yalign">0.5</property>
-					      <property name="xpad">0</property>
-					      <property name="ypad">0</property>
-					    </widget>
-					    <packing>
-					      <property name="padding">0</property>
-					      <property name="expand">False</property>
-					      <property name="fill">False</property>
-					    </packing>
-					  </child>
-
-					  <child>
-					    <widget class="GtkLabel" id="label13">
-					      <property name="visible">True</property>
-					      <property name="label" translatable="yes">Cancel _Download</property>
-					      <property name="use_underline">True</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="padding">0</property>
-					      <property name="expand">False</property>
-					      <property name="fill">False</property>
-					    </packing>
-					  </child>
-					</widget>
-				      </child>
-				    </widget>
-				  </child>
-				</widget>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
 			</widget>
 			<packing>
 			  <property name="tab_expand">False</property>
@@ -1288,7 +1202,7 @@
 		  <property name="can_focus">True</property>
 		  <property name="label" translatable="yes">&lt;b&gt;&lt;big&gt;You must check for updates manually&lt;/big&gt;&lt;/b&gt;
 
-Your system does not check for updates automatically. You can configure this behavior in &quot;System&quot; -&gt; &quot;Administration&quot; -&gt; &quot;Software Properties&quot;.</property>
+Your system does not check for updates automatically. You can configure this behavior in &lt;i&gt;Software Sources&lt;/i&gt; on the &lt;i&gt;Internet Updates&lt;/i&gt; tab.</property>
 		  <property name="use_underline">False</property>
 		  <property name="use_markup">True</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-- 
cgit v1.2.3