Merge lp:~rick-rickspencer3/pytask/theme_bug_hack_around into lp:pytask

[Rick Spencer]

Changed PytaskWindow to PytxkWindow to work around a theming bug in Ubuntu, and make PyTask suitable for Maverick.

Did the same for the About box and the Preferences dialog. Ensured that quickly design worked.

I propose this branch, as it makes PyTask look normal and suitable for running on Maverick. When the underlying bug is fixed, the code can be adjusted back as expected by:
1. find and replace PytxskWindow with PytaskWindow
2. bzr mv data/ui/PytxskWindow data/ui/PytaskWindow
3. repeat for the about box and preferences dialog

[lp:~rick-rickspencer3/pytask/theme_bug_hack_around]

166. By Rick Spencer on 2010-12-02

fixed up preferences and about dialog as well, made quickly design work again

167. By Rick Spencer on 2010-12-02

renamed modules

[Ryan Macnish (nisshh)]

review: Approve

=== modified file 'bin/pytask'
--- bin/pytask	2010-11-19 12:01:18 +0000
+++ bin/pytask	2010-12-02 01:08:10 +0000
@@ -51,7 +51,7 @@
 
 # Here are all the local imports
 from pytask import (
-    AboutPytaskDialog, PreferencesPytaskDialog)
+    AboutPytxskDialog, PreferencesPytxskDialog)
 from pytask.helpers import get_builder
 
 ind = appindicator.Indicator("Pytask", "/usr/share/pytask/media/pytask-indicator.png", appindicator.CATEGORY_APPLICATION_STATUS)
@@ -68,7 +68,7 @@
 menu.append(about_item)
 menu.append(quit_item)
 
-about = AboutPytaskDialog.AboutPytaskDialog()
+about = AboutPytxskDialog.AboutPytxskDialog()
 
 #window_state_item.connect("activate", indicator_window_state)
 #about_item.connect("activate", about)
@@ -79,8 +79,8 @@
 quit_item.show()
 ind.set_menu(menu)
 
-class PytaskWindow(gtk.Window):
-    __gtype_name__ = "PytaskWindow"
+class PytxskWindow(gtk.Window):
+    __gtype_name__ = "PytxskWindow"
     
     # To construct a new instance of this method, the following notable 
     # methods are called in this order:
@@ -96,9 +96,9 @@
         """Special static method that's automatically called by Python when 
         constructing a new instance of this class.
         
-        Returns a fully instantiated PytaskWindow object.
+        Returns a fully instantiated PytxskWindow object.
         """
-        builder = get_builder('PytaskWindow')
+        builder = get_builder('PytxskWindow')
         new_object = builder.get_object("pytask_window")
         new_object.finish_initializing(builder)
         return new_object
@@ -107,8 +107,8 @@
         """Called while initializing this instance in __new__
 
         finish_initalizing should be called after parsing the UI definition
-        and creating a PytaskWindow object with it in order to finish
-        initializing the start of the new PytaskWindow instance.
+        and creating a PytxskWindow object with it in order to finish
+        initializing the start of the new PytxskWindow instance.
         
         Put your initilization code in here and leave __init__ undefined.
         """
@@ -128,7 +128,7 @@
                 launchpad_available = False
 
         # Uncomment the following code to read in preferences at start up.
-        #dlg = PreferencesPytaskDialog.NewPreferencesPytaskDialog()
+        #dlg = PreferencesPytxskDialog.NewPreferencesPytxskDialog()
         #self.preferences = dlg.get_preferences()
 
         # Code for other initialization actions should be added here.
@@ -200,13 +200,13 @@
 
     def about(self, widget, data=None):
         """Display the about box for pytask."""
-        about = AboutPytaskDialog.AboutPytaskDialog()
+        about = AboutPytxskDialog.AboutPytxskDialog()
         response = about.run()
         about.destroy()
 
     def preferences(self, widget, data=None):
         """Display the preferences window for pytask."""
-        prefs = PreferencesPytaskDialog.PreferencesPytaskDialog()
+        prefs = PreferencesPytxskDialog.PreferencesPytxskDialog()
         response = prefs.run()
         if response == gtk.RESPONSE_OK:
             # Make any updates based on changed preferences here.
@@ -214,11 +214,11 @@
         prefs.destroy()
 
     def quit(self, widget, data=None):
-        """Signal handler for closing the PytaskWindow."""
+        """Signal handler for closing the PytxskWindow."""
         self.destroy()
 
     def on_destroy(self, widget, data=None):
-        """Called when the PytaskWindow is closed."""
+        """Called when the PytxskWindow is closed."""
         # Clean up code for saving application state should be added here.
         gtk.main_quit()
 
@@ -239,6 +239,6 @@
         logging.debug('debug mode enabled...')
 
     # Run the application.
-    window = PytaskWindow()
+    window = PytxskWindow()
     window.show()
     gtk.main()

=== renamed file 'data/ui/AboutPytaskDialog.ui' => 'data/ui/AboutPytxskDialog.ui'
--- data/ui/AboutPytaskDialog.ui	2010-11-17 06:44:54 +0000
+++ data/ui/AboutPytxskDialog.ui	2010-12-02 01:08:10 +0000
@@ -3,7 +3,7 @@
   <requires lib="gtk+" version="2.16"/>
   <!-- interface-requires about_pytask_dialog 1.0 -->
   <!-- interface-naming-policy toplevel-contextual -->
-  <object class="AboutPytaskDialog" id="about_pytask_dialog">
+  <object class="AboutPytxskDialog" id="about_pytask_dialog">
     <property name="border_width">5</property>
     <property name="window_position">center-on-parent</property>
     <property name="icon">../media/pytask24.png</property>

=== renamed file 'data/ui/PreferencesPytaskDialog.ui' => 'data/ui/PreferencesPytxskDialog.ui'
--- data/ui/PreferencesPytaskDialog.ui	2010-05-30 16:22:55 +0000
+++ data/ui/PreferencesPytxskDialog.ui	2010-12-02 01:08:10 +0000
@@ -3,7 +3,7 @@
   <requires lib="gtk+" version="2.16"/>
   <!-- interface-requires preferences_pytask_dialog 1.0 -->
   <!-- interface-naming-policy project-wide -->
-  <object class="PreferencesPytaskDialog" id="preferences_pytask_dialog">
+  <object class="PreferencesPytxskDialog" id="preferences_pytask_dialog">
     <property name="border_width">5</property>
     <property name="icon">../media/pytask24.png</property>
     <property name="type_hint">normal</property>

=== renamed file 'data/ui/PytaskWindow.ui' => 'data/ui/PytxskWindow.ui'
--- data/ui/PytaskWindow.ui	2010-09-11 21:49:59 +0000
+++ data/ui/PytxskWindow.ui	2010-12-02 01:08:10 +0000
@@ -1,11 +1,12 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="2.16"/>
   <!-- interface-requires pytask_window 1.0 -->
   <!-- interface-naming-policy project-wide -->
   <!-- interface-local-resource-path ../media -->
-  <object class="PytaskWindow" id="pytask_window">
+  <object class="PytxskWindow" id="pytask_window">
     <property name="title" translatable="yes">Pytask</property>
+    <property name="window_position">mouse</property>
     <property name="default_width">500</property>
     <property name="default_height">400</property>
     <property name="icon">../media/pytask24.png</property>

=== modified file 'data/ui/about_pytask_dialog.xml'
--- data/ui/about_pytask_dialog.xml	2010-05-16 10:57:01 +0000
+++ data/ui/about_pytask_dialog.xml	2010-12-02 01:08:10 +0000
@@ -1,8 +1,8 @@
 <glade-catalog name="about_pytask_dialog" domain="glade-3" 
                depends="gtk+" version="1.0">
   <glade-widget-classes>
-    <glade-widget-class title="About Pytask Dialog" name="AboutPytaskDialog" 
-                        generic-name="AboutPytaskDialog" parent="GtkAboutDialog"
+    <glade-widget-class title="About Pytask Dialog" name="AboutPytxskDialog" 
+                        generic-name="AboutPytxskDialog" parent="GtkAboutDialog"
                         icon-name="widget-gtk-about-dialog"/>
   </glade-widget-classes>
 

=== modified file 'data/ui/preferences_pytask_dialog.xml'
--- data/ui/preferences_pytask_dialog.xml	2010-05-16 10:57:01 +0000
+++ data/ui/preferences_pytask_dialog.xml	2010-12-02 01:08:10 +0000
@@ -1,8 +1,8 @@
 <glade-catalog name="preferences_pytask_dialog" domain="glade-3" 
                depends="gtk+" version="1.0">
   <glade-widget-classes>
-    <glade-widget-class title="Pytask Preferences Dialog" name="PreferencesPytaskDialog" 
-                        generic-name="PreferencePytaskDialog" parent="GtkDialog"
+    <glade-widget-class title="Pytask Preferences Dialog" name="PreferencesPytxskDialog" 
+                        generic-name="PreferencesPytxskDialog" parent="GtkDialog"
                         icon-name="widget-gtk-dialog"/>
   </glade-widget-classes>
 

=== modified file 'data/ui/pytask_window.xml'
--- data/ui/pytask_window.xml	2010-05-16 10:57:01 +0000
+++ data/ui/pytask_window.xml	2010-12-02 01:08:10 +0000
@@ -1,8 +1,8 @@
 <glade-catalog name="pytask_window" domain="glade-3" 
                depends="gtk+" version="1.0">
   <glade-widget-classes>
-    <glade-widget-class title="Pytask Window" name="PytaskWindow" 
-                        generic-name="PytaskWindow" parent="GtkWindow"
+    <glade-widget-class title="Pytxsk Window" name="PytxskWindow" 
+                        generic-name="PytxskWindow" parent="GtkWindow"
                         icon-name="widget-gtk-window"/>
   </glade-widget-classes>
 </glade-catalog>

=== renamed file 'pytask/AboutPytaskDialog.py' => 'pytask/AboutPytxskDialog.py'
--- pytask/AboutPytaskDialog.py	2010-09-17 22:43:50 +0000
+++ pytask/AboutPytxskDialog.py	2010-12-02 01:08:10 +0000
@@ -22,16 +22,16 @@
 from gettext import gettext as _
 gettext.textdomain('pytask')
 
-class AboutPytaskDialog(gtk.AboutDialog):
-    __gtype_name__ = "AboutPytaskDialog"
+class AboutPytxskDialog(gtk.AboutDialog):
+    __gtype_name__ = "AboutPytxskDialog"
 
     def __new__(cls):
         """Special static method that's automatically called by Python when 
         constructing a new instance of this class.
         
-        Returns a fully instantiated AboutPytaskDialog object.
+        Returns a fully instantiated AboutPytxskDialog object.
         """
-        builder = get_builder('AboutPytaskDialog')
+        builder = get_builder('AboutPytxskDialog')
         new_object = builder.get_object("about_pytask_dialog")
         new_object.finish_initializing(builder)
         return new_object
@@ -40,8 +40,8 @@
         """Called while initializing this instance in __new__
 
         finish_initalizing should be called after parsing the ui definition
-        and creating a AboutPytaskDialog object with it in order to
-        finish initializing the start of the new AboutPytaskDialog
+        and creating a AboutPytxskDialog object with it in order to
+        finish initializing the start of the new AboutPytxskDialog
         instance.
         
         Put your initialization code in here and leave __init__ undefined.
@@ -54,6 +54,6 @@
 
 
 if __name__ == "__main__":
-    dialog = AboutPytaskDialog()
+    dialog = AboutPytxskDialog()
     dialog.show()
     gtk.main()

=== renamed file 'pytask/PreferencesPytaskDialog.py' => 'pytask/PreferencesPytxskDialog.py'
--- pytask/PreferencesPytaskDialog.py	2010-09-17 22:43:50 +0000
+++ pytask/PreferencesPytxskDialog.py	2010-12-02 01:08:10 +0000
@@ -24,17 +24,17 @@
 from gettext import gettext as _
 gettext.textdomain('pytask')
 
-class PreferencesPytaskDialog(gtk.Dialog):
-    __gtype_name__ = "PreferencesPytaskDialog"
+class PreferencesPytxskDialog(gtk.Dialog):
+    __gtype_name__ = "PreferencesPytxskDialog"
     preferences = {}
 
     def __new__(cls):
         """Special static method that's automatically called by Python when 
         constructing a new instance of this class.
         
-        Returns a fully instantiated PreferencesPytaskDialog object.
+        Returns a fully instantiated PreferencesPytxskDialog object.
         """
-        builder = get_builder('PreferencesPytaskDialog')
+        builder = get_builder('PreferencesPytxskDialog')
         new_object = builder.get_object("preferences_pytask_dialog")
         new_object.finish_initializing(builder)
         return new_object
@@ -43,7 +43,7 @@
         """Called while initializing this instance in __new__
 
         finish_initalizing should be called after parsing the ui definition
-        and creating a PreferencesPytaskDialog object with it in order to
+        and creating a PreferencesPytxskDialog object with it in order to
         finish initializing the start of the new PerferencesPytaskDialog
         instance.
         
@@ -116,6 +116,6 @@
         pass
 
 if __name__ == "__main__":
-    dialog = PreferencesPytaskDialog()
+    dialog = PreferencesPytxskDialog()
     dialog.show()
     gtk.main()