restore position of vertical/horizaton spliters.

diff --git a/NEWS b/NEWS
index 3d9edd9..d00b15d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ v0.0.5
  * added urgency column.
  * implemented the cancel button of the task panel.
  * added menu.
+ * restore position of vertical/horizaton spliters.
 
 v0.0.4
 ------

diff --git a/NEWS.html b/NEWS.html
index e5e5cac..89e84e3 100644 (file)
--- a/NEWS.html
+++ b/NEWS.html
@@ -351,6 +351,11 @@ implemented the cancel button of the task panel.
 added menu.\r
 </p>\r
 </li>\r
+<li>\r
+<p>\r
+restore position of vertical/horizaton spliters.\r
+</p>\r
+</li>\r
 </ul></div>\r
 </div>\r
 </div>\r
@@ -496,7 +501,7 @@ Initial release.
 <div id="footnotes"><hr /></div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 2013-12-04 23:16:56 CET\r
+Last updated 2013-12-07 20:03:29 CET\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/po/fr.gmo b/po/fr.gmo
index 0a31a83..0734e63 100644 (file)
Binary files a/po/fr.gmo and b/po/fr.gmo differ

diff --git a/po/fr.po b/po/fr.po
index cfe59c5..402ed2c 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ptask\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2013-12-04 23:14+0100\n"
+"POT-Creation-Date: 2013-12-06 09:00+0100\n"
 "PO-Revision-Date: 2012-05-13 18:15+0000\n"
 "Last-Translator: jeanfi <Unknown>\n"
 "Language-Team: French <>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "X-Launchpad-Export-Date: 2012-07-02 08:28+0000\n"
 "X-Generator: Launchpad (build 15520)\n"
 
-#: src/main.c:62
+#: src/main.c:53
 #, c-format
 msgid ""
 "Copyright (C) %s jeanfi@gmail.com\n"
@@ -29,68 +29,68 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/main.c:73
+#: src/main.c:64
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr ""
 
-#: src/main.c:75
+#: src/main.c:66
 msgid "ptask is a task management user interface based on taskwarrior."
 msgstr ""
 
-#: src/main.c:79
+#: src/main.c:70
 #, fuzzy
 msgid "Options:"
 msgstr "Description:"
 
-#: src/main.c:80
+#: src/main.c:71
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit"
 msgstr ""
 
-#: src/main.c:85
+#: src/main.c:76
 msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
 msgstr ""
 
-#: src/main.c:90
+#: src/main.c:81
 #, c-format
 msgid "Report bugs to: %s\n"
 msgstr ""
 
-#: src/main.c:92
+#: src/main.c:83
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr ""
 
-#: src/main.c:127
+#: src/main.c:118
 msgid ""
 "Error loading tasks, verify that a supported version of taskwarrior is "
 "installed "
 msgstr ""
 
-#: src/main.c:200
+#: src/main.c:180
 msgid "Enables debug mode."
 msgstr ""
 
-#: src/main.c:209
+#: src/main.c:189
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/glade/ptask.glade:7
+#: src/glade/ptask.glade:27
 msgid "New Task"
 msgstr "Nouvelle Tache"
 
-#: src/glade/ptask.glade:66 src/glade/ptask.glade:578
+#: src/glade/ptask.glade:86 src/glade/ptask.glade:579
 msgid "Description:"
 msgstr "Description:"
 
-#: src/glade/ptask.glade:101 src/glade/ptask.glade:656
+#: src/glade/ptask.glade:121 src/glade/ptask.glade:657
 msgid "Project:"
 msgstr "Projet:"
 
-#: src/glade/ptask.glade:136 src/glade/ptask.glade:690
+#: src/glade/ptask.glade:156 src/glade/ptask.glade:691
 msgid "Priority:"
 msgstr "Priorite:"
 
@@ -106,7 +106,7 @@ msgstr ""
 msgid "Status:"
 msgstr "Etat:"
 
-#: src/glade/ptask.glade:434 src/glade/ptask.glade:506
+#: src/glade/ptask.glade:434 src/glade/ptask.glade:507
 msgid "Project"
 msgstr "Projet"
 
@@ -114,34 +114,34 @@ msgstr "Projet"
 msgid "Count"
 msgstr ""
 
-#: src/glade/ptask.glade:493
+#: src/glade/ptask.glade:494
 msgid "Priority"
 msgstr "Priorite"
 
-#: src/glade/ptask.glade:523
+#: src/glade/ptask.glade:524
 msgid "Description"
 msgstr "Description"
 
-#: src/glade/ptask.glade:539
+#: src/glade/ptask.glade:540
 msgid "Urgency"
 msgstr ""
 
-#: src/glade/ptask.glade:596
+#: src/glade/ptask.glade:597
 msgid "Note:"
 msgstr "Note:"
 
-#: src/glade/ptask.glade:730
+#: src/glade/ptask.glade:731
 msgid "Save"
 msgstr "Sauvegarder"
 
-#: src/glade/ptask.glade:744
+#: src/glade/ptask.glade:745
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/glade/ptask.glade:758
+#: src/glade/ptask.glade:759
 msgid "Mark Done"
 msgstr "Marquer fait"
 
-#: src/glade/ptask.glade:772
+#: src/glade/ptask.glade:773
 msgid "Remove"
 msgstr ""

diff --git a/po/ptask.pot b/po/ptask.pot
index a0ce6ec..1a34a8e 100644 (file)
--- a/po/ptask.pot
+++ b/po/ptask.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2013-12-04 23:14+0100\n"
+"POT-Creation-Date: 2013-12-06 09:00+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/main.c:62
+#: src/main.c:53
 #, c-format
 msgid ""
 "Copyright (C) %s jeanfi@gmail.com\n"
@@ -27,67 +27,67 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/main.c:73
+#: src/main.c:64
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr ""
 
-#: src/main.c:75
+#: src/main.c:66
 msgid "ptask is a task management user interface based on taskwarrior."
 msgstr ""
 
-#: src/main.c:79
+#: src/main.c:70
 msgid "Options:"
 msgstr ""
 
-#: src/main.c:80
+#: src/main.c:71
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit"
 msgstr ""
 
-#: src/main.c:85
+#: src/main.c:76
 msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
 msgstr ""
 
-#: src/main.c:90
+#: src/main.c:81
 #, c-format
 msgid "Report bugs to: %s\n"
 msgstr ""
 
-#: src/main.c:92
+#: src/main.c:83
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr ""
 
-#: src/main.c:127
+#: src/main.c:118
 msgid ""
 "Error loading tasks, verify that a supported version of taskwarrior is "
 "installed "
 msgstr ""
 
-#: src/main.c:200
+#: src/main.c:180
 msgid "Enables debug mode."
 msgstr ""
 
-#: src/main.c:209
+#: src/main.c:189
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/glade/ptask.glade:7
+#: src/glade/ptask.glade:27
 msgid "New Task"
 msgstr ""
 
-#: src/glade/ptask.glade:66 src/glade/ptask.glade:578
+#: src/glade/ptask.glade:86 src/glade/ptask.glade:579
 msgid "Description:"
 msgstr ""
 
-#: src/glade/ptask.glade:101 src/glade/ptask.glade:656
+#: src/glade/ptask.glade:121 src/glade/ptask.glade:657
 msgid "Project:"
 msgstr ""
 
-#: src/glade/ptask.glade:136 src/glade/ptask.glade:690
+#: src/glade/ptask.glade:156 src/glade/ptask.glade:691
 msgid "Priority:"
 msgstr ""
 
@@ -103,7 +103,7 @@ msgstr ""
 msgid "Status:"
 msgstr ""
 
-#: src/glade/ptask.glade:434 src/glade/ptask.glade:506
+#: src/glade/ptask.glade:434 src/glade/ptask.glade:507
 msgid "Project"
 msgstr ""
 
@@ -111,34 +111,34 @@ msgstr ""
 msgid "Count"
 msgstr ""
 
-#: src/glade/ptask.glade:493
+#: src/glade/ptask.glade:494
 msgid "Priority"
 msgstr ""
 
-#: src/glade/ptask.glade:523
+#: src/glade/ptask.glade:524
 msgid "Description"
 msgstr ""
 
-#: src/glade/ptask.glade:539
+#: src/glade/ptask.glade:540
 msgid "Urgency"
 msgstr ""
 
-#: src/glade/ptask.glade:596
+#: src/glade/ptask.glade:597
 msgid "Note:"
 msgstr ""
 
-#: src/glade/ptask.glade:730
+#: src/glade/ptask.glade:731
 msgid "Save"
 msgstr ""
 
-#: src/glade/ptask.glade:744
+#: src/glade/ptask.glade:745
 msgid "Cancel"
 msgstr ""
 
-#: src/glade/ptask.glade:758
+#: src/glade/ptask.glade:759
 msgid "Mark Done"
 msgstr ""
 
-#: src/glade/ptask.glade:772
+#: src/glade/ptask.glade:773
 msgid "Remove"
 msgstr ""

diff --git a/src/glade/ptask.glade b/src/glade/ptask.glade
index 00f4b37..1e9db98 100644 (file)
--- a/src/glade/ptask.glade
+++ b/src/glade/ptask.glade
@@ -413,7 +413,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkPaned" id="paned1">
+          <object class="GtkPaned" id="vpaned">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
@@ -460,7 +460,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkPaned" id="paned2">
+              <object class="GtkPaned" id="hpaned">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="orientation">vertical</property>

diff --git a/src/ptask.gschema.xml b/src/ptask.gschema.xml
index 7689db6..37ce6f5 100644 (file)
--- a/src/ptask.gschema.xml
+++ b/src/ptask.gschema.xml
@@ -19,10 +19,10 @@
       <default>0</default>
     </key>
     <key name="spliter-horizontal-pos" type="i">
-      <default>50</default>
+      <default>200</default>
     </key>
     <key name="spliter-vertical-pos" type="i">
-      <default>200</default>
+      <default>100</default>
     </key>
   </schema>
 </schemalist>
\ No newline at end of file

diff --git a/src/ui.c b/src/ui.c
index 4fabb8c..acfa2b6 100644 (file)
--- a/src/ui.c
+++ b/src/ui.c
@@ -30,6 +30,8 @@
 static GtkComboBox *w_status;
 static GSettings *gsettings;
 static GtkWindow *window;
+static GtkPaned *vpaned;
+static GtkPaned *hpaned;
 
 int newtask_clicked_cbk(GtkButton *btn, gpointer data)
 {
@@ -40,18 +42,24 @@ int newtask_clicked_cbk(GtkButton *btn, gpointer data)
 
 static void save_settings(GtkWindow *window, GSettings *settings)
 {
-       int w, h, x, y;
+       int w, h, x, y, pos;
 
        gtk_window_get_size(window, &w, &h);
        gtk_window_get_position(window, &x, &y);
 
-       log_debug("save_settings(): x=%d, y=%d, w=%d, h=%d", x, y, w, h);
+       log_fct("x=%d, y=%d, w=%d, h=%d", x, y, w, h);
 
        g_settings_set_int(settings, "window-width", w);
        g_settings_set_int(settings, "window-height", h);
        g_settings_set_int(settings, "window-x", x);
        g_settings_set_int(settings, "window-y", y);
 
+       pos = gtk_paned_get_position(vpaned);
+       g_settings_set_int(settings, "spliter-vertical-pos", pos);
+
+       pos = gtk_paned_get_position(hpaned);
+       g_settings_set_int(settings, "spliter-horizontal-pos", pos);
+
        ui_tasktree_save_settings(settings);
 
        g_settings_sync();
@@ -97,7 +105,7 @@ static int status_changed_cbk(GtkComboBox *w, gpointer data)
 
 GtkWindow *create_window(GtkBuilder *builder, GSettings *settings)
 {
-       int x, y, w, h;
+       int x, y, w, h, pos;
 
        gsettings = settings;
 
@@ -116,6 +124,14 @@ GtkWindow *create_window(GtkBuilder *builder, GSettings *settings)
        y = g_settings_get_int(settings, "window-y");
        gtk_window_move(window, x, y);
 
+       vpaned = GTK_PANED(gtk_builder_get_object(builder, "vpaned"));
+       pos = g_settings_get_int(settings, "spliter-vertical-pos");
+       gtk_paned_set_position(vpaned, pos);
+
+       hpaned = GTK_PANED(gtk_builder_get_object(builder, "hpaned"));
+       pos = g_settings_get_int(settings, "spliter-horizontal-pos");
+       gtk_paned_set_position(hpaned, pos);
+
        g_signal_connect(window, "delete_event",
                         G_CALLBACK(delete_event_cbk), settings);