Moved version list out of the PackageTable into the normal MainWindow

2 files changed, 266 insertions, 259 deletions

diff --git a/portato/gui/templates/MainWindow.glade b/portato/gui/templates/MainWindow.glade
index 788a339..54a08c9 100644
--- a/portato/gui/templates/MainWindow.glade
+++ b/portato/gui/templates/MainWindow.glade
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.3 on Mon Apr 21 23:09:43 2008 -->
+<!--Generated with glade3 3.4.4 on Sat Jun  7 19:07:21 2008 -->
 <glade-interface>
   <widget class="GtkWindow" id="MainWindow">
     <property name="border_width">2</property>
@@ -46,8 +46,8 @@
                         <property name="label" translatable="yes">Re_load Portage</property>
                         <property name="use_underline">True</property>
                         <signal name="activate" handler="cb_reload_clicked"/>
-                        <accelerator key="R" modifiers="GDK_CONTROL_MASK" signal="activate"/>
                         <accelerator key="F5" modifiers="" signal="activate"/>
+                        <accelerator key="R" modifiers="GDK_CONTROL_MASK" signal="activate"/>
                         <child internal-child="image">
                           <widget class="GtkImage" id="menu-item-image9">
                             <property name="visible">True</property>
@@ -463,7 +463,6 @@
                             <property name="visible">True</property>
                             <property name="headers_clickable">True</property>
                             <property name="search_column">1</property>
-                            <signal name="cursor_changed" handler="cb_version_list_changed"/>
                           </widget>
                         </child>
                       </widget>
@@ -616,271 +615,271 @@
                                       <placeholder/>
                                     </child>
                                     <child>
-                                      <widget class="GtkLabel" id="useFlagsLabel">
+                                      <widget class="GtkLabel" id="licenseLabel">
                                         <property name="visible">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                         <property name="no_show_all">True</property>
                                         <property name="xalign">0</property>
-                                        <property name="label">use flags</property>
-                                        <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+                                        <property name="label" translatable="yes">label</property>
                                         <property name="single_line_mode">True</property>
                                       </widget>
                                       <packing>
                                         <property name="left_attach">1</property>
                                         <property name="right_attach">2</property>
-                                        <property name="top_attach">4</property>
-                                        <property name="bottom_attach">5</property>
+                                        <property name="top_attach">3</property>
+                                        <property name="bottom_attach">4</property>
                                         <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkLabel" id="useFlagsLabelLabel">
+                                      <widget class="GtkLabel" id="licenseLabelLabel">
                                         <property name="visible">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                        <property name="no_show_all">True</property>
                                         <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">&lt;b&gt;Use Flags:&lt;/b&gt;</property>
+                                        <property name="label" translatable="yes">&lt;b&gt;License:&lt;/b&gt;</property>
                                         <property name="use_markup">True</property>
                                         <property name="single_line_mode">True</property>
                                       </widget>
                                       <packing>
-                                        <property name="top_attach">4</property>
-                                        <property name="bottom_attach">5</property>
+                                        <property name="top_attach">3</property>
+                                        <property name="bottom_attach">4</property>
                                         <property name="x_options">GTK_FILL</property>
                                         <property name="y_options"></property>
                                         <property name="y_padding">5</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkCheckButton" id="testingCheck">
+                                      <widget class="GtkLabel" id="notInSysLabel">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                         <property name="no_show_all">True</property>
-                                        <property name="label" translatable="yes">Testing</property>
-                                        <property name="xalign">0</property>
-                                        <property name="response_id">0</property>
-                                        <property name="draw_indicator">True</property>
-                                        <signal name="toggled" handler="cb_testing_toggled"/>
+                                        <property name="label" translatable="yes">&lt;b&gt;Installed, but not in portage anymore&lt;/b&gt;</property>
+                                        <property name="use_markup">True</property>
                                       </widget>
                                       <packing>
-                                        <property name="top_attach">7</property>
-                                        <property name="bottom_attach">8</property>
-                                        <property name="x_options">GTK_FILL</property>
+                                        <property name="right_attach">2</property>
+                                        <property name="top_attach">5</property>
+                                        <property name="bottom_attach">6</property>
                                         <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkLabel" id="maskedLabel">
+                                      <widget class="GtkLabel" id="missingLabel">
                                         <property name="visible">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                        <property name="xalign">0</property>
+                                        <property name="no_show_all">True</property>
+                                        <property name="label" translatable="yes">&lt;span foreground='red'&gt;&lt;b&gt;MISSING KEYWORD&lt;/b&gt;&lt;/span&gt;</property>
+                                        <property name="use_markup">True</property>
                                       </widget>
                                       <packing>
-                                        <property name="left_attach">1</property>
                                         <property name="right_attach">2</property>
-                                        <property name="top_attach">8</property>
-                                        <property name="bottom_attach">9</property>
+                                        <property name="top_attach">5</property>
+                                        <property name="bottom_attach">6</property>
                                         <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkCheckButton" id="maskedCheck">
+                                      <widget class="GtkHBox" id="linkBox">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                        <property name="no_show_all">True</property>
-                                        <property name="label" translatable="yes">Masked</property>
-                                        <property name="xalign">0</property>
-                                        <property name="response_id">0</property>
-                                        <property name="draw_indicator">True</property>
-                                        <signal name="toggled" handler="cb_masked_toggled"/>
+                                        <property name="spacing">5</property>
+                                        <child>
+                                          <placeholder/>
+                                        </child>
                                       </widget>
                                       <packing>
-                                        <property name="top_attach">8</property>
-                                        <property name="bottom_attach">9</property>
-                                        <property name="x_options">GTK_FILL</property>
+                                        <property name="left_attach">1</property>
+                                        <property name="right_attach">2</property>
+                                        <property name="top_attach">2</property>
+                                        <property name="bottom_attach">3</property>
                                         <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkCheckButton" id="installedCheck">
+                                      <widget class="GtkLabel" id="descLabelLabel">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                        <property name="no_show_all">True</property>
-                                        <property name="label" translatable="yes">Installed</property>
                                         <property name="xalign">0</property>
-                                        <property name="response_id">0</property>
-                                        <property name="draw_indicator">True</property>
-                                        <signal name="button_press_event" handler="cb_button_pressed"/>
+                                        <property name="label" translatable="yes">&lt;b&gt;Description:&lt;/b&gt;</property>
+                                        <property name="use_markup">True</property>
+                                        <property name="single_line_mode">True</property>
                                       </widget>
                                       <packing>
-                                        <property name="top_attach">6</property>
-                                        <property name="bottom_attach">7</property>
                                         <property name="x_options">GTK_FILL</property>
                                         <property name="y_options"></property>
+                                        <property name="y_padding">5</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkLabel" id="homepageLinkLabel">
+                                      <widget class="GtkLabel" id="overlayLabelLabel">
                                         <property name="visible">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                        <property name="no_show_all">True</property>
                                         <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">&lt;b&gt;Homepage:&lt;/b&gt;</property>
+                                        <property name="label" translatable="yes">&lt;b&gt;Overlay:&lt;/b&gt;</property>
                                         <property name="use_markup">True</property>
                                         <property name="single_line_mode">True</property>
                                       </widget>
                                       <packing>
-                                        <property name="top_attach">2</property>
-                                        <property name="bottom_attach">3</property>
+                                        <property name="top_attach">1</property>
+                                        <property name="bottom_attach">2</property>
                                         <property name="x_options">GTK_FILL</property>
                                         <property name="y_options"></property>
                                         <property name="y_padding">5</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkLabel" id="overlayLabel">
+                                      <widget class="GtkLabel" id="descLabel">
                                         <property name="visible">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                        <property name="no_show_all">True</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">label</property>
-                                        <property name="single_line_mode">True</property>
+                                        <property name="wrap">True</property>
                                       </widget>
                                       <packing>
                                         <property name="left_attach">1</property>
                                         <property name="right_attach">2</property>
-                                        <property name="top_attach">1</property>
-                                        <property name="bottom_attach">2</property>
                                         <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkLabel" id="descLabel">
+                                      <widget class="GtkLabel" id="overlayLabel">
                                         <property name="visible">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                        <property name="no_show_all">True</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">label</property>
-                                        <property name="wrap">True</property>
+                                        <property name="single_line_mode">True</property>
                                       </widget>
                                       <packing>
                                         <property name="left_attach">1</property>
                                         <property name="right_attach">2</property>
+                                        <property name="top_attach">1</property>
+                                        <property name="bottom_attach">2</property>
                                         <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkLabel" id="overlayLabelLabel">
+                                      <widget class="GtkLabel" id="homepageLinkLabel">
                                         <property name="visible">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                        <property name="no_show_all">True</property>
                                         <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">&lt;b&gt;Overlay:&lt;/b&gt;</property>
+                                        <property name="label" translatable="yes">&lt;b&gt;Homepage:&lt;/b&gt;</property>
                                         <property name="use_markup">True</property>
                                         <property name="single_line_mode">True</property>
                                       </widget>
                                       <packing>
-                                        <property name="top_attach">1</property>
-                                        <property name="bottom_attach">2</property>
+                                        <property name="top_attach">2</property>
+                                        <property name="bottom_attach">3</property>
                                         <property name="x_options">GTK_FILL</property>
                                         <property name="y_options"></property>
                                         <property name="y_padding">5</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkLabel" id="descLabelLabel">
+                                      <widget class="GtkCheckButton" id="installedCheck">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                        <property name="no_show_all">True</property>
+                                        <property name="label" translatable="yes">Installed</property>
                                         <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">&lt;b&gt;Description:&lt;/b&gt;</property>
-                                        <property name="use_markup">True</property>
-                                        <property name="single_line_mode">True</property>
+                                        <property name="response_id">0</property>
+                                        <property name="draw_indicator">True</property>
+                                        <signal name="button_press_event" handler="cb_button_pressed"/>
                                       </widget>
                                       <packing>
+                                        <property name="top_attach">6</property>
+                                        <property name="bottom_attach">7</property>
                                         <property name="x_options">GTK_FILL</property>
                                         <property name="y_options"></property>
-                                        <property name="y_padding">5</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkHBox" id="linkBox">
+                                      <widget class="GtkCheckButton" id="maskedCheck">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                        <property name="spacing">5</property>
-                                        <child>
-                                          <placeholder/>
-                                        </child>
+                                        <property name="no_show_all">True</property>
+                                        <property name="label" translatable="yes">Masked</property>
+                                        <property name="xalign">0</property>
+                                        <property name="response_id">0</property>
+                                        <property name="draw_indicator">True</property>
+                                        <signal name="toggled" handler="cb_masked_toggled"/>
                                       </widget>
                                       <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="right_attach">2</property>
-                                        <property name="top_attach">2</property>
-                                        <property name="bottom_attach">3</property>
+                                        <property name="top_attach">8</property>
+                                        <property name="bottom_attach">9</property>
+                                        <property name="x_options">GTK_FILL</property>
                                         <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkLabel" id="missingLabel">
+                                      <widget class="GtkLabel" id="maskedLabel">
                                         <property name="visible">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                        <property name="no_show_all">True</property>
-                                        <property name="label" translatable="yes">&lt;span foreground='red'&gt;&lt;b&gt;MISSING KEYWORD&lt;/b&gt;&lt;/span&gt;</property>
-                                        <property name="use_markup">True</property>
+                                        <property name="xalign">0</property>
                                       </widget>
                                       <packing>
+                                        <property name="left_attach">1</property>
                                         <property name="right_attach">2</property>
-                                        <property name="top_attach">5</property>
-                                        <property name="bottom_attach">6</property>
+                                        <property name="top_attach">8</property>
+                                        <property name="bottom_attach">9</property>
                                         <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkLabel" id="notInSysLabel">
+                                      <widget class="GtkCheckButton" id="testingCheck">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                         <property name="no_show_all">True</property>
-                                        <property name="label" translatable="yes">&lt;b&gt;Installed, but not in portage anymore&lt;/b&gt;</property>
-                                        <property name="use_markup">True</property>
+                                        <property name="label" translatable="yes">Testing</property>
+                                        <property name="xalign">0</property>
+                                        <property name="response_id">0</property>
+                                        <property name="draw_indicator">True</property>
+                                        <signal name="toggled" handler="cb_testing_toggled"/>
                                       </widget>
                                       <packing>
-                                        <property name="right_attach">2</property>
-                                        <property name="top_attach">5</property>
-                                        <property name="bottom_attach">6</property>
+                                        <property name="top_attach">7</property>
+                                        <property name="bottom_attach">8</property>
+                                        <property name="x_options">GTK_FILL</property>
                                         <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkLabel" id="licenseLabelLabel">
+                                      <widget class="GtkLabel" id="useFlagsLabelLabel">
                                         <property name="visible">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                        <property name="no_show_all">True</property>
                                         <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">&lt;b&gt;License:&lt;/b&gt;</property>
+                                        <property name="label" translatable="yes">&lt;b&gt;Use Flags:&lt;/b&gt;</property>
                                         <property name="use_markup">True</property>
                                         <property name="single_line_mode">True</property>
                                       </widget>
                                       <packing>
-                                        <property name="top_attach">3</property>
-                                        <property name="bottom_attach">4</property>
+                                        <property name="top_attach">4</property>
+                                        <property name="bottom_attach">5</property>
                                         <property name="x_options">GTK_FILL</property>
                                         <property name="y_options"></property>
                                         <property name="y_padding">5</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkLabel" id="licenseLabel">
+                                      <widget class="GtkLabel" id="useFlagsLabel">
                                         <property name="visible">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                         <property name="no_show_all">True</property>
                                         <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">label</property>
+                                        <property name="label">use flags</property>
+                                        <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
                                         <property name="single_line_mode">True</property>
                                       </widget>
                                       <packing>
                                         <property name="left_attach">1</property>
                                         <property name="right_attach">2</property>
-                                        <property name="top_attach">3</property>
-                                        <property name="bottom_attach">4</property>
+                                        <property name="top_attach">4</property>
+                                        <property name="bottom_attach">5</property>
                                         <property name="y_options"></property>
                                       </packing>
                                     </child>
diff --git a/portato/gui/windows/main.py b/portato/gui/windows/main.py
index f4b5f11..412ea1c 100644
--- a/portato/gui/windows/main.py
+++ b/portato/gui/windows/main.py
@@ -67,10 +67,6 @@ class PackageTable:
 		# the notebook
 		self.notebook = self.tree.get_widget("packageNotebook")
 		
-		# the version combo
-		self.versionList = self.tree.get_widget("versionList")
-		self.build_version_list()
-
 		# chechboxes
 		self.installedCheck = self.tree.get_widget("installedCheck")
 		self.maskedCheck = self.tree.get_widget("maskedCheck")
@@ -117,15 +113,13 @@ class PackageTable:
 		self.icons["or"] = self.window.render_icon(gtk.STOCK_MEDIA_PAUSE, gtk.ICON_SIZE_MENU)
 		self.icons["block"] = self.window.render_icon(gtk.STOCK_NO, gtk.ICON_SIZE_MENU)
 
-	def update (self, cp, queue = None, version = None, doEmerge = True, instantChange = False, type = None):
+	def update (self, pkg, queue = None, doEmerge = True, instantChange = False, type = None):
 		"""Updates the table to show the contents for the package.
 		
-		@param cp: the selected package
-		@type cp: string (cp)
+		@param pkg: the selected package
+		@type pkg: Package
 		@param queue: emerge-queue (if None the emerge-buttons are disabled)
 		@type queue: EmergeQueue
-		@param version: if not None, specifies the version to select
-		@type version: string
 		@param doEmerge: if False, the emerge buttons are disabled
 		@type doEmerge: boolean
 		@param instantChange: if True the changed keywords are updated instantly
@@ -133,37 +127,25 @@ class PackageTable:
 		@param type: the type of the queue this package is in; if None there is no queue :)
 		@type type: string"""
 		
-		self.cp = cp # category/package
-		self.version = version # version - if not None this is used
+		self.pkg = pkg
 		self.queue = queue
 		self.doEmerge = doEmerge
 		self.instantChange = instantChange
 		self.type = type
 
-		# packages and installed packages
-		if not self.doEmerge:
-			self.instPackages = self.packages = system.find_packages("=%s-%s" % (cp, version), masked = True)
-		else:
-			self.packages = system.sort_package_list(system.find_packages(cp, masked = True))
-			self.instPackages = system.sort_package_list(system.find_installed_packages(cp, masked = True))
-
-		# version-combo-box
-		self.versionList.get_model().clear()
-		self.fill_version_list()
-
 		if not self.queue or not self.doEmerge: 
 			self.emergeBtn.set_sensitive(False)
 			self.unmergeBtn.set_sensitive(False)
 		
 		# current status
-		self.cb_version_list_changed()
+		self._update_table()
 		self.vb.show_all()
 
 	def hide (self):
 		self.vb.hide_all()
 
 	def set_labels (self):
-		pkg = self.actual_package()
+		pkg = self.pkg
 		
 		# name
 		self.nameLabel.set_markup("<b>%s</b>" % pkg.get_cpv())
@@ -275,7 +257,7 @@ class PackageTable:
 				store.append(it, [get_icon(dep), dep.dep])
 		
 		try:
-			deptree = self.actual_package().get_dependencies()
+			deptree = self.pkg.get_dependencies()
 		except AssertionError:
 			w =  _("Can't display dependencies: This package has an unsupported dependency string.")
 			error(w)
@@ -285,7 +267,7 @@ class PackageTable:
 
 	def fill_use_list(self):
 
-		pkg = self.actual_package()
+		pkg = self.pkg
 		pkg_flags = pkg.get_iuse_flags()
 		pkg_flags.sort()
 	
@@ -309,7 +291,7 @@ class PackageTable:
 
 			enabled = use in euse
 			installed = use in instuse
-			store.append(actual_exp_it, [enabled, installed, use, system.get_use_desc(use, self.cp)])
+			store.append(actual_exp_it, [enabled, installed, use, system.get_use_desc(use, self.pkg.get_cp())])
 		
 	def build_dep_list (self):
 		store = gtk.TreeStore(gtk.gdk.Pixbuf, str)
@@ -348,115 +330,27 @@ class PackageTable:
 		self.useList.set_search_column(2)
 		self.useList.set_enable_tree_lines(True)
 
-	def build_version_list (self):
-		store = gtk.ListStore(gtk.gdk.Pixbuf, str, str)
-
-		# build view
-		self.versionList.set_model(store)
-		
-		col = gtk.TreeViewColumn(_("Versions"))
-		col.set_property("expand", True)
-		
-		self.slotcol = gtk.TreeViewColumn(_("Slot"))
-		self.slotcol.set_property("expand", True)
-
-		# adding the pixbuf
-		cell = gtk.CellRendererPixbuf()
-		col.pack_start(cell, False)
-		col.add_attribute(cell, "pixbuf", 0)
-
-		# adding the package name
-		cell = gtk.CellRendererText()
-		col.pack_start(cell, True)
-		col.add_attribute(cell, "text", 1)
-
-		# adding the slot
-		cell = gtk.CellRendererText()
-		self.slotcol.pack_start(cell, True)
-		self.slotcol.add_attribute(cell, "text", 2)
-
-		self.versionList.append_column(col)
-		self.versionList.append_column(self.slotcol)
-
-	def fill_version_list (self):
-		
-		store = self.versionList.get_model()
-
-		# this is here for performance reasons
-		# to not query the package with info, we do not need
-		if self.main.cfg.get_boolean("showSlots", "GUI"):
-			def get_slot(pkg):
-				return pkg.get_package_settings("SLOT")
-			
-			self.slotcol.set_visible(True)
-		
-		else:
-			def get_slot(*args):
-				return ""
-			
-			self.slotcol.set_visible(False)
-		
-		# append versions
-		for vers, inst, slot in ((x.get_version(), x.is_installed(), get_slot(x)) for x in self.packages):
-			if inst:
-				icon = self.main.instPixbuf
-			else:
-				icon = None
-				
-			store.append([icon, vers, slot])
-
-		pos = ((0,)) # default
-		
-		# activate the first one
-		try:
-			best_version = ""
-			if self.version:
-				best_version = self.version
-			else:
-				best_version = system.find_best_match(self.packages[0].get_cp(), only_installed = (self.instPackages != [])).get_version()
-			for i in range(len(self.packages)):
-				if self.packages[i].get_version() == best_version:
-					pos = (i,)
-					break
-		except AttributeError: # no package found
-			pass
-
-		self.versionList.get_selection().select_path(pos)
-		self.versionList.scroll_to_cell(pos)
-
-	def actual_package (self):
-		"""Returns the actual selected package.
-		
-		@returns: the actual selected package
-		@rtype: backend.Package"""
-
-		model, iter = self.versionList.get_selection().get_selected()
-		if iter:
-			return self.packages[model.get_path(iter)[0]]
-		else:
-			return self.packages[0]
-
 	def _update_keywords (self, emerge, update = False):
 		if emerge:
 			type = "install" if not self.type else self.type
 			try:
 				try:
-					self.queue.append(self.actual_package().get_cpv(), type = type, update = update)
+					self.queue.append(self.pkg.get_cpv(), type = type, update = update)
 				except PackageNotFoundException, e:
 					if unmask_dialog(e[0]) == gtk.RESPONSE_YES:
-						self.queue.append(self.actual_package().get_cpv(), type = type, unmask = True, update = update)
+						self.queue.append(self.pkg.get_cpv(), type = type, unmask = True, update = update)
 			except BlockedException, e:
 				blocked_dialog(e[0], e[1])
 		else:
 			try:
-				self.queue.append(self.actual_package().get_cpv(), type = "uninstall")
+				self.queue.append(self.pkg.get_cpv(), type = "uninstall")
 			except PackageNotFoundException, e:
 				error(_("Package could not be found: %s"), e[0])
 				#masked_dialog(e[0])
 
-	def cb_version_list_changed (self, *args):
+	def _update_table (self, *args):
 
-		pkg = self.actual_package()
+		pkg = self.pkg
 
 		# set the views
 		for v in (self.ebuildView, self.changelogView, self.filesView):
@@ -530,7 +424,7 @@ class PackageTable:
 
 		if self.doEmerge:
 			# set emerge-button-label
-			if not self.actual_package().is_installed():
+			if not pkg.is_installed():
 				self.unmergeBtn.set_sensitive(False)
 			else:
 				self.unmergeBtn.set_sensitive(True)
@@ -546,12 +440,10 @@ class PackageTable:
 
 	def cb_package_revert_clicked (self, button):
 		"""Callback for pressed revert-button."""
-		self.actual_package().remove_new_use_flags()
-		self.actual_package().remove_new_masked()
-		self.actual_package().remove_new_testing()
-		self.versionList.get_model().clear()
-		self.fill_version_list()
-		self.cb_version_list_changed()
+		self.pkg.remove_new_use_flags()
+		self.pkg.remove_new_masked()
+		self.pkg.remove_new_testing()
+		self._