[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [et-mgmt-tools] [PATCH] UI String Cleanups



On Mon, 2009-01-12 at 15:08 -0500, Cole Robinson wrote:
> This is the correct mailing list, but it's probably better to send
> things as 'hg exports' rather than bundles. No harm now though, but I'll
> update the README.

This should probably be updated as well:
http://virt-manager.et.redhat.com/scmrepo.html

> > This corrects a number of small UI issues. This should partially or
> > fully address bugs 452411, 475682, and 475926.

I took a look at those (and other bugs we filed) and prepared a few more
minor UI changes:

The attached patch should address the remainder of the issues in
#452411, so it can be closed (assuming you agree with my comment about
the pause action there).

It also addresses the wording in #475926 (and similar other cases), but
does not address the buttons. I imagine I'd have to create the dialog
myself, rather than use gtk.MessageDialog? I'm familiar with GTK+, but
not the PyGTK wrapper, so any pointers would be helpful.

The patch addresses the wording changes in #478408, but not the more
in-depth suggestions:
        Alternatively, if the first item in the list is always selected
        (making it impossible to select nothing if the list is
        non-empty), then the physical device radio button could be
        greyed out when the list is empty; this would make this error
        message entirely unnecessary.
        
        Perhaps this dialog (or the wizard) should mention installing
        hal if the list is empty (which was the reason the list was
        empty for me).

Likewise for #475639... wording changes done, more in-depth changes not.

For these more in-depth things, if you like the ideas, please let me
know and I can see about implementing them. If not, then let's close the
bugs out now. ;)

In the Shut Down* submenu (and does that really need to be a submenu?)
and toolbar drop-down, I changed the terminology to "Shut Down" and
"Force Off". To me, this seems more clear than "Poweroff" vs. "Force
Poweroff". If you don't like "Force Off", I'd suggest "Power Off"
instead, keeping the clean "shutdown" action as "Shut Down". I preferred
"Force Off" over "Power Off" because 1) there is only power to hosts,
not virtual machines, and 2) I wanted to keep the word "force" to make
it clear that's not the clean action.

I also updated the machine status terms to be "Shut Down" and "Off"
instead of "Shutdown" and "Shutoff", respectively, so they match.

* Yes, I also changed "Shutdown" to "Shut Down", which is what GNOME is
using in the panel.

Thanks for your time and consideration of these changes,
Richard
diff -r bbd79040d718 src/virtManager/addhardware.py
--- a/src/virtManager/addhardware.py	Mon Jan 12 15:18:14 2009 -0500
+++ b/src/virtManager/addhardware.py	Mon Jan 12 23:06:24 2009 +0000
@@ -702,7 +702,7 @@
         if page_num == PAGE_INTRO:
             if self.get_config_hardware_type() == None:
                 return self.err.val_err(_("Hardware Type Required"), \
-                                        _("You must specify what type of hardware to add"))
+                                        _("You must specify what type of hardware to add."))
             self._dev = None
         elif page_num == PAGE_DISK:
             path = self.get_config_disk_image()
@@ -712,7 +712,7 @@
 
             if self.window.get_widget("target-device").get_active() == -1:
                 return self.err.val_err(_("Target Device Required"),
-                                        _("You must select a target device for the disk"))
+                                        _("You must select a target device for the disk."))
 
             bus, device = self.get_config_disk_target()
             if self.window.get_widget("storage-partition").get_active():
@@ -754,7 +754,7 @@
 
             if self._dev.is_conflict_disk(self.vm.get_connection().vmm) is True:
                 res = self.err.yes_no(_('Disk "%s" is already in use by another guest!' % self._dev), \
-                                      _("Do you really want to use the disk ?"))
+                                      _("Do you really want to use the disk?"))
                 return res
 
         elif page_num == PAGE_NETWORK:
@@ -762,11 +762,11 @@
             if self.window.get_widget("net-type-network").get_active():
                 if self.window.get_widget("net-network").get_active() == -1:
                     return self.err.val_err(_("Virtual Network Required"),
-                                            _("You must select one of the virtual networks"))
+                                            _("You must select one of the virtual networks."))
             else:
                 if self.window.get_widget("net-device").get_active() == -1:
                     return self.err.val_err(_("Physical Device Required"),
-                                            _("You must select one of the physical devices"))
+                                            _("You must select a physical device."))
 
             mac = self.get_config_macaddr()
             if self.window.get_widget("mac-address").get_active():
diff -r bbd79040d718 src/virtManager/create.py
--- a/src/virtManager/create.py	Mon Jan 12 15:18:14 2009 -0500
+++ b/src/virtManager/create.py	Mon Jan 12 23:06:24 2009 +0000
@@ -979,7 +979,7 @@
             path = self.get_config_disk_image()
             if path == None or len(path) == 0:
                 return self.err.val_err(_("Storage Address Required"), \
-                                        _("You must specify a partition or a file for storage for the guest install"))
+                                        _("You must specify a partition or a file for storage for the guest install."))
 
             # Attempt to set disk
             filesize = None
@@ -1022,7 +1022,7 @@
                     return False
 
             if self._disk.is_conflict_disk(self._guest.conn) is True:
-                res = self.err.yes_no(_('Disk "%s" is already in use by another guest!' % self._disk.path), _("Do you really want to use the disk ?"))
+                res = self.err.yes_no(_('Disk "%s" is already in use by another guest!' % self._disk.path), _("Do you really want to use the disk?"))
                 return res
 
         elif page_num == PAGE_NETWORK:
@@ -1030,11 +1030,11 @@
             if self.window.get_widget("net-type-network").get_active():
                 if self.window.get_widget("net-network").get_active() == -1:
                     return self.err.val_err(_("Virtual Network Required"),
-                                            _("You must select one of the virtual networks"))
+                                            _("You must select one of the virtual networks."))
             else:
                 if self.window.get_widget("net-device").get_active() == -1:
                     return self.err.val_err(_("Physical Device Required"),
-                                            _("You must select one of the physical devices"))
+                                            _("You must select a physical device."))
 
             net = self.get_config_network()
             if self.window.get_widget("mac-address").get_active():
diff -r bbd79040d718 src/virtManager/details.py
--- a/src/virtManager/details.py	Mon Jan 12 15:18:14 2009 -0500
+++ b/src/virtManager/details.py	Mon Jan 12 23:06:24 2009 +0000
@@ -147,13 +147,13 @@
         reboot.connect("activate", self.control_vm_reboot)
         menu.add(reboot)
 
-        shutdown = gtk.ImageMenuItem("_Poweroff")
+        shutdown = gtk.ImageMenuItem("_Shut Down")
         shutdown.set_image(shutdownimg)
         shutdown.show()
         shutdown.connect("activate", self.control_vm_shutdown)
         menu.add(shutdown)
 
-        destroy = gtk.ImageMenuItem("_Force poweroff")
+        destroy = gtk.ImageMenuItem("_Force Off")
         destroy.set_image(destroyimg)
         destroy.show()
         destroy.connect("activate", self.control_vm_destroy)
diff -r bbd79040d718 src/virtManager/domain.py
--- a/src/virtManager/domain.py	Mon Jan 12 15:18:14 2009 -0500
+++ b/src/virtManager/domain.py	Mon Jan 12 23:06:24 2009 +0000
@@ -541,9 +541,9 @@
         elif self.lastStatus == libvirt.VIR_DOMAIN_PAUSED:
             return _("Paused")
         elif self.lastStatus == libvirt.VIR_DOMAIN_SHUTDOWN:
-            return _("Shutdown")
+            return _("Shut Down")
         elif self.lastStatus == libvirt.VIR_DOMAIN_SHUTOFF:
-            return _("Shutoff")
+            return _("Off")
         elif self.lastStatus == libvirt.VIR_DOMAIN_CRASHED:
             return _("Crashed")
         else:
diff -r bbd79040d718 src/virtManager/engine.py
--- a/src/virtManager/engine.py	Mon Jan 12 15:18:14 2009 -0500
+++ b/src/virtManager/engine.py	Mon Jan 12 23:06:24 2009 +0000
@@ -513,7 +513,7 @@
                 self.err.show_err(_("Error shutting down domain: %s" % str(e)),
                                   "".join(traceback.format_exc()))
         else:
-            logging.warning("Shutdown requested, but machine is already shutting down / shutoff")
+            logging.warning("Shut down requested, but the virtual machine is already shutting down / powered off")
 
     def reboot_domain(self, src, uri, uuid):
         con = self.get_connection(uri, False)
@@ -535,7 +535,7 @@
         conn = self.get_connection(uri, False)
         vm = conn.get_vm(uuid)
         destconn = self.get_connection(desturi, False)
-        resp = self.err.yes_no(_("%s will be migrated from %s to %s, are you sure?") % \
+        resp = self.err.yes_no(_("Are you sure you want to migrate %s from %s to %s?") % \
                     (vm.get_name(), conn.get_hostname(), destconn.get_hostname()))
         if resp:
             migrate_progress = None
diff -r bbd79040d718 src/virtManager/host.py
--- a/src/virtManager/host.py	Mon Jan 12 15:18:14 2009 -0500
+++ b/src/virtManager/host.py	Mon Jan 12 23:06:24 2009 +0000
@@ -243,8 +243,8 @@
         if net is None:
             return
 
-        result = self.err.yes_no(_("This will permanently delete the network "
-                                   "'%s', are you sure?") % net.get_name())
+        result = self.err.yes_no(_("Are you sure you want to permanently "
+                                   "delete the network %s?") % net.get_name())
         if not result:
             return
         try:
@@ -433,8 +433,8 @@
         if pool is None:
             return
 
-        result = self.err.yes_no(_("This will permanently delete the pool "
-                                   "'%s,' are you sure?") % pool.get_name())
+        result = self.err.yes_no(_("Are you sure you want to permanently "
+                                   "delete the pool %s?") % pool.get_name())
         if not result:
             return
         try:
@@ -448,8 +448,8 @@
         if vol is None:
             return
 
-        result = self.err.yes_no(_("This will permanently delete the volume "
-                                   "'%s,' are you sure?") % vol.get_name())
+        result = self.err.yes_no(_("Are you sure you want to permanently "
+                                   "delete the volume %s?") % vol.get_name())
         if not result:
             return
 
diff -r bbd79040d718 src/virtManager/manager.py
--- a/src/virtManager/manager.py	Mon Jan 12 15:18:14 2009 -0500
+++ b/src/virtManager/manager.py	Mon Jan 12 23:06:24 2009 +0000
@@ -189,7 +189,7 @@
         self.vmmenu.add(self.vmmenu_items["resume"])
 
 
-        self.vmmenu_items["shutdown"] = gtk.MenuItem("_Shutdown")
+        self.vmmenu_items["shutdown"] = gtk.MenuItem("_Shut Down")
         self.vmmenu_items["shutdown"].set_submenu(self.vmmenushutdown)
         self.vmmenu_items["shutdown"].show()
         self.vmmenu.add(self.vmmenu_items["shutdown"])
@@ -808,7 +808,7 @@
             if conn is None:
                 return
 
-            result = self.err.yes_no(_("This will permanently delete the connection \"%s\", are you sure?") % self.rows[conn.get_uri()][ROW_NAME])
+            result = self.err.yes_no(_("Are you sure you want to permanently delete the connection %s?") % self.rows[conn.get_uri()][ROW_NAME])
             if not result:
                 return
             self.engine.remove_connection(conn.get_uri())
@@ -819,7 +819,7 @@
                 return
 
             # are you sure you want to delete this VM?
-            result = self.err.yes_no(_("This will permanently delete the vm \"%s,\" are you sure?") % vm.get_name())
+            result = self.err.yes_no(_("Are you sure you want to permanently delete the virtual machine %s?") % vm.get_name())
             if not result:
                 return
             conn = vm.get_connection()
diff -r bbd79040d718 src/vmm-create.glade
--- a/src/vmm-create.glade	Mon Jan 12 15:18:14 2009 -0500
+++ b/src/vmm-create.glade	Mon Jan 12 23:06:24 2009 +0000
@@ -2684,7 +2684,7 @@
                             <child>
                               <widget class="GtkLabel" id="label280">
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">&lt;small&gt;&lt;b&gt;Tip:&lt;/b&gt; For best performance, the number of virtual CPUs should be less than (or equal to) the number of logical CPUs on the host system.&lt;/small&gt;</property>
+                                <property name="label" translatable="yes">&lt;small&gt;&lt;b&gt;Tip:&lt;/b&gt; For best performance, the number of virtual CPUs should be less than (or equal to) the number of physical CPUs on the host system.&lt;/small&gt;</property>
                                 <property name="use_markup">True</property>
                                 <property name="wrap">True</property>
                               </widget>
diff -r bbd79040d718 src/vmm-details.glade
--- a/src/vmm-details.glade	Mon Jan 12 15:18:14 2009 -0500
+++ b/src/vmm-details.glade	Mon Jan 12 23:06:24 2009 +0000
@@ -100,7 +100,7 @@
                             <child>
                               <widget class="GtkMenuItem" id="details-menu-poweroff">
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">Poweroff</property>
+                                <property name="label" translatable="yes">Shut Down</property>
                                 <property name="use_underline">True</property>
                                 <signal name="activate" handler="on_details_menu_poweroff_activate"/>
                               </widget>
@@ -108,7 +108,7 @@
                             <child>
                               <widget class="GtkMenuItem" id="details-menu-destroy">
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">Force poweroff</property>
+                                <property name="label" translatable="yes">Force Off</property>
                                 <property name="use_underline">True</property>
                                 <signal name="activate" handler="on_details_menu_destroy_activate"/>
                               </widget>
@@ -178,7 +178,7 @@
                     <child>
                       <widget class="GtkCheckMenuItem" id="details-menu-view-scale-display">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Scale display</property>
+                        <property name="label" translatable="yes">Scale Display</property>
                         <property name="use_underline">True</property>
                         <signal name="activate" handler="on_details_menu_view_scale_display_activate"/>
                       </widget>
@@ -212,7 +212,7 @@
             <child>
               <widget class="GtkMenuItem" id="details-menu-send-key">
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">Send key</property>
+                <property name="label" translatable="yes">Send Key</property>
                 <property name="use_underline">True</property>
                 <signal name="activate" handler="on_details-menu-send-key_activate"/>
                 <child>
@@ -418,7 +418,7 @@
               <widget class="GtkMenuToolButton" id="control-shutdown">
                 <property name="visible">True</property>
                 <property name="is_important">True</property>
-                <property name="label" translatable="yes">Shutdown</property>
+                <property name="label" translatable="yes">Shut Down</property>
                 <property name="use_underline">True</property>
                 <signal name="clicked" handler="on_control_shutdown_clicked"/>
               </widget>

Attachment: signature.asc
Description: This is a digitally signed message part


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]