From b1d8725e9ce8dbe21307af24764443fe7c9cf486 Mon Sep 17 00:00:00 2001
From: Fabio Erculiani <lxnay@sabayonlinux.org>
Date: Fri, 10 Jul 2009 22:15:59 +0200
Subject: [PATCH] [sulfur] usability work

:: hide progress tab until installation is started
:: rename "Queue" to "Installation", small but effective change
---
 sulfur/src/sulfur/__init__.py  | 6 +++++-
 sulfur/src/sulfur/sulfur.glade | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/sulfur/src/sulfur/__init__.py b/sulfur/src/sulfur/__init__.py
index c444da85f..73b79de0e 100644
--- a/sulfur/src/sulfur/__init__.py
+++ b/sulfur/src/sulfur/__init__.py
@@ -280,6 +280,9 @@ class SulfurApplication(Controller, SulfurApplicationEventsMixin):
         self.switch_application_mode(simple_mode)
         self.in_mode_loading = False
 
+        # hide progress Tab by default
+        self.ui.progressVBox.hide()
+
         self.setup_preferences()
 
     def switch_application_mode(self, do_simple):
@@ -1410,6 +1413,7 @@ class SulfurApplication(Controller, SulfurApplicationEventsMixin):
         self.ui.queueVbox.hide()
         self.ui.systemVbox.hide()
         self.ui.packagesVbox.hide()
+        self.ui.progressVBox.show()
 
     def show_notebook_tabs_after_install(self):
         self.ui.queueVbox.show()
@@ -1475,7 +1479,7 @@ class SulfurApplication(Controller, SulfurApplicationEventsMixin):
 
         # preventive check against other instances
         locked = self.Equo.application_lock_check()
-        if locked:
+        if locked or not entropy.tools.is_root():
             okDialog(self.ui.main,
                 _("Another Entropy instance is running. Cannot process queue."))
             self.progress.reset_progress()
diff --git a/sulfur/src/sulfur/sulfur.glade b/sulfur/src/sulfur/sulfur.glade
index 4dab204a3..854fec2a5 100644
--- a/sulfur/src/sulfur/sulfur.glade
+++ b/sulfur/src/sulfur/sulfur.glade
@@ -4998,7 +4998,7 @@ Install+Removal</property>
                     <child>
                       <widget class="GtkLabel" id="label5">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Queue</property>
+                        <property name="label" translatable="yes">Installation</property>
                       </widget>
                       <packing>
                         <property name="position">1</property>
@@ -5338,7 +5338,7 @@ Install+Removal</property>
                     <child>
                       <widget class="GtkLabel" id="label17">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Installation</property>
+                        <property name="label" translatable="yes">Progress</property>
                       </widget>
                       <packing>
                         <property name="position">1</property>