From 20eb458789ff0b7e210e4031b03705ebbba00585 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Thu, 30 May 2013 07:25:45 +0000 Subject: [PATCH 1/1] translation of glade content --- doc/index.html | 13 ++------- po/Makefile | 3 ++- po/POTFILES | 3 ++- po/POTFILES.in | 2 ++ po/fr.gmo | Bin 453 -> 453 bytes po/fr.po | 74 +++++++++++++++++++++++++++++++++++++++++++++++----- po/prss.pot | 74 +++++++++++++++++++++++++++++++++++++++++++++++----- scripts/valgrind.sh | 12 +++++++++ src/main.c | 16 ++++++++---- 9 files changed, 165 insertions(+), 32 deletions(-) create mode 100755 scripts/valgrind.sh diff --git a/doc/index.html b/doc/index.html index 80c9f14..3b42700 100644 --- a/doc/index.html +++ b/doc/index.html @@ -798,11 +798,6 @@ CURL library

  • -GConf2 library -

    -
    • -
  • -

    GTK+ 3 library

    • @@ -871,11 +866,6 @@ libcurl4-gnutls-dev

  • -libgconf2-dev -

    -
    • -
  • -

    libgtk-3-dev

    • @@ -920,6 +910,7 @@ sudo make install

    2. Installation from PPA

    +

    For Ubuntu 12.04, 12.10 and 13.04:

    sudo apt-add-repository ppa:jfi/prss
@@ -943,7 +934,7 @@ password fields.
    diff --git a/po/Makefile b/po/Makefile index b1a59de..e7b6ae6 100644 --- a/po/Makefile +++ b/po/Makefile @@ -73,7 +73,8 @@ $(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3) POTFILES = \ ../src/log.c \ - ../src/main.c + ../src/main.c \ + ../src/glade/prss.glade CATALOGS = fr.gmo diff --git a/po/POTFILES b/po/POTFILES index bdeb3c3..06022e2 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -1,2 +1,3 @@ ../src/log.c \ - ../src/main.c + ../src/main.c \ + ../src/glade/prss.glade diff --git a/po/POTFILES.in b/po/POTFILES.in index d11d321..8f5e2ff 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,2 +1,4 @@ src/log.c src/main.c +src/glade/prss.glade + diff --git a/po/fr.gmo b/po/fr.gmo index 188b2d455aadbbd5c58461b48dde2acadc141a57..ee4e4fb3ed9e22b9cf856ed1040de84d0d92ab2e 100644 GIT binary patch delta 19 acmX@ge3W^@R1RYU1p`YfBa@ADH5dUu2?fCb delta 19 acmX@ge3W^@R1O1U1w#WXBlC@OH5dUt)&;x( diff --git a/po/fr.po b/po/fr.po index 099fd87..3035bb3 100644 --- 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-05-03 10:27+0200\n" +"POT-Creation-Date: 2013-05-30 09:24+0200\n" "PO-Revision-Date: 2012-05-13 18:15+0000\n" "Last-Translator: jeanfi \n" "Language-Team: French <>\n" @@ -68,33 +68,93 @@ msgstr "" msgid "%s home page: <%s>\n" msgstr "" -#: src/main.c:471 +#: src/main.c:488 msgid "PRSS is a GTK+ client application for Tiny Tiny RSS" msgstr "" -#: src/main.c:473 +#: src/main.c:490 msgid "" "Copyright(c) 2010-2013\n" "jeanfi@gmail.com" msgstr "" -#: src/main.c:476 +#: src/main.c:493 msgid "About PRSS" msgstr "" -#: src/main.c:479 +#: src/main.c:496 msgid "PRSS Homepage" msgstr "" -#: src/main.c:526 +#: src/main.c:543 msgid "Enables debug mode." msgstr "" -#: src/main.c:541 +#: src/main.c:558 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" +#: src/glade/prss.glade:5 +msgid "Refresh" +msgstr "" + +#: src/glade/prss.glade:43 +msgid "Preferences" +msgstr "" + +#: src/glade/prss.glade:109 +msgid "URL:" +msgstr "" + +#: src/glade/prss.glade:122 +msgid "Login:" +msgstr "" + +#: src/glade/prss.glade:136 +msgid "Password:" +msgstr "" + +#: src/glade/prss.glade:194 +msgid "Account" +msgstr "" + +#: src/glade/prss.glade:208 +msgid "Layout:" +msgstr "" + +#: src/glade/prss.glade:246 +msgid "Interface" +msgstr "" + +#: src/glade/prss.glade:275 +msgid "Pitchoune RSS" +msgstr "" + +#: src/glade/prss.glade:293 +msgid "_File" +msgstr "" + +#: src/glade/prss.glade:334 +msgid "_Help" +msgstr "" + +#: src/glade/prss.glade:370 src/glade/prss.glade:384 +msgid "toolbutton1" +msgstr "" + +#: src/glade/prss.glade:432 +msgid "Feed" +msgstr "" + +#: src/glade/prss.glade:481 +msgid "Headline" +msgstr "" + +#: src/glade/prss.glade:497 +msgid "Date" +msgstr "" + #~ msgid "New Task" #~ msgstr "Nouvelle Tache" diff --git a/po/prss.pot b/po/prss.pot index f995e0c..1afbdfc 100644 --- a/po/prss.pot +++ b/po/prss.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-05-03 10:27+0200\n" +"POT-Creation-Date: 2013-05-30 09:24+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -65,29 +65,89 @@ msgstr "" msgid "%s home page: <%s>\n" msgstr "" -#: src/main.c:471 +#: src/main.c:488 msgid "PRSS is a GTK+ client application for Tiny Tiny RSS" msgstr "" -#: src/main.c:473 +#: src/main.c:490 msgid "" "Copyright(c) 2010-2013\n" "jeanfi@gmail.com" msgstr "" -#: src/main.c:476 +#: src/main.c:493 msgid "About PRSS" msgstr "" -#: src/main.c:479 +#: src/main.c:496 msgid "PRSS Homepage" msgstr "" -#: src/main.c:526 +#: src/main.c:543 msgid "Enables debug mode." msgstr "" -#: src/main.c:541 +#: src/main.c:558 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" + +#: src/glade/prss.glade:5 +msgid "Refresh" +msgstr "" + +#: src/glade/prss.glade:43 +msgid "Preferences" +msgstr "" + +#: src/glade/prss.glade:109 +msgid "URL:" +msgstr "" + +#: src/glade/prss.glade:122 +msgid "Login:" +msgstr "" + +#: src/glade/prss.glade:136 +msgid "Password:" +msgstr "" + +#: src/glade/prss.glade:194 +msgid "Account" +msgstr "" + +#: src/glade/prss.glade:208 +msgid "Layout:" +msgstr "" + +#: src/glade/prss.glade:246 +msgid "Interface" +msgstr "" + +#: src/glade/prss.glade:275 +msgid "Pitchoune RSS" +msgstr "" + +#: src/glade/prss.glade:293 +msgid "_File" +msgstr "" + +#: src/glade/prss.glade:334 +msgid "_Help" +msgstr "" + +#: src/glade/prss.glade:370 src/glade/prss.glade:384 +msgid "toolbutton1" +msgstr "" + +#: src/glade/prss.glade:432 +msgid "Feed" +msgstr "" + +#: src/glade/prss.glade:481 +msgid "Headline" +msgstr "" + +#: src/glade/prss.glade:497 +msgid "Date" +msgstr "" diff --git a/scripts/valgrind.sh b/scripts/valgrind.sh new file mode 100755 index 0000000..9d0aa76 --- /dev/null +++ b/scripts/valgrind.sh @@ -0,0 +1,12 @@ +#/bin/bash + +SDIR=`dirname $0` + +export G_SLICE=always-malloc +export G_DEBUG=gc-friendly + +DUMP_FILE=prss_`date +"%Y_%m_%d_%H_%M_%S"`.log + +echo starts prss with options: $* + +valgrind -v --tool=memcheck --leak-check=full --track-origins=yes --leak-resolution=high --num-callers=20 --log-file=$DUMP_FILE $SDIR/../src/prss $* \ No newline at end of file diff --git a/src/main.c b/src/main.c index 46e18bc..b20297b 100644 --- a/src/main.c +++ b/src/main.c @@ -446,12 +446,15 @@ void headline_row_activated_cbk(GtkWidget *widget, gpointer data) static void save_settings() { - int w, h; + int w, h, x, y; - gtk_window_get_size(window, - &w, - &h); + gtk_window_get_size(window, &w, &h); + gtk_window_get_position(window, &x, &y); + log_debug("save_settings(): x=%d, y=%d", x, y); + + g_settings_set_int(settings, "window-x", x); + g_settings_set_int(settings, "window-y", y); g_settings_set_int(settings, "window-width", w); g_settings_set_int(settings, "window-height", h); } @@ -576,9 +579,12 @@ int main(int argc, char **argv) NULL); window = GTK_WINDOW(gtk_builder_get_object(builder, "window")); - gtk_window_set_default_size(GTK_WINDOW(window), + gtk_window_set_default_size(window, g_settings_get_int(settings, "window-width"), g_settings_get_int(settings, "window-height")); + gtk_window_move(window, + g_settings_get_int(settings, "window-x"), + g_settings_get_int(settings, "window-y")); w_feedtree = GTK_TREE_VIEW(gtk_builder_get_object(builder, "feed_tree")); -- 2.7.4