From: Jean-Philippe Orsini Date: Sat, 26 Oct 2013 23:35:47 +0000 (+0000) Subject: added icon X-Git-Tag: v0.0.6~94 X-Git-Url: http://git.wpitchoune.net/gitweb/?p=ptask.git;a=commitdiff_plain;h=7a4a18c0f8f992328e087cfe516361d1ef9c2858 added icon --- diff --git a/Makefile.am b/Makefile.am index b353711..5549ea2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,7 @@ -SUBDIRS = po \ +SUBDIRS = icons/hicolor/scalable \ + po \ src \ - tests + tests dist_doc_DATA = AUTHORS \ COPYING \ diff --git a/Makefile.in b/Makefile.in index 89d2f37..91653f7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -286,9 +286,10 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = po \ +SUBDIRS = icons/hicolor/scalable \ + po \ src \ - tests + tests dist_doc_DATA = AUTHORS \ COPYING \ diff --git a/NEWS b/NEWS index 565f9b3..ae7ef61 100644 --- a/NEWS +++ b/NEWS @@ -12,6 +12,7 @@ v0.0.4 * supported versions of taskwarrior are 2.2.0 and 2.0.0. * added taskwarrior version checking. * added support for taskwarrior 2.2.0 (avoid confirmation query). + * added window position and size restore. v0.0.3 ------ diff --git a/NEWS.html b/NEWS.html index 1e42666..2466c3d 100644 --- a/NEWS.html +++ b/NEWS.html @@ -788,6 +788,11 @@ added taskwarrior version checking. added support for taskwarrior 2.2.0 (avoid confirmation query).

+
  • +

    +added window position and size restore. +

    +
    • @@ -856,7 +861,7 @@ Initial release.
    diff --git a/config.status b/config.status index 95274af..e837e8a 100755 --- a/config.status +++ b/config.status @@ -393,7 +393,7 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q` " # Files that config.status was made for. -config_files=" Makefile po/Makefile.in src/Makefile src/glade/Makefile tests/Makefile" +config_files=" Makefile icons/hicolor/scalable/Makefile po/Makefile.in src/Makefile src/glade/Makefile tests/Makefile" config_headers=" config.h" config_commands=" depfiles po-directories" @@ -438,7 +438,7 @@ Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." -ac_pwd='/home/jporsini/work/wpitchoune/svnpub/ptask/trunk' +ac_pwd='/home/jporsini/work.local/wpitchoune/svnpub/ptask/trunk' srcdir='.' INSTALL='/usr/bin/install -c' MKDIR_P='/bin/mkdir -p' @@ -558,6 +558,7 @@ do "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "icons/hicolor/scalable/Makefile") CONFIG_FILES="$CONFIG_FILES icons/hicolor/scalable/Makefile" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "src/glade/Makefile") CONFIG_FILES="$CONFIG_FILES src/glade/Makefile" ;; @@ -751,12 +752,12 @@ S["mkdir_p"]="/bin/mkdir -p" S["MKDIR_P"]="/bin/mkdir -p" S["INSTALL_STRIP_PROGRAM"]="$(install_sh) -c -s" S["STRIP"]="" -S["install_sh"]="${SHELL} /home/jporsini/work/wpitchoune/svnpub/ptask/trunk/install-sh" -S["MAKEINFO"]="${SHELL} /home/jporsini/work/wpitchoune/svnpub/ptask/trunk/missing --run makeinfo" -S["AUTOHEADER"]="${SHELL} /home/jporsini/work/wpitchoune/svnpub/ptask/trunk/missing --run autoheader" -S["AUTOMAKE"]="${SHELL} /home/jporsini/work/wpitchoune/svnpub/ptask/trunk/missing --run automake-1.11" -S["AUTOCONF"]="${SHELL} /home/jporsini/work/wpitchoune/svnpub/ptask/trunk/missing --run autoconf" -S["ACLOCAL"]="${SHELL} /home/jporsini/work/wpitchoune/svnpub/ptask/trunk/missing --run aclocal-1.11" +S["install_sh"]="${SHELL} /home/jporsini/work.local/wpitchoune/svnpub/ptask/trunk/install-sh" +S["MAKEINFO"]="${SHELL} /home/jporsini/work.local/wpitchoune/svnpub/ptask/trunk/missing --run makeinfo" +S["AUTOHEADER"]="${SHELL} /home/jporsini/work.local/wpitchoune/svnpub/ptask/trunk/missing --run autoheader" +S["AUTOMAKE"]="${SHELL} /home/jporsini/work.local/wpitchoune/svnpub/ptask/trunk/missing --run automake-1.11" +S["AUTOCONF"]="${SHELL} /home/jporsini/work.local/wpitchoune/svnpub/ptask/trunk/missing --run autoconf" +S["ACLOCAL"]="${SHELL} /home/jporsini/work.local/wpitchoune/svnpub/ptask/trunk/missing --run aclocal-1.11" S["VERSION"]="0.0.x" S["PACKAGE"]="ptask" S["CYGPATH_W"]="echo" diff --git a/configure b/configure index 47df5c1..d78267b 100755 --- a/configure +++ b/configure @@ -6928,7 +6928,7 @@ endif -ac_config_files="$ac_config_files Makefile po/Makefile.in src/Makefile src/glade/Makefile tests/Makefile" +ac_config_files="$ac_config_files Makefile icons/hicolor/scalable/Makefile po/Makefile.in src/Makefile src/glade/Makefile tests/Makefile" for ac_prog in help2man @@ -7753,6 +7753,7 @@ do "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "icons/hicolor/scalable/Makefile") CONFIG_FILES="$CONFIG_FILES icons/hicolor/scalable/Makefile" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "src/glade/Makefile") CONFIG_FILES="$CONFIG_FILES src/glade/Makefile" ;; diff --git a/configure.ac b/configure.ac index c9eff51..01daed8 100644 --- a/configure.ac +++ b/configure.ac @@ -52,6 +52,7 @@ GLIB_GSETTINGS AC_CONFIG_FILES([ Makefile + icons/hicolor/scalable/Makefile po/Makefile.in src/Makefile src/glade/Makefile diff --git a/icons/hicolor/scalable/Makefile.am b/icons/hicolor/scalable/Makefile.am new file mode 100644 index 0000000..88cdc23 --- /dev/null +++ b/icons/hicolor/scalable/Makefile.am @@ -0,0 +1,6 @@ +themedir = $(datadir)/icons/hicolor +size = scalable +context = apps +EXTRA_DIST = ptask.svg +prssdistpixdir = $(themedir)/$(size)/$(context) +prssdistpix_DATA = $(EXTRA_DIST) diff --git a/icons/hicolor/scalable/ptask.svg b/icons/hicolor/scalable/ptask.svg new file mode 100644 index 0000000..2fcf23b --- /dev/null +++ b/icons/hicolor/scalable/ptask.svg @@ -0,0 +1,68 @@ + + + + + + + + + + image/svg+xml + + + + + + + PTASK + + diff --git a/po/Makefile b/po/Makefile index ea8150b..3e4611e 100644 --- a/po/Makefile +++ b/po/Makefile @@ -34,12 +34,12 @@ INSTALL_DATA = ${INSTALL} -m 644 # We use $(mkdir_p). # In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as # "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions, -# ${SHELL} /home/jporsini/work/wpitchoune/svnpub/ptask/trunk/install-sh does not start with $(SHELL), so we add it. +# ${SHELL} /home/jporsini/work.local/wpitchoune/svnpub/ptask/trunk/install-sh does not start with $(SHELL), so we add it. # In automake >= 1.10, /bin/mkdir -p is derived from ${MKDIR_P}, which is defined # either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake # versions, $(mkinstalldirs) and $(install_sh) are unused. -mkinstalldirs = $(SHELL) ${SHELL} /home/jporsini/work/wpitchoune/svnpub/ptask/trunk/install-sh -d -install_sh = $(SHELL) ${SHELL} /home/jporsini/work/wpitchoune/svnpub/ptask/trunk/install-sh +mkinstalldirs = $(SHELL) ${SHELL} /home/jporsini/work.local/wpitchoune/svnpub/ptask/trunk/install-sh -d +install_sh = $(SHELL) ${SHELL} /home/jporsini/work.local/wpitchoune/svnpub/ptask/trunk/install-sh MKDIR_P = /bin/mkdir -p mkdir_p = /bin/mkdir -p diff --git a/po/Makefile.in b/po/Makefile.in index ca508b4..13ef718 100644 --- a/po/Makefile.in +++ b/po/Makefile.in @@ -34,12 +34,12 @@ INSTALL_DATA = ${INSTALL} -m 644 # We use $(mkdir_p). # In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as # "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions, -# ${SHELL} /home/jporsini/work/wpitchoune/svnpub/ptask/trunk/install-sh does not start with $(SHELL), so we add it. +# ${SHELL} /home/jporsini/work.local/wpitchoune/svnpub/ptask/trunk/install-sh does not start with $(SHELL), so we add it. # In automake >= 1.10, /bin/mkdir -p is derived from ${MKDIR_P}, which is defined # either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake # versions, $(mkinstalldirs) and $(install_sh) are unused. -mkinstalldirs = $(SHELL) ${SHELL} /home/jporsini/work/wpitchoune/svnpub/ptask/trunk/install-sh -d -install_sh = $(SHELL) ${SHELL} /home/jporsini/work/wpitchoune/svnpub/ptask/trunk/install-sh +mkinstalldirs = $(SHELL) ${SHELL} /home/jporsini/work.local/wpitchoune/svnpub/ptask/trunk/install-sh -d +install_sh = $(SHELL) ${SHELL} /home/jporsini/work.local/wpitchoune/svnpub/ptask/trunk/install-sh MKDIR_P = /bin/mkdir -p mkdir_p = /bin/mkdir -p diff --git a/po/fr.gmo b/po/fr.gmo index 0bb79bb..b3894ad 100644 Binary files a/po/fr.gmo and b/po/fr.gmo differ diff --git a/po/fr.po b/po/fr.po index 6fb558c..7af8530 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-10-19 11:51+0200\n" +"POT-Creation-Date: 2013-10-27 01:35+0200\n" "PO-Revision-Date: 2012-05-13 18:15+0000\n" "Last-Translator: jeanfi \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:65 +#: src/main.c:66 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -29,51 +29,51 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/main.c:76 +#: src/main.c:77 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "" -#: src/main.c:78 +#: src/main.c:79 msgid "ptask is a task management user interface based on taskwarrior." msgstr "" -#: src/main.c:82 +#: src/main.c:83 #, fuzzy msgid "Options:" msgstr "Description:" -#: src/main.c:83 +#: src/main.c:84 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" msgstr "" -#: src/main.c:88 +#: src/main.c:89 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/main.c:93 +#: src/main.c:94 #, c-format msgid "Report bugs to: %s\n" msgstr "" -#: src/main.c:95 +#: src/main.c:96 #, c-format msgid "%s home page: <%s>\n" msgstr "" -#: src/main.c:210 +#: src/main.c:211 msgid "" "Error loading tasks, verify that a supported version of taskwarrior is " -"installed and its configuration file exist." +"installed " msgstr "" -#: src/main.c:490 +#: src/main.c:480 msgid "Enables debug mode." msgstr "" -#: src/main.c:499 +#: src/main.c:489 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" @@ -82,7 +82,7 @@ msgstr "" msgid "New Task" msgstr "Nouvelle Tache" -#: src/glade/ptask.glade:66 src/glade/ptask.glade:368 +#: src/glade/ptask.glade:66 src/glade/ptask.glade:367 msgid "Description:" msgstr "Description:" @@ -102,30 +102,30 @@ msgstr "Priorite" msgid "Project" msgstr "Projet" -#: src/glade/ptask.glade:325 +#: src/glade/ptask.glade:324 msgid "Description" msgstr "Description" -#: src/glade/ptask.glade:386 +#: src/glade/ptask.glade:385 msgid "Note:" msgstr "Note:" -#: src/glade/ptask.glade:446 +#: src/glade/ptask.glade:445 msgid "Project:" msgstr "Projet:" -#: src/glade/ptask.glade:480 +#: src/glade/ptask.glade:479 msgid "Priority:" msgstr "Priorite:" -#: src/glade/ptask.glade:520 +#: src/glade/ptask.glade:519 msgid "Mark Done" msgstr "Marquer fait" -#: src/glade/ptask.glade:557 +#: src/glade/ptask.glade:556 msgid "Save" msgstr "Sauvegarder" -#: src/glade/ptask.glade:571 +#: src/glade/ptask.glade:570 msgid "Cancel" msgstr "Annuler" diff --git a/po/ptask.pot b/po/ptask.pot index e0c5434..8577efe 100644 --- 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-10-19 11:51+0200\n" +"POT-Creation-Date: 2013-10-27 01:35+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: src/main.c:65 +#: src/main.c:66 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -27,50 +27,50 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/main.c:76 +#: src/main.c:77 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "" -#: src/main.c:78 +#: src/main.c:79 msgid "ptask is a task management user interface based on taskwarrior." msgstr "" -#: src/main.c:82 +#: src/main.c:83 msgid "Options:" msgstr "" -#: src/main.c:83 +#: src/main.c:84 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" msgstr "" -#: src/main.c:88 +#: src/main.c:89 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/main.c:93 +#: src/main.c:94 #, c-format msgid "Report bugs to: %s\n" msgstr "" -#: src/main.c:95 +#: src/main.c:96 #, c-format msgid "%s home page: <%s>\n" msgstr "" -#: src/main.c:210 +#: src/main.c:211 msgid "" "Error loading tasks, verify that a supported version of taskwarrior is " -"installed and its configuration file exist." +"installed " msgstr "" -#: src/main.c:490 +#: src/main.c:480 msgid "Enables debug mode." msgstr "" -#: src/main.c:499 +#: src/main.c:489 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" @@ -79,7 +79,7 @@ msgstr "" msgid "New Task" msgstr "" -#: src/glade/ptask.glade:66 src/glade/ptask.glade:368 +#: src/glade/ptask.glade:66 src/glade/ptask.glade:367 msgid "Description:" msgstr "" @@ -99,30 +99,30 @@ msgstr "" msgid "Project" msgstr "" -#: src/glade/ptask.glade:325 +#: src/glade/ptask.glade:324 msgid "Description" msgstr "" -#: src/glade/ptask.glade:386 +#: src/glade/ptask.glade:385 msgid "Note:" msgstr "" -#: src/glade/ptask.glade:446 +#: src/glade/ptask.glade:445 msgid "Project:" msgstr "" -#: src/glade/ptask.glade:480 +#: src/glade/ptask.glade:479 msgid "Priority:" msgstr "" -#: src/glade/ptask.glade:520 +#: src/glade/ptask.glade:519 msgid "Mark Done" msgstr "" -#: src/glade/ptask.glade:557 +#: src/glade/ptask.glade:556 msgid "Save" msgstr "" -#: src/glade/ptask.glade:571 +#: src/glade/ptask.glade:570 msgid "Cancel" msgstr ""