Merge lp:~mac9416/keryx/keryx-1.0 into lp:~excid3/keryx/keryx-1.0

[mac9416]

I dropped in a module I wrote for 0.92.5 to make it easier to make Message Dialogs.

[mac9416 (mac9416)]

It's going to take a lot of dialogs for the MessageDialogs module to pay for itself in saved lines of code. Maybe you can think of a good way to make MessageDialogs more concise.

[Chris Oliver (excid3)]

Already on it.

On Sat, Aug 7, 2010 at 10:44 AM, mac9416 <email address hidden> wrote:

> It's going to take a lot of dialogs for the MessageDialogs module to pay
> for itself in saved lines of code. Maybe you can think of a good way to make
> MessageDialogs more concise.
> --
> https://code.launchpad.net/~mac9416/keryx/keryx-1.0/+merge/32035
> You are requested to review the proposed merge of
> lp:~mac9416/keryx/keryx-1.0 into lp:~excid3/keryx/keryx-1.0.
>

--
Chris Oliver
http://excid3.com

[Chris Oliver (excid3)]

Refactored in commit after merge.

review: Approve

[lp:~mac9416/keryx/keryx-1.0]

29. By Chris Oliver on 2010-08-07

Added todo

30. By Chris Oliver on 2010-08-07

merge lp:~mac9416/keryx/keryx-1.0

[mac9416 (mac9416)]

You're a good man. Chuck that diff at me when you're done. I'd like to see what you do.

[Chris Oliver (excid3)]

Done dealio. Check out revision 31 for the sweet update. Might give you some nifty ideas for shortening code.

[Chris Oliver (excid3)]

Also I've been pushing to both lp:~excid3/keryx/keryx-1.0 AND lp:keryx/unstable so it's available in both. Just merge request to unstable now instead. It's best not to have our main branch a personal one.

[Chris Oliver (excid3)]

Another note, this isn't thoroughly tested. May be typos. Could you test it if you get a chance?

=== modified file '.bzrignore'
--- .bzrignore	2010-08-03 03:20:46 +0000
+++ .bzrignore	2010-08-07 15:39:46 +0000
@@ -12,3 +12,9 @@
 .git/objects
 .git/refs
 .git
+data/projects/amanda
+data/projects/amandasd
+data/downloads
+data/downloads
+data/keryx.conf
+data/projects

=== modified file 'bin/keryx'
--- bin/keryx	2010-08-06 04:15:53 +0000
+++ bin/keryx	2010-08-07 15:39:46 +0000
@@ -44,6 +44,8 @@
 
 from keryx import (
     AboutKeryxDialog, keryxconfig)
+from keryx.MessageDialogs import (error_dialog, info_dialog, question_dialog,
+                                  warning_dialog)
 from keryx.helpers import create_tab, create_closeable_tab, get_builder
 
 
@@ -160,25 +162,23 @@
         
         if not platform.system() == "Linux" or \
            not os.path.exists(status_file) or \
-           not os.path.exists(sources_file):
-            md = gtk.MessageDialog(self, 
-                gtk.DIALOG_DESTROY_WITH_PARENT, gtk.MESSAGE_ERROR, 
-                gtk.BUTTONS_OK, "Sorry, you can only add Debian based Linux distros.\nPlease use Keryx on your offline machine.")
-            md.set_title("Error Adding Computer")
-            md.run()
-            md.destroy()
+           not os.path.exists(sources_file):  # FIXME: Not everyone has a main sources_file.
+            error_dialog(self, 
+                         "Sorry, you can only add Debian based Linux " \
+                         "distros.\nPlease use Keryx on your offline " \
+                         "machine.",
+                         "Error adding computer")
             return
     
         name = self._get("add_computer_name_entry").get_text()
         
         path = os.path.join(self.config.get("projects"), name)
         if os.path.exists(path):
-            md = gtk.MessageDialog(self, 
-                gtk.DIALOG_DESTROY_WITH_PARENT, gtk.MESSAGE_ERROR, 
-                gtk.BUTTONS_OK, "The computer appears to have already been added.\nMake sure you to use a different name for each computer.")
-            md.set_title("Error Adding Computer")
-            md.run()
-            md.destroy()
+            error_dialog(self, 
+                         "The computer appears to have already been added.\n" \
+                         "Make sure you to use a different name for each " \
+                         "computer.",
+                         "Error Adding Computer")
             print path
             return
         
@@ -196,12 +196,12 @@
                                     platform.release()))
         f.close()
         
-        md = gtk.MessageDialog(self, 
-            gtk.DIALOG_DESTROY_WITH_PARENT, gtk.MESSAGE_INFO, 
-            gtk.BUTTONS_OK, "Computer added successfully!\nNow you can click Manage to select some packages to download later or you can move Keryx to a computer with internet access to get started.")
-        md.set_title("Everything Went Better Than Expected")
-        md.run()
-        md.destroy()
+        info_dialog(self, 
+                    "Computer added successfully!\nNow you can click Manage " \
+                    "to select some packages to download later or you can " \
+                    "move Keryx to a computer with internet access to get " \
+                    "started.",
+                    "Everything Went Better Than Expected")
         
     def about(self, widget, data=None):
         """Display the about box for keryx."""
@@ -228,7 +228,10 @@
         
     def on_proxy_manual_radiobutton_toggled(self, widget, data=None):
         """Called when Manual proxy configuration is toggled"""
-        widgets = ["proxy_entry", "proxy_port_spinbutton", "proxy_username_entry", "proxy_password_entry"]
+        widgets = ["proxy_entry", 
+                   "proxy_port_spinbutton", 
+                   "proxy_username_entry", 
+                   "proxy_password_entry"]
         s = widget.get_active()
         
         # Set manual proxy entries sensitive as necessary

=== modified file 'data/ui/KeryxWindow.ui'
--- data/ui/KeryxWindow.ui	2010-08-05 18:23:18 +0000
+++ data/ui/KeryxWindow.ui	2010-08-07 15:39:46 +0000
@@ -30,7 +30,7 @@
   <object class="KeryxWindow" id="keryx_window">
     <property name="title" translatable="yes">Keryx</property>
     <property name="window_position">center</property>
-    <property name="icon">../media/icon.png</property>
+    <property name="icon">../media/keryx_64x64.png</property>
     <signal name="destroy" handler="on_destroy"/>
     <child>
       <object class="GtkVBox" id="vbox1">
@@ -710,8 +710,8 @@
                                         <child>
                                           <object class="GtkFileChooserButton" id="projects_filechooserbutton">
                                             <property name="visible">True</property>
+                                            <property name="action">select-folder</property>
                                             <property name="show_hidden">True</property>
-                                            <property name="action">select-folder</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
@@ -743,8 +743,8 @@
                                         <child>
                                           <object class="GtkFileChooserButton" id="downloads_filechooserbutton">
                                             <property name="visible">True</property>
+                                            <property name="action">select-folder</property>
                                             <property name="show_hidden">True</property>
-                                            <property name="action">select-folder</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>

=== added file 'keryx/MessageDialogs.py'
--- keryx/MessageDialogs.py	1970-01-01 00:00:00 +0000
+++ keryx/MessageDialogs.py	2010-08-07 15:39:46 +0000
@@ -0,0 +1,65 @@
+"""We have here several simple dialogs for convenience."""
+
+import gtk
+    
+
+def error_dialog(parent, text, title=None, buttons=gtk.BUTTONS_OK):
+    md = gtk.MessageDialog(parent, 
+                           gtk.DIALOG_DESTROY_WITH_PARENT, 
+                           gtk.MESSAGE_ERROR, 
+                           buttons, 
+                           text)
+    if title:
+        md.set_title(title)
+    result = md.run()
+    md.destroy()
+
+    if result == gtk.RESPONSE_CLOSE:
+        return False
+
+
+def info_dialog(parent, text, title=None, buttons=gtk.BUTTONS_OK):
+    md = gtk.MessageDialog(parent, 
+                           gtk.DIALOG_DESTROY_WITH_PARENT, 
+                           gtk.MESSAGE_INFO, 
+                           buttons, 
+                           text)
+    if title:
+        md.set_title(title)
+    result = md.run()
+    md.destroy()
+    
+    if result == gtk.RESPONSE_CLOSE:
+        return False
+
+
+def question_dialog(parent, text, title=None, buttons=gtk.BUTTONS_YES_NO):
+    md = gtk.MessageDialog(parent, 
+                           gtk.DIALOG_DESTROY_WITH_PARENT, 
+                           gtk.MESSAGE_QUESTION, 
+                           buttons, 
+                           text)
+    if title:
+        md.set_title(title)
+    result = md.run()
+    md.destroy()
+
+    if result == gtk.RESPONSE_YES:
+        return True
+    else:
+        return False
+
+
+def warning_dialog(parent, text, title=None, buttons=gtk.BUTTONS_OK):
+    md = gtk.MessageDialog(parent, 
+                           gtk.DIALOG_DESTROY_WITH_PARENT, 
+                           gtk.MESSAGE_WARNING, 
+                           buttons, 
+                           text)
+    if title:
+        md.set_title(title)
+    result =  md.run()
+    md.destroy()
+
+    if result == gtk.RESPONSE_CLOSE:
+        return False