Merge lp:~abhiram-ampabathina/gtg/gtg into lp:~gtg/gtg/old-trunk

[Abhiram]

Commit for the bug/feature : "Preferences for fonts in editor"

Hello,
         I have tried and fixed the feature "preferences for fonts in editor". I followed the exact same description at the bug description. Review it for merging. Code worked for me fine without crashing.

Thank you

Best,
Abhiram

[Izidor Matušov (izidor)]

Hi Abhiram,

the code works for me! Congratulation. I have some nitpicking to do:

* Please, set the default font to the current one. If users don't want to change the font, they use the same font as until now. Look at the difference: http://i.imgur.com/0jsqR.png

* Put before font selecting widget description, something like "Font: "

* I found a small glitch:
1, Open GTG and set a new font in the preferences
2, Restart GTG
3, Open the preferences dialog -> there is the default font (Sans 12) instead of my font.

* It would be nice to change the name of the font button widget from fontbutton1 into fontbutton

* You added import pygtk twice. I think you can remove it and it should still work.

* Change "config1" into something like "browser_config" ? Maybe even better would be to store that configuration in the editor configuration.

You are doing good work and improving your hacking skills. Keep working and it will be easier :)

review: Needs Fixing (code, running)

[lp:~abhiram-ampabathina/gtg/gtg]

1227. By Abhiram on 2012-08-06

Changed some nitpicking

1228. By Abhiram on 2012-08-06

Changed some nitpicking

[Abhiram (abhiram-ampabathina)]

> Hi Abhiram,
>
> the code works for me! Congratulation. I have some nitpicking to do:
>
> * Please, set the default font to the current one. If users don't want to
> change the font, they use the same font as until now. Look at the difference:
> http://i.imgur.com/0jsqR.png
>
> * Put before font selecting widget description, something like "Font: "
>
> * I found a small glitch:
> 1, Open GTG and set a new font in the preferences
> 2, Restart GTG
> 3, Open the preferences dialog -> there is the default font (Sans 12) instead
> of my font.
>
> * It would be nice to change the name of the font button widget from
> fontbutton1 into fontbutton
>
> * You added import pygtk twice. I think you can remove it and it should still
> work.
>
> * Change "config1" into something like "browser_config" ? Maybe even better
> would be to store that configuration in the editor configuration.
>
> You are doing good work and improving your hacking skills. Keep working and it
> will be easier :)

Hello izidor,
      Thank you. I have made all the changes including the "Retaining of the font selection after restarting". I request you to carry out the review again.

Best,
Abhiram

[lp:~abhiram-ampabathina/gtg/gtg]

1229. By Abhiram on 2012-08-06

Changed some nitpicking

1230. By Abhiram on 2012-08-06

Changed some nitpicking

1231. By Abhiram on 2012-08-07

changed the important code for preferences font

1232. By Abhiram on 2012-08-07

added the default value to fontbutton

1233. By Abhiram on 2012-08-07

made code sexier

1234. By Abhiram on 2012-08-07

made code sexier

1235. By Abhiram on 2012-08-07

removed some part

1236. By Abhiram on 2012-08-07

 some changes

1237. By Abhiram on 2012-08-07

 some changes

[Izidor Matušov (izidor)]

I merged with few modifications.

review: Approve (code, running)

[Abhiram (abhiram-ampabathina)]

Hello izidor,
     I see that you have merged the code. What are the modifications that you made? Are they big one? You might have suggested me. I might have tried them too. Any way, thankyou. I am gonna keep hacking.

Best,
Abhiram

=== modified file 'GTG/core/__init__.py'
--- GTG/core/__init__.py	2012-07-24 17:42:59 +0000
+++ GTG/core/__init__.py	2012-08-07 16:07:26 +0000
@@ -65,6 +65,7 @@
             'y_pos': 10,
             'tasklist_sort_column': 5,
             'tasklist_sort_order': 1,
+            "font_name": ""
             },
 'tag_editor': {
             "custom_colors": [],

=== modified file 'GTG/gtk/editor/editor.py'
--- GTG/gtk/editor/editor.py	2012-07-20 09:39:42 +0000
+++ GTG/gtk/editor/editor.py	2012-08-07 16:07:26 +0000
@@ -24,7 +24,7 @@
 The rest is the logic of the widget: date changing widgets, buttons, ...
 """
 import time
-
+import pango
 import gtk
 
 from GTG                     import _, ngettext
@@ -51,8 +51,9 @@
         taskconfig is a ConfigObj dic to save infos about tasks
         thisisnew is True when a new task is created and opened
         '''
-        self.req = requester
-        self.vmanager = vmanager
+	self.req = requester
+	self.browser_config = self.req.get_config('browser')
+	self.vmanager = vmanager
         self.config = taskconfig
         self.time = None
         self.clipboard = clipboard
@@ -102,6 +103,9 @@
         self.textview.set_left_margin(7)
         self.textview.set_right_margin(5)
         scrolled.add(self.textview)
+	conf_font_value = self.browser_config.get("font_name")
+	if(conf_font_value!= "" ):
+            self.textview.modify_font(pango.FontDescription(conf_font_value) ) 
         #Voila! it's done
         self.calendar       = GTGCalendar(self.builder)
         self.duedate_widget = self.builder.get_object("duedate_entry")

=== modified file 'GTG/gtk/preferences.glade'
--- GTG/gtk/preferences.glade	2012-07-13 17:24:28 +0000
+++ GTG/gtk/preferences.glade	2012-08-07 16:07:26 +0000
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="2.16"/>
-  <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkDialog" id="PreferencesDialog">
     <property name="can_focus">False</property>
     <property name="border_width">3</property>
@@ -9,7 +8,7 @@
     <property name="type_hint">dialog</property>
     <signal name="delete-event" handler="on_PreferencesDialog_delete_event" swapped="no"/>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="prefs-vbox1">
+      <object class="GtkBox" id="prefs-vbox1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <child>
@@ -71,7 +70,7 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
-                    <property name="position">1</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
@@ -91,6 +90,23 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <child>
+                              <object class="GtkCheckButton" id="bg_color_enable">
+                                <property name="label" translatable="yes">Enable colored backgrounds in the task list</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="toggled" handler="on_bg_color_toggled" swapped="no"/>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="padding">3</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
                               <object class="GtkCheckButton" id="pref_show_preview">
                                 <property name="label" translatable="yes">Show description preview in the task list.</property>
                                 <property name="visible">True</property>
@@ -104,23 +120,6 @@
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
                                 <property name="padding">3</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkCheckButton" id="bg_color_enable">
-                                <property name="label" translatable="yes">Enable colored backgrounds in the task list</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="on_bg_color_toggled" swapped="no"/>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="padding">3</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -141,6 +140,70 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkFrame" id="frame1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">none</property>
+                    <child>
+                      <object class="GtkAlignment" id="prefs-alignment1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="yalign">0.50999999046325684</property>
+                        <property name="bottom_padding">15</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <object class="GtkHBox" id="prefs-vbox4">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <child>
+                              <object class="GtkLabel" id="label5">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">Font :</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkFontButton" id="fontbutton">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
+                                <signal name="font-set" handler="on_fontbutton_font_set" swapped="no"/>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="padding">5</property>
+                                <property name="pack_type">end</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel" id="label1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Editor&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">2</property>
                   </packing>
                 </child>
@@ -192,7 +255,7 @@
           </packing>
         </child>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="prefs-action_area">
+          <object class="GtkButtonBox" id="prefs-action_area">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>

=== modified file 'GTG/gtk/preferences.py'
--- GTG/gtk/preferences.py	2012-07-13 17:24:28 +0000
+++ GTG/gtk/preferences.py	2012-08-07 16:07:26 +0000
@@ -18,7 +18,6 @@
 # -----------------------------------------------------------------------------
 
 """ The Preferences Dialog for configuring GTG """
-
 import os
 import shutil
 
@@ -81,7 +80,11 @@
         self.pref_autostart = builder.get_object("pref_autostart")
         self.pref_show_preview = builder.get_object("pref_show_preview")
         self.bg_color_enable = builder.get_object("bg_color_enable")
-
+        self.fontbutton = builder.get_object("fontbutton")
+        style = self.dialog.get_style()
+	check_style = self.config.get("font_name")
+	if(check_style!=""):
+	    self.fontbutton.set_font_name(check_style)
         builder.connect_signals({
           'on_pref_autostart_toggled':
             self.on_autostart_toggled,
@@ -95,6 +98,8 @@
             self.on_close,
           'on_PreferencesDialog_delete_event':
             self.on_close,
+          'on_fontbutton_font_set':
+            self.on_font_change,  
         })
 
     def  _refresh_preferences_store(self):
@@ -149,3 +154,5 @@
         if curstate != widget.get_active():
             self.config.set("bg_color_enable", not curstate)
             self._refresh_task_browser()
+    def on_font_change(self,widget):
+	self.config.set("font_name", self.fontbutton.get_font_name())