diff -Nru yad-0.28.2/ChangeLog yad-0.31.0/ChangeLog
--- yad-0.28.2/ChangeLog 2015-07-15 17:55:52.000000000 +0000
+++ yad-0.31.0/ChangeLog 2015-09-10 08:28:48.000000000 +0000
@@ -1,3 +1,153 @@
+2015-09-10 05:31 v1c0nt
+
+ * data/yad.1, po/ru.po, po/uk.po, src/file.c, src/form.c,
+ src/option.c, src/util.c, src/yad.h: enable preview for all of
+ file chooser dialogs
+
+2015-09-09 16:34 v1c0nt
+
+ * po/ru.po, po/uk.po: remove crap from translation
+
+2015-09-09 16:19 v1c0nt
+
+ * data/yad.1, po/ru.po, po/uk.po, src/file.c, src/form.c,
+ src/option.c, src/yad.h: extend file filters and apply them to
+ all of file dialogs
+
+2015-09-09 12:15 v1c0nt
+
+ * src/form.c, src/option.c, src/util.c, src/yad.h: add date_format
+ default settings
+
+2015-09-09 11:25 v1c0nt
+
+ * src/option.c, src/yad.h: remove rules_hint from settings
+
+2015-09-09 11:21 v1c0nt
+
+ * data/yad.1, po/ru.po, po/uk.po, src/color.c, src/option.c,
+ src/util.c, src/yad.h: add palette options to color dialog.
+ remove this settings fron yad settings file
+
+2015-09-09 10:29 v1c0nt
+
+ * data/yad.1, src/html.c, src/icons.c, src/text.c, src/util.c,
+ src/yad.h: change hardcoded xdg-open to yad setting
+ "open_command"
+
+2015-09-09 09:53 v1c0nt
+
+ * src/main.c, src/option.c, src/util.c, src/yad.h: remove obsolete
+ dialog-sep option. code cleanup
+
+2015-09-09 05:48 v1c0nt
+
+ * ChangeLog:
+
+2015-09-08 14:22 v1c0nt
+
+ * po/ru.po, po/uk.po:
+
+2015-09-08 14:22 v1c0nt
+
+ * data/yad.1, src/option.c:
+
+2015-09-08 14:16 v1c0nt
+
+ * configure.ac: add -no-rules-hint option to list dialog
+
+2015-09-08 14:15 v1c0nt
+
+ * data/yad.1, po/ru.po, po/uk.po, src/color.c, src/list.c,
+ src/option.c, src/util.c, src/yad.h:
+
+2015-09-08 12:20 v1c0nt
+
+ * data/yad.1, src/main.c: add YAD_OPTIONS variable
+
+2015-09-08 12:03 v1c0nt
+
+ * src/main.c: fix setting icon theme
+
+2015-09-08 10:35 v1c0nt
+
+ * configure.ac:
+
+2015-09-08 10:34 v1c0nt
+
+ * data/yad.1, po/ru.po, po/uk.po, src/list.c, src/option.c,
+ src/yad.h: add separators to --list dialog
+
+2015-09-08 04:57 v1c0nt
+
+ * src/option.c: fix parsing orientation
+
+2015-09-05 06:28 v1c0nt
+
+ * ChangeLog, NEWS: update NEWS
+
+2015-09-05 05:31 v1c0nt
+
+ * configure.ac, data/yad.1: update man page. bump version to
+ 0.30.0. prepare to next release
+
+2015-09-05 05:21 v1c0nt
+
+ * po/POTFILES.in, po/ru.po, po/uk.po, src/notebook.c, src/option.c,
+ src/paned.c, src/yad.h: add paned dialog
+
+2015-09-04 14:54 v1c0nt
+
+ * src/paned.c:
+
+2015-09-04 14:53 v1c0nt
+
+ * src/main.c:
+
+2015-09-04 11:57 v1c0nt
+
+ * src/Makefile.am, src/about.c, src/notebook.c, src/option.c,
+ src/util.c, src/yad.h: add placeholder for paned dialog
+
+2015-08-31 08:15 v1c0nt
+
+ * po/ru.po, po/uk.po: fix translation
+
+2015-08-27 06:04 v1c0nt
+
+ * data/yad.1, src/option.c: rename --parent to --parent-win
+
+2015-08-26 16:16 v1c0nt
+
+ * configure.ac: bump version
+
+2015-08-26 16:15 v1c0nt
+
+ * data/yad.1, po/ru.po, po/uk.po, src/main.c, src/option.c,
+ src/yad.h: add --parent option
+
+2015-08-26 15:39 v1c0nt
+
+ * data/yad.1, po/ru.po, po/uk.po, src/option.c, src/text.c,
+ src/yad.h: add --uri-color option for text dialog
+
+2015-08-01 16:34 v1c0nt
+
+ * NEWS, src/about.c, src/browser.c, src/calendar.c, src/color.c,
+ src/dnd.c, src/entry.c, src/file.c, src/font.c, src/form.c,
+ src/html.c, src/icons.c, src/list.c, src/multi-progress.c,
+ src/notebook.c, src/notification.c, src/option.c, src/print.c,
+ src/progress.c, src/scale.c, src/text.c, src/util.c, src/yad.h:
+ update copyright years
+
+2015-07-29 09:50 v1c0nt
+
+ * configure.ac, src/main.c: fix build with --disable-html
+
+2015-07-15 12:58 v1c0nt
+
+ * ChangeLog:
+
2015-07-15 12:58 v1c0nt
* ChangeLog, NEWS, configure.ac: release 0.29.0
diff -Nru yad-0.28.2/configure yad-0.31.0/configure
--- yad-0.28.2/configure 2015-07-15 17:55:52.000000000 +0000
+++ yad-0.31.0/configure 2015-09-11 10:17:41.000000000 +0000
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for YAD 0.29.0.
+# Generated by GNU Autoconf 2.69 for YAD 0.31.0.
#
# Report bugs to .
#
@@ -580,8 +580,8 @@
# Identity of this package.
PACKAGE_NAME='YAD'
PACKAGE_TARNAME='yad'
-PACKAGE_VERSION='0.29.0'
-PACKAGE_STRING='YAD 0.29.0'
+PACKAGE_VERSION='0.31.0'
+PACKAGE_STRING='YAD 0.31.0'
PACKAGE_BUGREPORT='https://sourceforge.net/p/yad-dialog/tickets/'
PACKAGE_URL='https://sourceforge.net/projects/yad-dialog/'
@@ -1346,7 +1346,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures YAD 0.29.0 to adapt to many kinds of systems.
+\`configure' configures YAD 0.31.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1412,7 +1412,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of YAD 0.29.0:";;
+ short | recursive ) echo "Configuration of YAD 0.31.0:";;
esac
cat <<\_ACEOF
@@ -1527,7 +1527,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-YAD configure 0.29.0
+YAD configure 0.31.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1896,7 +1896,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by YAD $as_me 0.29.0, which was
+It was created by YAD $as_me 0.31.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2760,7 +2760,7 @@
# Define the identity of the package.
PACKAGE='yad'
- VERSION='0.29.0'
+ VERSION='0.31.0'
cat >>confdefs.h <<_ACEOF
@@ -6569,7 +6569,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by YAD $as_me 0.29.0, which was
+This file was extended by YAD $as_me 0.31.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -6636,7 +6636,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-YAD config.status 0.29.0
+YAD config.status 0.31.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -Nru yad-0.28.2/configure.ac yad-0.31.0/configure.ac
--- yad-0.28.2/configure.ac 2015-07-15 17:55:52.000000000 +0000
+++ yad-0.31.0/configure.ac 2015-09-10 09:49:50.000000000 +0000
@@ -1,4 +1,4 @@
-AC_INIT([YAD], [0.29.0], [https://sourceforge.net/p/yad-dialog/tickets/], yad, [https://sourceforge.net/projects/yad-dialog/])
+AC_INIT([YAD], [0.31.0], [https://sourceforge.net/p/yad-dialog/tickets/], yad, [https://sourceforge.net/projects/yad-dialog/])
AC_CONFIG_AUX_DIR([build])
AM_INIT_AUTOMAKE([1.11 foreign dist-xz no-dist-gzip])
diff -Nru yad-0.28.2/data/yad.1 yad-0.31.0/data/yad.1
--- yad-0.28.2/data/yad.1 2015-07-15 17:55:52.000000000 +0000
+++ yad-0.31.0/data/yad.1 2015-09-10 07:47:06.000000000 +0000
@@ -8,7 +8,7 @@
.SH DESCRIPTION
\fBYAD\fP is a program that will display GTK+ dialogs, and return
-(either in the return code, or on standard output) the users
+(either in the return code or on standard output) the users
input. This allows you to present information, and ask for information
from the user, from all manner of shell scripts.
.PP
@@ -93,6 +93,9 @@
Style of indicator may be set through the gtkrc file.
See \fIhttp://code.google.com/p/yad/wiki/TimeoutIndicator\fP for details.
.TP
+.B \-\-parent-win=\fIXID\fP
+Specify a parent window for the dialog. This makes \fIYAD\fP possible to use as embedded GUI tool.
+.TP
.B \-\-kill-parent\fI[=SIGNAL]\fP
Send SIGNAL to parent process. Default value of SIGNAL is a SIGTERM.
SIGNAL may be specified by it's number or symbolic name with or without SIG prefix.
@@ -227,6 +230,9 @@
.B \-\-init\-color=\fICOLOR\fP
Set initial color value.
.TP
+.B \-\-gtk-palette
+Show system palette inside color dialog.
+.TP
.B \-\-extra
Show extra information about color in returned string.
.TP
@@ -237,6 +243,9 @@
Show palette and set predefined colors from given filename.
By default used \fI/etc/X11/rgb.txt\fP.
.TP
+.B \-\-expand-palette
+Expander for list of user-defined colors will be initially opened.
+.TP
.B \-\-mode=\fIMODE\fP
Set output color mode. Possible values are \fIhex\fP or \fIrgb\fP. Default is \fIhex\fP. HEX mode looks like \fI#rrggbbaa\fP, RGB mode - \fIrgba(r, g, b, a)\fP.
In RGBA mode opacity have values from 0.0 to 1.0.
@@ -341,16 +350,6 @@
Confirm file selection if filename already exists.
Optional argument is a text for confirmation dialog.
.TP
-.B \-\-file-filter=\fINAME | PATTERN1 PATTERN2 ...\fP
-Add a filename filter. \fINAME\fP is a displayed filter name, \fIPATTERN\fP
-is a shell-style filename pattern (for example *.txt). This option may be
-used multiply times.
-.TP
-.B \-\-add-preview
-Add preview widget to file dialog. Preview images loads from large or normal thumbnails according to XDG Thumbnails
-specification v0.8.0 (http://standards.freedesktop.org/thumbnail-spec/latest/) or creates by yad for image files and saves
-as large thumbnails.
-.TP
.B \-\-quoted-output
Output values will be shell-style quoted.
@@ -489,6 +488,9 @@
.B \-\-no-click
Disable sorting of column content by clicking on its header.
.TP
+.B \-\-no-rules-hint
+Don't draw even and odd rows by a different colors. This option depends on your current gtk theme and may not work.
+.TP
.B \-\-print-all
Print all data from the list.
.TP
@@ -504,6 +506,15 @@
.B \-\-search\-column=\fINUMBER\fP
Set the quick search column. \fI0\fP mean to disable searching. By default search mades on first column.
.TP
+.B \-\-tooltip\-column=\fINUMBER\fP
+Set the column with popup tooltips.
+.TP
+.B \-\-sep\-column=\fINUMBER\fP
+Set the row separator column. If the cell value from this column equal to specified row separator value such row will be draw as separator.
+.TP
+.B \-\-sep\-value=\fITEXT\fP
+Set the \fITEXT\fP as a row separator value.
+.TP
.B \-\-limit=\fINUMBER\fP
Set the number of rows in list dialog. Will be shown only the last \fINUMBER\fP rows. This option will take effect only when data reading from stdin.
.TP
@@ -545,7 +556,7 @@
.SS Notebook options
.TP
.B \-\-key=\fIKEY\fP
-Set the key of this notebook.
+Set the key of the children.
.TP
.B \-\-tab=\fITEXT\fP
Add tab with specified label to notebook. \fITEXT\fP may be in a form \fILABEL[!ICON[!TOOLTIP]]\fP
@@ -557,7 +568,7 @@
.B \-\-tab-borders=\fINUMBER\fP
Set the borders width around widget in tabs.
.PP
-See \fBNOTEBOOK\fP section for more about notebook dialog.
+See \fBNOTEBOOK and PANED\fP section for more about notebook dialog.
.SS Notification options
.TP
@@ -584,6 +595,19 @@
.PP
See \fBNOTIFICATION\fP section for more about separators.
+.SS Paned options
+.TP
+.B \-\-key=\fIKEY\fP
+Set the key of the children.
+.TP
+.B \-\-orient=\fITYPE\fP
+Set orientation of panes inside dialog. \fITYPE\fP may be in \fIhor[izontal]\fP or \fIvert[ical]\fP.
+.TP
+.B \-\-splitter=\fIPOS\fP
+Set the initial splitter position.
+.PP
+See \fBNOTEBOOK and PANED\fP section for more about paned dialog.
+
.SS Print options
.TP
.B \-\-type=\fITYPE\fP
@@ -671,6 +695,9 @@
.B \-\-show-uri
Make links in text clickable. Links opens with \fIxdg-open\fP command.
.TP
+.B \-\-uri-color
+Set color for links. Default is \fIblue\fP.
+.TP
.B \-\-listen
Listen data from stdin even if filename was specified.
@@ -709,6 +736,26 @@
.B \-\-mark=\fI[NAME]:VALUE\fP
Add a mark to scale. May be used multiply times. \fINAME\fP is an optional arguments for set label to mark.
+.SS File filters options
+.TP
+.B \-\-file-filter=\fINAME | PATTERN1 PATTERN2 ...\fP
+Add a filename filter. \fINAME\fP is a displayed filter name, \fIPATTERN\fP
+is a shell-style filename pattern (for example *.txt). This option may be used multiply times.
+.TP
+.B \-\-mime-filter=\fINAME | MIME1 MIME2 ...\fP
+Add a mime-type filter. \fINAME\fP is a displayed filter name, \fIPATTERN\fP
+is a name of mime type (for example text/plain). This option may be used multiply times.
+.TP
+.B \-\-image-filter=\fI[NAME]\fP
+Add filter for images supported by gdk-pixbuf library. \fINAME\fP in as optional name for this filter.
+.TP
+.B \-\-add-preview
+Add preview widget. Preview images loads from large or normal thumbnails according to XDG Thumbnails
+specification v0.8.0 (http://standards.freedesktop.org/thumbnail-spec/latest/) or creates by yad for image files and saves
+as large thumbnails.
+
+This options applies to all of yad's file chooser dialogs.
+
.SS Miscellaneous options
.TP
.B \-?, \-\-help
@@ -723,7 +770,7 @@
.PP
Also the standard GTK+ options are accepted.
-.SH NOTEBOOK
+.SH NOTEBOOK and PANED
Notebook is a complex dialog which swallow other dialogs in his tabs.
Dialogs identifies by unique key (integer) and must be runs in a special plug mode (\-\-plug option).
Following example runs notebook dialog with two tabs, first has a simple text and second is an entry dialog.
@@ -738,6 +785,9 @@
NOTE: The order of output results for tabs is undefined!
+Paned works in a same manner as a notebook with one restriction - only first and secong plug dialogs
+will be swallowed to panes.
+
.SH NOTIFICATION
Allows commands to be sent to yad in the form \fBcommand:args\fP.
Possible commands are \fIicon\fP, \fItooltip\fP, \fIvisible\fP, \fIaction\fP, \fImenu\fP and \fIquit\fP.
@@ -767,6 +817,10 @@
.SH ENVIRONMENT VARIABLES
.TP
+.B YAD_OPTIONS
+This variable can holds some default options for yad. All options in this
+variable may be redefined from command line.
+.TP
.B YAD_PID
This variable sets to the value of current dialog's pid and accessible in all
dialog children.
@@ -850,7 +904,7 @@
.TP
.B yad.conf
YAD default settings. \fIyad.conf\fP placed in \fI$XDG_CONFIG_HOME\fP or \fI$HOME/.config\fP
-directory. This file contain comments on every settings and will be automatically
+directory. This file contain comments on every defaults and will be automatically
recreated on yad'd start if it doesn't exists.
.SH EXAMPLES
diff -Nru yad-0.28.2/debian/bzr-builder.manifest yad-0.31.0/debian/bzr-builder.manifest
--- yad-0.28.2/debian/bzr-builder.manifest 2015-07-15 17:55:52.000000000 +0000
+++ yad-0.31.0/debian/bzr-builder.manifest 1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-# bzr-builder format 0.3 deb-version {debupstream}-0~2
-lp:~robinpalat/+junk/test5 revid:robinpalat@gmail.com-20150715175150-suwa5azhro89kyj2
diff -Nru yad-0.28.2/debian/changelog yad-0.31.0/debian/changelog
--- yad-0.28.2/debian/changelog 2015-07-15 17:55:52.000000000 +0000
+++ yad-0.31.0/debian/changelog 2015-09-14 09:29:34.000000000 +0000
@@ -1,11 +1,469 @@
-yad (0.28.2-0~2~ubuntu15.04.1) vivid; urgency=low
+yad (0.31.0-1~webupd8~vivid0) vivid; urgency=medium
+
+ * New upstream release
+
+ -- Alin Andrei Mon, 14 Sep 2015 12:28:19 +0300
- * Auto build.
+yad (0.30.1-1~webupd8~precise0) precise; urgency=medium
+
+ * New upstream release
+
+ -- Alin Andrei Thu, 10 Sep 2015 13:01:17 +0300
- -- Robin Palat Wed, 15 Jul 2015 17:55:52 +0000
+yad (0.29.0-1~webupd8~wily0) wily; urgency=medium
+
+ * New upstream bugfix release
+
+ -- Alin Andrei Tue, 11 Aug 2015 12:00:29 +0300
-yad (0.28.2) vivid; urgency=medium
+yad (0.28.1-1~webupd8~vivid0) vivid; urgency=medium
* New upstream bugfix release
- -- robinpalat Thu, 15 jul 2015 15:22:17 +0300
+ -- Alin Andrei Thu, 12 Mar 2015 15:22:17 +0300
+
+yad (0.28.0-1~webupd8~vivid1) vivid; urgency=medium
+
+ * New upstream release
+ * Bump Standards-Version to 3.9.5
+ * Added potfiles_fix.patch
+ * Rules: build with --enable-html
+ * Build-depend on libwebkitgtk-dev for HTML dialog support
+
+ -- Alin Andrei Mon, 09 Mar 2015 12:13:55 +0300
+
+yad (0.27.0-1~webupd8~utopic0) utopic; urgency=medium
+
+ * New upstream release
+
+ -- Alin Andrei Tue, 19 Aug 2014 13:51:29 +0300
+
+yad (0.26.1-1~webupd8~trusty1) trusty; urgency=medium
+
+ * build with GTK2 until this bug is fixed: https://sourceforge.net/p/yad-dialog/tickets/213/
+
+ -- Alin Andrei Tue, 08 Apr 2014 12:29:48 +0300
+
+yad (0.26.1-1~webupd8~trusty) trusty; urgency=medium
+
+ * new upstream release
+
+ -- Alin Andrei Sun, 23 Feb 2014 12:29:48 +0300
+
+yad (0.26.0-1~webupd8~trusty) trusty; urgency=medium
+
+ * new upstream release
+
+ -- Alin Andrei Mon, 10 Feb 2014 12:29:48 +0300
+
+yad (0.25.1-1~webupd8~saucy) saucy; urgency=medium
+
+ * new upstream release
+
+ -- Alin Andrei Fri, 06 Dec 2013 12:29:48 +0300
+
+yad (0.24.1-1~webupd8~trusty) trusty; urgency=medium
+
+ * new upstream release
+
+ -- Alin Andrei Wed, 27 Nov 2013 12:29:48 +0300
+
+yad (0.24.0-1~webupd8~trusty) trusty; urgency=medium
+
+ * new upstream release
+
+ -- Alin Andrei Mon, 18 Nov 2013 12:29:48 +0300
+
+yad (0.23.1-1~webupd8~saucy) saucy; urgency=medium
+
+ * new upstream release
+
+ -- Alin Andrei Fri, 18 Oct 2013 12:29:48 +0300
+
+yad (0.23.0-1~webupd8~saucy) saucy; urgency=medium
+
+ * new upstream release
+
+ -- Alin Andrei Tue, 03 Sep 2013 12:29:48 +0300
+
+yad (0.22.1-1~webupd8~saucy) saucy; urgency=medium
+
+ * new upstream release
+
+ -- Alin Andrei Mon, 15 Jul 2013 12:50:31 +0300
+
+yad (0.22.0-1~webupd8~saucy) saucy; urgency=medium
+
+ * new upstream release - build with gtk3 for saucy - oneiric
+
+ -- Alin Andrei Wed, 26 Jun 2013 12:50:31 +0300
+
+yad (0.21.0-1~webupd8~saucy) saucy; urgency=medium
+
+ * new upstream release - build with gtk3 for saucy - oneiric
+
+ -- Alin Andrei Mon, 13 May 2013 12:50:31 +0300
+
+yad (0.20.3-1~webupd8~raring) raring; urgency=medium
+
+ * new upstream release - build with gtk3 for raring - oneiric
+
+ -- Alin Andrei Fri, 05 Apr 2013 11:20:34 +0300
+
+yad (0.20.2-1~webupd8~oneiric) oneiric; urgency=medium
+
+ * new upstream release - build with gtk3 for raring - oneiric
+
+ -- Alin Andrei Mon, 01 Apr 2013 12:50:37 +0300
+
+yad (0.20.1-1~webupd8~raring) raring; urgency=medium
+
+ * new upstream release - build with gtk3 for raring - oneiric
+
+ -- Alin Andrei Mon, 25 Mar 2013 16:53:49 +0200
+
+yad (0.20.0-1~webupd8~raring) raring; urgency=medium
+
+ * new upstream release - build with gtk3 for raring - oneiric
+
+ -- Alin Andrei Wed, 20 Mar 2013 12:30:50 +0200
+
+yad (0.19.1-1~webupd8~raring) raring; urgency=medium
+
+ * new upstream release - build with gtk3 for raring - oneiric
+
+ -- Alin Andrei Wed, 02 Jan 2013 12:41:21 +0200
+
+yad (0.19.0-1~webupd8~quantal) quantal; urgency=medium
+
+ * new upstream release - build with gtk3 for raring - oneiric
+
+ -- Alin Andrei Sun, 30 Dec 2012 16:59:07 +0200
+
+yad (0.18.0-1~webupd8~quantal) quantal; urgency=medium
+
+ * new upstream release - build with gtk3 for raring - oneiric
+
+ -- Alin Andrei Fri, 23 Nov 2012 20:26:41 +0200
+
+yad (0.17.1.1-1+svn-r600~webupd8~quantal) quantal; urgency=medium
+
+ * grab the latest SVN to fix CPU 100% issue along with other bug fixes - build with gtk3 for quantal - oneiric
+
+ -- Alin Andrei Mon, 22 Oct 2012 15:16:56 +0300
+
+yad (0.17.1.1-1~webupd8~quantal1) quantal; urgency=medium
+
+ * add fix100cpu.patch - build with gtk3 for oneiric, precise and quantal
+
+ -- Alin Andrei Tue, 16 Oct 2012 01:43:25 +0300
+
+yad (0.17.1.1-1~webupd8~quantal) quantal; urgency=medium
+
+ * build for quantal
+
+ -- Alin Andrei Mon, 05 Mar 2012 22:05:10 +0100
+
+yad (0.17.1.1-1~webupd8~precise) precise; urgency=low
+
+ * new upstream release - build with gtk3 for oneiric and precise
+
+ -- Alin Andrei Mon, 05 Mar 2012 22:05:10 +0100
+
+yad (0.17.0-1~webupd8~precise) precise; urgency=medium
+
+ * new upstream release: upload for oneiric and precise (gtk3)
+
+ -- Alin Andrei Thu, 23 Feb 2012 21:43:32 +0000
+
+yad (0.16.3-1~webupd8~oneiric) oneiric; urgency=low
+
+ * upload for oneiric and precise (gtk3)
+
+ -- Alin Andrei Thu, 20 Oct 2011 21:54:33 +0300
+
+yad (0.16.1-1+r483~webupd8~oneiric) oneiric; urgency=low
+
+ * update to svn r483 to fix build with gtk3
+
+ -- Alin Andrei Thu, 20 Oct 2011 21:54:33 +0300
+
+yad (0.16.1-1~webupd8~oneiric) oneiric; urgency=low
+
+ * new release for Oneiric with GTK3 support
+
+ -- Alin Andrei Thu, 20 Oct 2011 21:54:33 +0300
+
+yad (0.15.1-1~webupd8~oneiric) oneiric; urgency=low
+
+ * upload for oneiric with gtk3 support
+
+ -- Alin Andrei Thu, 20 Oct 2011 21:54:33 +0300
+
+yad (0.15.0-1~webupd8~oneiric1) oneiric; urgency=low
+
+ * new try - build with gtk3
+
+ -- Alin Andrei Thu, 20 Oct 2011 21:54:33 +0300
+
+yad (0.15.0-1~webupd8~oneiric1) oneiric; urgency=medium
+
+ * new upstream release for oneiric - with gtk3
+
+ -- Alin Andrei Thu, 20 Oct 2011 21:23:35 +0300
+
+yad (0.14.1-2+r386~webupd8~oneiric1) oneiric; urgency=medium
+
+ * get latest svn to fix an ugly text placement bug
+
+ -- Alin Andrei Wed, 07 Sep 2011 14:44:04 +0300
+
+yad (0.14.1-1~webupd8~oneiric1) oneiric; urgency=medium
+
+ * new upstream release
+
+ -- Alin Andrei Wed, 07 Sep 2011 12:57:24 +0300
+
+yad (0.14.1-1~webupd8~lucid1) lucid; urgency=medium
+
+ * new upstream release
+
+ -- Alin Andrei Wed, 07 Sep 2011 12:55:19 +0300
+
+yad (0.12.4-1~webupd8~natty) natty; urgency=low
+
+ * new upstream release
+
+ -- Alin Andrei Wed, 29 Jun 2011 11:42:47 +0300
+
+yad (0.12.3-1~webupd8~natty) natty; urgency=low
+
+ * new upstream release
+
+ -- Alin Andrei Mon, 27 Jun 2011 17:17:09 +0300
+
+yad (0.12.2-1~webupd8~natty) natty; urgency=low
+
+ * new upstream release
+
+ -- Alin Andrei Tue, 21 Jun 2011 00:16:32 +0300
+
+yad (0.12.0-1~webupd8~natty) natty; urgency=low
+
+ * new upstream release
+
+ -- Alin Andrei Sun, 05 Jun 2011 23:48:11 +0300
+
+yad (0.11.0-1~webupd8~natty) natty; urgency=low
+
+ * new upstream release
+
+ -- Alin Andrei Mon, 16 May 2011 00:01:48 +0300
+
+yad (0.10.2-1~webupd8~natty) natty; urgency=low
+
+ * new upstream release
+
+ -- Alin Andrei Sat, 16 Apr 2011 20:07:06 +0300
+
+yad (0.10.1-1~webupd8~maverick) maverick; urgency=low
+
+ * new upstream release
+
+ -- Alin Andrei Wed, 06 Apr 2011 13:08:22 +0300
+
+yad (0.10.0-1~webupd8~maverick) maverick; urgency=low
+
+ * new upstream release
+
+ -- Alin Andrei Mon, 28 Mar 2011 15:03:57 +0300
+
+yad (0.10.0-1~webupd8~karmic) karmic; urgency=low
+
+ * new upstream release
+
+ -- Alin Andrei Mon, 28 Mar 2011 15:02:53 +0300
+
+yad (0.9.1.1-1+svnr224~webupd8~maverick1) maverick; urgency=low
+
+ * maybe now it works
+
+ -- Alin Andrei Fri, 18 Mar 2011 00:37:12 +0200
+
+yad (0.9.1.1-1+svn224~webupd8~karmic1) karmic; urgency=low
+
+ * trying yet another build
+
+ -- Alin Andrei Fri, 18 Mar 2011 00:05:07 +0200
+
+yad (0.9.1-1~really0.8.1~webupd8~karmic) karmic; urgency=low
+
+ * revert to 0.8.1 to fix huge bug
+
+ -- Alin Andrei Wed, 16 Mar 2011 21:03:42 +0200
+
+yad (0.9.1-1~really0.8.1~webupd8~maverick) maverick; urgency=low
+
+ * new upstream release
+
+ -- Alin Andrei Sun, 06 Mar 2011 17:20:58 +0200
+
+yad (0.8.1-1~webupd8~maverick1) maverick; urgency=low
+
+ * new upstream release
+
+ -- Alin Andrei Sat, 29 Jan 2011 12:31:53 +0200
+
+yad (0.8.0-1+r203~webupd8~karmic) karmic; urgency=low
+
+ * update to svn r203 to fix DIR in form
+
+ -- Alin Andrei Tue, 25 Jan 2011 21:35:15 +0200
+
+yad (0.8.0-1~webupd8~maverick) maverick; urgency=low
+
+ * new upstream release
+
+ -- Alin Andrei Tue, 11 Jan 2011 13:27:07 +0200
+
+yad (0.7.2-1~webupd8~maverick) maverick; urgency=low
+
+ * new upstream release
+
+ -- Alin Andrei Mon, 06 Dec 2010 11:57:24 +0200
+
+yad (0.7.1-1+r185~webupd8~maverick) maverick; urgency=low
+
+ * new svn - tries to fix the icons dialog
+
+ -- Alin Andrei Fri, 03 Dec 2010 16:38:44 +0200
+
+yad (0.7.1-1~webupd8~maverick) maverick; urgency=low
+
+ * new upstream release
+
+ -- Alin Andrei Fri, 03 Dec 2010 11:15:36 +0200
+
+yad (0.6.0-1+r172~webupd8~maverick) maverick; urgency=low
+
+ * new svn - tries to fix the .desktop files ordering issue - take 2
+
+ -- Alin Andrei Wed, 17 Nov 2010 10:31:01 +0200
+
+yad (0.6.0-1+r171~webupd8~lucid) lucid; urgency=low
+
+ * new svn - tries to fix the .desktop files ordering issue
+
+ -- Alin Andrei Mon, 15 Nov 2010 18:30:22 +0200
+
+yad (0.6.0-1+r169~webupd8~maverick2) maverick; urgency=low
+
+ * new svn - adds --always-print-result finally
+
+ -- Alin Andrei Sun, 14 Nov 2010 18:30:22 +0200
+
+yad (0.6.0-0ubuntu1~webupd8~maverick) maverick; urgency=low
+
+ * new upstream release
+
+ -- Alin Andrei Mon, 08 Nov 2010 18:30:22 +0200
+
+yad (0.5.2-0ubuntu1~webupd8~karmic) karmic; urgency=low
+
+ * Ubuntu upload
+
+ -- Alin Andrei Wed, 03 Nov 2010 15:59:34 +0200
+
+yad (0.5.2-1) testing; urgency=low
+
+ * new upstream version
+
+ -- Slavko Tue, 19 Oct 2010 17:01:46 +0200
+
+yad (0.5.1-1) testing; urgency=low
+
+ * set name of initial color value to --init-color for avoid set aliased
+ parameter in scale dialog
+
+ -- Slavko Thu, 14 Oct 2010 16:37:18 +0200
+
+yad (0.5.0-1) testing; urgency=low
+
+ * add --no-markup option
+ * add --geometry option
+ * new filed types in form dialog
+ * notification icon always close on middle click
+ * YAD now understand SIGUSR1 and SIGUSR2 signals
+ * YAD can be build against new gtk+ 3.0
+ * fix output bug in list dialog
+
+ -- Slavko Sun, 10 Oct 2010 10:08:01 +0200
+
+yad (0.4.0-1) testing; urgency=low
+
+ * new upstream release
+ * add --no-headers option in list dialog
+ * add tooltip column type for list dialog
+ * fix tail mode in text dialog
+ * initial value in color dialog now sets as --init-color
+ * code cleanups
+
+ -- Slavko Fri, 03 Sep 2010 12:38:29 +0200
+
+yad (0.3.1-1) testing; urgency=low
+
+ * new upstream release
+ * fix key handling in editable lists
+ * fix format string vulnerability in file dialog
+ * fix handling quickly piped lots of data from stdi
+
+ -- Slavko Fri, 23 Jul 2010 08:55:46 +0200
+
+yad (0.3.0-1) testing; urgency=low
+
+ * new upstream release
+ * sk localisation from upstream
+
+ -- Slavko Sun, 11 Jul 2010 11:11:19 +0200
+
+yad (0.2.1-2) testing; urgency=low
+
+ * patch POTFILES.in file with adding new line at end
+
+ -- Slavko Sun, 30 May 2010 11:19:14 +0200
+
+yad (0.2.1-1) unstable; urgency=low
+
+ * new upstream version
+ * improve keyboard navigation
+ * update man page
+ * add slovak translation
+ * add label to timeout indicator
+ * some fixes in dnd dialog
+
+ -- Slavko Sun, 30 May 2010 10:58:36 +0200
+
+yad (0.2.0-4) unstable; urgency=low
+
+ * added examples to package too :-)
+
+ -- Slavko Fri, 09 Apr 2010 22:25:11 +0200
+
+yad (0.2.0-3) unstable; urgency=low
+
+ * added examples from HomePage Wiki
+
+ -- Slavko Fri, 09 Apr 2010 22:10:45 +0200
+
+yad (0.2.0-2) unstable; urgency=low
+
+ * opravené generovanie lokalizácie
+ * pridaná sk lokalizácia
+
+ -- Slavko Fri, 09 Apr 2010 21:20:27 +0200
+
+yad (0.2.0-1) unstable; urgency=low
+
+ * Initial release
+
+ -- Slavko Fri, 09 Apr 2010 20:01:44 +0200
diff -Nru yad-0.28.2/debian/control yad-0.31.0/debian/control
--- yad-0.28.2/debian/control 2015-07-15 17:55:52.000000000 +0000
+++ yad-0.31.0/debian/control 2015-03-09 10:28:04.000000000 +0000
@@ -1,7 +1,7 @@
Source: yad
Section: x11
Priority: extra
-Maintainer: robinpalat
+Maintainer: Alin Andrei
Build-Depends: quilt (>= 0.46-7~), debhelper (>= 7), autotools-dev, mime-support, gettext, intltool, libgtk2.0-dev, libcroco3, libxml-parser-perl, libxml2, libexpat1, gawk, libwebkitgtk-dev
Standards-Version: 3.9.5
Homepage: https://sourceforge.net/projects/yad-dialog/
@@ -13,3 +13,10 @@
Yad (yet another dialog) is a fork of Zenity with many improvements, such
as custom buttons, additional dialogs, pop-up menu in notification icon
and more.
+ .
+ There were two main reasons to make this fork. The first one is to remove
+ dependencies on deprecated libraries, such as libglade and gnome-canvas.
+ And the second one - as for me, Zenity looks like an abandoned project. Its
+ ChangeLog consists of just "bump version to..." and "translation updated" for
+ the long time, but many interesting ideas which are ignored by
+ developers/maintainers were in GNOME Bugzilla.
diff -Nru yad-0.28.2/debian/copyright yad-0.31.0/debian/copyright
--- yad-0.28.2/debian/copyright 1970-01-01 00:00:00.000000000 +0000
+++ yad-0.31.0/debian/copyright 2014-04-08 11:38:37.000000000 +0000
@@ -0,0 +1,35 @@
+This work was packaged for Debian by:
+
+ Slavko on Fri, 09 Apr 2010 20:01:44 +0200
+
+It was downloaded from:
+
+ https://sourceforge.net/projects/yad-dialog/
+
+Upstream Author(s):
+
+ Victor Ananjevsky
+
+ Zenity Authors:
+ Glynn Foster
+ Mike Newman
+
+Copyright:
+
+ Copyright (C) 2010 Victor Ananjevsky
+
+ other see /usr/share/docúyad/THANKS
+
+License:
+
+ This software is licensed under the GPL v.3
+
+ see "/usr/share/common-licenses/GPL-3"
+
+The Debian packaging is:
+
+ Copyright (C) 2010 Slavko
+
+and is licensed under the GPL version 3,
+see "/usr/share/common-licenses/GPL-3"
+
diff -Nru yad-0.28.2/debian/README.Debian yad-0.31.0/debian/README.Debian
--- yad-0.28.2/debian/README.Debian 1970-01-01 00:00:00.000000000 +0000
+++ yad-0.31.0/debian/README.Debian 2011-01-25 11:27:26.000000000 +0000
@@ -0,0 +1,6 @@
+yad for Debian
+--------------
+
+Examples of the usage this dialog's program are in /usr/share/doc/yad/examples
+
+ -- Slavko Fri, 09 Apr 2010 20:01:44 +0200
diff -Nru yad-0.28.2/debian/source/format yad-0.31.0/debian/source/format
--- yad-0.28.2/debian/source/format 2015-07-15 17:55:52.000000000 +0000
+++ yad-0.31.0/debian/source/format 2012-11-23 18:23:22.000000000 +0000
@@ -1 +1 @@
-1.0
+3.0 (quilt)
diff -Nru yad-0.28.2/NEWS yad-0.31.0/NEWS
--- yad-0.28.2/NEWS 2015-07-15 17:55:52.000000000 +0000
+++ yad-0.31.0/NEWS 2015-09-10 11:06:21.000000000 +0000
@@ -1,3 +1,25 @@
+Version 0.31.0
+ - add separators to list dialog
+ - use YAD_OPTIONS variable for specify default yad arguments
+ - add --no-rules-hint option to list dialog
+ - add parameters for controlling palletes in color selection
+ - remove some entries from settings file
+ - set default open command and date format through the settings file
+ - add additional filter settings for file selection dialogs
+ - apply filter and preview settings to all of file selection dialogs
+ - fix settings custom icon theme
+
+Version 0.30.1
+ - fix parsing paned orientation
+
+Version 0.30.0
+ - add paned dialog
+ - add --parent-win option to make dialog transient for special window
+ - add --uri-color option for setting text color of URIs in text-info dialog
+
+Version 0.29.1
+ - fix build without HTML dialog
+
Version 0.29.0
- fix focus problems in html dialog
- set default encoding from locale for html widget
diff -Nru yad-0.28.2/po/POTFILES.in yad-0.31.0/po/POTFILES.in
--- yad-0.28.2/po/POTFILES.in 2015-07-15 17:55:52.000000000 +0000
+++ yad-0.31.0/po/POTFILES.in 2015-09-08 08:31:21.000000000 +0000
@@ -11,6 +11,7 @@
src/list.c
src/option.c
src/multi-progress.c
+src/paned.c
src/print.c
src/progress.c
src/color.c
diff -Nru yad-0.28.2/po/ru.po yad-0.31.0/po/ru.po
--- yad-0.28.2/po/ru.po 2015-07-15 17:55:52.000000000 +0000
+++ yad-0.31.0/po/ru.po 2015-09-10 07:47:06.000000000 +0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YAD\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-15 15:23+0300\n"
+"POT-Creation-Date: 2015-09-10 08:27+0300\n"
"PO-Revision-Date: 2009-04-30 16:47+0300\n"
"Last-Translator: Victor Ananjevsky \n"
"Language-Team: \n"
@@ -92,31 +92,31 @@
msgid "Initial value greater than maximum.\n"
msgstr "Начальное значение больше маскимального.\n"
-#: ../src/form.c:404
+#: ../src/form.c:407
msgid "Select files"
msgstr "Выбор файлов"
-#: ../src/form.c:412
+#: ../src/form.c:415
msgid "Select folders"
msgstr "Выбор каталогов"
-#: ../src/form.c:476
+#: ../src/form.c:492
msgid "Select or create file"
msgstr "Выбор или создание файла"
-#: ../src/form.c:484
+#: ../src/form.c:500
msgid "Select or create folder"
msgstr "Выбор или создание каталога"
-#: ../src/form.c:521
+#: ../src/form.c:549
msgid "Select date"
msgstr "Выбор даты"
-#: ../src/form.c:742
+#: ../src/form.c:767
msgid "Select file"
msgstr "Выбор файла"
-#: ../src/form.c:757
+#: ../src/form.c:795
msgid "Select folder"
msgstr "Выбор каталога"
@@ -130,12 +130,17 @@
msgid "Unable to open directory %s: %s\n"
msgstr "Не могу открыть каталог %s: %s\n"
-#: ../src/main.c:103 ../src/main.c:250
+#: ../src/main.c:103 ../src/main.c:258
#, c-format
msgid "%d sec"
msgstr "%d сек"
-#: ../src/main.c:683
+#: ../src/main.c:692 ../src/main.c:699
+#, c-format
+msgid "Unable to parse YAD_OPTIONS: %s\n"
+msgstr "Не могу разобрать YAD_OPTIONS: %s\n"
+
+#: ../src/main.c:710
#, c-format
msgid "Unable to parse command line: %s\n"
msgstr "Не удается разобрать командную строку: %s\n"
@@ -159,463 +164,460 @@
msgid "Yad notification"
msgstr "Диалог уведомлений"
-#: ../src/list.c:770
+#: ../src/list.c:769
msgid "Add row"
msgstr "Добавить строку"
-#: ../src/list.c:777
+#: ../src/list.c:776
msgid "Delete row"
msgstr "Удалить строку"
-#: ../src/list.c:784
+#: ../src/list.c:783
msgid "Duplicate row"
msgstr "Скопировать строку"
-#: ../src/list.c:811
+#: ../src/list.c:818
#, c-format
msgid "No column titles specified for List dialog.\n"
msgstr "Не заданы заголовоки колонок для диалога со списком\n"
-#: ../src/option.c:75
+#: ../src/option.c:78
msgid "Set the dialog title"
msgstr "Задать заголовок диалога"
-#: ../src/option.c:76
+#: ../src/option.c:79
msgid "TITLE"
msgstr "ЗАГОЛОВОК"
-#: ../src/option.c:81
+#: ../src/option.c:84
msgid "Set the window icon"
msgstr "Задать значок диалога"
-#: ../src/option.c:82
+#: ../src/option.c:85
msgid "ICONPATH"
msgstr "ЗНАЧОК"
-#: ../src/option.c:87
+#: ../src/option.c:90
msgid "Set the width"
msgstr "Задать ширину окна"
-#: ../src/option.c:88
+#: ../src/option.c:91
msgid "WIDTH"
msgstr "ШИРИНА"
-#: ../src/option.c:93
+#: ../src/option.c:96
msgid "Set the height"
msgstr "Задать высоту окна"
-#: ../src/option.c:94
+#: ../src/option.c:97
msgid "HEIGHT"
msgstr "ВЫСОТА"
-#: ../src/option.c:99
+#: ../src/option.c:102
msgid "Set the window geometry"
msgstr "Задать геометрию окна"
-#: ../src/option.c:100
+#: ../src/option.c:103
msgid "WxH+X+Y"
msgstr "ВxШ+X+Y"
-#: ../src/option.c:105
+#: ../src/option.c:108
msgid "Set dialog timeout in seconds"
msgstr "Задать время работы диалога в секундах"
-#: ../src/option.c:106
+#: ../src/option.c:109
msgid "TIMEOUT"
msgstr "ЗАДЕРЖКА"
-#: ../src/option.c:111
+#: ../src/option.c:114
msgid "Show remaining time indicator (top, bottom, left, right)"
msgstr "Показать индикатор задержки (top, bottom, left, right)"
-#: ../src/option.c:112
+#: ../src/option.c:115 ../src/option.c:1040
msgid "POS"
msgstr "ПОЗИЦИЯ"
-#: ../src/option.c:117
+#: ../src/option.c:120
msgid "Set the dialog text"
msgstr "Задать текст диалога"
-#: ../src/option.c:118 ../src/option.c:148 ../src/option.c:415
-#: ../src/option.c:421 ../src/option.c:427 ../src/option.c:567
-#: ../src/option.c:1055 ../src/option.c:1094
+#: ../src/option.c:121 ../src/option.c:151 ../src/option.c:428
+#: ../src/option.c:434 ../src/option.c:440 ../src/option.c:568
+#: ../src/option.c:859 ../src/option.c:1102 ../src/option.c:1141
msgid "TEXT"
msgstr "ТЕКСТ"
-#: ../src/option.c:123
+#: ../src/option.c:126
msgid "Set the dialog text alignment (left, center, right, fill)"
msgstr "Задать выравнивание текста диалога (left, center, right, fill)"
-#: ../src/option.c:124 ../src/option.c:166 ../src/option.c:590
-#: ../src/option.c:810 ../src/option.c:898 ../src/option.c:941
-#: ../src/option.c:1021 ../src/option.c:1222
+#: ../src/option.c:127 ../src/option.c:169 ../src/option.c:591
+#: ../src/option.c:817 ../src/option.c:917 ../src/option.c:960
+#: ../src/option.c:1034 ../src/option.c:1068 ../src/option.c:1269
msgid "TYPE"
msgstr "ТИП"
-#: ../src/option.c:129
+#: ../src/option.c:132
msgid "Set the dialog image"
msgstr "Задать картинку диалога"
-#: ../src/option.c:130 ../src/option.c:451 ../src/option.c:463
+#: ../src/option.c:133 ../src/option.c:464 ../src/option.c:476
msgid "IMAGE"
msgstr "КАРТИНКА"
-#: ../src/option.c:135
+#: ../src/option.c:138
msgid "Show image above main widget"
msgstr "Показывать картинку над основным виджетом"
-#: ../src/option.c:141
+#: ../src/option.c:144
msgid "Use specified icon theme instead of default"
msgstr "Использовать указанную тему иконок"
-#: ../src/option.c:142
+#: ../src/option.c:145
msgid "THEME"
msgstr "ТЕМА"
-#: ../src/option.c:147
+#: ../src/option.c:150
msgid "Hide main widget with expander"
msgstr "Спрятать основной виджет"
-#: ../src/option.c:153
+#: ../src/option.c:156
msgid "Add dialog button (may be used multiple times)"
msgstr "Добавить кнопку (может использоваться несколько раз)"
-#: ../src/option.c:154
+#: ../src/option.c:157
msgid "NAME:ID"
msgstr "ИМЯ:ID"
-#: ../src/option.c:159
+#: ../src/option.c:162
msgid "Don't show buttons"
msgstr "Не показывать кнопки"
-#: ../src/option.c:165
+#: ../src/option.c:168
msgid "Set buttons layout type (spread, edge, start, end or center)"
msgstr "Задать тип размещения кнопок (spread, edge, start, end или center)"
-#: ../src/option.c:171
+#: ../src/option.c:174
msgid "Don't use pango markup language in dialog's text"
msgstr "Не использовать разметку pango в тексте"
-#: ../src/option.c:177
+#: ../src/option.c:180
msgid "Don't close dialog if Escape was pressed"
msgstr "Не закрывать диалог при нажатии Escape"
-#: ../src/option.c:184
-msgid "Add separator between dialog and buttons"
-msgstr "Добавить разделитель между диалогом и кнопками"
-
-#: ../src/option.c:191
+#: ../src/option.c:186
msgid "Set window borders"
msgstr "Установить границы окна"
-#: ../src/option.c:192 ../src/option.c:271 ../src/option.c:596
-#: ../src/option.c:816 ../src/option.c:822 ../src/option.c:828
-#: ../src/option.c:834 ../src/option.c:840 ../src/option.c:846
-#: ../src/option.c:947
+#: ../src/option.c:187 ../src/option.c:266 ../src/option.c:597
+#: ../src/option.c:823 ../src/option.c:829 ../src/option.c:835
+#: ../src/option.c:841 ../src/option.c:847 ../src/option.c:853
+#: ../src/option.c:865 ../src/option.c:966
msgid "NUMBER"
msgstr "ЧИСЛО"
-#: ../src/option.c:197
+#: ../src/option.c:192
msgid "Always print result"
msgstr "Всегда выводить результат"
-#: ../src/option.c:203
+#: ../src/option.c:198
msgid "Dialog text can be selected"
msgstr "Текст диалога может быть выделен"
-#: ../src/option.c:210
+#: ../src/option.c:205
msgid "Set window sticky"
msgstr "Окно видимо на всех рабочих столах"
-#: ../src/option.c:216
+#: ../src/option.c:211
msgid "Set window unresizable"
msgstr "Неизменяемый размер"
-#: ../src/option.c:222
+#: ../src/option.c:217
msgid "Place window on top"
msgstr "Разместить окно поверх остальных"
-#: ../src/option.c:228
+#: ../src/option.c:223
msgid "Place window on center of screen"
msgstr "Разместить окно в центре экрана"
-#: ../src/option.c:234
+#: ../src/option.c:229
msgid "Place window at the mouse position"
msgstr "Разместить окно под указателем мыши"
-#: ../src/option.c:240
+#: ../src/option.c:235
msgid "Set window undecorated"
msgstr "Убрать обрамление"
-#: ../src/option.c:246
+#: ../src/option.c:241
msgid "Don't show window in taskbar"
msgstr "Не показывать окно в панели задач"
-#: ../src/option.c:252
+#: ../src/option.c:247
msgid "Set window maximized"
msgstr "Задать окну максимальный размер"
-#: ../src/option.c:258
+#: ../src/option.c:253
msgid "Set window fulscreen"
msgstr "Развернуть окно на весь экран"
-#: ../src/option.c:264
+#: ../src/option.c:259
msgid "Special type of dialog for XEMBED"
msgstr "Специальный режим диалога для встраивания"
-#: ../src/option.c:265 ../src/option.c:929
+#: ../src/option.c:260 ../src/option.c:948 ../src/option.c:1046
msgid "KEY"
msgstr "КЛЮЧ"
-#: ../src/option.c:270
+#: ../src/option.c:265
msgid "Tab nubmer of this dialog"
msgstr "Номер вкладки для этого диалога"
-#: ../src/option.c:277
+#: ../src/option.c:272
+msgid "XID of parent window"
+msgstr "Идентификатор родительсткого окна"
+
+#: ../src/option.c:278
msgid "Send SIGNAL to parent"
msgstr "Послать СИГНАЛ родителю"
-#: ../src/option.c:278
+#: ../src/option.c:279
msgid "SIGNAL"
msgstr "СИГНАЛ"
-#: ../src/option.c:283
+#: ../src/option.c:284
msgid "Print X Window Id to the stderr"
msgstr "Вывести идентификатор окна на stderr"
-#: ../src/option.c:290
+#: ../src/option.c:291
msgid "Add path for search icons by name"
msgstr "Добавить каталог для поиска изображений по имени"
-#: ../src/option.c:291
+#: ../src/option.c:292
msgid "PATH"
msgstr "ПУТЬ"
-#: ../src/option.c:300
+#: ../src/option.c:301
msgid "Display calendar dialog"
msgstr "Отобразить диалог для выбора даты"
-#: ../src/option.c:306
+#: ../src/option.c:307
msgid "Set the calendar day"
msgstr "Задать день календаря"
-#: ../src/option.c:307
+#: ../src/option.c:308
msgid "DAY"
msgstr "ДЕНЬ"
-#: ../src/option.c:312
+#: ../src/option.c:313
msgid "Set the calendar month"
msgstr "Задать месяц календаря"
-#: ../src/option.c:313
+#: ../src/option.c:314
msgid "MONTH"
msgstr "МЕСЯЦ"
-#: ../src/option.c:318
+#: ../src/option.c:319
msgid "Set the calendar year"
msgstr "Задать год календаря"
-#: ../src/option.c:319
+#: ../src/option.c:320
msgid "YEAR"
msgstr "ГОД"
-#: ../src/option.c:324 ../src/option.c:613
+#: ../src/option.c:325 ../src/option.c:614
msgid "Set the format for the returned date"
msgstr "Задать формат возвращаемой даты"
-#: ../src/option.c:325 ../src/option.c:614 ../src/option.c:721
+#: ../src/option.c:326 ../src/option.c:615 ../src/option.c:722
msgid "PATTERN"
msgstr "ШАБЛОН"
-#: ../src/option.c:330
+#: ../src/option.c:331
msgid "Set the filename with dates details"
msgstr "Задать имя файла с описанием дат"
-#: ../src/option.c:331 ../src/option.c:359 ../src/option.c:491
-#: ../src/option.c:1015 ../src/option.c:1240 ../src/option.c:1280
-#: ../src/option.c:1290
+#: ../src/option.c:332 ../src/option.c:366 ../src/option.c:504
+#: ../src/option.c:1062 ../src/option.c:1287 ../src/option.c:1361
+#: ../src/option.c:1371
msgid "FILENAME"
msgstr "ИМЯ_ФАЙЛА"
-#: ../src/option.c:340
+#: ../src/option.c:341
msgid "Display color selection dialog"
msgstr "Отобразить диалог для выбора цвета"
-#: ../src/option.c:346
+#: ../src/option.c:347
msgid "Alias for --color"
msgstr "Синоним для --color"
-#: ../src/option.c:352
+#: ../src/option.c:353
msgid "Set initial color value"
msgstr "Задать начальное значение цвета"
-#: ../src/option.c:353 ../src/option.c:1198 ../src/option.c:1204
+#: ../src/option.c:354 ../src/option.c:1245 ../src/option.c:1251
+#: ../src/option.c:1305
msgid "COLOR"
msgstr "ЦВЕТ"
-#: ../src/option.c:358
+#: ../src/option.c:359
+msgid "Show system palette in color dialog"
+msgstr "Показывать системную палитру"
+
+#: ../src/option.c:365
msgid "Set path to palette file. Default - "
msgstr "Задать путь к файлу цветов. По-умолчанию - "
-#: ../src/option.c:364
+#: ../src/option.c:371
+msgid "Expand user palette"
+msgstr "Раскрывать пользовательскую палитру"
+
+#: ../src/option.c:377
msgid "Set output mode to MODE. Values are hex (default) or rgb"
msgstr "Установить ревим вывода в РЕЖИМ. Значения - hex (по-умолчанию) или rgb"
-#: ../src/option.c:365
+#: ../src/option.c:378
msgid "MODE"
msgstr "РЕЖИМ"
-#: ../src/option.c:370
+#: ../src/option.c:383
msgid "Use #rrrrggggbbbb format instead of #rrggbb"
msgstr "Использовать формат #rrrrggggbbbb вместо #rrggbb"
-#: ../src/option.c:376
+#: ../src/option.c:389
msgid "Add opacity to output color value"
msgstr "Добавить прозрачность к значению цвета"
-#: ../src/option.c:386
+#: ../src/option.c:399
msgid "Display drag-n-drop box"
msgstr "Отобразить диалог для перехвата dnd"
-#: ../src/option.c:392
+#: ../src/option.c:405
msgid "Use dialog text as tooltip"
msgstr "Использовать текст диалога в качестве подсказки"
-#: ../src/option.c:398
+#: ../src/option.c:411
msgid "Set command for process d-n-d data"
msgstr "Команда для обработки полученных данных"
-#: ../src/option.c:399 ../src/option.c:457 ../src/option.c:469
-#: ../src/option.c:852 ../src/option.c:963
+#: ../src/option.c:412 ../src/option.c:470 ../src/option.c:482
+#: ../src/option.c:871 ../src/option.c:982
msgid "CMD"
msgstr "КОМАНДА"
-#: ../src/option.c:408
+#: ../src/option.c:421
msgid "Display text entry or combo-box dialog"
msgstr "Отобразить диалог для ввода текста или выбора варианта"
-#: ../src/option.c:414
+#: ../src/option.c:427
msgid "Set the entry label"
msgstr "Задать метку поля ввода"
-#: ../src/option.c:420
+#: ../src/option.c:433
msgid "Set the entry text"
msgstr "Задать текст по умолчанию для ввода"
-#: ../src/option.c:426
+#: ../src/option.c:439
msgid "Hide the entry text"
msgstr "Прятать введенный текст (Пароль)"
-#: ../src/option.c:432
+#: ../src/option.c:445
msgid "Use completion instead of combo-box"
msgstr "Использовать автодополнение вместо списка значений"
-#: ../src/option.c:438
+#: ../src/option.c:451
msgid "Use spin button for text entry"
msgstr "Использовать числовое поле вместо текста"
-#: ../src/option.c:444
+#: ../src/option.c:457
msgid "Allow changes to text in combo-box"
msgstr "Разрешить изменять текст в режиме выбора варианта"
-#: ../src/option.c:450
+#: ../src/option.c:463
msgid "Set the left entry icon"
msgstr "Задать левый значок"
-#: ../src/option.c:456
+#: ../src/option.c:469
msgid "Set the left entry icon action"
msgstr "Действие для левого значка"
-#: ../src/option.c:462
+#: ../src/option.c:475
msgid "Set the right entry icon"
msgstr "Задать правый значок"
-#: ../src/option.c:468
+#: ../src/option.c:481
msgid "Set the right entry icon action"
msgstr "Действие для правого значка"
-#: ../src/option.c:478
+#: ../src/option.c:491
msgid "Display file selection dialog"
msgstr "Отобразить диалог для выбора файла"
-#: ../src/option.c:484
+#: ../src/option.c:497
msgid "Alias for --file"
msgstr "Синоним для --file"
-#: ../src/option.c:490
+#: ../src/option.c:503
msgid "Set the filename"
msgstr "Задать имя файла"
-#: ../src/option.c:496
+#: ../src/option.c:509
msgid "Allow multiple files to be selected"
msgstr "Разрешить выбор нескольких файлов"
-#: ../src/option.c:502
+#: ../src/option.c:515
msgid "Activate directory-only selection"
msgstr "Активировать выделение только по каталогам"
-#: ../src/option.c:508
+#: ../src/option.c:521
msgid "Activate save mode"
msgstr "Активировать режим сохранения"
-#: ../src/option.c:514 ../src/option.c:601 ../src/option.c:785
+#: ../src/option.c:527 ../src/option.c:602 ../src/option.c:792
msgid "Set output separator character"
msgstr "Установить выходной разделяющий символ"
-#: ../src/option.c:515 ../src/option.c:602 ../src/option.c:608
-#: ../src/option.c:786 ../src/option.c:975 ../src/option.c:981
+#: ../src/option.c:528 ../src/option.c:603 ../src/option.c:609
+#: ../src/option.c:793 ../src/option.c:994 ../src/option.c:1000
msgid "SEPARATOR"
msgstr "РАЗДЕЛИТЕЛЬ"
-#: ../src/option.c:520
+#: ../src/option.c:533
msgid "Confirm file selection if filename already exists"
msgstr "Подтверждать выбор файла, если файл уже существует"
-#: ../src/option.c:521
+#: ../src/option.c:534
msgid "[TEXT]"
msgstr "[ТЕКСТ]"
-#: ../src/option.c:526
-msgid "Sets a filename filter"
-msgstr "Задать фильтр файлов"
-
-#: ../src/option.c:527
-msgid "NAME | PATTERN1 PATTERN2 ..."
-msgstr "ИМЯ | ШАБЛОН1 ШАБЛОН2 ..."
-
-#: ../src/option.c:532
-msgid "Enable preview"
-msgstr "Добавить предпросмотр"
-
-#: ../src/option.c:538 ../src/option.c:625 ../src/option.c:869
+#: ../src/option.c:539 ../src/option.c:626 ../src/option.c:888
msgid "Quote dialogs output"
msgstr "Вывод значений в кавычках"
-#: ../src/option.c:548
+#: ../src/option.c:549
msgid "Display font selection dialog"
msgstr "Отобразить диалог для выбора шрифта"
-#: ../src/option.c:554
+#: ../src/option.c:555
msgid "Alias for --font"
msgstr "Синоним для --font"
-#: ../src/option.c:560
+#: ../src/option.c:561
msgid "Set initial font"
msgstr "Задать начальный шрифт"
-#: ../src/option.c:561 ../src/option.c:1039 ../src/option.c:1210
+#: ../src/option.c:562 ../src/option.c:1086 ../src/option.c:1257
msgid "FONTNAME"
msgstr "ШРИФТ"
-#: ../src/option.c:566
+#: ../src/option.c:567
msgid "Set preview text"
msgstr "Задать текст образца"
-#: ../src/option.c:576
+#: ../src/option.c:577
msgid "Display form dialog"
msgstr "Отобразить диалог формы ввода"
-#: ../src/option.c:583
+#: ../src/option.c:584
msgid ""
"Add field to form (TYPE - H, RO, NUM, CHK, CB, CBE, CE, FL, SFL, MFL, DIR, "
"CDIR, MDIR, FN, DT, SCL, CLR, BTN, FBTN, LBL or TXT)"
@@ -623,95 +625,95 @@
"Добавить поле к форме (Тип поля: Н, RO, NUM, CHK, CB, CBE, CE, FL, SFL, MFL, "
"DIR, CDIR, MDIR, FN, MFL, DT, SCL, CLR, BTN, FBTN, LBL или TXT)"
-#: ../src/option.c:584 ../src/option.c:886
+#: ../src/option.c:585 ../src/option.c:905
msgid "LABEL[:TYPE]"
msgstr "МЕТКА[:ТИП]"
-#: ../src/option.c:589
+#: ../src/option.c:590
msgid "Set alignment of filed labels (left, center or right)"
msgstr "Задать выравнивание меток полей (left, center или right)"
-#: ../src/option.c:595
+#: ../src/option.c:596
msgid "Set number of columns in form"
msgstr "Задать количество колонок в форме"
-#: ../src/option.c:607
+#: ../src/option.c:608
msgid "Set separator character for combobox or scale data"
msgstr "Установить разделяющий символ для данных списка или числового поля"
-#: ../src/option.c:619
+#: ../src/option.c:620
msgid "Make form scrollable"
msgstr "Сделать форму прокручиваемой"
-#: ../src/option.c:631
+#: ../src/option.c:632
msgid "Order output fields by rows"
msgstr "Упорядочить вівод по строкам"
-#: ../src/option.c:642
+#: ../src/option.c:643
msgid "Display HTML dialog"
msgstr "Отобразить HTML диалог"
-#: ../src/option.c:648
+#: ../src/option.c:649
msgid "Open specified location"
msgstr "Открыть указанный адрес"
-#: ../src/option.c:649
+#: ../src/option.c:650
msgid "URI"
msgstr "URI"
-#: ../src/option.c:654
+#: ../src/option.c:655
msgid "Turn on browser mode"
msgstr "Включить режим браузера"
-#: ../src/option.c:660
+#: ../src/option.c:661
msgid "Print clicked uri to stdout"
msgstr "Печатать ссылки по щелчку"
-#: ../src/option.c:666
+#: ../src/option.c:667
msgid "Set mime type of input stream data"
msgstr "Задать тип mime для входных данных"
-#: ../src/option.c:667
+#: ../src/option.c:668
msgid "MIME"
msgstr "MIME"
-#: ../src/option.c:672
+#: ../src/option.c:673
msgid "Set encoding of input stream data"
msgstr "Задать кодировку для входных данных"
-#: ../src/option.c:673
+#: ../src/option.c:674
msgid "ENCODING"
msgstr "КОДИРОВКА"
-#: ../src/option.c:683
+#: ../src/option.c:684
msgid "Display icons box dialog"
msgstr "Отобразить диалог со значками быстрого доступа"
-#: ../src/option.c:689
+#: ../src/option.c:690
msgid "Read data from .desktop files in specified directory"
msgstr "Читать данные из .desktop файлов в определенном каталоге"
-#: ../src/option.c:690
+#: ../src/option.c:691
msgid "DIRECTORY"
msgstr "КАТАЛОГ"
-#: ../src/option.c:695
+#: ../src/option.c:696
msgid "Use compact (list) view"
msgstr "Использовать компактный вид (список)"
-#: ../src/option.c:701
+#: ../src/option.c:702
msgid "Use GenericName field instead of Name for icon label"
msgstr "Использовать поле GenericName вместо Name для метки"
-#: ../src/option.c:707
+#: ../src/option.c:708
msgid "Read data from stdin"
msgstr "Читать данные со стандартного ввода"
-#: ../src/option.c:713
+#: ../src/option.c:714
msgid "Set the width of dialog items"
msgstr "Задать ширину элемента диалога"
-#: ../src/option.c:720
+#: ../src/option.c:721
#, no-c-format
msgid ""
"Use specified pattern for launch command in terminal (default: xterm -e %s)"
@@ -719,66 +721,70 @@
"Использовать указанный шаблон для запуска в терминале (по умолчанию: xterm -"
"e %s)"
-#: ../src/option.c:726
+#: ../src/option.c:727
msgid "Sort items by name instead of filename"
msgstr "Сортировать по полю Имя вместо имени файла"
-#: ../src/option.c:732
+#: ../src/option.c:733
msgid "Sort items in descending order"
msgstr "Сортировать в убывающем порядке"
-#: ../src/option.c:738
+#: ../src/option.c:739
msgid "Activate items by single click"
msgstr "Активировать элемент одинарным щелчком"
-#: ../src/option.c:748
+#: ../src/option.c:749
msgid "Display list dialog"
msgstr "Отобразить диалог со списком"
-#: ../src/option.c:754
-msgid "Don't show column headers"
-msgstr "Не показывать заголовки колонок"
-
-#: ../src/option.c:760
+#: ../src/option.c:755
msgid "Set the column header (TYPE - TEXT, NUM, FLT, CHK, RD, IMG, HD or TIP)"
msgstr ""
"Задать заголовок столбца (ТИП - TEXT, NUM, FLT, CHK, RD, IMG, HD или TIP)"
-#: ../src/option.c:761
+#: ../src/option.c:756
msgid "COLUMN[:TYPE]"
msgstr "СТОЛБЕЦ[:ТИП]"
-#: ../src/option.c:766
+#: ../src/option.c:761
msgid "Use checkboxes for first column"
msgstr "Использовать флажки для первой колонки"
-#: ../src/option.c:772
+#: ../src/option.c:767
msgid "Use radioboxes for first column"
msgstr "Использовать переключатель для первой колонки"
-#: ../src/option.c:778
+#: ../src/option.c:773
+msgid "Don't show column headers"
+msgstr "Не показывать заголовки колонок"
+
+#: ../src/option.c:779
msgid "Disable clickable column headers"
msgstr "Запретить нажимаемые заголовки"
-#: ../src/option.c:791
+#: ../src/option.c:785
+msgid "Disable rules hints"
+msgstr "Запретить раскраску строк"
+
+#: ../src/option.c:798
msgid "Allow multiple rows to be selected"
msgstr "Разрешить выбор нескольких строк"
-#: ../src/option.c:797 ../src/option.c:1245
+#: ../src/option.c:804 ../src/option.c:1292
msgid "Allow changes to text"
msgstr "Разрешить изменять текст"
-#: ../src/option.c:803
+#: ../src/option.c:810
msgid "Print all data from list"
msgstr "Печатать таблицу полностью"
-#: ../src/option.c:809
+#: ../src/option.c:816
msgid "Set ellipsize mode for text columns (TYPE - NONE, START, MIDDLE or END)"
msgstr ""
"Задать тип усечсения для текстовых столбцов (ТИП - NONE, START, MIDDLE или "
"END)"
-#: ../src/option.c:815
+#: ../src/option.c:822
msgid ""
"Print a specific column. By default or if 0 is specified will be printed all "
"columns"
@@ -786,534 +792,613 @@
"Распечатать только определённый столбец. По-умолчанию или если столбец равен "
"0, будут распечатаны все столбцы"
-#: ../src/option.c:821
+#: ../src/option.c:828
msgid "Hide a specific column"
msgstr "Скрыть указанный столбец"
-#: ../src/option.c:827
+#: ../src/option.c:834
msgid "Set the column expandable by default. 0 sets all columns expandable"
msgstr ""
"Задать колонку, расширяемую по-умолчанию. 0 устанавливает расширяемыми все "
"колонки"
-#: ../src/option.c:833
+#: ../src/option.c:840
msgid ""
"Set the quick search column. Default is first column. Set it to 0 for "
"disable searching"
msgstr "Задать колонку поиска. По-умолчанию первая. 0 запрещает поиск"
-#: ../src/option.c:839
+#: ../src/option.c:846
msgid "Set the tooltip column"
msgstr "Задать колонку всплывающих подсказок"
-#: ../src/option.c:845
+#: ../src/option.c:852
+msgid "Set the row separator column"
+msgstr "Задать колонку разделителя строк"
+
+#: ../src/option.c:858
+msgid "Set the row separator value"
+msgstr "Задать значение разделителя строк"
+
+#: ../src/option.c:864
msgid "Set the limit of rows in list"
msgstr "Задать количество строк в списке"
-#: ../src/option.c:851
+#: ../src/option.c:870
msgid "Set double-click action"
msgstr "Действие по двойному щелчку мыши"
-#: ../src/option.c:857
+#: ../src/option.c:876
msgid "Use regex in search"
msgstr "Использовать регулярные выражения при поиске"
-#: ../src/option.c:863
+#: ../src/option.c:882
msgid "Listen for data on stdin in addition to command-line"
msgstr "Получать даннные из stdin в дополнение к указанным в командной строке"
-#: ../src/option.c:879
+#: ../src/option.c:898
msgid "Display multi progress bars dialog"
msgstr "Отобразить диалог c несколькими индикаторами"
-#: ../src/option.c:885
+#: ../src/option.c:904
msgid "Add the progress bar (TYPE - NORM, RTL or PULSE)"
msgstr "Добавить индикатор (ТИП - NORM, RTL или PULSE)"
-#: ../src/option.c:891
+#: ../src/option.c:910
msgid "Show vertical bars"
msgstr "Показывать вертикальные индикаторы"
-#: ../src/option.c:897
+#: ../src/option.c:916
msgid "Set alignment of bar labels (left, center or right)"
msgstr "Задать выравнивание меток индикаторов (left, center или right)"
-#: ../src/option.c:904
+#: ../src/option.c:923
#, no-c-format
msgid "Dismiss the dialog when 100% of all bars has been reached"
msgstr "Закрыть диалог по достижении 100% всеми индикаторами"
-#: ../src/option.c:911 ../src/option.c:1080
+#: ../src/option.c:930 ../src/option.c:1127
msgid "Kill parent process if cancel button is pressed"
msgstr "Завершить родительский процесс, если нажата кнопка отмены"
-#: ../src/option.c:922
+#: ../src/option.c:941
msgid "Display notebook dialog"
msgstr "Отобразить диалог с вкладками"
-#: ../src/option.c:928
+#: ../src/option.c:947 ../src/option.c:1045
msgid "Identifier of embedded dialogs"
msgstr "Идентификатор встраиваемых диалогов"
-#: ../src/option.c:934
+#: ../src/option.c:953
msgid "Add a tab to notebook"
msgstr "Добавить вкладку"
-#: ../src/option.c:935
+#: ../src/option.c:954
msgid "LABEL"
msgstr "МЕТКА"
-#: ../src/option.c:940
+#: ../src/option.c:959
msgid "Set position of a notebook tabs (top, bottom, left or right)"
msgstr "Задать позицию метки вкладки (top, bottom, left или right)"
-#: ../src/option.c:946
+#: ../src/option.c:965
msgid "Set tab borders"
msgstr "Установить границы вкладки"
-#: ../src/option.c:956
+#: ../src/option.c:975
msgid "Display notification"
msgstr "Отобразить диалог уведомления"
-#: ../src/option.c:962
+#: ../src/option.c:981
msgid "Set left-click action"
msgstr "Действие по левому щелчку мыши"
-#: ../src/option.c:968
+#: ../src/option.c:987
msgid "Listen for commands on stdin"
msgstr "Воспринимать команды со стандартного ввода"
-#: ../src/option.c:974
+#: ../src/option.c:993
msgid "Set separator character for menu values"
msgstr "Установить разделяющий символ для значений меню"
-#: ../src/option.c:980
+#: ../src/option.c:999
msgid "Set separator character for menu items"
msgstr "Установить разделяющий символ для элементов меню"
-#: ../src/option.c:986
+#: ../src/option.c:1005
msgid "Set initial popup menu"
msgstr "Задать начальное меню"
-#: ../src/option.c:987
+#: ../src/option.c:1006
msgid "STRING"
msgstr "СТРОКА"
-#: ../src/option.c:992
+#: ../src/option.c:1011
msgid "Disable exit on middle click"
msgstr "Запретить выход по щелчку средней кнопкой"
-#: ../src/option.c:998
+#: ../src/option.c:1017
msgid "Doesn't show icon at startup"
msgstr "Не показывать иконку при запуске"
-#: ../src/option.c:1008
+#: ../src/option.c:1027
+msgid "Display paned dialog"
+msgstr "Отобразить диалог панелей"
+
+#: ../src/option.c:1033
+msgid "Set orientation (TYPE - hor[izontal] or vert[ical])"
+msgstr "Задать ориентацию (ТИП - hor[izontal] или vert[ical])"
+
+#: ../src/option.c:1039
+msgid "Set initial splitter position"
+msgstr "Задать начальную позицию разделителя"
+
+#: ../src/option.c:1055
msgid "Display printing dialog"
msgstr "Отобразить диалог печати"
-#: ../src/option.c:1014
+#: ../src/option.c:1061
msgid "Source filename"
msgstr "Имя исходного файла"
-#: ../src/option.c:1020
+#: ../src/option.c:1067
msgid "Set source type (TYPE - TEXT, IMAGE or RAW)"
msgstr "Тип исходных данных (ТИП - TEXT, IMAGE или RAW)"
-#: ../src/option.c:1026
+#: ../src/option.c:1073
msgid "Add headers to page"
msgstr "Добавлять колонтитулы на страницу"
-#: ../src/option.c:1032
+#: ../src/option.c:1079
msgid "Enable preview in print dialog"
msgstr "Разрешить предпросмотр в диалоге печати"
-#: ../src/option.c:1038 ../src/option.c:1209
+#: ../src/option.c:1085 ../src/option.c:1256
msgid "Use specified font"
msgstr "Использовать указанный шрифт"
-#: ../src/option.c:1048
+#: ../src/option.c:1095
msgid "Display progress indication dialog"
msgstr "Отобразить диалог хода процесса"
-#: ../src/option.c:1054
+#: ../src/option.c:1101
msgid "Set progress text"
msgstr "Показывать текст на индикаторе"
-#: ../src/option.c:1060
+#: ../src/option.c:1107
msgid "Set initial percentage"
msgstr "Задать начальный процент"
-#: ../src/option.c:1061
+#: ../src/option.c:1108
msgid "PERCENTAGE"
msgstr "ПРОЦЕНТЫ"
-#: ../src/option.c:1066
+#: ../src/option.c:1113
msgid "Pulsate progress bar"
msgstr "Пульсирующий индикатор прогресса"
-#: ../src/option.c:1073
+#: ../src/option.c:1120
#, no-c-format
msgid "Dismiss the dialog when 100% has been reached"
msgstr "Закрыть диалог по достижении 100%"
-#: ../src/option.c:1087
+#: ../src/option.c:1134
msgid "Right-To-Left progress bar direction"
msgstr "Направление индикатора Справа-Налево"
-#: ../src/option.c:1093
+#: ../src/option.c:1140
msgid "Show log window"
msgstr "Показать окно журнала"
-#: ../src/option.c:1099
+#: ../src/option.c:1146
msgid "Expand log window"
msgstr "Развернуть окно журнала"
-#: ../src/option.c:1105
+#: ../src/option.c:1152
msgid "Place log window above progress bar"
msgstr "Разместить окно журнала над индикатором прогресса"
-#: ../src/option.c:1111
+#: ../src/option.c:1158
msgid "Height of log window"
msgstr "Высота окна журнала"
-#: ../src/option.c:1121
+#: ../src/option.c:1168
msgid "Display scale dialog"
msgstr "Отобразить диалог масштаба"
-#: ../src/option.c:1127
+#: ../src/option.c:1174
msgid "Set initial value"
msgstr "Задать начальное значение"
-#: ../src/option.c:1128 ../src/option.c:1134 ../src/option.c:1140
-#: ../src/option.c:1146 ../src/option.c:1152
+#: ../src/option.c:1175 ../src/option.c:1181 ../src/option.c:1187
+#: ../src/option.c:1193 ../src/option.c:1199
msgid "VALUE"
msgstr "ЗНАЧЕНИЕ"
-#: ../src/option.c:1133
+#: ../src/option.c:1180
msgid "Set minimum value"
msgstr "Задать минимальное значение"
-#: ../src/option.c:1139
+#: ../src/option.c:1186
msgid "Set maximum value"
msgstr "Задать максимальное значение"
-#: ../src/option.c:1145
+#: ../src/option.c:1192
msgid "Set step size"
msgstr "Задать шаг"
-#: ../src/option.c:1151
+#: ../src/option.c:1198
msgid "Set paging size"
msgstr "Задать шаг страницы"
-#: ../src/option.c:1157
+#: ../src/option.c:1204
msgid "Print partial values"
msgstr "Печатать частичные значения"
-#: ../src/option.c:1163
+#: ../src/option.c:1210
msgid "Hide value"
msgstr "Скрыть величину"
-#: ../src/option.c:1169
+#: ../src/option.c:1216
msgid "Show vertical scale"
msgstr "Показывать вертикальную шкалу"
-#: ../src/option.c:1175
+#: ../src/option.c:1222
msgid "Invert direction"
msgstr "Инвертировать направление"
-#: ../src/option.c:1181
+#: ../src/option.c:1228
msgid "Add mark to scale (may be used multiple times)"
msgstr "Добавить метку (может использоваться несколько раз)"
-#: ../src/option.c:1182
+#: ../src/option.c:1229
msgid "NAME:VALUE"
msgstr "ИМЯ:ЗНАЧЕНИЕ"
-#: ../src/option.c:1191
+#: ../src/option.c:1238
msgid "Display text information dialog"
msgstr "Отобразить диалог с текстовой информацией"
-#: ../src/option.c:1197
+#: ../src/option.c:1244
msgid "Use specified color for text"
msgstr "Использовать указанный цвет текста"
-#: ../src/option.c:1203
+#: ../src/option.c:1250
msgid "Use specified color for background"
msgstr "Использовать указанный цвет фона"
-#: ../src/option.c:1215
+#: ../src/option.c:1262
msgid "Enable text wrapping"
msgstr "Разрешить перенос текста"
-#: ../src/option.c:1221
+#: ../src/option.c:1268
msgid "Set justification (TYPE - left, right, center or fill)"
msgstr "Установить выравнивание (ТИП - left, right, center или fill)"
-#: ../src/option.c:1227
+#: ../src/option.c:1274
msgid "Set text margins"
msgstr "Установить отступы"
-#: ../src/option.c:1228
+#: ../src/option.c:1275
msgid "SIZE"
msgstr "РАЗМЕР"
-#: ../src/option.c:1233
+#: ../src/option.c:1280
msgid "Autoscroll to end of text"
msgstr "Автопрокрутка в конец текста"
-#: ../src/option.c:1239
+#: ../src/option.c:1286
msgid "Open file"
msgstr "Открыть файл"
-#: ../src/option.c:1251
+#: ../src/option.c:1298
msgid "Make URI clickable"
msgstr "Сделать ссылки активными"
-#: ../src/option.c:1257
+#: ../src/option.c:1304
+msgid "Use specified color for links"
+msgstr "Использовать указанный цвет для ссылок"
+
+#: ../src/option.c:1310
msgid "Listen for data on stdin in addition to file"
msgstr "Получать данные из стандартного потока ввода в дополнение к файлу"
-#: ../src/option.c:1267
+#: ../src/option.c:1320
+msgid "Sets a filename filter"
+msgstr "Задать фильтр файлов по маске"
+
+#: ../src/option.c:1321
+msgid "NAME | PATTERN1 PATTERN2 ..."
+msgstr "ИМЯ | ШАБЛОН1 ШАБЛОН2 ..."
+
+#: ../src/option.c:1326
+msgid "Sets a mime-type filter"
+msgstr "Задать фильтр файлов по типу mime"
+
+#: ../src/option.c:1327
+msgid "NAME | MIME1 MIME2 ..."
+msgstr "ИМЯ | ТИП1 ТИП2 ..."
+
+#: ../src/option.c:1332
+msgid "Add filter for images"
+msgstr "Добавить фильтр изображений"
+
+#: ../src/option.c:1333
+msgid "NAME"
+msgstr "ИМЯ"
+
+#: ../src/option.c:1338
+msgid "Enable preview"
+msgstr "Добавить предпросмотр"
+
+#: ../src/option.c:1348
msgid "Show about dialog"
msgstr "Показать диалог 'О программе'"
-#: ../src/option.c:1273
+#: ../src/option.c:1354
msgid "Print version"
msgstr "Вывести версию"
-#: ../src/option.c:1279
+#: ../src/option.c:1360
msgid "Load additional GTK settings from file"
msgstr "Загрузить дополнительные настройки GTK из файла"
-#: ../src/option.c:1289
+#: ../src/option.c:1370
msgid "Load extra arguments from file"
msgstr "Загрузить дополнительные аргументы из файла"
-#: ../src/option.c:1334 ../src/option.c:1562
+#: ../src/option.c:1415 ../src/option.c:1708
#, c-format
msgid "Unknown align type: %s\n"
msgstr "Неизвестный тип выравнивания: %s\n"
-#: ../src/option.c:1491
+#: ../src/option.c:1572
#, c-format
msgid "Mark %s doesn't have a value\n"
msgstr "Метке %s не задано значение\n"
-#: ../src/option.c:1528
+#: ../src/option.c:1609
+msgid "Images"
+msgstr "Изображения"
+
+#: ../src/option.c:1674
#, c-format
msgid "Unknown color mode: %s\n"
msgstr "Неизвестный режим цвета: '%s'\n"
-#: ../src/option.c:1547
+#: ../src/option.c:1693
#, c-format
msgid "Unknown buttons layout type: %s\n"
msgstr "Неизвестный тип расположения кнопок: %s\n"
-#: ../src/option.c:1579
+#: ../src/option.c:1725
#, c-format
msgid "Unknown justification type: %s\n"
msgstr "Неизвестный тип выравнивания: %s\n"
-#: ../src/option.c:1596
+#: ../src/option.c:1742
#, c-format
msgid "Unknown tab position type: %s\n"
msgstr "Неизвестный тип позиции вкладки: %s\n"
-#: ../src/option.c:1632
+#: ../src/option.c:1778
#, c-format
msgid "Unknown ellipsize type: %s\n"
msgstr "Неизвестный тип усечения: %s\n"
-#: ../src/option.c:1647
+#: ../src/option.c:1791
+#, c-format
+msgid "Unknown orientation: %s\n"
+msgstr "Неизвестная ориентация: %s\n"
+
+#: ../src/option.c:1806
#, c-format
msgid "Unknown source type: %s\n"
msgstr "Неизвестный исходный тип: %s\n"
-#: ../src/option.c:1658
+#: ../src/option.c:1817
msgid "Progress log"
msgstr "Окно журнала"
-#: ../src/option.c:1768
+#: ../src/option.c:1925
#, c-format
msgid "Unknown signal: %s\n"
msgstr "Неизвестный сигнал: %s\n"
-#: ../src/option.c:1920
+#: ../src/option.c:2081
msgid "File exist. Overwrite?"
msgstr "Файл существует. Перезаписать?"
-#: ../src/option.c:2026
+#: ../src/option.c:2198
msgid "- Yet another dialoging program"
msgstr "- Программа для отображения диалогов"
#. Adds general option entries
-#: ../src/option.c:2030
+#: ../src/option.c:2202
msgid "General options"
msgstr "Основные параметры"
-#: ../src/option.c:2030
+#: ../src/option.c:2202
msgid "Show general options"
msgstr "Показывать основные параметры"
#. Adds calendar option entries
-#: ../src/option.c:2036
+#: ../src/option.c:2208
msgid "Calendar options"
msgstr "Параметры календаря"
-#: ../src/option.c:2036
+#: ../src/option.c:2208
msgid "Show calendar options"
msgstr "Показывать параметры календаря"
#. Adds color option entries
-#: ../src/option.c:2042
+#: ../src/option.c:2214
msgid "Color selection options"
msgstr "Параметры диалога выбора цвета"
-#: ../src/option.c:2042
+#: ../src/option.c:2214
msgid "Show color selection options"
msgstr "Показывать параметры диалога выбора цвета"
#. Adds dnd option entries
-#: ../src/option.c:2048
+#: ../src/option.c:2220
msgid "DND options"
msgstr "Параметры DND"
-#: ../src/option.c:2048
+#: ../src/option.c:2220
msgid "Show drag-n-drop options"
msgstr "Показывать параметры dnd"
#. Adds entry option entries
-#: ../src/option.c:2054
+#: ../src/option.c:2226
msgid "Text entry options"
msgstr "Параметры ввода текста"
-#: ../src/option.c:2054
+#: ../src/option.c:2226
msgid "Show text entry options"
msgstr "Показывать параметры ввода текста"
#. Adds file selection option entries
-#: ../src/option.c:2060
+#: ../src/option.c:2232
msgid "File selection options"
msgstr "Параметры диалога выбора файла"
-#: ../src/option.c:2060
+#: ../src/option.c:2232
msgid "Show file selection options"
msgstr "Показывать параметры диалога выбора файлов"
#. Add font selection option entries
-#: ../src/option.c:2066
+#: ../src/option.c:2238
msgid "Font selection options"
msgstr "Параметры диалога выбора шрифта"
-#: ../src/option.c:2066
+#: ../src/option.c:2238
msgid "Show font selection options"
msgstr "Показывать параметры диалога выбора шрифта"
#. Add form option entries
-#: ../src/option.c:2072
+#: ../src/option.c:2244
msgid "Form options"
msgstr "Параметры диалога формы"
-#: ../src/option.c:2072
+#: ../src/option.c:2244
msgid "Show form options"
msgstr "Показывать параметры диалога формы"
#. Add html options entries
-#: ../src/option.c:2079
+#: ../src/option.c:2251
msgid "HTML options"
msgstr "Параметры HTML диалога"
-#: ../src/option.c:2079
+#: ../src/option.c:2251
msgid "Show HTML options"
msgstr "Показывать параметры HTML диалога"
#. Add icons option entries
-#: ../src/option.c:2086
+#: ../src/option.c:2258
msgid "Icons box options"
msgstr "Параметры диалога значков"
-#: ../src/option.c:2086
+#: ../src/option.c:2258
msgid "Show icons box options"
msgstr "Показывать параметры диалога значков быстрого доступа"
#. Adds list option entries
-#: ../src/option.c:2092
+#: ../src/option.c:2264
msgid "List options"
msgstr "Параметры списка"
-#: ../src/option.c:2092
+#: ../src/option.c:2264
msgid "Show list options"
msgstr "Показывать параметры списка"
#. Adds multi progress option entries
-#: ../src/option.c:2098
+#: ../src/option.c:2270
msgid "Multi progress bars options"
msgstr "Параметры диалога с несколькими индикаторами"
-#: ../src/option.c:2099
+#: ../src/option.c:2271
msgid "Show multi progress bars options"
msgstr "Показывать параметры диалога с несколькими индикаторами"
#. Adds notebook option entries
-#: ../src/option.c:2105
+#: ../src/option.c:2277
msgid "Notebook options"
msgstr "Параметры диалога с вкладками"
-#: ../src/option.c:2105
+#: ../src/option.c:2277
msgid "Show notebook dialog options"
msgstr "Показывать параметры диалога с вкладками"
#. Adds notification option entries
-#: ../src/option.c:2111
+#: ../src/option.c:2283
msgid "Notification icon options"
msgstr "Параметры значка уведомления"
-#: ../src/option.c:2112
+#: ../src/option.c:2284
msgid "Show notification icon options"
msgstr "Показывать параметры значка уведомления"
+#. Adds paned option entries
+#: ../src/option.c:2290
+msgid "Paned dialog options"
+msgstr "Параметры диалога с панелями"
+
+#: ../src/option.c:2290
+msgid "Show paned dialog options"
+msgstr "Показывать параметры диалога с панелями"
+
#. Adds print option entries
-#: ../src/option.c:2118
+#: ../src/option.c:2296
msgid "Print dialog options"
msgstr "Параметры диалога печати"
-#: ../src/option.c:2118
+#: ../src/option.c:2296
msgid "Show print dialog options"
msgstr "Показывать параметры диалога печати"
#. Adds progress option entries
-#: ../src/option.c:2124
+#: ../src/option.c:2302
msgid "Progress options"
msgstr "Параметры хода процесса"
-#: ../src/option.c:2124
+#: ../src/option.c:2302
msgid "Show progress options"
msgstr "Показывать параметры хода процесса"
#. Adds scale option entries
-#: ../src/option.c:2130
+#: ../src/option.c:2308
msgid "Scale options"
msgstr "Параметры масштаба"
-#: ../src/option.c:2130
+#: ../src/option.c:2308
msgid "Show scale options"
msgstr "Показывать параметры масштаба"
#. Adds text option entries
-#: ../src/option.c:2136
+#: ../src/option.c:2314
msgid "Text information options"
msgstr "Параметры текстовой информации"
-#: ../src/option.c:2136
+#: ../src/option.c:2314
msgid "Show text information options"
msgstr "Показывать параметры текстовой информации"
+#. Adds file filters option entries
+#: ../src/option.c:2320
+msgid "File filter options"
+msgstr "Параметры фильтров диалога выбора файла"
+
+#: ../src/option.c:2320
+msgid "Show file filter options"
+msgstr "Показывать параметры фильтров диалога выбора файлов"
+
#. Adds miscellaneous option entries
-#: ../src/option.c:2142
+#: ../src/option.c:2326
msgid "Miscellaneous options"
msgstr "Дополнительные параметры"
-#: ../src/option.c:2142
+#: ../src/option.c:2326
msgid "Show miscellaneous options"
msgstr "Показывать дополнительные параметры"
diff -Nru yad-0.28.2/po/uk.po yad-0.31.0/po/uk.po
--- yad-0.28.2/po/uk.po 2015-07-15 17:55:52.000000000 +0000
+++ yad-0.31.0/po/uk.po 2015-09-11 10:17:29.000000000 +0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YAD\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-15 15:23+0300\n"
+"POT-Creation-Date: 2015-09-10 08:27+0300\n"
"PO-Revision-Date: 2009-04-30 16:47+0300\n"
"Last-Translator: Victor Ananjevsky \n"
"Language-Team: \n"
@@ -73,7 +73,7 @@
#: ../src/calendar.c:39 ../src/text.c:389
#, c-format
msgid "Cannot open file '%s': %s\n"
-msgstr "Не можу відкрити файлу %s: %s\n"
+msgstr "Не можу відкрити файл %s: %s\n"
#: ../src/entry.c:173 ../src/scale.c:39
#, c-format
@@ -92,50 +92,55 @@
msgid "Initial value greater than maximum.\n"
msgstr "Початкове значення - більше за максимальне.\n"
-#: ../src/form.c:404
+#: ../src/form.c:407
msgid "Select files"
msgstr "Вибір файлу"
-#: ../src/form.c:412
+#: ../src/form.c:415
msgid "Select folders"
msgstr "Вибір каталогів"
-#: ../src/form.c:476
+#: ../src/form.c:492
msgid "Select or create file"
msgstr "Вибір або створення файлу"
-#: ../src/form.c:484
+#: ../src/form.c:500
msgid "Select or create folder"
msgstr "Вибір або створення каталогу"
-#: ../src/form.c:521
+#: ../src/form.c:549
msgid "Select date"
msgstr "Вибір дати"
-#: ../src/form.c:742
+#: ../src/form.c:767
msgid "Select file"
msgstr "Вибір файлу"
-#: ../src/form.c:757
+#: ../src/form.c:795
msgid "Select folder"
msgstr "Вибір каталогу"
#: ../src/icons.c:325
#, c-format
msgid "Unable to parse file %s: %s\n"
-msgstr "Не можу розібрати файлу %s: %s\n"
+msgstr "Не можу розібрати файл %s: %s\n"
#: ../src/icons.c:342
#, c-format
msgid "Unable to open directory %s: %s\n"
-msgstr "Не можу відкрити каталогу %s: %s\n"
+msgstr "Не можу відкрити каталог %s: %s\n"
-#: ../src/main.c:103 ../src/main.c:250
+#: ../src/main.c:103 ../src/main.c:258
#, c-format
msgid "%d sec"
msgstr "%d сек"
-#: ../src/main.c:683
+#: ../src/main.c:692 ../src/main.c:699
+#, c-format
+msgid "Unable to parse YAD_OPTIONS: %s\n"
+msgstr "Не можу розібрати YAD_OPTIONS: %s\n"
+
+#: ../src/main.c:710
#, c-format
msgid "Unable to parse command line: %s\n"
msgstr "Не вдається розібрати командний рядок: %s\n"
@@ -159,465 +164,462 @@
msgid "Yad notification"
msgstr "Діалог повідомлень"
-#: ../src/list.c:770
+#: ../src/list.c:769
msgid "Add row"
msgstr "Додати рядок"
-#: ../src/list.c:777
+#: ../src/list.c:776
msgid "Delete row"
-msgstr "Прибрати рядок"
+msgstr "Видалити рядок"
-#: ../src/list.c:784
+#: ../src/list.c:783
msgid "Duplicate row"
msgstr "Скопіювати рядок"
-#: ../src/list.c:811
+#: ../src/list.c:818
#, c-format
msgid "No column titles specified for List dialog.\n"
msgstr "Не задані заголовки стовпчиків для діалогу зі списком\n"
-#: ../src/option.c:75
+#: ../src/option.c:78
msgid "Set the dialog title"
msgstr "Задати заголовок діалогу"
-#: ../src/option.c:76
+#: ../src/option.c:79
msgid "TITLE"
msgstr "ЗАГОЛОВОК"
-#: ../src/option.c:81
+#: ../src/option.c:84
msgid "Set the window icon"
msgstr "Задати іконку діалогу"
-#: ../src/option.c:82
+#: ../src/option.c:85
msgid "ICONPATH"
msgstr "ІКОНКА"
-#: ../src/option.c:87
+#: ../src/option.c:90
msgid "Set the width"
msgstr "Задати ширину вікна"
-#: ../src/option.c:88
+#: ../src/option.c:91
msgid "WIDTH"
msgstr "ШИРИНА"
-#: ../src/option.c:93
+#: ../src/option.c:96
msgid "Set the height"
msgstr "Задати висоту вікна"
-#: ../src/option.c:94
+#: ../src/option.c:97
msgid "HEIGHT"
msgstr "ВИСОТА"
-#: ../src/option.c:99
+#: ../src/option.c:102
msgid "Set the window geometry"
msgstr "Задати геометрію вікна"
-#: ../src/option.c:100
+#: ../src/option.c:103
msgid "WxH+X+Y"
msgstr "ВxШ+X+Y"
-#: ../src/option.c:105
+#: ../src/option.c:108
msgid "Set dialog timeout in seconds"
msgstr "Задати час роботи діалогу в секундах"
-#: ../src/option.c:106
+#: ../src/option.c:109
msgid "TIMEOUT"
msgstr "ЗАТРИМКА"
-#: ../src/option.c:111
+#: ../src/option.c:114
msgid "Show remaining time indicator (top, bottom, left, right)"
msgstr "Показник часу, який залишився (top, bottom, left, right)"
-#: ../src/option.c:112
+#: ../src/option.c:115 ../src/option.c:1040
msgid "POS"
msgstr "ПОЗИЦІЯ"
-#: ../src/option.c:117
+#: ../src/option.c:120
msgid "Set the dialog text"
msgstr "Задати текст діалогу"
-#: ../src/option.c:118 ../src/option.c:148 ../src/option.c:415
-#: ../src/option.c:421 ../src/option.c:427 ../src/option.c:567
-#: ../src/option.c:1055 ../src/option.c:1094
+#: ../src/option.c:121 ../src/option.c:151 ../src/option.c:428
+#: ../src/option.c:434 ../src/option.c:440 ../src/option.c:568
+#: ../src/option.c:859 ../src/option.c:1102 ../src/option.c:1141
msgid "TEXT"
msgstr "ТЕКСТ"
-#: ../src/option.c:123
+#: ../src/option.c:126
msgid "Set the dialog text alignment (left, center, right, fill)"
msgstr "Задати вирівнювання тексту діалогу (left, center, right, fill)"
-#: ../src/option.c:124 ../src/option.c:166 ../src/option.c:590
-#: ../src/option.c:810 ../src/option.c:898 ../src/option.c:941
-#: ../src/option.c:1021 ../src/option.c:1222
+#: ../src/option.c:127 ../src/option.c:169 ../src/option.c:591
+#: ../src/option.c:817 ../src/option.c:917 ../src/option.c:960
+#: ../src/option.c:1034 ../src/option.c:1068 ../src/option.c:1269
msgid "TYPE"
msgstr "ТИП"
-#: ../src/option.c:129
+#: ../src/option.c:132
msgid "Set the dialog image"
-msgstr "Задати картинку діалогу"
+msgstr "Задати зображення діалогу"
-#: ../src/option.c:130 ../src/option.c:451 ../src/option.c:463
+#: ../src/option.c:133 ../src/option.c:464 ../src/option.c:476
msgid "IMAGE"
-msgstr "КАРТИНКА"
+msgstr "ЗОБРАЖЕННЯ"
-#: ../src/option.c:135
+#: ../src/option.c:138
msgid "Show image above main widget"
-msgstr "Показувати картинку над основним віджетом"
+msgstr "Показувати зображення над основним віджетом"
-#: ../src/option.c:141
+#: ../src/option.c:144
msgid "Use specified icon theme instead of default"
msgstr "Використовувати вказану тему іконок"
-#: ../src/option.c:142
+#: ../src/option.c:145
msgid "THEME"
msgstr "ТЕМА"
-#: ../src/option.c:147
+#: ../src/option.c:150
msgid "Hide main widget with expander"
msgstr "Приховати головний віджет"
-#: ../src/option.c:153
+#: ../src/option.c:156
msgid "Add dialog button (may be used multiple times)"
msgstr "Додати кнопку (може використовуватись декілька разів)"
-#: ../src/option.c:154
+#: ../src/option.c:157
msgid "NAME:ID"
msgstr "ІМ'Я:ID"
-#: ../src/option.c:159
+#: ../src/option.c:162
msgid "Don't show buttons"
msgstr "Не показувати кнопки"
-#: ../src/option.c:165
+#: ../src/option.c:168
msgid "Set buttons layout type (spread, edge, start, end or center)"
msgstr "Задати тип розміщення кнопок (spread, edge, start, end або center)"
# # (розкидано, по краю, на початку, по центру)
-#: ../src/option.c:171
+#: ../src/option.c:174
msgid "Don't use pango markup language in dialog's text"
msgstr "Не використовувати розмітку pango в тексті"
-#: ../src/option.c:177
+#: ../src/option.c:180
msgid "Don't close dialog if Escape was pressed"
-msgstr "Не закривати диалог, якшо натиснуто Escape"
-
-#: ../src/option.c:184
-msgid "Add separator between dialog and buttons"
-msgstr "Додати розділювач між діалогом та кнопками"
+msgstr "Не закривати діалог, якшо натиснуто Escape"
-#: ../src/option.c:191
+#: ../src/option.c:186
msgid "Set window borders"
-msgstr "Задати краї вікна"
+msgstr "Встановити межі вікна"
-#: ../src/option.c:192 ../src/option.c:271 ../src/option.c:596
-#: ../src/option.c:816 ../src/option.c:822 ../src/option.c:828
-#: ../src/option.c:834 ../src/option.c:840 ../src/option.c:846
-#: ../src/option.c:947
+#: ../src/option.c:187 ../src/option.c:266 ../src/option.c:597
+#: ../src/option.c:823 ../src/option.c:829 ../src/option.c:835
+#: ../src/option.c:841 ../src/option.c:847 ../src/option.c:853
+#: ../src/option.c:865 ../src/option.c:966
msgid "NUMBER"
msgstr "ЧИСЛО"
-#: ../src/option.c:197
+#: ../src/option.c:192
msgid "Always print result"
msgstr "Завжди виводити результат"
-#: ../src/option.c:203
+#: ../src/option.c:198
msgid "Dialog text can be selected"
msgstr "Текст діалогу може буди виділеним"
-#: ../src/option.c:210
+#: ../src/option.c:205
msgid "Set window sticky"
-msgstr "Вікно - на всіх стільницях"
+msgstr "Вікно на всіх стільницях"
-#: ../src/option.c:216
+#: ../src/option.c:211
msgid "Set window unresizable"
msgstr "Незмінний розмір вікна"
-#: ../src/option.c:222
+#: ../src/option.c:217
msgid "Place window on top"
msgstr "Розташувати вікно над іншими"
-#: ../src/option.c:228
+#: ../src/option.c:223
msgid "Place window on center of screen"
msgstr "Розташувати вікно по центру екрана"
-#: ../src/option.c:234
+#: ../src/option.c:229
msgid "Place window at the mouse position"
msgstr "Розташувати вікно в положенні мишки"
-#: ../src/option.c:240
+#: ../src/option.c:235
msgid "Set window undecorated"
msgstr "Прибрати декорації вікна"
-#: ../src/option.c:246
+#: ../src/option.c:241
msgid "Don't show window in taskbar"
msgstr "Не показувати вікна в панелі завдань"
-#: ../src/option.c:252
+#: ../src/option.c:247
msgid "Set window maximized"
-msgstr "Задати вікну максимальний розмір вікна"
+msgstr "Задати вікну максимальний розмір"
-#: ../src/option.c:258
+#: ../src/option.c:253
msgid "Set window fulscreen"
msgstr "Розгорнути вікно на весь екран"
-#: ../src/option.c:264
+#: ../src/option.c:259
msgid "Special type of dialog for XEMBED"
-msgstr "Спеціальний режим діалога для вбудовування"
+msgstr "Особливий режим діалогу для вбудовування"
-#: ../src/option.c:265 ../src/option.c:929
+#: ../src/option.c:260 ../src/option.c:948 ../src/option.c:1046
msgid "KEY"
msgstr "КЛЮЧ"
-#: ../src/option.c:270
+#: ../src/option.c:265
msgid "Tab nubmer of this dialog"
-msgstr "Номер вкладки для цього діалога"
+msgstr "Номер вкладки для цього діалогу"
-#: ../src/option.c:277
+#: ../src/option.c:272
+msgid "XID of parent window"
+msgstr "Ідентифікатор батьківського вікна"
+
+#: ../src/option.c:278
msgid "Send SIGNAL to parent"
msgstr "Послати СИГНАЛ батьківському процесу"
-#: ../src/option.c:278
+#: ../src/option.c:279
msgid "SIGNAL"
msgstr "СИГНАЛ"
-#: ../src/option.c:283
+#: ../src/option.c:284
msgid "Print X Window Id to the stderr"
msgstr "Вивести ідентифікатор вікна на stderr"
-#: ../src/option.c:290
+#: ../src/option.c:291
msgid "Add path for search icons by name"
-msgstr "Додати каталог для пошуку зображень"
+msgstr "Додати каталог для пошуку іконок"
-#: ../src/option.c:291
+#: ../src/option.c:292
msgid "PATH"
msgstr "КАТАЛОГ"
-#: ../src/option.c:300
+#: ../src/option.c:301
msgid "Display calendar dialog"
-msgstr "Зобразити діалог для вибору дати"
+msgstr "Відобразити діалог для вибору дати"
-#: ../src/option.c:306
+#: ../src/option.c:307
msgid "Set the calendar day"
msgstr "Задати календарний день"
-#: ../src/option.c:307
+#: ../src/option.c:308
msgid "DAY"
msgstr "ДЕНЬ"
-#: ../src/option.c:312
+#: ../src/option.c:313
msgid "Set the calendar month"
msgstr "Задати календарний місяць"
-#: ../src/option.c:313
+#: ../src/option.c:314
msgid "MONTH"
msgstr "МІСЯЦЬ"
-#: ../src/option.c:318
+#: ../src/option.c:319
msgid "Set the calendar year"
msgstr "Задати календарний рік"
-#: ../src/option.c:319
+#: ../src/option.c:320
msgid "YEAR"
msgstr "РІК"
-#: ../src/option.c:324 ../src/option.c:613
+#: ../src/option.c:325 ../src/option.c:614
msgid "Set the format for the returned date"
msgstr "Задати формат відображення дати"
-#: ../src/option.c:325 ../src/option.c:614 ../src/option.c:721
+#: ../src/option.c:326 ../src/option.c:615 ../src/option.c:722
msgid "PATTERN"
msgstr "ШАБЛОН"
-#: ../src/option.c:330
+#: ../src/option.c:331
msgid "Set the filename with dates details"
msgstr "Задати назву файлу з описом дат"
-#: ../src/option.c:331 ../src/option.c:359 ../src/option.c:491
-#: ../src/option.c:1015 ../src/option.c:1240 ../src/option.c:1280
-#: ../src/option.c:1290
+#: ../src/option.c:332 ../src/option.c:366 ../src/option.c:504
+#: ../src/option.c:1062 ../src/option.c:1287 ../src/option.c:1361
+#: ../src/option.c:1371
msgid "FILENAME"
msgstr "НАЗВА ФАЙЛУ"
-#: ../src/option.c:340
+#: ../src/option.c:341
msgid "Display color selection dialog"
msgstr "Відобразити діалог для вибору кольору"
-#: ../src/option.c:346
+#: ../src/option.c:347
msgid "Alias for --color"
msgstr "Синонім для --color"
-#: ../src/option.c:352
+#: ../src/option.c:353
msgid "Set initial color value"
msgstr "Задати початковий колір"
-#: ../src/option.c:353 ../src/option.c:1198 ../src/option.c:1204
+#: ../src/option.c:354 ../src/option.c:1245 ../src/option.c:1251
+#: ../src/option.c:1305
msgid "COLOR"
msgstr "КОЛІР"
-#: ../src/option.c:358
+#: ../src/option.c:359
+msgid "Show system palette in color dialog"
+msgstr "Відобразити системну палітру"
+
+#: ../src/option.c:365
msgid "Set path to palette file. Default - "
msgstr "Задати шлях до файлу кольорів. Без назви - "
-#: ../src/option.c:364
+#: ../src/option.c:371
+msgid "Expand user palette"
+msgstr "Розкривати палітру користувача"
+
+#: ../src/option.c:377
msgid "Set output mode to MODE. Values are hex (default) or rgb"
msgstr ""
"Встановити режим вивода в РЕЖИМ. Значення - hex (за умовчанням) або rgb"
-#: ../src/option.c:365
+#: ../src/option.c:378
msgid "MODE"
msgstr "РЕЖИМ"
-#: ../src/option.c:370
+#: ../src/option.c:383
msgid "Use #rrrrggggbbbb format instead of #rrggbb"
msgstr "Використовувати формат #rrrrggggbbbb замість #rrggbb"
-#: ../src/option.c:376
+#: ../src/option.c:389
msgid "Add opacity to output color value"
msgstr "Додати прозорість до значення кольору"
-#: ../src/option.c:386
+#: ../src/option.c:399
msgid "Display drag-n-drop box"
msgstr "Відобразити діалог для перехоплення dnd"
-#: ../src/option.c:392
+#: ../src/option.c:405
msgid "Use dialog text as tooltip"
msgstr "Використовувати текст діалогу в якості підказки"
-#: ../src/option.c:398
+#: ../src/option.c:411
msgid "Set command for process d-n-d data"
msgstr "Команда для обробки отриманих даних"
-#: ../src/option.c:399 ../src/option.c:457 ../src/option.c:469
-#: ../src/option.c:852 ../src/option.c:963
+#: ../src/option.c:412 ../src/option.c:470 ../src/option.c:482
+#: ../src/option.c:871 ../src/option.c:982
msgid "CMD"
msgstr "КОМАНДА"
-#: ../src/option.c:408
+#: ../src/option.c:421
msgid "Display text entry or combo-box dialog"
msgstr "Відобразити діалог для вводу тексту або вибору варіанта"
-#: ../src/option.c:414
+#: ../src/option.c:427
msgid "Set the entry label"
msgstr "Задати мітку поля вводу"
-#: ../src/option.c:420
+#: ../src/option.c:433
msgid "Set the entry text"
msgstr "Задати текст для поля вводу"
-#: ../src/option.c:426
+#: ../src/option.c:439
msgid "Hide the entry text"
-msgstr "Сховати введений текст (Пароль)"
+msgstr "Приховати введений текст (Пароль)"
-#: ../src/option.c:432
+#: ../src/option.c:445
msgid "Use completion instead of combo-box"
msgstr "Використовувати автозаповнення замість списку значень"
-#: ../src/option.c:438
+#: ../src/option.c:451
msgid "Use spin button for text entry"
msgstr "Використовувати числове поле замість тексту"
-#: ../src/option.c:444
+#: ../src/option.c:457
msgid "Allow changes to text in combo-box"
msgstr "Дозволити змінювати текст у режимі вибору варіанта"
-#: ../src/option.c:450
+#: ../src/option.c:463
msgid "Set the left entry icon"
msgstr "Задати ліву іконку"
-#: ../src/option.c:456
+#: ../src/option.c:469
msgid "Set the left entry icon action"
msgstr "Дія для лівої іконки"
-#: ../src/option.c:462
+#: ../src/option.c:475
msgid "Set the right entry icon"
msgstr "Задати праву іконку"
-#: ../src/option.c:468
+#: ../src/option.c:481
msgid "Set the right entry icon action"
msgstr "Дія для правої іконки"
-#: ../src/option.c:478
+#: ../src/option.c:491
msgid "Display file selection dialog"
-msgstr "Відобразити діалог для вибору файлу"
+msgstr "Відобразити діалог для вибору файла"
-#: ../src/option.c:484
+#: ../src/option.c:497
msgid "Alias for --file"
msgstr "Синонім для --file"
-#: ../src/option.c:490
+#: ../src/option.c:503
msgid "Set the filename"
msgstr "Задати назву файлу"
-#: ../src/option.c:496
+#: ../src/option.c:509
msgid "Allow multiple files to be selected"
msgstr "Дозволити вибір декількох файлів"
-#: ../src/option.c:502
+#: ../src/option.c:515
msgid "Activate directory-only selection"
-msgstr "Активувати виділення тільки по каталогам"
+msgstr "Активувати виділення тільки по каталогах"
-#: ../src/option.c:508
+#: ../src/option.c:521
msgid "Activate save mode"
msgstr "Активувати режим зберігання"
-#: ../src/option.c:514 ../src/option.c:601 ../src/option.c:785
+#: ../src/option.c:527 ../src/option.c:602 ../src/option.c:792
msgid "Set output separator character"
-msgstr "Установити вихідний розділювач"
+msgstr "Встановити вихідний розділювач"
-#: ../src/option.c:515 ../src/option.c:602 ../src/option.c:608
-#: ../src/option.c:786 ../src/option.c:975 ../src/option.c:981
+#: ../src/option.c:528 ../src/option.c:603 ../src/option.c:609
+#: ../src/option.c:793 ../src/option.c:994 ../src/option.c:1000
msgid "SEPARATOR"
msgstr "РОЗДІЛЮВАЧ"
-#: ../src/option.c:520
+#: ../src/option.c:533
msgid "Confirm file selection if filename already exists"
msgstr "Підтвердити вибір файлу, якщо файл вже існує"
-#: ../src/option.c:521
+#: ../src/option.c:534
msgid "[TEXT]"
msgstr "[ТЕКСТ]"
-#: ../src/option.c:526
-msgid "Sets a filename filter"
-msgstr "Задати фільтр файлів"
-
-#: ../src/option.c:527
-msgid "NAME | PATTERN1 PATTERN2 ..."
-msgstr "НАЗВА | ШАБЛОН1 ШАБЛОН2 ..."
-
-#: ../src/option.c:532
-msgid "Enable preview"
-msgstr "Додати попередній перегляд"
-
-#: ../src/option.c:538 ../src/option.c:625 ../src/option.c:869
+#: ../src/option.c:539 ../src/option.c:626 ../src/option.c:888
msgid "Quote dialogs output"
msgstr "Виводити значення у лапках"
-#: ../src/option.c:548
+#: ../src/option.c:549
msgid "Display font selection dialog"
msgstr "Відобразити діалог для вибору шрифту"
-#: ../src/option.c:554
+#: ../src/option.c:555
msgid "Alias for --font"
msgstr "Синонім для --font"
-#: ../src/option.c:560
+#: ../src/option.c:561
msgid "Set initial font"
msgstr "Задати початковий шрифт"
-#: ../src/option.c:561 ../src/option.c:1039 ../src/option.c:1210
+#: ../src/option.c:562 ../src/option.c:1086 ../src/option.c:1257
msgid "FONTNAME"
msgstr "НАЗВА_ШРИФТУ"
-#: ../src/option.c:566
+#: ../src/option.c:567
msgid "Set preview text"
msgstr "Задати текст зразка"
-#: ../src/option.c:576
+#: ../src/option.c:577
msgid "Display form dialog"
msgstr "Відобразити діалог форми вводу"
-#: ../src/option.c:583
+#: ../src/option.c:584
msgid ""
"Add field to form (TYPE - H, RO, NUM, CHK, CB, CBE, CE, FL, SFL, MFL, DIR, "
"CDIR, MDIR, FN, DT, SCL, CLR, BTN, FBTN, LBL or TXT)"
@@ -625,95 +627,95 @@
"Додати поле до форми (Тип поля: Н, RO, NUM, CHK, CB, CBE, CE, FL, SFL, MFL, "
"DIR, CDIR, MDIR, FN, MFL, DT, SCL, CLR, BTN, FBTN, LBL або TXT)"
-#: ../src/option.c:584 ../src/option.c:886
+#: ../src/option.c:585 ../src/option.c:905
msgid "LABEL[:TYPE]"
msgstr "МІТКА[:ТИП]"
-#: ../src/option.c:589
+#: ../src/option.c:590
msgid "Set alignment of filed labels (left, center or right)"
msgstr "Задати вирівнювання міток полів (left, center або right)"
-#: ../src/option.c:595
+#: ../src/option.c:596
msgid "Set number of columns in form"
msgstr "Задати кількість стовпчиків у формі"
-#: ../src/option.c:607
+#: ../src/option.c:608
msgid "Set separator character for combobox or scale data"
msgstr "Задати розділювач для даних списку або числового поля"
-#: ../src/option.c:619
+#: ../src/option.c:620
msgid "Make form scrollable"
msgstr "Додати прокрутку до форми"
-#: ../src/option.c:631
+#: ../src/option.c:632
msgid "Order output fields by rows"
msgstr "Упорядкувати виведення по рядках"
-#: ../src/option.c:642
+#: ../src/option.c:643
msgid "Display HTML dialog"
msgstr "Відобразити HTML діалог"
-#: ../src/option.c:648
+#: ../src/option.c:649
msgid "Open specified location"
msgstr "Відкрити вказану адресу"
-#: ../src/option.c:649
+#: ../src/option.c:650
msgid "URI"
msgstr "URI"
-#: ../src/option.c:654
+#: ../src/option.c:655
msgid "Turn on browser mode"
msgstr "Ввімкнути режим браузеру"
-#: ../src/option.c:660
+#: ../src/option.c:661
msgid "Print clicked uri to stdout"
msgstr "Друкувати натиснуті зсилки"
-#: ../src/option.c:666
+#: ../src/option.c:667
msgid "Set mime type of input stream data"
msgstr "Задати тип mime для вхідних даних"
-#: ../src/option.c:667
+#: ../src/option.c:668
msgid "MIME"
msgstr "MIME"
-#: ../src/option.c:672
+#: ../src/option.c:673
msgid "Set encoding of input stream data"
msgstr "Задати кодування для вхідних даних"
-#: ../src/option.c:673
+#: ../src/option.c:674
msgid "ENCODING"
msgstr "КОДУВАННЯ"
-#: ../src/option.c:683
+#: ../src/option.c:684
msgid "Display icons box dialog"
msgstr "Відобразити діалог з іконками швидкого доступу"
-#: ../src/option.c:689
+#: ../src/option.c:690
msgid "Read data from .desktop files in specified directory"
msgstr "Читати дані з файлів .desktop у вказаному каталозі"
-#: ../src/option.c:690
+#: ../src/option.c:691
msgid "DIRECTORY"
msgstr "КАТАЛОГ"
-#: ../src/option.c:695
+#: ../src/option.c:696
msgid "Use compact (list) view"
msgstr "Використовувати компактний вигляд (список)"
-#: ../src/option.c:701
+#: ../src/option.c:702
msgid "Use GenericName field instead of Name for icon label"
msgstr "Використовувати поле GenericName замість Name для мітки"
-#: ../src/option.c:707
+#: ../src/option.c:708
msgid "Read data from stdin"
msgstr "Читати дані зі стандартного вводу"
-#: ../src/option.c:713
+#: ../src/option.c:714
msgid "Set the width of dialog items"
msgstr "Задати ширину елемента діалогу"
-#: ../src/option.c:720
+#: ../src/option.c:721
#, no-c-format
msgid ""
"Use specified pattern for launch command in terminal (default: xterm -e %s)"
@@ -721,66 +723,70 @@
"Використовувати вказаний шаблон для запуску в терміналі (без шаблону: xterm -"
"e %s)"
-#: ../src/option.c:726
+#: ../src/option.c:727
msgid "Sort items by name instead of filename"
msgstr "Сортувати по полю Назва замість назви файлу"
-#: ../src/option.c:732
+#: ../src/option.c:733
msgid "Sort items in descending order"
msgstr "Сортувати в порядку спадання"
-#: ../src/option.c:738
+#: ../src/option.c:739
msgid "Activate items by single click"
msgstr "Активувати елемент одним натисненням"
-#: ../src/option.c:748
+#: ../src/option.c:749
msgid "Display list dialog"
msgstr "Відобразити діалог зі списком"
-#: ../src/option.c:754
-msgid "Don't show column headers"
-msgstr "Не показувати заголовки стовпчиків"
-
-#: ../src/option.c:760
+#: ../src/option.c:755
msgid "Set the column header (TYPE - TEXT, NUM, FLT, CHK, RD, IMG, HD or TIP)"
msgstr ""
"Задати заголовок стовпчика (ТИП - TEXT, NUM, FLT, CHK, RD, IMG, HD або TIP)"
-#: ../src/option.c:761
+#: ../src/option.c:756
msgid "COLUMN[:TYPE]"
msgstr "СТОВПЧИК[:ТИП]"
-#: ../src/option.c:766
+#: ../src/option.c:761
msgid "Use checkboxes for first column"
msgstr "Використовувати відмітки для першого стовпчика"
-#: ../src/option.c:772
+#: ../src/option.c:767
msgid "Use radioboxes for first column"
msgstr "Використовувати перемикач для першого стовпчика"
-#: ../src/option.c:778
+#: ../src/option.c:773
+msgid "Don't show column headers"
+msgstr "Не показувати заголовки стовпчиків"
+
+#: ../src/option.c:779
msgid "Disable clickable column headers"
msgstr "Заборонити натискати на заголовок"
-#: ../src/option.c:791
+#: ../src/option.c:785
+msgid "Disable rules hints"
+msgstr "Заборонити розмальовку стрічок"
+
+#: ../src/option.c:798
msgid "Allow multiple rows to be selected"
msgstr "Дозволити вибір декількох рядків"
-#: ../src/option.c:797 ../src/option.c:1245
+#: ../src/option.c:804 ../src/option.c:1292
msgid "Allow changes to text"
msgstr "Дозволити змінювати текст"
-#: ../src/option.c:803
+#: ../src/option.c:810
msgid "Print all data from list"
msgstr "Виводити таблицю повністю"
-#: ../src/option.c:809
+#: ../src/option.c:816
msgid "Set ellipsize mode for text columns (TYPE - NONE, START, MIDDLE or END)"
msgstr ""
"Задати тип урізання для текстових стовпчиків (ТИП - NONE, START, MIDDLE або "
"END)"
-#: ../src/option.c:815
+#: ../src/option.c:822
msgid ""
"Print a specific column. By default or if 0 is specified will be printed all "
"columns"
@@ -788,15 +794,15 @@
"Виводити тільки вказаний стовпчик. Без вказівки або якщо стовпчик дорівнює "
"0, будуть виведені усі стовпчики"
-#: ../src/option.c:821
+#: ../src/option.c:828
msgid "Hide a specific column"
msgstr "Сховати вказаний стовпчик"
-#: ../src/option.c:827
+#: ../src/option.c:834
msgid "Set the column expandable by default. 0 sets all columns expandable"
msgstr "Задати стовпчик, який розширюється. 0 розширює всі стовпчики"
-#: ../src/option.c:833
+#: ../src/option.c:840
msgid ""
"Set the quick search column. Default is first column. Set it to 0 for "
"disable searching"
@@ -804,518 +810,597 @@
"Задати стовпчик швидкого пошуку. Без вказівки використовується перший "
"стовпчик. 0 забороняє пошук"
-#: ../src/option.c:839
+#: ../src/option.c:846
msgid "Set the tooltip column"
msgstr "Задати стовпчик підказок"
-#: ../src/option.c:845
+#: ../src/option.c:852
+msgid "Set the row separator column"
+msgstr "Задати стовпчик розділювача стрічок"
+
+#: ../src/option.c:858
+msgid "Set the row separator value"
+msgstr "Задати значення розділювача стрічок"
+
+#: ../src/option.c:864
msgid "Set the limit of rows in list"
msgstr "Задати кількість рядків у списку"
-#: ../src/option.c:851
+#: ../src/option.c:870
msgid "Set double-click action"
-msgstr "Дія для подвійного клацання мишки"
+msgstr "Дія для подвійного натискання мишки"
-#: ../src/option.c:857
+#: ../src/option.c:876
msgid "Use regex in search"
msgstr "Використовувати регулярні вирази в пошуку"
-#: ../src/option.c:863
+#: ../src/option.c:882
msgid "Listen for data on stdin in addition to command-line"
msgstr "Отримувати дані з потоку вводу додатково до командного рядка"
-#: ../src/option.c:879
+#: ../src/option.c:898
msgid "Display multi progress bars dialog"
msgstr "Відобразити діалог з декількома індикаторами виконання"
-#: ../src/option.c:885
+#: ../src/option.c:904
msgid "Add the progress bar (TYPE - NORM, RTL or PULSE)"
msgstr "Додати індикатор виконання (ТИП - NORM, RTL або PULSE)"
-#: ../src/option.c:891
+#: ../src/option.c:910
msgid "Show vertical bars"
msgstr "Відобразити вертикальні індикатори"
-#: ../src/option.c:897
+#: ../src/option.c:916
msgid "Set alignment of bar labels (left, center or right)"
msgstr "Задати вирівнювання міток індикаторів (left, center або right)"
-#: ../src/option.c:904
+#: ../src/option.c:923
#, no-c-format
msgid "Dismiss the dialog when 100% of all bars has been reached"
msgstr "Закрити діалог по досягненні 100% усіма індикаторами"
-#: ../src/option.c:911 ../src/option.c:1080
+#: ../src/option.c:930 ../src/option.c:1127
msgid "Kill parent process if cancel button is pressed"
msgstr "Завершити батьківський процес, якщо натиснута кнопка відміни"
-#: ../src/option.c:922
+#: ../src/option.c:941
msgid "Display notebook dialog"
msgstr "Відобразити діалог із вкладинками"
-#: ../src/option.c:928
+#: ../src/option.c:947 ../src/option.c:1045
msgid "Identifier of embedded dialogs"
msgstr "Ідентифікатор діалогів що вбудовуваються"
-#: ../src/option.c:934
+#: ../src/option.c:953
msgid "Add a tab to notebook"
msgstr "Додати вкладку"
-#: ../src/option.c:935
+#: ../src/option.c:954
msgid "LABEL"
msgstr "МІТКА"
-#: ../src/option.c:940
+#: ../src/option.c:959
msgid "Set position of a notebook tabs (top, bottom, left or right)"
msgstr "Задати позицію ярлика вкладки (top, bottom, left, або right)"
-#: ../src/option.c:946
+#: ../src/option.c:965
msgid "Set tab borders"
-msgstr "Задати краї вкладок"
+msgstr "Задати межі вкладок"
-#: ../src/option.c:956
+#: ../src/option.c:975
msgid "Display notification"
msgstr "Відобразити діалог повідомлень"
-#: ../src/option.c:962
+#: ../src/option.c:981
msgid "Set left-click action"
-msgstr "Дія для лівого клацання мишки"
+msgstr "Дія для лівої кнопки мишки"
-#: ../src/option.c:968
+#: ../src/option.c:987
msgid "Listen for commands on stdin"
msgstr "Читати команди зі стандартного вводу"
-#: ../src/option.c:974
+#: ../src/option.c:993
msgid "Set separator character for menu values"
msgstr "Встановити розділювач для значень меню"
-#: ../src/option.c:980
+#: ../src/option.c:999
msgid "Set separator character for menu items"
msgstr "Встановити розділювач для елементів меню"
-#: ../src/option.c:986
+#: ../src/option.c:1005
msgid "Set initial popup menu"
msgstr "Задати початкове меню"
-#: ../src/option.c:987
+#: ../src/option.c:1006
msgid "STRING"
msgstr "РЯДОК"
-#: ../src/option.c:992
+#: ../src/option.c:1011
msgid "Disable exit on middle click"
msgstr "Заборонити вихід середньою кнопкою мишки"
-#: ../src/option.c:998
+#: ../src/option.c:1017
msgid "Doesn't show icon at startup"
msgstr "Не показувати іконку при старті"
-#: ../src/option.c:1008
+#: ../src/option.c:1027
+msgid "Display paned dialog"
+msgstr "Відобразити діалог з панелями"
+
+#: ../src/option.c:1033
+msgid "Set orientation (TYPE - hor[izontal] or vert[ical])"
+msgstr "Задати оріентицію (ТИП - hor[izontal] або vert[ical])"
+
+#: ../src/option.c:1039
+msgid "Set initial splitter position"
+msgstr "Задати початкову позицію розділювача"
+
+#: ../src/option.c:1055
msgid "Display printing dialog"
msgstr "Відобразити діалог друку"
-#: ../src/option.c:1014
+#: ../src/option.c:1061
msgid "Source filename"
msgstr "Назва файлу"
-#: ../src/option.c:1020
+#: ../src/option.c:1067
msgid "Set source type (TYPE - TEXT, IMAGE or RAW)"
msgstr "Задати тип даних (ТИП - TEXT, IMAGE або RAW)"
-#: ../src/option.c:1026
+#: ../src/option.c:1073
msgid "Add headers to page"
msgstr "Додати колонтитули до сторінки"
-#: ../src/option.c:1032
+#: ../src/option.c:1079
msgid "Enable preview in print dialog"
msgstr "Додати попередній перегляд до діалогу друку"
-#: ../src/option.c:1038 ../src/option.c:1209
+#: ../src/option.c:1085 ../src/option.c:1256
msgid "Use specified font"
msgstr "Використовувати вказаний шрифт"
-#: ../src/option.c:1048
+#: ../src/option.c:1095
msgid "Display progress indication dialog"
msgstr "Відобразити діалог прогресу"
-#: ../src/option.c:1054
+#: ../src/option.c:1101
msgid "Set progress text"
msgstr "Показувати текст на індикаторі"
-#: ../src/option.c:1060
+#: ../src/option.c:1107
msgid "Set initial percentage"
msgstr "Задати початковий процент"
-#: ../src/option.c:1061
+#: ../src/option.c:1108
msgid "PERCENTAGE"
msgstr "ВІДСОТКИ"
-#: ../src/option.c:1066
+#: ../src/option.c:1113
msgid "Pulsate progress bar"
msgstr "Пульсовий індикатор виконання"
-#: ../src/option.c:1073
+#: ../src/option.c:1120
#, no-c-format
msgid "Dismiss the dialog when 100% has been reached"
msgstr "Закрити діалог по досягненні 100%"
-#: ../src/option.c:1087
+#: ../src/option.c:1134
msgid "Right-To-Left progress bar direction"
-msgstr "Напрямок індикатору Справа Наліво"
+msgstr "Напрямок індикатору Справа-Наліво"
-#: ../src/option.c:1093
+#: ../src/option.c:1140
msgid "Show log window"
msgstr "Відобразити вікно журналу"
-#: ../src/option.c:1099
+#: ../src/option.c:1146
msgid "Expand log window"
msgstr "Розгорнути вікно журналу"
-#: ../src/option.c:1105
+#: ../src/option.c:1152
msgid "Place log window above progress bar"
msgstr "Розмістити вікно жуналу поверх індикатора виконання"
-#: ../src/option.c:1111
+#: ../src/option.c:1158
msgid "Height of log window"
msgstr "Висота вікна журналу"
-#: ../src/option.c:1121
+#: ../src/option.c:1168
msgid "Display scale dialog"
msgstr "Відобразити діалог масштабу"
-#: ../src/option.c:1127
+#: ../src/option.c:1174
msgid "Set initial value"
msgstr "Задати початкове значення"
-#: ../src/option.c:1128 ../src/option.c:1134 ../src/option.c:1140
-#: ../src/option.c:1146 ../src/option.c:1152
+#: ../src/option.c:1175 ../src/option.c:1181 ../src/option.c:1187
+#: ../src/option.c:1193 ../src/option.c:1199
msgid "VALUE"
msgstr "ЗНАЧЕННЯ"
-#: ../src/option.c:1133
+#: ../src/option.c:1180
msgid "Set minimum value"
msgstr "Задати мінімальне значення"
-#: ../src/option.c:1139
+#: ../src/option.c:1186
msgid "Set maximum value"
msgstr "Задати максимальне значення"
-#: ../src/option.c:1145
+#: ../src/option.c:1192
msgid "Set step size"
msgstr "Задати крок"
-#: ../src/option.c:1151
+#: ../src/option.c:1198
msgid "Set paging size"
msgstr "Задати крок сторінки"
-#: ../src/option.c:1157
+#: ../src/option.c:1204
msgid "Print partial values"
msgstr "Виводити часткові значення"
-#: ../src/option.c:1163
+#: ../src/option.c:1210
msgid "Hide value"
msgstr "Сховати значення"
-#: ../src/option.c:1169
+#: ../src/option.c:1216
msgid "Show vertical scale"
msgstr "Відобразити вертикальну шкалу"
-#: ../src/option.c:1175
+#: ../src/option.c:1222
msgid "Invert direction"
-msgstr "Інвертувати напрямок"
+msgstr "Зворотній напрямок"
-#: ../src/option.c:1181
+#: ../src/option.c:1228
msgid "Add mark to scale (may be used multiple times)"
msgstr "Додати мітку шкали (може використовуватись декілька разів)"
-#: ../src/option.c:1182
+#: ../src/option.c:1229
msgid "NAME:VALUE"
msgstr "НАЗВА:ЗНАЧЕННЯ"
-#: ../src/option.c:1191
+#: ../src/option.c:1238
msgid "Display text information dialog"
msgstr "Відобразити діалог з текстовою інформацією"
-#: ../src/option.c:1197
+#: ../src/option.c:1244
msgid "Use specified color for text"
msgstr "Використовувати вказаний колір тексту"
-#: ../src/option.c:1203
+#: ../src/option.c:1250
msgid "Use specified color for background"
msgstr "Використовувати вказаний колір фону"
-#: ../src/option.c:1215
+#: ../src/option.c:1262
msgid "Enable text wrapping"
msgstr "Дозволити перенос тексту"
-#: ../src/option.c:1221
+#: ../src/option.c:1268
msgid "Set justification (TYPE - left, right, center or fill)"
msgstr "Встановити вирівнювання (ТИП - left, right, center або fill)"
-#: ../src/option.c:1227
+#: ../src/option.c:1274
msgid "Set text margins"
msgstr "Встановити відступи"
-#: ../src/option.c:1228
+#: ../src/option.c:1275
msgid "SIZE"
msgstr "РОЗМІР"
-#: ../src/option.c:1233
+#: ../src/option.c:1280
msgid "Autoscroll to end of text"
msgstr "Автопрокрутка в кінець тексту"
-#: ../src/option.c:1239
+#: ../src/option.c:1286
msgid "Open file"
msgstr "Відкрити файл"
-#: ../src/option.c:1251
+#: ../src/option.c:1298
msgid "Make URI clickable"
msgstr "Зробити посилання активними"
-#: ../src/option.c:1257
+#: ../src/option.c:1304
+msgid "Use specified color for links"
+msgstr "Використовувати вказаний колір для посилань"
+
+#: ../src/option.c:1310
msgid "Listen for data on stdin in addition to file"
msgstr "Отримувати дані з потоку вводу додатково до файлу"
-#: ../src/option.c:1267
+#: ../src/option.c:1320
+msgid "Sets a filename filter"
+msgstr "Задати фільтр файлів по масці"
+
+#: ../src/option.c:1321
+msgid "NAME | PATTERN1 PATTERN2 ..."
+msgstr "НАЗВА | ШАБЛОН1 ШАБЛОН2 ..."
+
+#: ../src/option.c:1326
+msgid "Sets a mime-type filter"
+msgstr "Задати фільтр файлів по типу mime"
+
+#: ../src/option.c:1327
+msgid "NAME | MIME1 MIME2 ..."
+msgstr "НАЗВА | ТИП1 ТИП2 ..."
+
+#: ../src/option.c:1332
+msgid "Add filter for images"
+msgstr "Додати фільтр для зображень"
+
+#: ../src/option.c:1333
+msgid "NAME"
+msgstr "ІМ'Я"
+
+#: ../src/option.c:1338
+msgid "Enable preview"
+msgstr "Додати попередній перегляд"
+
+#: ../src/option.c:1348
msgid "Show about dialog"
msgstr "Показати діалог 'Про програму'"
-#: ../src/option.c:1273
+#: ../src/option.c:1354
msgid "Print version"
msgstr "Вивести версію"
-#: ../src/option.c:1279
+#: ../src/option.c:1360
msgid "Load additional GTK settings from file"
msgstr "Завантажити додаткові налаштування GTK з файлу"
-#: ../src/option.c:1289
+#: ../src/option.c:1370
msgid "Load extra arguments from file"
msgstr "Завантажити додаткові аргументи з файлу"
-#: ../src/option.c:1334 ../src/option.c:1562
+#: ../src/option.c:1415 ../src/option.c:1708
#, c-format
msgid "Unknown align type: %s\n"
msgstr "Невідомий тип вирівнювання: %s\n"
-#: ../src/option.c:1491
+#: ../src/option.c:1572
#, c-format
msgid "Mark %s doesn't have a value\n"
msgstr "Помітці %s не надано значення\n"
-#: ../src/option.c:1528
+#: ../src/option.c:1609
+msgid "Images"
+msgstr "Зображення"
+
+#: ../src/option.c:1674
#, c-format
msgid "Unknown color mode: %s\n"
-msgstr "Невідомий режим коліру: '%s'\n"
+msgstr "Невідомий режим кольору: '%s'\n"
-#: ../src/option.c:1547
+#: ../src/option.c:1693
#, c-format
msgid "Unknown buttons layout type: %s\n"
msgstr "Невідомий тип розміщення кнопок: %s\n"
-#: ../src/option.c:1579
+#: ../src/option.c:1725
#, c-format
msgid "Unknown justification type: %s\n"
msgstr "Невідомий тип вирівнювання: %s\n"
-#: ../src/option.c:1596
+#: ../src/option.c:1742
#, c-format
msgid "Unknown tab position type: %s\n"
msgstr "Невідомий тип позиції вкладки: %s\n"
-#: ../src/option.c:1632
+#: ../src/option.c:1778
#, c-format
msgid "Unknown ellipsize type: %s\n"
msgstr "Невідомий тип урізання: %s\n"
-#: ../src/option.c:1647
+#: ../src/option.c:1791
+#, c-format
+msgid "Unknown orientation: %s\n"
+msgstr "Невідома орієнтація: %s\n"
+
+#: ../src/option.c:1806
#, c-format
msgid "Unknown source type: %s\n"
msgstr "Невідомий тип даних: %s\n"
-#: ../src/option.c:1658
+#: ../src/option.c:1817
msgid "Progress log"
msgstr "Вікно журналу"
-#: ../src/option.c:1768
+#: ../src/option.c:1925
#, c-format
msgid "Unknown signal: %s\n"
msgstr "Невідомий сигнал: %s\n"
-#: ../src/option.c:1920
+#: ../src/option.c:2081
msgid "File exist. Overwrite?"
msgstr "Файл існує. Перезаписати?"
-#: ../src/option.c:2026
+#: ../src/option.c:2198
msgid "- Yet another dialoging program"
msgstr "- Програма для відображення діалогів"
#. Adds general option entries
-#: ../src/option.c:2030
+#: ../src/option.c:2202
msgid "General options"
msgstr "Основні параметри"
-#: ../src/option.c:2030
+#: ../src/option.c:2202
msgid "Show general options"
msgstr "Показувати основні параметри"
#. Adds calendar option entries
-#: ../src/option.c:2036
+#: ../src/option.c:2208
msgid "Calendar options"
msgstr "Параметри календаря"
-#: ../src/option.c:2036
+#: ../src/option.c:2208
msgid "Show calendar options"
msgstr "Показувати параметри календаря"
#. Adds color option entries
-#: ../src/option.c:2042
+#: ../src/option.c:2214
msgid "Color selection options"
msgstr "Параметри діалогу вибору кольору"
-#: ../src/option.c:2042
+#: ../src/option.c:2214
msgid "Show color selection options"
msgstr "Показувати параметри діалогу вибору кольору"
#. Adds dnd option entries
-#: ../src/option.c:2048
+#: ../src/option.c:2220
msgid "DND options"
msgstr "Параметри DND"
-#: ../src/option.c:2048
+#: ../src/option.c:2220
msgid "Show drag-n-drop options"
msgstr "Показувати параметри dnd"
#. Adds entry option entries
-#: ../src/option.c:2054
+#: ../src/option.c:2226
msgid "Text entry options"
msgstr "Параметри вводу тексту"
-#: ../src/option.c:2054
+#: ../src/option.c:2226
msgid "Show text entry options"
msgstr "Показувати параметри вводу тексту"
#. Adds file selection option entries
-#: ../src/option.c:2060
+#: ../src/option.c:2232
msgid "File selection options"
msgstr "Параметри діалогу вибору файлів"
-#: ../src/option.c:2060
+#: ../src/option.c:2232
msgid "Show file selection options"
msgstr "Показувати параметри діалогу вибору файлів"
#. Add font selection option entries
-#: ../src/option.c:2066
+#: ../src/option.c:2238
msgid "Font selection options"
msgstr "Параметри діалогу вибору шрифту"
-#: ../src/option.c:2066
+#: ../src/option.c:2238
msgid "Show font selection options"
msgstr "Показувати параметри діалоги вибору шрифту"
#. Add form option entries
-#: ../src/option.c:2072
+#: ../src/option.c:2244
msgid "Form options"
msgstr "Параметри діалогу форми"
-#: ../src/option.c:2072
+#: ../src/option.c:2244
msgid "Show form options"
msgstr "Показувати параметри діалогу форми"
#. Add html options entries
-#: ../src/option.c:2079
+#: ../src/option.c:2251
msgid "HTML options"
msgstr "Параметри HTML діалогу"
-#: ../src/option.c:2079
+#: ../src/option.c:2251
msgid "Show HTML options"
msgstr "Показувати параметри HTML діалогу"
#. Add icons option entries
-#: ../src/option.c:2086
+#: ../src/option.c:2258
msgid "Icons box options"
msgstr "Параметри діалогу іконок"
-#: ../src/option.c:2086
+#: ../src/option.c:2258
msgid "Show icons box options"
msgstr "Показувати параметри діалогу іконок швидкого доступу"
#. Adds list option entries
-#: ../src/option.c:2092
+#: ../src/option.c:2264
msgid "List options"
msgstr "Параметри списку"
-#: ../src/option.c:2092
+#: ../src/option.c:2264
msgid "Show list options"
msgstr "Показувати параметри списку"
#. Adds multi progress option entries
-#: ../src/option.c:2098
+#: ../src/option.c:2270
msgid "Multi progress bars options"
msgstr "Параметри діалогу з декількома індикаторами"
-#: ../src/option.c:2099
+#: ../src/option.c:2271
msgid "Show multi progress bars options"
msgstr "Показувати параметри діалогу з декількома індикаторами"
#. Adds notebook option entries
-#: ../src/option.c:2105
+#: ../src/option.c:2277
msgid "Notebook options"
msgstr "Параметри діалогу з вкладками"
-#: ../src/option.c:2105
+#: ../src/option.c:2277
msgid "Show notebook dialog options"
msgstr "Показувати параметри діалогу з вкладками"
#. Adds notification option entries
-#: ../src/option.c:2111
+#: ../src/option.c:2283
msgid "Notification icon options"
msgstr "Параметри іконки повідомлень"
-#: ../src/option.c:2112
+#: ../src/option.c:2284
msgid "Show notification icon options"
msgstr "Показувати параметри іконки повідомлень"
+#. Adds paned option entries
+#: ../src/option.c:2290
+msgid "Paned dialog options"
+msgstr "Параметри діалогу з панелями"
+
+#: ../src/option.c:2290
+msgid "Show paned dialog options"
+msgstr "Показувати параметри діалогу з панелями"
+
#. Adds print option entries
-#: ../src/option.c:2118
+#: ../src/option.c:2296
msgid "Print dialog options"
msgstr "Параметри діалогу друку"
-#: ../src/option.c:2118
+#: ../src/option.c:2296
msgid "Show print dialog options"
msgstr "Показувати параметри діалогу друку"
#. Adds progress option entries
-#: ../src/option.c:2124
+#: ../src/option.c:2302
msgid "Progress options"
msgstr "Параметри прогресу"
-#: ../src/option.c:2124
+#: ../src/option.c:2302
msgid "Show progress options"
msgstr "Показувати параметри прогресу"
#. Adds scale option entries
-#: ../src/option.c:2130
+#: ../src/option.c:2308
msgid "Scale options"
msgstr "Параметри масштабу"
-#: ../src/option.c:2130
+#: ../src/option.c:2308
msgid "Show scale options"
msgstr "Показувати параметри масштабу"
#. Adds text option entries
-#: ../src/option.c:2136
+#: ../src/option.c:2314
msgid "Text information options"
msgstr "Параметри текстової інформації"
-#: ../src/option.c:2136
+#: ../src/option.c:2314
msgid "Show text information options"
msgstr "Показувати параметри текстової інформації"
+#. Adds file filters option entries
+#: ../src/option.c:2320
+msgid "File filter options"
+msgstr "Параметри фільтрів для діалогу вибору файлів"
+
+#: ../src/option.c:2320
+msgid "Show file filter options"
+msgstr "Показувати параметри фільтрів для діалогу вибору файлів"
+
#. Adds miscellaneous option entries
-#: ../src/option.c:2142
+#: ../src/option.c:2326
msgid "Miscellaneous options"
msgstr "Додаткові параметри"
-#: ../src/option.c:2142
+#: ../src/option.c:2326
msgid "Show miscellaneous options"
msgstr "Показувати додаткові параметри"
@@ -1357,7 +1442,7 @@
#: ../src/color.c:65
#, c-format
msgid "Can't open file %s: %s\n"
-msgstr "Не можу відкрити файлу %s: %s\n"
+msgstr "Не можу відкрити файл %s: %s\n"
#. create expander
#: ../src/color.c:150
@@ -1379,7 +1464,7 @@
#: ../src/browser.c:132
msgid "scalable "
-msgstr "масштабовний "
+msgstr "масштабований "
#: ../src/browser.c:142
msgid "built-in"
@@ -1388,11 +1473,11 @@
#. initialize GTK+ and parse the command line arguments
#: ../src/browser.c:200
msgid "- Icon browser"
-msgstr "- Переглядач іконок"
+msgstr "- Навігатор іконок"
#: ../src/browser.c:213
msgid "Icon browser"
-msgstr "Переглядач іконок"
+msgstr "Навігатор іконок"
#: ../src/browser.c:247
msgid "Name:"
@@ -1416,7 +1501,7 @@
#: ../data/yad-icon-browser.desktop.in.h:1
msgid "Icon Browser"
-msgstr "Переглядач іконок"
+msgstr "Павігатор іконок"
#: ../data/yad-icon-browser.desktop.in.h:2
msgid "Inspect GTK Icon Theme"
diff -Nru yad-0.28.2/README.md yad-0.31.0/README.md
--- yad-0.28.2/README.md 2015-07-15 17:55:52.000000000 +0000
+++ yad-0.31.0/README.md 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-# yad
diff -Nru yad-0.28.2/src/about.c yad-0.31.0/src/about.c
--- yad-0.28.2/src/about.c 2015-07-15 17:55:52.000000000 +0000
+++ yad-0.31.0/src/about.c 2015-09-04 11:28:56.000000000 +0000
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with YAD. If not, see .
*
- * Copyright (C) 2008-2014, Victor Ananjevsky
+ * Copyright (C) 2008-2015, Victor Ananjevsky
*/
#include "yad.h"
@@ -54,14 +54,13 @@
g_object_set (G_OBJECT (dialog),
"name", PACKAGE_NAME,
"version", PACKAGE_VERSION,
- "copyright",
- "Copyright \xc2\xa9 2008-2014 Victor Ananjevsky ",
+ "copyright", "Copyright \xc2\xa9 2008-2015 Victor Ananjevsky ",
"comments", comments,
"authors", authors,
"website", PACKAGE_URL,
"translator-credits", translators,
- "wrap-license", TRUE,
- "license", license,
+ "wrap-license", TRUE,
+ "license", license,
"logo-icon-name", "yad",
NULL);
diff -Nru yad-0.28.2/src/browser.c yad-0.31.0/src/browser.c
--- yad-0.28.2/src/browser.c 2015-07-15 17:55:52.000000000 +0000
+++ yad-0.31.0/src/browser.c 2015-09-04 10:24:50.000000000 +0000
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with YAD. If not, see .
*
- * Copyright (C) 2010-2014, Victor Ananjevsky
+ * Copyright (C) 2010-2015, Victor Ananjevsky
*/
#include
diff -Nru yad-0.28.2/src/calendar.c yad-0.31.0/src/calendar.c
--- yad-0.28.2/src/calendar.c 2015-07-15 17:55:52.000000000 +0000
+++ yad-0.31.0/src/calendar.c 2015-09-04 10:24:50.000000000 +0000
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with YAD. If not, see .
*
- * Copyright (C) 2008-2014, Victor Ananjevsky
+ * Copyright (C) 2008-2015, Victor Ananjevsky
*/
#include
diff -Nru yad-0.28.2/src/color.c yad-0.31.0/src/color.c
--- yad-0.28.2/src/color.c 2015-07-15 17:55:52.000000000 +0000
+++ yad-0.31.0/src/color.c 2015-09-09 11:13:45.000000000 +0000
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with YAD. If not, see .
*
- * Copyright (C) 2008-2014, Victor Ananjevsky
+ * Copyright (C) 2008-2015, Victor Ananjevsky
*/
#include
@@ -125,7 +125,7 @@
color = gtk_color_selection_new ();
gtk_widget_set_name (color, "yad-color-widget");
- gtk_color_selection_set_has_palette (GTK_COLOR_SELECTION (color), settings.show_gtk_palette);
+ gtk_color_selection_set_has_palette (GTK_COLOR_SELECTION (color), options.color_data.gtk_palette);
if (options.color_data.init_color)
{
GdkColor c;
@@ -148,7 +148,7 @@
/* create expander */
exp = gtk_expander_new (_("Palette"));
- gtk_expander_set_expanded (GTK_EXPANDER (exp), settings.expand_palette);
+ gtk_expander_set_expanded (GTK_EXPANDER (exp), options.color_data.expand_palette);
gtk_container_set_border_width (GTK_CONTAINER (exp), 5);
gtk_box_pack_start (GTK_BOX (w), exp, TRUE, TRUE, 2);
@@ -156,11 +156,11 @@
sw = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), GTK_SHADOW_ETCHED_IN);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ gtk_widget_set_size_request (sw, -1, 75);
gtk_container_add (GTK_CONTAINER (exp), sw);
list = gtk_tree_view_new_with_model (model);
gtk_widget_set_name (list, "yad-color-palette");
- gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (list), settings.rules_hint);
g_object_unref (model);
gtk_container_add (GTK_CONTAINER (sw), list);
@@ -234,11 +234,10 @@
break;
case YAD_COLOR_RGB:
if (options.color_data.alpha)
- g_print ("rgba(%.1f, %.1f, %.1f, %.1f)\n", (double) c.red / 255.0, (double) c.green / 255.0,
+ g_print ("rgba(%.1f, %.1f, %.1f, %.1f)\n", (double) c.red / 255.0, (double) c.green / 255.0,
(double) c.blue / 255.0, (double) alpha / 255 / 255);
else
- g_print ("rgb(%.1f, %.1f, %.1f)\n", (double) c.red / 255.0,
- (double) c.green / 255.0, (double) c.blue / 255.0);
+ g_print ("rgb(%.1f, %.1f, %.1f)\n", (double) c.red / 255.0, (double) c.green / 255.0, (double) c.blue / 255.0);
break;
}
}
diff -Nru yad-0.28.2/src/dnd.c yad-0.31.0/src/dnd.c
--- yad-0.28.2/src/dnd.c 2015-07-15 17:55:52.000000000 +0000
+++ yad-0.31.0/src/dnd.c 2015-09-04 10:24:50.000000000 +0000
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with YAD. If not, see .
*
- * Copyright (C) 2008-2014, Victor Ananjevsky
+ * Copyright (C) 2008-2015, Victor Ananjevsky
*/
#include
@@ -66,7 +66,7 @@
if (options.common_data.command)
{
gchar *action, *arg;
-
+
arg = g_shell_quote (dstr);
action = g_strdup_printf ("%s %s", options.common_data.command, arg);
g_free (arg);
diff -Nru yad-0.28.2/src/entry.c yad-0.31.0/src/entry.c
--- yad-0.28.2/src/entry.c 2015-07-15 17:55:52.000000000 +0000
+++ yad-0.31.0/src/entry.c 2015-09-04 10:24:50.000000000 +0000
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with YAD. If not, see .
*
- * Copyright (C) 2008-2014, Victor Ananjevsky
+ * Copyright (C) 2008-2015, Victor Ananjevsky
*/
#include
@@ -56,12 +56,12 @@
switch (pos)
{
- case GTK_ENTRY_ICON_PRIMARY:
- cmd = options.entry_data.licon_action;
- break;
- case GTK_ENTRY_ICON_SECONDARY:
- cmd = options.entry_data.ricon_action;
- break;
+ case GTK_ENTRY_ICON_PRIMARY:
+ cmd = options.entry_data.licon_action;
+ break;
+ case GTK_ENTRY_ICON_SECONDARY:
+ cmd = options.entry_data.ricon_action;
+ break;
}
if (cmd)
@@ -228,7 +228,8 @@
is_combo = TRUE;
}
- i = 0; active = -1;
+ i = 0;
+ active = -1;
while (options.extra_data[i] != NULL)
{
if (options.entry_data.entry_text &&
diff -Nru yad-0.28.2/src/file.c yad-0.31.0/src/file.c
--- yad-0.28.2/src/file.c 2015-07-15 17:55:52.000000000 +0000
+++ yad-0.31.0/src/file.c 2015-09-10 07:47:06.000000000 +0000
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with YAD. If not, see .
*
- * Copyright (C) 2008-2014, Victor Ananjevsky
+ * Copyright (C) 2008-2015, Victor Ananjevsky
*/
#include
@@ -23,9 +23,6 @@
static GtkWidget *filechooser;
-static gchar *normal_path;
-static gchar *large_path;
-
static void
file_activated_cb (GtkFileChooser * chooser, gpointer data)
{
@@ -33,65 +30,6 @@
gtk_dialog_response (GTK_DIALOG (data), YAD_RESPONSE_OK);
}
-static void
-update_preview_cb (GtkFileChooser * chooser, gpointer data)
-{
- gchar *uri;
- GtkWidget *p = GTK_WIDGET (data);
-
- uri = gtk_file_chooser_get_preview_uri (chooser);
- if (uri)
- {
- gchar *file;
- GChecksum *chs;
- GdkPixbuf *pb;
-
- chs = g_checksum_new (G_CHECKSUM_MD5);
- g_checksum_update (chs, uri, -1);
- /* first try to get preview from large thumbnail */
- file = g_strdup_printf ("%s/%s.png", large_path, g_checksum_get_string (chs));
- if (g_file_test (file, G_FILE_TEST_EXISTS))
- pb = gdk_pixbuf_new_from_file (file, NULL);
- else
- {
- /* try to get preview from normal thumbnail */
- g_free (file);
- file = g_strdup_printf ("%s/%s.png", normal_path, g_checksum_get_string (chs));
- if (g_file_test (file, G_FILE_TEST_EXISTS))
- pb = gdk_pixbuf_new_from_file (file, NULL);
- else
- {
- /* try to create it */
- g_free (file);
- file = g_filename_from_uri (uri, NULL, NULL);
- pb = gdk_pixbuf_new_from_file_at_size (file, 256, 256, NULL);
- g_free (file);
- if (pb)
- {
- /* save thumbnail */
- g_mkdir_with_parents (large_path, 0755);
- file = g_strdup_printf ("%s/%s.png", large_path, g_checksum_get_string (chs));
- gdk_pixbuf_save (pb, file, "png", NULL, NULL);
- }
- }
- }
- g_checksum_free (chs);
-
- if (pb)
- {
- gtk_image_set_from_pixbuf (GTK_IMAGE (p), pb);
- g_object_unref (pb);
- gtk_file_chooser_set_preview_widget_active (chooser, TRUE);
- }
- else
- gtk_file_chooser_set_preview_widget_active (chooser, FALSE);
-
- g_free (uri);
- }
- else
- gtk_file_chooser_set_preview_widget_active (chooser, FALSE);
-}
-
void
confirm_overwrite_cb (GtkDialog * dlg, gint id, gpointer data)
{
@@ -125,6 +63,7 @@
{
GtkWidget *w;
gchar *dir, *basename;
+ GList *filt;
GtkFileChooserAction action = GTK_FILE_CHOOSER_ACTION_OPEN;
if (options.file_data.directory)
@@ -167,65 +106,17 @@
if (options.common_data.multi)
gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (w), TRUE);
+ /* add preview */
if (options.common_data.preview)
{
- /* add widget */
GtkWidget *p = gtk_image_new ();
gtk_file_chooser_set_preview_widget (GTK_FILE_CHOOSER (w), p);
- g_signal_connect (w, "update-preview", G_CALLBACK (update_preview_cb), p);
- /* init thumbnails path */
- normal_path = g_build_filename (g_get_user_cache_dir (), "thumbnails", "normal", NULL);
- large_path = g_build_filename (g_get_user_cache_dir (), "thumbnails", "large", NULL);
+ g_signal_connect (w, "update-preview", G_CALLBACK (update_preview), p);
}
- if (options.file_data.filter)
- {
- /* Filter format: Executables | *.exe *.bat *.com */
- gint filter_i;
-
- for (filter_i = 0; options.file_data.filter[filter_i]; filter_i++)
- {
- GtkFileFilter *filter = gtk_file_filter_new ();
- gchar *filter_str = options.file_data.filter[filter_i];
- gchar **pattern, **patterns;
- gchar *name = NULL;
- gint i;
-
- /* Set name */
- for (i = 0; filter_str[i] != '\0'; i++)
- {
- if (filter_str[i] == '|')
- break;
- }
-
- if (filter_str[i] == '|')
- name = g_strstrip (g_strndup (filter_str, i));
-
- if (name)
- {
- gtk_file_filter_set_name (filter, name);
-
- /* Point i to the right position for split */
- for (++i; filter_str[i] == ' '; i++);
- }
- else
- {
- gtk_file_filter_set_name (filter, filter_str);
- i = 0;
- }
-
- /* Get patterns */
- patterns = g_strsplit_set (filter_str + i, " ", -1);
-
- for (pattern = patterns; *pattern; pattern++)
- gtk_file_filter_add_pattern (filter, *pattern);
-
- g_free (name);
- g_strfreev (patterns);
-
- gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (w), filter);
- }
- }
+ /* add filters */
+ for (filt = options.common_data.filters; filt; filt = filt->next)
+ gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (w), GTK_FILE_FILTER (filt->data));
g_signal_connect (w, "file-activated", G_CALLBACK (file_activated_cb), dlg);
diff -Nru yad-0.28.2/src/font.c yad-0.31.0/src/font.c
--- yad-0.28.2/src/font.c 2015-07-15 17:55:52.000000000 +0000
+++ yad-0.31.0/src/font.c 2015-09-04 10:24:50.000000000 +0000
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with YAD. If not, see .
*
- * Copyright (C) 2008-2014, Victor Ananjevsky
+ * Copyright (C) 2008-2015, Victor Ananjevsky
*/
#include
diff -Nru yad-0.28.2/src/form.c yad-0.31.0/src/form.c
--- yad-0.28.2/src/form.c 2015-07-15 17:55:52.000000000 +0000
+++ yad-0.31.0/src/form.c 2015-09-10 07:47:06.000000000 +0000
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with YAD. If not, see .
*
- * Copyright (C) 2008-2014, Victor Ananjevsky
+ * Copyright (C) 2008-2015, Victor Ananjevsky
*/
#include
@@ -90,7 +90,7 @@
#else
gtk_combo_box_get_active_text (GTK_COMBO_BOX (g_slist_nth_data (fields, num)))
#endif
- );
+ );
break;
case YAD_FIELD_SCALE:
g_string_append_printf (xcmd, "%d", (gint) gtk_range_get_value
@@ -98,10 +98,12 @@
break;
case YAD_FIELD_FILE:
case YAD_FIELD_DIR:
- g_string_append (xcmd, gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (g_slist_nth_data (fields, num))));
+ g_string_append (xcmd,
+ gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (g_slist_nth_data (fields, num))));
break;
case YAD_FIELD_FONT:
- g_string_append (xcmd, gtk_font_button_get_font_name (GTK_FONT_BUTTON (g_slist_nth_data (fields, num))));
+ g_string_append (xcmd,
+ gtk_font_button_get_font_name (GTK_FONT_BUTTON (g_slist_nth_data (fields, num))));
break;
case YAD_FIELD_COLOR:
{
@@ -246,7 +248,7 @@
gtk_entry_set_text (GTK_ENTRY (w), s[def]);
g_strfreev (s);
break;
- }
+ }
case YAD_FIELD_COMBO:
case YAD_FIELD_COMBO_ENTRY:
@@ -320,7 +322,7 @@
break;
}
- default: ;
+ default:;
}
}
@@ -383,6 +385,7 @@
select_files_cb (GtkEntry * entry, GtkEntryIconPosition pos, GdkEventButton * event, gpointer data)
{
GtkWidget *dlg;
+ GList *filt;
static gchar *path = NULL;
if (event->button == 1)
@@ -418,6 +421,18 @@
gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dlg), TRUE);
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dlg), path);
+ /* add preview */
+ if (options.common_data.preview)
+ {
+ GtkWidget *p = gtk_image_new ();
+ gtk_file_chooser_set_preview_widget (GTK_FILE_CHOOSER (dlg), p);
+ g_signal_connect (dlg, "update-preview", G_CALLBACK (update_preview), p);
+ }
+
+ /* add filters */
+ for (filt = options.common_data.filters; filt; filt = filt->next)
+ gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dlg), GTK_FILE_FILTER (filt->data));
+
if (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_ACCEPT)
{
GSList *files, *ptr;
@@ -438,7 +453,7 @@
ptr = ptr->next;
}
- str->str[str->len-1] = '\0'; // remove last item separator
+ str->str[str->len - 1] = '\0'; // remove last item separator
gtk_entry_set_text (entry, str->str);
g_slist_free (files);
@@ -455,6 +470,7 @@
create_files_cb (GtkEntry * entry, GtkEntryIconPosition pos, GdkEventButton * event, gpointer data)
{
GtkWidget *dlg;
+ GList *filt;
static gchar *path = NULL;
if (event->button == 1)
@@ -489,6 +505,18 @@
}
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dlg), path);
+ /* add preview */
+ if (options.common_data.preview)
+ {
+ GtkWidget *p = gtk_image_new ();
+ gtk_file_chooser_set_preview_widget (GTK_FILE_CHOOSER (dlg), p);
+ g_signal_connect (dlg, "update-preview", G_CALLBACK (update_preview), p);
+ }
+
+ /* add filters */
+ for (filt = options.common_data.filters; filt; filt = filt->next)
+ gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dlg), GTK_FILE_FILTER (filt->data));
+
if (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_ACCEPT)
{
gchar *file = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dlg));
@@ -543,9 +571,6 @@
gchar *format = options.common_data.date_format;
gchar time_string[128];
- if (format == NULL)
- format = "%x";
-
gtk_calendar_get_date (GTK_CALENDAR (cal), &day, &month, &year);
d = g_date_new_dmy (year, month + 1, day);
g_date_strftime (time_string, 127, format, d);
@@ -561,6 +586,7 @@
{
GtkWidget *sw, *vp, *tbl;
GtkWidget *w = NULL;
+ GList *filt;
if (options.form_data.fields)
{
@@ -613,8 +639,7 @@
/* add field label */
l = NULL;
if (fld->type != YAD_FIELD_CHECK && fld->type != YAD_FIELD_BUTTON &&
- fld->type != YAD_FIELD_FULL_BUTTON &&
- fld->type != YAD_FIELD_LABEL && fld->type != YAD_FIELD_TEXT)
+ fld->type != YAD_FIELD_FULL_BUTTON && fld->type != YAD_FIELD_LABEL && fld->type != YAD_FIELD_TEXT)
{
gchar *buf = g_strcompress (fld->name);
l = gtk_label_new (NULL);
@@ -742,6 +767,19 @@
e = gtk_file_chooser_button_new (_("Select file"), GTK_FILE_CHOOSER_ACTION_OPEN);
gtk_widget_set_name (e, "yad-form-file");
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (e), g_get_current_dir ());
+
+ /* add preview */
+ if (options.common_data.preview)
+ {
+ GtkWidget *p = gtk_image_new ();
+ gtk_file_chooser_set_preview_widget (GTK_FILE_CHOOSER (e), p);
+ g_signal_connect (e, "update-preview", G_CALLBACK (update_preview), p);
+ }
+
+ /* add filters */
+ for (filt = options.common_data.filters; filt; filt = filt->next)
+ gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (e), GTK_FILE_FILTER (filt->data));
+
#if !GTK_CHECK_VERSION(3,0,0)
gtk_table_attach (GTK_TABLE (tbl), e, 1 + col * 2, 2 + col * 2, row, row + 1,
GTK_EXPAND | GTK_FILL, 0, 5, 5);
@@ -801,8 +839,7 @@
e = gtk_entry_new ();
gtk_widget_set_name (e, "yad-form-entry");
gtk_entry_set_icon_from_stock (GTK_ENTRY (e), GTK_ENTRY_ICON_SECONDARY, "gtk-directory");
- g_signal_connect (G_OBJECT (e), "icon-press", G_CALLBACK (select_files_cb),
- GINT_TO_POINTER (fld->type));
+ g_signal_connect (G_OBJECT (e), "icon-press", G_CALLBACK (select_files_cb), GINT_TO_POINTER (fld->type));
g_signal_connect (G_OBJECT (e), "activate", G_CALLBACK (form_activate_cb), dlg);
#if !GTK_CHECK_VERSION(3,0,0)
gtk_table_attach (GTK_TABLE (tbl), e, 1 + col * 2, 2 + col * 2, row, row + 1,
@@ -820,8 +857,7 @@
e = gtk_entry_new ();
gtk_widget_set_name (e, "yad-form-entry");
gtk_entry_set_icon_from_stock (GTK_ENTRY (e), GTK_ENTRY_ICON_SECONDARY, "gtk-directory");
- g_signal_connect (G_OBJECT (e), "icon-press", G_CALLBACK (create_files_cb),
- GINT_TO_POINTER (fld->type));
+ g_signal_connect (G_OBJECT (e), "icon-press", G_CALLBACK (create_files_cb), GINT_TO_POINTER (fld->type));
g_signal_connect (G_OBJECT (e), "activate", G_CALLBACK (form_activate_cb), dlg);
#if !GTK_CHECK_VERSION(3,0,0)
gtk_table_attach (GTK_TABLE (tbl), e, 1 + col * 2, 2 + col * 2, row, row + 1,
@@ -880,8 +916,7 @@
if (fld->type == YAD_FIELD_BUTTON)
gtk_button_set_relief (GTK_BUTTON (e), GTK_RELIEF_NONE);
#if !GTK_CHECK_VERSION(3,0,0)
- gtk_table_attach (GTK_TABLE (tbl), e, col * 2, 2 + col * 2, row, row + 1,
- GTK_EXPAND | GTK_FILL, 0, 5, 5);
+ gtk_table_attach (GTK_TABLE (tbl), e, col * 2, 2 + col * 2, row, row + 1, GTK_EXPAND | GTK_FILL, 0, 5, 5);
#else
gtk_grid_attach (GTK_GRID (tbl), e, col * 2, row, 2, 1);
gtk_widget_set_hexpand (e, TRUE);
@@ -915,8 +950,7 @@
gtk_widget_set_name (e, "yad-form-separator");
}
#if !GTK_CHECK_VERSION(3,0,0)
- gtk_table_attach (GTK_TABLE (tbl), e, col * 2, 2 + col * 2, row, row + 1,
- GTK_EXPAND | GTK_FILL, 0, 5, 5);
+ gtk_table_attach (GTK_TABLE (tbl), e, col * 2, 2 + col * 2, row, row + 1, GTK_EXPAND | GTK_FILL, 0, 5, 5);
#else
gtk_grid_attach (GTK_GRID (tbl), e, col * 2, row, 2, 1);
gtk_widget_set_hexpand (e, TRUE);
diff -Nru yad-0.28.2/src/html.c yad-0.31.0/src/html.c
--- yad-0.28.2/src/html.c 2015-07-15 17:55:52.000000000 +0000
+++ yad-0.31.0/src/html.c 2015-09-09 10:23:45.000000000 +0000
@@ -37,7 +37,7 @@
#endif
static void
-load_uri (const gchar *uri)
+load_uri (const gchar * uri)
{
gchar *addr = NULL;
@@ -74,14 +74,14 @@
}
static void
-loaded_cb (WebKitWebView *v, WebKitWebFrame *f, gpointer d)
+loaded_cb (WebKitWebView * v, WebKitWebFrame * f, gpointer d)
{
is_loaded = TRUE;
}
static gboolean
-link_cb (WebKitWebView *v, WebKitWebFrame *f, WebKitNetworkRequest *r,
- WebKitWebNavigationAction *act, WebKitWebPolicyDecision *pd, gpointer d)
+link_cb (WebKitWebView * v, WebKitWebFrame * f, WebKitNetworkRequest * r,
+ WebKitWebNavigationAction * act, WebKitWebPolicyDecision * pd, gpointer d)
{
gchar *uri = (gchar *) webkit_network_request_get_uri (r);
@@ -91,7 +91,7 @@
g_printf ("%s\n", uri);
else
{
- gchar *cmd = g_strdup_printf ("xdg-open '%s'", uri);
+ gchar *cmd = g_strdup_printf (settings.open_cmd, uri);
g_spawn_command_line_async (cmd, NULL);
g_free (cmd);
}
@@ -104,7 +104,7 @@
}
static void
-link_hover_cb (WebKitWebView *v, const gchar *t, const gchar *link, gpointer *d)
+link_hover_cb (WebKitWebView * v, const gchar * t, const gchar * link, gpointer * d)
{
if (link)
is_link = TRUE;
@@ -113,7 +113,7 @@
}
static void
-select_file_cb (GtkEntry *entry, GtkEntryIconPosition pos, GdkEventButton *ev, gpointer d)
+select_file_cb (GtkEntry * entry, GtkEntryIconPosition pos, GdkEventButton * ev, gpointer d)
{
GtkWidget *dlg;
static gchar *dir = NULL;
@@ -124,9 +124,7 @@
dlg = gtk_file_chooser_dialog_new (_("IxHTML - Select File"),
GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (entry))),
GTK_FILE_CHOOSER_ACTION_OPEN,
- GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- NULL);
+ GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL);
if (dir)
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dlg), dir);
@@ -141,26 +139,24 @@
dir = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dlg));
}
- gtk_widget_destroy (dlg);
+ gtk_widget_destroy (dlg);
}
static void
-do_open_cb (GtkWidget *w, GtkDialog *dlg)
+do_open_cb (GtkWidget * w, GtkDialog * dlg)
{
gtk_dialog_response (dlg, GTK_RESPONSE_ACCEPT);
}
static void
-open_cb (GtkWidget *w, gpointer d)
+open_cb (GtkWidget * w, gpointer d)
{
GtkWidget *dlg, *cnt, *lbl, *entry;
dlg = gtk_dialog_new_with_buttons (_("Open URI"),
GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (view))),
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
- GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
- NULL);
+ GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL);
gtk_window_set_default_size (GTK_WINDOW (dlg), 350, -1);
cnt = gtk_dialog_get_content_area (GTK_DIALOG (dlg));
@@ -185,8 +181,7 @@
}
static gboolean
-menu_cb (WebKitWebView *view, GtkWidget *menu, WebKitHitTestResult *hit,
- gboolean kb, gpointer d)
+menu_cb (WebKitWebView * view, GtkWidget * menu, WebKitHitTestResult * hit, gboolean kb, gpointer d)
{
GtkWidget *mi;
@@ -207,7 +202,7 @@
}
static gboolean
-handle_stdin (GIOChannel *ch, GIOCondition cond, gpointer d)
+handle_stdin (GIOChannel * ch, GIOCondition cond, gpointer d)
{
gchar *buf;
GError *err = NULL;
@@ -224,8 +219,7 @@
return FALSE;
case G_IO_STATUS_EOF:
- webkit_web_view_load_string (view, inbuf->str, options.html_data.mime,
- options.html_data.encoding, NULL);
+ webkit_web_view_load_string (view, inbuf->str, options.html_data.mime, options.html_data.encoding, NULL);
return FALSE;
case G_IO_STATUS_AGAIN:
@@ -236,7 +230,7 @@
}
GtkWidget *
-html_create_widget (GtkWidget *dlg)
+html_create_widget (GtkWidget * dlg)
{
GtkWidget *sw;
WebKitWebSettings *settings;
@@ -248,7 +242,7 @@
view = WEBKIT_WEB_VIEW (webkit_web_view_new ());
gtk_container_add (GTK_CONTAINER (sw), GTK_WIDGET (view));
-
+
settings = webkit_web_view_get_settings (view);
g_get_charset (&enc);
g_object_set (G_OBJECT (settings), "default-encoding", enc);
@@ -267,7 +261,7 @@
gtk_widget_show_all (sw);
gtk_widget_grab_focus (GTK_WIDGET (view));
-
+
if (options.html_data.uri)
load_uri (options.html_data.uri);
else if (!options.html_data.browser)
diff -Nru yad-0.28.2/src/icons.c yad-0.31.0/src/icons.c
--- yad-0.28.2/src/icons.c 2015-07-15 17:55:52.000000000 +0000
+++ yad-0.31.0/src/icons.c 2015-09-09 10:22:50.000000000 +0000
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with YAD. If not, see .
*
- * Copyright (C) 2008-2014, Victor Ananjevsky
+ * Copyright (C) 2008-2015, Victor Ananjevsky
*/
#include "yad.h"
@@ -45,7 +45,7 @@
} DEntry;
static void
-select_cb (GObject *obj, gpointer data)
+select_cb (GObject * obj, gpointer data)
{
static gboolean first_time = TRUE;
@@ -184,35 +184,35 @@
switch (column_count)
{
- case COL_NAME:
- case COL_COMMAND:
- gtk_list_store_set (GTK_LIST_STORE (model), &iter, column_count, string->str, -1);
+ case COL_NAME:
+ case COL_COMMAND:
+ gtk_list_store_set (GTK_LIST_STORE (model), &iter, column_count, string->str, -1);
+ break;
+ case COL_TOOLTIP:
+ {
+ gchar *buf = g_markup_escape_text (string->str, -1);
+ gtk_list_store_set (GTK_LIST_STORE (model), &iter, column_count, buf, -1);
+ g_free (buf);
break;
- case COL_TOOLTIP:
- {
- gchar *buf = g_markup_escape_text (string->str, -1);
- gtk_list_store_set (GTK_LIST_STORE (model), &iter, column_count, buf, -1);
- g_free (buf);
- break;
- }
- case COL_PIXBUF:
- if (options.icons_data.compact)
- if (*string->str)
- pb = get_pixbuf (string->str, YAD_SMALL_ICON);
- else
- pb = NULL;
+ }
+ case COL_PIXBUF:
+ if (options.icons_data.compact)
+ if (*string->str)
+ pb = get_pixbuf (string->str, YAD_SMALL_ICON);
else
- pb = get_pixbuf (string->str, YAD_BIG_ICON);
- gtk_list_store_set (GTK_LIST_STORE (model), &iter, column_count, pb, -1);
- if (pb)
- g_object_unref (pb);
- break;
- case COL_TERM:
- if (strcasecmp (string->str, "true") == 0)
- gtk_list_store_set (GTK_LIST_STORE (model), &iter, column_count, TRUE, -1);
- else
- gtk_list_store_set (GTK_LIST_STORE (model), &iter, column_count, FALSE, -1);
- break;
+ pb = NULL;
+ else
+ pb = get_pixbuf (string->str, YAD_BIG_ICON);
+ gtk_list_store_set (GTK_LIST_STORE (model), &iter, column_count, pb, -1);
+ if (pb)
+ g_object_unref (pb);
+ break;
+ case COL_TERM:
+ if (strcasecmp (string->str, "true") == 0)
+ gtk_list_store_set (GTK_LIST_STORE (model), &iter, column_count, TRUE, -1);
+ else
+ gtk_list_store_set (GTK_LIST_STORE (model), &iter, column_count, FALSE, -1);
+ break;
}
column_count++;
@@ -304,7 +304,7 @@
gchar *url = g_key_file_get_string (kf, "Desktop Entry", "URL", NULL);
if (url)
{
- ent->command = g_strdup_printf ("xdg-open '%s'", url);
+ ent->command = g_strdup_printf (settings.open_cmd, url);
g_free (url);
}
}
diff -Nru yad-0.28.2/src/list.c yad-0.31.0/src/list.c
--- yad-0.28.2/src/list.c 2015-07-15 17:55:52.000000000 +0000
+++ yad-0.31.0/src/list.c 2015-09-08 13:58:19.000000000 +0000
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with YAD. If not, see .
*
- * Copyright (C) 2008-2014, Victor Ananjevsky
+ * Copyright (C) 2008-2015, Victor Ananjevsky
*/
#include
@@ -406,8 +406,7 @@
g_ascii_strtoll (string->str, NULL, 10), -1);
break;
case YAD_COLUMN_FLOAT:
- gtk_list_store_set (GTK_LIST_STORE (model), &iter, column_count,
- g_ascii_strtod (string->str, NULL), -1);
+ gtk_list_store_set (GTK_LIST_STORE (model), &iter, column_count, g_ascii_strtod (string->str, NULL), -1);
break;
case YAD_COLUMN_IMAGE:
pb = get_pixbuf (string->str, YAD_SMALL_ICON);
@@ -575,7 +574,7 @@
gchar *cval;
gtk_tree_model_get (model, &iter, i, &cval, -1);
if (cval)
- {
+ {
gchar *sval = g_shell_quote (cval);
g_string_append_printf (args, " %s", sval);
g_free (sval);
@@ -795,6 +794,14 @@
return FALSE;
}
+static gboolean
+row_sep_func (GtkTreeModel * m, GtkTreeIter * it, gpointer data)
+{
+ gchar *name;
+ gtk_tree_model_get (m, it, options.list_data.sep_column - 1, &name, -1);
+ return (strcmp (name, options.list_data.sep_value) == 0);
+}
+
GtkWidget *
list_create_widget (GtkWidget * dlg)
{
@@ -821,7 +828,7 @@
list_view = gtk_tree_view_new_with_model (model);
gtk_widget_set_name (list_view, "yad-list-widget");
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (list_view), !options.list_data.no_headers);
- gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (list_view), settings.rules_hint);
+ gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (list_view), options.list_data.rules_hint);
gtk_tree_view_set_reorderable (GTK_TREE_VIEW (list_view), options.common_data.editable);
g_object_unref (model);
@@ -858,6 +865,10 @@
gtk_tree_view_set_search_equal_func (GTK_TREE_VIEW (list_view), regex_search, NULL, NULL);
}
+ /* add row separator function */
+ if (options.list_data.sep_column > 0)
+ gtk_tree_view_set_row_separator_func (GTK_TREE_VIEW (list_view), row_sep_func, NULL, NULL);
+
return w;
}
diff -Nru yad-0.28.2/src/main.c yad-0.31.0/src/main.c
--- yad-0.28.2/src/main.c 2015-07-15 17:55:52.000000000 +0000
+++ yad-0.31.0/src/main.c 2015-09-09 09:49:35.000000000 +0000
@@ -126,12 +126,14 @@
g_signal_stop_emission_by_name (G_OBJECT (w), "close");
}
+#ifdef HAVE_HTML
static void
html_response_cb (GtkDialog *dlg, gint id, gint *data)
{
*data = id;
gtk_main_quit ();
}
+#endif
GtkWidget *
create_dialog (void)
@@ -147,11 +149,17 @@
dlg = gtk_dialog_new ();
gtk_window_set_type_hint (GTK_WINDOW (dlg), GDK_WINDOW_TYPE_HINT_NORMAL);
gtk_window_set_title (GTK_WINDOW (dlg), options.data.dialog_title);
-#if !GTK_CHECK_VERSION(2,22,0)
- gtk_dialog_set_has_separator (GTK_DIALOG (dlg), options.data.dialog_sep);
-#endif
gtk_widget_set_name (dlg, "yad-dialog-window");
+#ifndef G_OS_WIN32
+ if (options.parent)
+ {
+ gdk_window_set_transient_for (gtk_widget_get_window (dlg),
+ gdk_x11_window_foreign_new_for_display (gdk_display_get_default (),
+ options.parent));
+ }
+#endif
+
if (options.data.no_escape)
g_signal_connect (G_OBJECT (dlg), "close", G_CALLBACK (ignore_close_cb) , NULL);
@@ -365,7 +373,10 @@
case YAD_MODE_NOTEBOOK:
main_widget = notebook_create_widget (dlg);
break;
- case YAD_MODE_PROGRESS:
+ case YAD_MODE_PANED:
+ main_widget = paned_create_widget (dlg);
+ break;
+ case YAD_MODE_PROGRESS:
main_widget = progress_create_widget (dlg);
break;
case YAD_MODE_SCALE:
@@ -625,6 +636,9 @@
case YAD_MODE_NOTEBOOK:
notebook_print_result ();
break;
+ case YAD_MODE_PANED:
+ paned_print_result ();
+ break;
case YAD_MODE_SCALE:
scale_print_result ();
break;
@@ -661,6 +675,47 @@
g_set_application_name ("YAD");
yad_options_init ();
+ ctx = yad_create_context ();
+ /* parse YAD_OPTIONS */
+ if (g_getenv ("YAD_OPTIONS"))
+ {
+ gchar *cmd, **args = NULL;
+ gint cnt;
+
+ cmd = g_strdup_printf ("yad %s", g_getenv ("YAD_OPTIONS"));
+
+ if (g_shell_parse_argv (cmd, &cnt, &args, &err))
+ {
+ g_option_context_parse (ctx, &cnt, &args, &err);
+ if (err)
+ {
+ g_printerr (_("Unable to parse YAD_OPTIONS: %s\n"), err->message);
+ g_error_free (err);
+ err = NULL;
+ }
+ }
+ else
+ {
+ g_printerr (_("Unable to parse YAD_OPTIONS: %s\n"), err->message);
+ g_error_free (err);
+ err = NULL;
+ }
+
+ g_free (cmd);
+ }
+ /* parse command line */
+ g_option_context_parse (ctx, &argc, &argv, &err);
+ if (err)
+ {
+ g_printerr (_("Unable to parse command line: %s\n"), err->message);
+ return -1;
+ }
+ yad_set_mode ();
+
+ /* parse custom gtkrc */
+ if (options.gtkrc_file)
+ gtk_rc_parse (options.gtkrc_file);
+
/* set default icons and icon theme */
if (options.data.icon_theme)
{
@@ -676,19 +731,6 @@
settings.small_fallback_image =
gtk_icon_theme_load_icon (settings.icon_theme, "yad", MIN (w, h), GTK_ICON_LOOKUP_GENERIC_FALLBACK, NULL);
- ctx = yad_create_context ();
- g_option_context_parse (ctx, &argc, &argv, &err);
- if (err)
- {
- g_printerr (_("Unable to parse command line: %s\n"), err->message);
- return -1;
- }
- yad_set_mode ();
-
- /* parse custom gtkrc */
- if (options.gtkrc_file)
- gtk_rc_parse (options.gtkrc_file);
-
/* correct separators */
str = g_strcompress (options.common_data.separator);
options.common_data.separator = str;
@@ -765,6 +807,7 @@
ret = yad_print_run ();
break;
+#ifdef HAVE_HTML
case YAD_MODE_HTML:
/* Webkit doesn't handle focus for child dialogs when gtk_dialog_run() is used */
/* FIXME: maybe this solution must be expanded to all dialogs */
@@ -775,6 +818,7 @@
gtk_main ();
break;
+#endif
default:
dialog = create_dialog ();
@@ -792,6 +836,8 @@
}
else if (options.mode == YAD_MODE_NOTEBOOK)
notebook_swallow_childs ();
+ else if (options.mode == YAD_MODE_PANED)
+ paned_swallow_childs ();
ret = gtk_dialog_run (GTK_DIALOG (dialog));
if (options.data.always_print)
@@ -808,6 +854,8 @@
#ifndef G_OS_WIN32
if (options.mode == YAD_MODE_NOTEBOOK)
notebook_close_childs ();
+ else if (options.mode == YAD_MODE_PANED)
+ paned_close_childs ();
/* autokill option for progress dialog */
if (!options.kill_parent)
{
diff -Nru yad-0.28.2/src/Makefile.am yad-0.31.0/src/Makefile.am
--- yad-0.28.2/src/Makefile.am 2015-07-15 17:55:52.000000000 +0000
+++ yad-0.31.0/src/Makefile.am 2015-09-04 11:29:42.000000000 +0000
@@ -5,27 +5,28 @@
bin_PROGRAMS = yad
yad_SOURCES = \
- about.c \
- calendar.c \
- color.c \
+ about.c \
+ calendar.c \
+ color.c \
dnd.c \
- entry.c \
- file.c \
- font.c \
- form.c \
- icons.c \
- list.c \
+ entry.c \
+ file.c \
+ font.c \
+ form.c \
+ icons.c \
+ list.c \
multi-progress.c \
- notebook.c \
+ notebook.c \
notification.c \
- option.c \
- print.c \
- progress.c \
- scale.c \
- text.c \
- util.c \
- main.c \
- yad.h \
+ option.c \
+ paned.c \
+ print.c \
+ progress.c \
+ scale.c \
+ text.c \
+ util.c \
+ main.c \
+ yad.h \
calendar.xpm
if HTML
diff -Nru yad-0.28.2/src/Makefile.in yad-0.31.0/src/Makefile.in
--- yad-0.28.2/src/Makefile.in 2015-07-15 17:55:52.000000000 +0000
+++ yad-0.31.0/src/Makefile.in 2015-09-11 10:17:42.000000000 +0000
@@ -105,8 +105,8 @@
PROGRAMS = $(bin_PROGRAMS)
am__yad_SOURCES_DIST = about.c calendar.c color.c dnd.c entry.c file.c \
font.c form.c icons.c list.c multi-progress.c notebook.c \
- notification.c option.c print.c progress.c scale.c text.c \
- util.c main.c yad.h calendar.xpm html.c
+ notification.c option.c paned.c print.c progress.c scale.c \
+ text.c util.c main.c yad.h calendar.xpm html.c
@HTML_TRUE@am__objects_1 = yad-html.$(OBJEXT)
am_yad_OBJECTS = yad-about.$(OBJEXT) yad-calendar.$(OBJEXT) \
yad-color.$(OBJEXT) yad-dnd.$(OBJEXT) yad-entry.$(OBJEXT) \
@@ -114,9 +114,9 @@
yad-icons.$(OBJEXT) yad-list.$(OBJEXT) \
yad-multi-progress.$(OBJEXT) yad-notebook.$(OBJEXT) \
yad-notification.$(OBJEXT) yad-option.$(OBJEXT) \
- yad-print.$(OBJEXT) yad-progress.$(OBJEXT) yad-scale.$(OBJEXT) \
- yad-text.$(OBJEXT) yad-util.$(OBJEXT) yad-main.$(OBJEXT) \
- $(am__objects_1)
+ yad-paned.$(OBJEXT) yad-print.$(OBJEXT) yad-progress.$(OBJEXT) \
+ yad-scale.$(OBJEXT) yad-text.$(OBJEXT) yad-util.$(OBJEXT) \
+ yad-main.$(OBJEXT) $(am__objects_1)
yad_OBJECTS = $(am_yad_OBJECTS)
am__DEPENDENCIES_1 =
yad_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
@@ -323,8 +323,8 @@
top_srcdir = @top_srcdir@
yad_SOURCES = about.c calendar.c color.c dnd.c entry.c file.c font.c \
form.c icons.c list.c multi-progress.c notebook.c \
- notification.c option.c print.c progress.c scale.c text.c \
- util.c main.c yad.h calendar.xpm $(am__append_1)
+ notification.c option.c paned.c print.c progress.c scale.c \
+ text.c util.c main.c yad.h calendar.xpm $(am__append_1)
yad_CFLAGS = $(GTK_CFLAGS) $(HTML_CFLAGS)
yad_LDADD = $(GTK_LIBS) $(HTML_LIBS)
@BUILD_IB_TRUE@yad_icon_browser_SOURCES = browser.c
@@ -436,6 +436,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yad-notebook.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yad-notification.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yad-option.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yad-paned.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yad-print.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yad-progress.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yad-scale.Po@am__quote@
@@ -653,6 +654,20 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(yad_CFLAGS) $(CFLAGS) -c -o yad-option.obj `if test -f 'option.c'; then $(CYGPATH_W) 'option.c'; else $(CYGPATH_W) '$(srcdir)/option.c'; fi`
+yad-paned.o: paned.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(yad_CFLAGS) $(CFLAGS) -MT yad-paned.o -MD -MP -MF $(DEPDIR)/yad-paned.Tpo -c -o yad-paned.o `test -f 'paned.c' || echo '$(srcdir)/'`paned.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/yad-paned.Tpo $(DEPDIR)/yad-paned.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='paned.c' object='yad-paned.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(yad_CFLAGS) $(CFLAGS) -c -o yad-paned.o `test -f 'paned.c' || echo '$(srcdir)/'`paned.c
+
+yad-paned.obj: paned.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(yad_CFLAGS) $(CFLAGS) -MT yad-paned.obj -MD -MP -MF $(DEPDIR)/yad-paned.Tpo -c -o yad-paned.obj `if test -f 'paned.c'; then $(CYGPATH_W) 'paned.c'; else $(CYGPATH_W) '$(srcdir)/paned.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/yad-paned.Tpo $(DEPDIR)/yad-paned.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='paned.c' object='yad-paned.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(yad_CFLAGS) $(CFLAGS) -c -o yad-paned.obj `if test -f 'paned.c'; then $(CYGPATH_W) 'paned.c'; else $(CYGPATH_W) '$(srcdir)/paned.c'; fi`
+
yad-print.o: print.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(yad_CFLAGS) $(CFLAGS) -MT yad-print.o -MD -MP -MF $(DEPDIR)/yad-print.Tpo -c -o yad-print.o `test -f 'print.c' || echo '$(srcdir)/'`print.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/yad-print.Tpo $(DEPDIR)/yad-print.Po
diff -Nru yad-0.28.2/src/multi-progress.c yad-0.31.0/src/multi-progress.c
--- yad-0.28.2/src/multi-progress.c 2015-07-15 17:55:52.000000000 +0000
+++ yad-0.31.0/src/multi-progress.c 2015-09-04 10:24:50.000000000 +0000
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with YAD. If not, see .
*
- * Copyright (C) 2008-2014, Victor Ananjevsky
+ * Copyright (C) 2008-2015, Victor Ananjevsky
*/
#include
@@ -52,8 +52,7 @@
do
{
- status =
- g_io_channel_read_line_string (channel, string, NULL, &err);
+ status = g_io_channel_read_line_string (channel, string, NULL, &err);
while (gtk_events_pending ())
gtk_main_iteration ();
diff -Nru yad-0.28.2/src/notebook.c yad-0.31.0/src/notebook.c
--- yad-0.28.2/src/notebook.c 2015-07-15 17:55:52.000000000 +0000
+++ yad-0.31.0/src/notebook.c 2015-09-08 08:31:21.000000000 +0000
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with YAD. If not, see .
*
- * Copyright (C) 2008-2014, Victor Ananjevsky
+ * Copyright (C) 2008-2015, Victor Ananjevsky
*/
#include
@@ -29,7 +29,6 @@
#include
#include
#include
-#include
#include "yad.h"
@@ -42,7 +41,7 @@
GSList *tab;
/* get shared memory */
- tabs = get_tabs (options.notebook_data.key, TRUE);
+ tabs = get_tabs (options.common_data.key, TRUE);
if (!tabs)
exit (-1);
diff -Nru yad-0.28.2/src/notification.c yad-0.31.0/src/notification.c
--- yad-0.28.2/src/notification.c 2015-07-15 17:55:52.000000000 +0000
+++ yad-0.31.0/src/notification.c 2015-09-04 10:24:50.000000000 +0000
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with YAD. If not, see .
*
- * Copyright (C) 2008-2014, Victor Ananjevsky
+ * Copyright (C) 2008-2015, Victor Ananjevsky
*/
#include
@@ -54,7 +54,7 @@
}
static void
-parse_menu_str (gchar *str)
+parse_menu_str (gchar * str)
{
gchar **menu_vals;
gint i = 0;
diff -Nru yad-0.28.2/src/option.c yad-0.31.0/src/option.c
--- yad-0.28.2/src/option.c 2015-07-15 17:55:52.000000000 +0000
+++ yad-0.31.0/src/option.c 2015-09-10 07:47:06.000000000 +0000
@@ -30,6 +30,7 @@
static gboolean add_scale_mark (const gchar *, const gchar *, gpointer, GError **);
static gboolean add_palette (const gchar *, const gchar *, gpointer, GError **);
static gboolean add_confirm_overwrite (const gchar *, const gchar *, gpointer, GError **);
+static gboolean add_file_filter (const gchar *, const gchar *, gpointer, GError **);
static gboolean set_color_mode (const gchar *, const gchar *, gpointer, GError **);
static gboolean set_buttons_layout (const gchar *, const gchar *, gpointer, GError **);
static gboolean set_align (const gchar *, const gchar *, gpointer, GError **);
@@ -38,6 +39,7 @@
static gboolean set_scale_value (const gchar *, const gchar *, gpointer, GError **);
static gboolean set_ellipsize (const gchar *, const gchar *, gpointer, GError **);
static gboolean set_expander (const gchar *, const gchar *, gpointer, GError **);
+static gboolean set_orient (const gchar *, const gchar *, gpointer, GError **);
static gboolean set_print_type (const gchar *, const gchar *, gpointer, GError **);
static gboolean set_progress_log (const gchar *, const gchar *, gpointer, GError **);
#ifndef G_OS_WIN32
@@ -62,6 +64,7 @@
static gboolean multi_progress_mode = FALSE;
static gboolean notebook_mode = FALSE;
static gboolean notification_mode = FALSE;
+static gboolean paned_mode = FALSE;
static gboolean print_mode = FALSE;
static gboolean progress_mode = FALSE;
static gboolean scale_mode = FALSE;
@@ -176,14 +179,6 @@
&options.data.no_escape,
N_("Don't close dialog if Escape was pressed"),
NULL},
-#if !GTK_CHECK_VERSION(2,22,0)
- {"dialog-sep", 0,
- 0,
- G_OPTION_ARG_NONE,
- &options.data.dialog_sep,
- N_("Add separator between dialog and buttons"),
- NULL},
-#endif
{"borders", 0,
0,
G_OPTION_ARG_INT,
@@ -270,6 +265,12 @@
N_("Tab nubmer of this dialog"),
N_("NUMBER")},
#ifndef G_OS_WIN32
+ {"parent-win", 0,
+ 0,
+ G_OPTION_ARG_INT,
+ &options.parent,
+ N_("XID of parent window"),
+ "XID"},
{"kill-parent", 0,
G_OPTION_FLAG_OPTIONAL_ARG,
G_OPTION_ARG_CALLBACK,
@@ -351,12 +352,24 @@
&options.color_data.init_color,
N_("Set initial color value"),
N_("COLOR")},
+ {"gtk-palette", 0,
+ 0,
+ G_OPTION_ARG_NONE,
+ &options.color_data.gtk_palette,
+ N_("Show system palette in color dialog"),
+ NULL},
{"palette", 0,
G_OPTION_FLAG_OPTIONAL_ARG,
G_OPTION_ARG_CALLBACK,
add_palette,
N_("Set path to palette file. Default - " RGB_FILE),
N_("FILENAME")},
+ {"expand-palette", 0,
+ 0,
+ G_OPTION_ARG_NONE,
+ &options.color_data.expand_palette,
+ N_("Expand user palette"),
+ NULL},
{"mode", 0,
0,
G_OPTION_ARG_CALLBACK,
@@ -519,18 +532,6 @@
add_confirm_overwrite,
N_("Confirm file selection if filename already exists"),
N_("[TEXT]")},
- {"file-filter", 0,
- 0,
- G_OPTION_ARG_STRING_ARRAY,
- &options.file_data.filter,
- N_("Sets a filename filter"),
- N_("NAME | PATTERN1 PATTERN2 ...")},
- {"add-preview", 0,
- 0,
- G_OPTION_ARG_NONE,
- &options.common_data.preview,
- N_("Enable preview"),
- NULL},
{"quoted-output", 0,
G_OPTION_FLAG_NOALIAS,
G_OPTION_ARG_NONE,
@@ -747,12 +748,6 @@
&list_mode,
N_("Display list dialog"),
NULL},
- {"no-headers", 0,
- 0,
- G_OPTION_ARG_NONE,
- &options.list_data.no_headers,
- N_("Don't show column headers"),
- NULL},
{"column", 0,
0,
G_OPTION_ARG_CALLBACK,
@@ -771,12 +766,24 @@
&options.list_data.radiobox,
N_("Use radioboxes for first column"),
NULL},
+ {"no-headers", 0,
+ 0,
+ G_OPTION_ARG_NONE,
+ &options.list_data.no_headers,
+ N_("Don't show column headers"),
+ NULL},
{"no-click", 0,
G_OPTION_FLAG_REVERSE,
G_OPTION_ARG_NONE,
&options.list_data.clickable,
N_("Disable clickable column headers"),
NULL},
+ {"no-rules-hint", 0,
+ G_OPTION_FLAG_REVERSE,
+ G_OPTION_ARG_NONE,
+ &options.list_data.rules_hint,
+ N_("Disable rules hints"),
+ NULL},
{"separator",
0,
G_OPTION_FLAG_NOALIAS,
@@ -838,6 +845,18 @@
&options.list_data.tooltip_column,
N_("Set the tooltip column"),
N_("NUMBER")},
+ {"sep-column", 0,
+ 0,
+ G_OPTION_ARG_INT,
+ &options.list_data.sep_column,
+ N_("Set the row separator column"),
+ N_("NUMBER")},
+ {"sep-value", 0,
+ 0,
+ G_OPTION_ARG_STRING,
+ &options.list_data.sep_value,
+ N_("Set the row separator value"),
+ N_("TEXT")},
{"limit", 0,
0,
G_OPTION_ARG_INT,
@@ -922,9 +941,9 @@
N_("Display notebook dialog"),
NULL},
{"key", 0,
- 0,
+ G_OPTION_FLAG_NOALIAS,
G_OPTION_ARG_INT,
- &options.notebook_data.key,
+ &options.common_data.key,
N_("Identifier of embedded dialogs"),
N_("KEY")},
{"tab", 0,
@@ -1000,6 +1019,34 @@
{NULL}
};
+static GOptionEntry paned_options[] = {
+ {"paned", 0,
+ G_OPTION_FLAG_IN_MAIN,
+ G_OPTION_ARG_NONE,
+ &paned_mode,
+ N_("Display paned dialog"),
+ NULL},
+ {"orient", 0,
+ 0,
+ G_OPTION_ARG_CALLBACK,
+ set_orient,
+ N_("Set orientation (TYPE - hor[izontal] or vert[ical])"),
+ N_("TYPE")},
+ {"splitter", 0,
+ 0,
+ G_OPTION_ARG_INT,
+ &options.paned_data.splitter,
+ N_("Set initial splitter position"),
+ N_("POS")},
+ {"key", 0,
+ G_OPTION_FLAG_NOALIAS,
+ G_OPTION_ARG_INT,
+ &options.common_data.key,
+ N_("Identifier of embedded dialogs"),
+ N_("KEY")},
+ {NULL}
+};
+
static GOptionEntry print_options[] = {
{"print", 0,
G_OPTION_FLAG_IN_MAIN,
@@ -1026,7 +1073,7 @@
N_("Add headers to page"),
NULL},
{"add-preview", 0,
- 0,
+ G_OPTION_FLAG_NOALIAS,
G_OPTION_ARG_NONE,
&options.common_data.preview,
N_("Enable preview in print dialog"),
@@ -1250,6 +1297,12 @@
&options.text_data.uri,
N_("Make URI clickable"),
NULL},
+ {"uri-color", 0,
+ 0,
+ G_OPTION_ARG_STRING,
+ &options.text_data.uri_color,
+ N_("Use specified color for links"),
+ N_("COLOR")},
{"listen", 0,
G_OPTION_FLAG_NOALIAS,
G_OPTION_ARG_NONE,
@@ -1259,6 +1312,34 @@
{NULL}
};
+static GOptionEntry filter_options[] = {
+ {"file-filter", 0,
+ 0,
+ G_OPTION_ARG_CALLBACK,
+ add_file_filter,
+ N_("Sets a filename filter"),
+ N_("NAME | PATTERN1 PATTERN2 ...")},
+ {"mime-filter", 0,
+ 0,
+ G_OPTION_ARG_CALLBACK,
+ add_file_filter,
+ N_("Sets a mime-type filter"),
+ N_("NAME | MIME1 MIME2 ...")},
+ {"image-filter", 0,
+ G_OPTION_FLAG_OPTIONAL_ARG,
+ G_OPTION_ARG_CALLBACK,
+ add_file_filter,
+ N_("Add filter for images"),
+ N_("NAME")},
+ {"add-preview", 0,
+ G_OPTION_FLAG_NOALIAS,
+ G_OPTION_ARG_NONE,
+ &options.common_data.preview,
+ N_("Enable preview"),
+ NULL},
+ {NULL}
+};
+
static GOptionEntry misc_options[] = {
{"about", 0,
0,
@@ -1518,11 +1599,76 @@
}
static gboolean
+add_file_filter (const gchar * option_name, const gchar * value, gpointer data, GError ** err)
+{
+ GtkFileFilter *filter = gtk_file_filter_new ();
+
+ /* add image filter */
+ if (strcmp (option_name, "--image-filter") == 0)
+ {
+ gtk_file_filter_set_name (filter, value ? value : _("Images"));
+ gtk_file_filter_add_pixbuf_formats (filter);
+ options.common_data.filters = g_list_append (options.common_data.filters, filter);
+ }
+ else
+ {
+ gint i;
+ gchar **pattern, **patterns;
+ gchar *name = NULL;
+ gboolean is_mime = (strcmp (option_name, "--mime-filter") == 0);
+
+ /* Set name */
+ for (i = 0; value[i] != '\0'; i++)
+ {
+ if (value[i] == '|')
+ break;
+ }
+
+ if (value[i] == '|')
+ name = g_strstrip (g_strndup (value, i));
+
+ if (name)
+ {
+ gtk_file_filter_set_name (filter, name);
+
+ /* Point i to the right position for split */
+ for (++i; value[i] == ' '; i++);
+ }
+ else
+ {
+ gtk_file_filter_set_name (filter, value);
+ i = 0;
+ }
+
+ /* Get patterns */
+ patterns = g_strsplit_set (value + i, " ", -1);
+
+ if (is_mime)
+ {
+ for (pattern = patterns; *pattern; pattern++)
+ gtk_file_filter_add_mime_type (filter, *pattern);
+ }
+ else
+ {
+ for (pattern = patterns; *pattern; pattern++)
+ gtk_file_filter_add_pattern (filter, *pattern);
+ }
+
+ g_free (name);
+ g_strfreev (patterns);
+
+ options.common_data.filters = g_list_append (options.common_data.filters, filter);
+ }
+
+ return TRUE;
+}
+
+static gboolean
set_color_mode (const gchar * option_name, const gchar * value, gpointer data, GError ** err)
{
if (strcasecmp (value, "hex") == 0)
options.color_data.mode = YAD_COLOR_HEX;
- else if(strcasecmp (value, "rgb") == 0)
+ else if (strcasecmp (value, "rgb") == 0)
options.color_data.mode = YAD_COLOR_RGB;
else
g_printerr (_("Unknown color mode: %s\n"), value);
@@ -1635,6 +1781,19 @@
}
static gboolean
+set_orient (const gchar * option_name, const gchar * value, gpointer data, GError ** err)
+{
+ if (strncasecmp (value, "hor", 3) == 0)
+ options.paned_data.orient = GTK_ORIENTATION_HORIZONTAL;
+ else if (strncasecmp (value, "vert", 4) == 0)
+ options.print_data.type = GTK_ORIENTATION_VERTICAL;
+ else
+ g_printerr (_("Unknown orientation: %s\n"), value);
+
+ return TRUE;
+}
+
+static gboolean
set_print_type (const gchar * option_name, const gchar * value, gpointer data, GError ** err)
{
if (strcasecmp (value, "text") == 0)
@@ -1726,8 +1885,7 @@
else if (strcmp (value + ofst, "STKFLT") == 0)
sn = SIGSTKFLT;
#endif
- else if (strcmp (value + ofst, "CHLD") == 0 ||
- strcmp (value + ofst, "CLD") == 0)
+ else if (strcmp (value + ofst, "CHLD") == 0 || strcmp (value + ofst, "CLD") == 0)
sn = SIGCHLD;
else if (strcmp (value + ofst, "CONT") == 0)
sn = SIGCONT;
@@ -1751,8 +1909,7 @@
sn = SIGPROF;
else if (strcmp (value + ofst, "WINCH") == 0)
sn = SIGWINCH;
- else if (strcmp (value + ofst, "IO") == 0 ||
- strcmp (value + ofst, "POLL") == 0)
+ else if (strcmp (value + ofst, "IO") == 0 || strcmp (value + ofst, "POLL") == 0)
sn = SIGIO;
#ifdef SIGPWR
else if (strcmp (value + ofst, "PWR") == 0)
@@ -1802,6 +1959,8 @@
options.mode = YAD_MODE_NOTEBOOK;
else if (notification_mode)
options.mode = YAD_MODE_NOTIFICATION;
+ else if (paned_mode)
+ options.mode = YAD_MODE_PANED;
else if (print_mode)
options.mode = YAD_MODE_PRINT;
else if (progress_mode)
@@ -1825,6 +1984,7 @@
options.extra_data = NULL;
options.gtkrc_file = NULL;
#ifndef G_OS_WIN32
+ options.parent = 0;
options.kill_parent = 0;
options.print_xid = FALSE;
#endif
@@ -1850,9 +2010,6 @@
options.data.buttons = NULL;
options.data.no_buttons = FALSE;
options.data.buttons_layout = GTK_BUTTONBOX_END;
-#if !GTK_CHECK_VERSION(2,22,0)
- options.data.dialog_sep = settings.dlg_sep;
-#endif
options.data.borders = -1;
options.data.no_markup = FALSE;
options.data.no_escape = FALSE;
@@ -1878,12 +2035,14 @@
options.common_data.multi = FALSE;
options.common_data.editable = FALSE;
options.common_data.command = NULL;
- options.common_data.date_format = "%x";
+ options.common_data.date_format = settings.date_format;
options.common_data.vertical = FALSE;
options.common_data.align = 0.0;
options.common_data.listen = FALSE;
options.common_data.preview = FALSE;
options.common_data.quoted_output = FALSE;
+ options.common_data.filters = NULL;
+ options.common_data.key = -1;
/* Initialize calendar data */
options.calendar_data.day = -1;
@@ -1893,7 +2052,9 @@
/* Initialize color data */
options.color_data.init_color = NULL;
+ options.color_data.gtk_palette = FALSE;
options.color_data.use_palette = FALSE;
+ options.color_data.expand_palette = FALSE;
options.color_data.palette = NULL;
options.color_data.extra = FALSE;
options.color_data.alpha = FALSE;
@@ -1918,7 +2079,9 @@
options.file_data.save = FALSE;
options.file_data.confirm_overwrite = FALSE;
options.file_data.confirm_text = N_("File exist. Overwrite?");
- options.file_data.filter = NULL;
+ options.file_data.file_filt = NULL;
+ options.file_data.mime_filt = NULL;
+ options.file_data.image_filt = NULL;
/* Initialize font data */
options.font_data.preview = NULL;
@@ -1954,11 +2117,14 @@
options.list_data.checkbox = FALSE;
options.list_data.radiobox = FALSE;
options.list_data.print_all = FALSE;
+ options.list_data.rules_hint = TRUE;
options.list_data.print_column = 0;
options.list_data.hide_column = 0;
options.list_data.expand_column = -1; // must be -1 for disable expand by default (keep the original behavior)
options.list_data.search_column = 0;
options.list_data.tooltip_column = 0;
+ options.list_data.sep_column = 0;
+ options.list_data.sep_value = NULL;
options.list_data.limit = 0;
options.list_data.ellipsize = PANGO_ELLIPSIZE_NONE;
options.list_data.dclick_action = NULL;
@@ -1972,13 +2138,16 @@
options.notebook_data.tabs = NULL;
options.notebook_data.borders = 5;
options.notebook_data.pos = GTK_POS_TOP;
- options.notebook_data.key = -1;
/* Initialize notification data */
options.notification_data.middle = TRUE;
options.notification_data.hidden = FALSE;
options.notification_data.menu = NULL;
+ /* Initialize paned data */
+ options.paned_data.orient = GTK_ORIENTATION_VERTICAL;
+ options.paned_data.splitter = -1;
+
/* Initialize print data */
options.print_data.type = YAD_PRINT_TEXT;
options.print_data.headers = FALSE;
@@ -2014,7 +2183,10 @@
options.text_data.back = NULL;
options.text_data.wrap = FALSE;
options.text_data.justify = GTK_JUSTIFY_LEFT;
+ options.text_data.margins = 0;
options.text_data.tail = FALSE;
+ options.text_data.uri = FALSE;
+ options.text_data.uri_color = "blue";
}
GOptionContext *
@@ -2114,6 +2286,12 @@
g_option_group_set_translation_domain (a_group, GETTEXT_PACKAGE);
g_option_context_add_group (tmp_ctx, a_group);
+ /* Adds paned option entries */
+ a_group = g_option_group_new ("paned", _("Paned dialog options"), _("Show paned dialog options"), NULL, NULL);
+ g_option_group_add_entries (a_group, paned_options);
+ g_option_group_set_translation_domain (a_group, GETTEXT_PACKAGE);
+ g_option_context_add_group (tmp_ctx, a_group);
+
/* Adds print option entries */
a_group = g_option_group_new ("print", _("Print dialog options"), _("Show print dialog options"), NULL, NULL);
g_option_group_add_entries (a_group, print_options);
@@ -2138,6 +2316,12 @@
g_option_group_set_translation_domain (a_group, GETTEXT_PACKAGE);
g_option_context_add_group (tmp_ctx, a_group);
+ /* Adds file filters option entries */
+ a_group = g_option_group_new ("filter", _("File filter options"), _("Show file filter options"), NULL, NULL);
+ g_option_group_add_entries (a_group, filter_options);
+ g_option_group_set_translation_domain (a_group, GETTEXT_PACKAGE);
+ g_option_context_add_group (tmp_ctx, a_group);
+
/* Adds miscellaneous option entries */
a_group = g_option_group_new ("misc", _("Miscellaneous options"), _("Show miscellaneous options"), NULL, NULL);
g_option_group_add_entries (a_group, misc_options);
diff -Nru yad-0.28.2/src/paned.c yad-0.31.0/src/paned.c
--- yad-0.28.2/src/paned.c 1970-01-01 00:00:00.000000000 +0000
+++ yad-0.31.0/src/paned.c 2015-09-08 08:31:21.000000000 +0000
@@ -0,0 +1,125 @@
+/*
+ * This file is part of YAD.
+ *
+ * YAD is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * YAD is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with YAD. If not, see .
+ *
+ * Copyright (C) 2008-2015, Victor Ananjevsky
+ */
+
+#include
+#include
+#include
+#include
+
+#include
+#include
+
+#include
+#include
+#include
+#include
+
+#include "yad.h"
+
+static GtkWidget *paned;
+
+GtkWidget *
+paned_create_widget (GtkWidget * dlg)
+{
+ GtkWidget *w, *s;
+
+ /* get shared memory */
+ tabs = get_tabs (options.common_data.key, TRUE);
+ if (!tabs)
+ exit (-1);
+
+ /* create widget */
+ if (options.paned_data.orient == GTK_ORIENTATION_HORIZONTAL)
+ paned = w = gtk_hpaned_new ();
+ else
+ paned = w = gtk_vpaned_new ();
+
+ gtk_paned_set_position (GTK_PANED (w), options.paned_data.splitter);
+
+ s = gtk_socket_new ();
+ gtk_paned_add1 (GTK_PANED (w), s);
+ g_object_set_data (G_OBJECT (w), "s1", s);
+
+ s = gtk_socket_new ();
+ gtk_paned_add2 (GTK_PANED (w), s);
+ g_object_set_data (G_OBJECT (w), "s2", s);
+
+ return w;
+}
+
+void
+paned_swallow_childs (void)
+{
+ GtkWidget *s1, *s2;
+
+ s1 = GTK_WIDGET (g_object_get_data (G_OBJECT (paned), "s1"));
+ s2 = GTK_WIDGET (g_object_get_data (G_OBJECT (paned), "s2"));
+
+ /* wait until all children are register */
+ while (tabs[0].xid != 2)
+ usleep (1000);
+
+ if (tabs[1].pid != -1)
+ gtk_socket_add_id (GTK_SOCKET (s1), tabs[1].xid);
+ if (tabs[2].pid != -1)
+ gtk_socket_add_id (GTK_SOCKET (s2), tabs[2].xid);
+}
+
+void
+paned_print_result (void)
+{
+ if (tabs[1].pid != -1)
+ kill (tabs[1].pid, SIGUSR1);
+ if (tabs[2].pid != -1)
+ kill (tabs[2].pid, SIGUSR1);
+}
+
+void
+paned_close_childs (void)
+{
+ guint i;
+ struct shmid_ds buf;
+ gboolean is_running = TRUE;
+
+ gtk_widget_destroy (paned);
+
+ if (tabs[1].pid != -1)
+ kill (tabs[1].pid, SIGUSR2);
+ if (tabs[2].pid != -1)
+ kill (tabs[2].pid, SIGUSR2);
+
+ /* wait for stop subprocesses */
+ while (is_running)
+ {
+ is_running = FALSE;
+ for (i = 1; i <= 3; i++)
+ {
+ if (tabs[i].pid != -1 && kill (tabs[i].pid, 0) == 0)
+ {
+ is_running = TRUE;
+ break;
+ }
+ }
+ gtk_main_iteration ();
+ }
+
+ /* cleanup shared memory */
+ shmctl (tabs[0].pid, IPC_RMID, &buf);
+ shmdt (tabs);
+}
diff -Nru yad-0.28.2/src/print.c yad-0.31.0/src/print.c
--- yad-0.28.2/src/print.c 2015-07-15 17:55:52.000000000 +0000
+++ yad-0.31.0/src/print.c 2015-09-04 10:24:50.000000000 +0000
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with YAD. If not, see .
*
- * Copyright (C) 2008-2014, Victor Ananjevsky
+ * Copyright (C) 2008-2015, Victor Ananjevsky
*/
#include
@@ -247,13 +247,13 @@
if (!settings.print_settings)
settings.print_settings = gtk_print_unix_dialog_get_settings (GTK_PRINT_UNIX_DIALOG (dlg));
-
+
uri = g_build_filename (g_get_current_dir (), "yad.pdf", NULL);
gtk_print_settings_set (settings.print_settings, "output-uri", g_filename_to_uri (uri, NULL, NULL));
g_free (uri);
-
+
gtk_print_unix_dialog_set_settings (GTK_PRINT_UNIX_DIALOG (dlg), settings.print_settings);
-
+
if (settings.page_setup)
gtk_print_unix_dialog_set_page_setup (GTK_PRINT_UNIX_DIALOG (dlg), settings.page_setup);
@@ -332,88 +332,88 @@
//gtk_widget_show (dlg);
switch (gtk_dialog_run (GTK_DIALOG (dlg)))
{
- case GTK_RESPONSE_APPLY: /* ask for preview */
- act = GTK_PRINT_OPERATION_ACTION_PREVIEW;
- case GTK_RESPONSE_OK: /* run print */
- settings.print_settings = gtk_print_unix_dialog_get_settings (GTK_PRINT_UNIX_DIALOG (dlg));
- settings.page_setup = gtk_print_unix_dialog_get_page_setup (GTK_PRINT_UNIX_DIALOG (dlg));
- job_name = g_strdup_printf ("yad-%s-%d", g_path_get_basename (options.common_data.uri), getpid ());
- if (options.print_data.type != YAD_PRINT_RAW)
- {
- /* print text or image */
- GtkPrintOperation *op = gtk_print_operation_new ();
- gtk_print_operation_set_unit (op, GTK_UNIT_POINTS);
- gtk_print_operation_set_print_settings (op, settings.print_settings);
- gtk_print_operation_set_default_page_setup (op, settings.page_setup);
- gtk_print_operation_set_job_name (op, job_name);
-
- switch (options.print_data.type)
- {
- case YAD_PRINT_TEXT:
- g_signal_connect (G_OBJECT (op), "begin-print", G_CALLBACK (begin_print_text), NULL);
- g_signal_connect (G_OBJECT (op), "draw-page", G_CALLBACK (draw_page_text), NULL);
- break;
- case YAD_PRINT_IMAGE:
- gtk_print_operation_set_n_pages (op, 1);
- g_signal_connect (G_OBJECT (op), "draw-page", G_CALLBACK (draw_page_image), NULL);
- break;
- default:;
- }
-
- if (gtk_print_operation_run (op, act, NULL, &err) == GTK_PRINT_OPERATION_RESULT_ERROR)
- {
- g_printerr (_("Printing failed: %s\n"), err->message);
- ret = 1;
- }
- }
- else
- {
- /* print raw ps or pdf data */
- GtkPrinter *prnt;
- GtkPrintJob *job;
-
- prnt = gtk_print_unix_dialog_get_selected_printer (GTK_PRINT_UNIX_DIALOG (dlg));
-
- if (g_str_has_suffix (options.common_data.uri, ".ps"))
- {
- if (!gtk_printer_accepts_ps (prnt))
- {
- g_printerr (_("Printer doesn't support ps format.\n"));
- ret = 1;
- }
- }
- else if (g_str_has_suffix (options.common_data.uri, ".pdf"))
- {
- if (!gtk_printer_accepts_pdf (prnt))
- {
- g_printerr (_("Printer doesn't support pdf format.\n"));
- ret = 1;
- }
- }
- else
- {
- g_printerr (_("This file type is not supported for raw printing.\n"));
- ret = 1;
- }
- if (ret == 1)
+ case GTK_RESPONSE_APPLY: /* ask for preview */
+ act = GTK_PRINT_OPERATION_ACTION_PREVIEW;
+ case GTK_RESPONSE_OK: /* run print */
+ settings.print_settings = gtk_print_unix_dialog_get_settings (GTK_PRINT_UNIX_DIALOG (dlg));
+ settings.page_setup = gtk_print_unix_dialog_get_page_setup (GTK_PRINT_UNIX_DIALOG (dlg));
+ job_name = g_strdup_printf ("yad-%s-%d", g_path_get_basename (options.common_data.uri), getpid ());
+ if (options.print_data.type != YAD_PRINT_RAW)
+ {
+ /* print text or image */
+ GtkPrintOperation *op = gtk_print_operation_new ();
+ gtk_print_operation_set_unit (op, GTK_UNIT_POINTS);
+ gtk_print_operation_set_print_settings (op, settings.print_settings);
+ gtk_print_operation_set_default_page_setup (op, settings.page_setup);
+ gtk_print_operation_set_job_name (op, job_name);
+
+ switch (options.print_data.type)
+ {
+ case YAD_PRINT_TEXT:
+ g_signal_connect (G_OBJECT (op), "begin-print", G_CALLBACK (begin_print_text), NULL);
+ g_signal_connect (G_OBJECT (op), "draw-page", G_CALLBACK (draw_page_text), NULL);
+ break;
+ case YAD_PRINT_IMAGE:
+ gtk_print_operation_set_n_pages (op, 1);
+ g_signal_connect (G_OBJECT (op), "draw-page", G_CALLBACK (draw_page_image), NULL);
break;
+ default:;
+ }
- job = gtk_print_job_new (job_name, prnt, settings.print_settings, settings.page_setup);
- if (gtk_print_job_set_source_file (job, options.common_data.uri, &err))
- {
- gtk_print_job_send (job, (GtkPrintJobCompleteFunc) raw_print_done, &ret, NULL);
- gtk_main ();
- }
- else
- {
- g_printerr (_("Load source file failed: %s\n"), err->message);
- ret = 1;
- }
- }
- break;
- default:
- ret = 1;
- break;
+ if (gtk_print_operation_run (op, act, NULL, &err) == GTK_PRINT_OPERATION_RESULT_ERROR)
+ {
+ g_printerr (_("Printing failed: %s\n"), err->message);
+ ret = 1;
+ }
+ }
+ else
+ {
+ /* print raw ps or pdf data */
+ GtkPrinter *prnt;
+ GtkPrintJob *job;
+
+ prnt = gtk_print_unix_dialog_get_selected_printer (GTK_PRINT_UNIX_DIALOG (dlg));
+
+ if (g_str_has_suffix (options.common_data.uri, ".ps"))
+ {
+ if (!gtk_printer_accepts_ps (prnt))
+ {
+ g_printerr (_("Printer doesn't support ps format.\n"));
+ ret = 1;
+ }
+ }
+ else if (g_str_has_suffix (options.common_data.uri, ".pdf"))
+ {
+ if (!gtk_printer_accepts_pdf (prnt))
+ {
+ g_printerr (_("Printer doesn't support pdf format.\n"));
+ ret = 1;
+ }
+ }
+ else
+ {
+ g_printerr (_("This file type is not supported for raw printing.\n"));
+ ret = 1;
+ }
+ if (ret == 1)
+ break;
+
+ job = gtk_print_job_new (job_name, prnt, settings.print_settings, settings.page_setup);
+ if (gtk_print_job_set_source_file (job, options.common_data.uri, &err))
+ {
+ gtk_print_job_send (job, (GtkPrintJobCompleteFunc) raw_print_done, &ret, NULL);
+ gtk_main ();
+ }
+ else
+ {
+ g_printerr (_("Load source file failed: %s\n"), err->message);
+ ret = 1;
+ }
+ }
+ break;
+ default:
+ ret = 1;
+ break;
}
gtk_widget_destroy (dlg);
diff -Nru yad-0.28.2/src/progress.c yad-0.31.0/src/progress.c
--- yad-0.28.2/src/progress.c 2015-07-15 17:55:52.000000000 +0000
+++ yad-0.31.0/src/progress.c 2015-09-04 10:24:50.000000000 +0000
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with YAD. If not, see .
*
- * Copyright (C) 2008-2014, Victor Ananjevsky
+ * Copyright (C) 2008-2015, Victor Ananjevsky
*/
#include
@@ -94,7 +94,7 @@
gchar *logline;
GtkTextIter end;
- logline = g_strdup_printf ("%s\n", match); /* add new line */
+ logline = g_strdup_printf ("%s\n", match); /* add new line */
gtk_text_buffer_get_end_iter (log_buffer, &end);
gtk_text_buffer_insert (log_buffer, &end, logline, -1);
g_free (logline);
diff -Nru yad-0.28.2/src/scale.c yad-0.31.0/src/scale.c
--- yad-0.28.2/src/scale.c 2015-07-15 17:55:52.000000000 +0000
+++ yad-0.31.0/src/scale.c 2015-09-04 10:24:50.000000000 +0000
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with YAD. If not, see .
*
- * Copyright (C) 2008-2014, Victor Ananjevsky
+ * Copyright (C) 2008-2015, Victor Ananjevsky
*/
#include "yad.h"
@@ -68,7 +68,7 @@
{
#if GTK_CHECK_VERSION(3,0,0)
w = scale = gtk_scale_new (GTK_ORIENTATION_VERTICAL, GTK_ADJUSTMENT (adj));
-#else
+#else
w = scale = gtk_vscale_new (GTK_ADJUSTMENT (adj));
#endif
gtk_range_set_inverted (GTK_RANGE (w), !options.scale_data.invert);
@@ -77,7 +77,7 @@
{
#if GTK_CHECK_VERSION(3,0,0)
w = scale = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, GTK_ADJUSTMENT (adj));
-#else
+#else
w = scale = gtk_hscale_new (GTK_ADJUSTMENT (adj));
#endif
gtk_range_set_inverted (GTK_RANGE (w), options.scale_data.invert);
diff -Nru yad-0.28.2/src/text.c yad-0.31.0/src/text.c
--- yad-0.28.2/src/text.c 2015-07-15 17:55:52.000000000 +0000
+++ yad-0.31.0/src/text.c 2015-09-09 10:23:29.000000000 +0000
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with YAD. If not, see .
*
- * Copyright (C) 2008-2014, Victor Ananjevsky
+ * Copyright (C) 2008-2015, Victor Ananjevsky
*/
#include
@@ -92,12 +92,12 @@
#if GTK_CHECK_VERSION(2,24,0)
if (key->keyval == GDK_KEY_Escape)
#else
- if (key->keyval == GDK_Escape)
+ if (key->keyval == GDK_Escape)
#endif
- {
- gtk_widget_destroy (win);
- return TRUE;
- }
+ {
+ gtk_widget_destroy (win);
+ return TRUE;
+ }
return FALSE;
}
@@ -166,23 +166,23 @@
#if GTK_CHECK_VERSION(2,24,0)
if ((key->keyval == GDK_KEY_Return || key->keyval == GDK_KEY_KP_Enter) && (key->state & GDK_CONTROL_MASK))
#else
- if ((key->keyval == GDK_Return || key->keyval == GDK_KP_Enter) && (key->state & GDK_CONTROL_MASK))
+ if ((key->keyval == GDK_Return || key->keyval == GDK_KP_Enter) && (key->state & GDK_CONTROL_MASK))
#endif
- {
- if (options.plug == -1)
- gtk_dialog_response (GTK_DIALOG (data), YAD_RESPONSE_OK);
- return TRUE;
- }
+ {
+ if (options.plug == -1)
+ gtk_dialog_response (GTK_DIALOG (data), YAD_RESPONSE_OK);
+ return TRUE;
+ }
#if GTK_CHECK_VERSION(2,24,0)
if ((key->state & GDK_CONTROL_MASK) && (key->keyval == GDK_KEY_S || key->keyval == GDK_KEY_s))
#else
- if ((key->state & GDK_CONTROL_MASK) && (key->keyval == GDK_S || key->keyval == GDK_s))
+ if ((key->state & GDK_CONTROL_MASK) && (key->keyval == GDK_S || key->keyval == GDK_s))
#endif
- {
- show_search ();
- return TRUE;
- }
+ {
+ show_search ();
+ return TRUE;
+ }
return FALSE;
}
@@ -204,7 +204,7 @@
gtk_text_iter_forward_to_tag_toggle (&end, tag);
url = gtk_text_iter_get_text (&start, &end);
- cmdline = g_strdup_printf ("xdg-open '%s'", url);
+ cmdline = g_strdup_printf (settings.open_cmd, url);
g_free (url);
g_spawn_command_line_async (cmdline, NULL);
@@ -520,7 +520,9 @@
/* Create text tag for URI */
tag = gtk_text_buffer_create_tag (text_buffer, NULL,
- "foreground", "blue", "underline", PANGO_UNDERLINE_SINGLE, NULL);
+ "foreground", options.text_data.uri_color,
+ "underline", PANGO_UNDERLINE_SINGLE,
+ NULL);
g_object_set_data (G_OBJECT (tag), "is_link", GINT_TO_POINTER (1));
g_signal_connect (G_OBJECT (tag), "event", G_CALLBACK (tag_event_cb), NULL);
diff -Nru yad-0.28.2/src/util.c yad-0.31.0/src/util.c
--- yad-0.28.2/src/util.c 2015-07-15 17:55:52.000000000 +0000
+++ yad-0.31.0/src/util.c 2015-09-10 07:47:06.000000000 +0000
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with YAD. If not, see .
*
- * Copyright (C) 2008-2014, Victor Ananjevsky
+ * Copyright (C) 2008-2015, Victor Ananjevsky
*/
#include
@@ -26,8 +26,6 @@
#include "yad.h"
-#define SETTINGS_FILE "yad.conf"
-
YadSettings settings;
void
@@ -41,22 +39,18 @@
settings.timeout = 0;
settings.to_indicator = "none";
settings.show_remain = FALSE;
- settings.rules_hint = TRUE;
settings.always_selected = FALSE;
-#if !GTK_CHECK_VERSION(2,22,0)
- settings.dlg_sep = FALSE;
-#endif
settings.combo_always_editable = FALSE;
- settings.show_gtk_palette = FALSE;
- settings.expand_palette = FALSE;
- settings.term = "xterm -e %s";
+ settings.term = "xterm -e '%s'";
+ settings.open_cmd = "xdg-open '%s'";
+ settings.date_format = "%x";
settings.ignore_unknown = TRUE;
settings.max_tab = 100;
settings.print_settings = NULL;
settings.page_setup = NULL;
- filename = g_build_filename (g_get_user_config_dir (), SETTINGS_FILE, NULL);
+ filename = g_build_filename (g_get_user_config_dir (), YAD_SETTINGS_FILE, NULL);
if (g_file_test (filename, G_FILE_TEST_EXISTS))
{
@@ -64,10 +58,6 @@
if (g_key_file_load_from_file (kf, filename, G_KEY_FILE_NONE, NULL))
{
-#if !GTK_CHECK_VERSION(2,22,0)
- if (g_key_file_has_key (kf, "General", "dialog_separator", NULL))
- settings.dlg_sep = g_key_file_get_boolean (kf, "General", "dialog_separator", NULL);
-#endif
if (g_key_file_has_key (kf, "General", "width", NULL))
settings.width = g_key_file_get_integer (kf, "General", "width", NULL);
if (g_key_file_has_key (kf, "General", "height", NULL))
@@ -78,18 +68,16 @@
settings.to_indicator = g_key_file_get_string (kf, "General", "timeout_indicator", NULL);
if (g_key_file_has_key (kf, "General", "show_remain", NULL))
settings.show_remain = g_key_file_get_boolean (kf, "General", "show_remain", NULL);
- if (g_key_file_has_key (kf, "General", "rules_hint", NULL))
- settings.rules_hint = g_key_file_get_boolean (kf, "General", "rules_hint", NULL);
if (g_key_file_has_key (kf, "General", "always_selected", NULL))
settings.always_selected = g_key_file_get_boolean (kf, "General", "always_selected", NULL);
if (g_key_file_has_key (kf, "General", "combo_always_editable", NULL))
settings.combo_always_editable = g_key_file_get_boolean (kf, "General", "combo_always_editable", NULL);
- if (g_key_file_has_key (kf, "General", "show_gtk_palette", NULL))
- settings.show_gtk_palette = g_key_file_get_boolean (kf, "General", "show_gtk_palette", NULL);
- if (g_key_file_has_key (kf, "General", "expand_palette", NULL))
- settings.expand_palette = g_key_file_get_boolean (kf, "General", "expand_palette", NULL);
if (g_key_file_has_key (kf, "General", "terminal", NULL))
settings.term = g_key_file_get_string (kf, "General", "terminal", NULL);
+ if (g_key_file_has_key (kf, "General", "open_command", NULL))
+ settings.open_cmd = g_key_file_get_string (kf, "General", "open_command", NULL);
+ if (g_key_file_has_key (kf, "General", "date_format", NULL))
+ settings.date_format = g_key_file_get_string (kf, "General", "date_format", NULL);
if (g_key_file_has_key (kf, "General", "ignore_unknown_options", NULL))
settings.ignore_unknown = g_key_file_get_boolean (kf, "General", "ignore_unknown_options", NULL);
if (g_key_file_has_key (kf, "General", "max_tab", NULL))
@@ -115,37 +103,31 @@
kf = g_key_file_new ();
-#if !GTK_CHECK_VERSION(2,22,0)
- g_key_file_set_boolean (kf, "General", "dialog_separator", settings.dlg_sep);
- g_key_file_set_comment (kf, "General", "dialog_separator", "Enable separator between dialog and buttons", NULL);
-#endif
g_key_file_set_integer (kf, "General", "width", settings.width);
- g_key_file_set_comment (kf, "General", "width", "Default dialog width", NULL);
+ g_key_file_set_comment (kf, "General", "width", " Default dialog width", NULL);
g_key_file_set_integer (kf, "General", "height", settings.height);
- g_key_file_set_comment (kf, "General", "height", "Default dialog height", NULL);
+ g_key_file_set_comment (kf, "General", "height", " Default dialog height", NULL);
g_key_file_set_integer (kf, "General", "timeout", settings.timeout);
- g_key_file_set_comment (kf, "General", "timeout", "Default timeout (0 for no timeout)", NULL);
+ g_key_file_set_comment (kf, "General", "timeout", " Default timeout (0 for no timeout)", NULL);
g_key_file_set_string (kf, "General", "timeout_indicator", settings.to_indicator);
g_key_file_set_comment (kf, "General", "timeout_indicator",
- "Position of timeout indicator (top, bottom, left, right, none)", NULL);
+ " Position of timeout indicator (top, bottom, left, right, none)", NULL);
g_key_file_set_boolean (kf, "General", "show_remain", settings.show_remain);
- g_key_file_set_comment (kf, "General", "show_remain", "Show remain seconds in timeout indicator", NULL);
- g_key_file_set_boolean (kf, "General", "rules_hint", settings.rules_hint);
- g_key_file_set_comment (kf, "General", "rules_hint", "Enable rules hints in list widget", NULL);
+ g_key_file_set_comment (kf, "General", "show_remain", " Show remain seconds in timeout indicator", NULL);
g_key_file_set_boolean (kf, "General", "always_selected", settings.always_selected);
- g_key_file_set_comment (kf, "General", "always_selected", "List widget always have a selection", NULL);
+ g_key_file_set_comment (kf, "General", "always_selected", " List widget always have a selection", NULL);
g_key_file_set_boolean (kf, "General", "combo_always_editable", settings.combo_always_editable);
- g_key_file_set_comment (kf, "General", "combo_always_editable", "Combo-box in entry dialog is always editable", NULL);
- g_key_file_set_boolean (kf, "General", "show_gtk_palette", settings.show_gtk_palette);
- g_key_file_set_comment (kf, "General", "show_gtk_palette", "Show GtkColorSelection palette", NULL);
- g_key_file_set_boolean (kf, "General", "expand_palette", settings.expand_palette);
- g_key_file_set_comment (kf, "General", "expand_palette", "Expand list of predefined colors in color dialog", NULL);
+ g_key_file_set_comment (kf, "General", "combo_always_editable", " Combo-box in entry dialog is always editable", NULL);
g_key_file_set_string (kf, "General", "terminal", settings.term);
- g_key_file_set_comment (kf, "General", "terminal", "Default terminal command (use %s for command template)", NULL);
+ g_key_file_set_comment (kf, "General", "terminal", " Default terminal command (use %s for arguments placeholder)", NULL);
+ g_key_file_set_string (kf, "General", "open_command", settings.open_cmd);
+ g_key_file_set_comment (kf, "General", "open_command", " Default open command (use %s for arguments placeholder)", NULL);
+ g_key_file_set_string (kf, "General", "date_format", settings.date_format);
+ g_key_file_set_comment (kf, "General", "date_format", " Default date format (sett msgfmt(3) for details)", NULL);
g_key_file_set_boolean (kf, "General", "ignore_unknown_options", settings.ignore_unknown);
- g_key_file_set_comment (kf, "General", "ignore_unknown_options", "Ingnore unknown command-line options", NULL);
+ g_key_file_set_comment (kf, "General", "ignore_unknown_options", " Ingnore unknown command-line options", NULL);
g_key_file_set_integer (kf, "General", "max_tab", settings.max_tab);
- g_key_file_set_comment (kf, "General", "max_tab", "Maximum number of tabs in notebook", NULL);
+ g_key_file_set_comment (kf, "General", "max_tab", " Maximum number of tabs in notebook", NULL);
if (settings.print_settings)
gtk_print_settings_to_key_file (settings.print_settings, kf, NULL);
@@ -158,7 +140,7 @@
if (g_mkdir_with_parents (g_get_user_config_dir (), 0755) != -1)
{
- gchar *filename = g_build_filename (g_get_user_config_dir (), SETTINGS_FILE, NULL);
+ gchar *filename = g_build_filename (g_get_user_config_dir (), YAD_SETTINGS_FILE, NULL);
g_file_set_contents (filename, context, -1, NULL);
g_free (filename);
}
@@ -205,6 +187,73 @@
return pb;
}
+void
+update_preview (GtkFileChooser * chooser, GtkWidget *p)
+{
+ gchar *uri;
+ static gchar *normal_path = NULL;
+ static gchar *large_path = NULL;
+
+ /* init thumbnails path */
+ if (!normal_path)
+ normal_path = g_build_filename (g_get_user_cache_dir (), "thumbnails", "normal", NULL);
+ if (!large_path)
+ large_path = g_build_filename (g_get_user_cache_dir (), "thumbnails", "large", NULL);
+
+ /* load preview */
+ uri = gtk_file_chooser_get_preview_uri (chooser);
+ if (uri)
+ {
+ gchar *file;
+ GChecksum *chs;
+ GdkPixbuf *pb;
+
+ chs = g_checksum_new (G_CHECKSUM_MD5);
+ g_checksum_update (chs, uri, -1);
+ /* first try to get preview from large thumbnail */
+ file = g_strdup_printf ("%s/%s.png", large_path, g_checksum_get_string (chs));
+ if (g_file_test (file, G_FILE_TEST_EXISTS))
+ pb = gdk_pixbuf_new_from_file (file, NULL);
+ else
+ {
+ /* try to get preview from normal thumbnail */
+ g_free (file);
+ file = g_strdup_printf ("%s/%s.png", normal_path, g_checksum_get_string (chs));
+ if (g_file_test (file, G_FILE_TEST_EXISTS))
+ pb = gdk_pixbuf_new_from_file (file, NULL);
+ else
+ {
+ /* try to create it */
+ g_free (file);
+ file = g_filename_from_uri (uri, NULL, NULL);
+ pb = gdk_pixbuf_new_from_file_at_size (file, 256, 256, NULL);
+ g_free (file);
+ if (pb)
+ {
+ /* save thumbnail */
+ g_mkdir_with_parents (large_path, 0755);
+ file = g_strdup_printf ("%s/%s.png", large_path, g_checksum_get_string (chs));
+ gdk_pixbuf_save (pb, file, "png", NULL, NULL);
+ }
+ }
+ }
+ g_checksum_free (chs);
+
+ if (pb)
+ {
+ gtk_image_set_from_pixbuf (GTK_IMAGE (p), pb);
+ g_object_unref (pb);
+ gtk_file_chooser_set_preview_widget_active (chooser, TRUE);
+ }
+ else
+ gtk_file_chooser_set_preview_widget_active (chooser, FALSE);
+
+ g_free (uri);
+ }
+ else
+ gtk_file_chooser_set_preview_widget_active (chooser, FALSE);
+}
+
gchar **
split_arg (const gchar * str)
{
@@ -251,7 +300,7 @@
}
/* attach shared memory */
- if ((t = shmat (shmid, NULL, 0)) == (YadNTabs *) -1)
+ if ((t = shmat (shmid, NULL, 0)) == (YadNTabs *) - 1)
{
g_printerr ("yad: cannot attach shared memory for key %ld: %s\n", key, strerror (errno));
return NULL;
@@ -272,7 +321,7 @@
}
GtkWidget *
-get_label (gchar *str, guint border)
+get_label (gchar * str, guint border)
{
GtkWidget *a, *t, *i, *l;
GtkStockItem it;
@@ -338,17 +387,17 @@
return a;
}
-char *
-escape_str (char *str)
+gchar *
+escape_str (gchar *str)
{
- char *res, *buf = str;
- unsigned i = 0, len;
+ gchar *res, *buf = str;
+ guint i = 0, len;
if (!str)
return NULL;
len = strlen (str);
- res = (char *) calloc (len + 1, sizeof (char));
+ res = (gchar *) calloc (len + 1, sizeof (gchar));
while (*buf)
{
@@ -356,13 +405,13 @@
{
case '\n':
len += 1;
- res = (char *) realloc (res, len + 1);
+ res = (gchar *) realloc (res, len + 1);
strcpy (res + i, "\\n");
i += 2;
break;
case '\t':
len += 1;
- res = (char *) realloc (res, len + 1);
+ res = (gchar *) realloc (res, len + 1);
strcpy (res + i, "\\t");
i += 2;
break;
diff -Nru yad-0.28.2/src/yad.h yad-0.31.0/src/yad.h
--- yad-0.28.2/src/yad.h 2015-07-15 17:55:52.000000000 +0000
+++ yad-0.31.0/src/yad.h 2015-09-10 07:47:06.000000000 +0000
@@ -42,6 +42,7 @@
#define YAD_RESPONSE_CANCEL 1
#define YAD_RESPONSE_TIMEOUT 70
#define YAD_RESPONSE_ESC -4 /* 252 */
+
#define YAD_URL_REGEX "(http|https|ftp)://[a-zA-Z0-9./_%#&-]+"
typedef enum {
@@ -61,6 +62,7 @@
YAD_MODE_MULTI_PROGRESS,
YAD_MODE_NOTEBOOK,
YAD_MODE_NOTIFICATION,
+ YAD_MODE_PANED,
YAD_MODE_PRINT,
YAD_MODE_PROGRESS,
YAD_MODE_SCALE,
@@ -168,9 +170,6 @@
gchar *dialog_image;
gboolean image_on_top;
gchar *icon_theme;
-#if !GTK_CHECK_VERSION(3,0,0)
- gboolean dialog_sep;
-#endif
gchar *expander;
gint borders;
GSList *buttons;
@@ -201,7 +200,9 @@
typedef struct {
gchar *init_color;
+ gboolean gtk_palette;
gboolean use_palette;
+ gboolean expand_palette;
gchar *palette;
gboolean extra;
gboolean alpha;
@@ -229,7 +230,9 @@
gboolean save;
gboolean confirm_overwrite;
gchar *confirm_text;
- gchar **filter;
+ gchar **file_filt;
+ gchar **mime_filt;
+ gchar *image_filt;
} YadFileData;
typedef struct {
@@ -270,11 +273,14 @@
gboolean checkbox;
gboolean radiobox;
gboolean print_all;
+ gboolean rules_hint;
gint print_column;
gint hide_column;
gint expand_column;
gint search_column;
gint tooltip_column;
+ gint sep_column;
+ gchar *sep_value;
guint limit;
PangoEllipsizeMode ellipsize;
gchar *dclick_action;
@@ -290,7 +296,6 @@
GSList *tabs;
guint borders;
GtkPositionType pos;
- key_t key;
} YadNotebookData;
typedef struct {
@@ -300,6 +305,11 @@
} YadNotificationData;
typedef struct {
+ GtkOrientation orient;
+ gint splitter;
+} YadPanedData;
+
+typedef struct {
YadPrintType type;
gboolean headers;
} YadPrintData;
@@ -340,6 +350,7 @@
gint margins;
gboolean tail;
gboolean uri;
+ gchar *uri_color;
} YadTextData;
typedef struct {
@@ -356,6 +367,8 @@
gboolean listen;
gboolean preview;
gboolean quoted_output;
+ GList *filters;
+ key_t key;
} YadCommonData;
typedef struct {
@@ -379,6 +392,7 @@
YadMultiProgressData multi_progress_data;
YadNotebookData notebook_data;
YadNotificationData notification_data;
+ YadPanedData paned_data;
YadPrintData print_data;
YadProgressData progress_data;
YadScaleData scale_data;
@@ -393,6 +407,7 @@
guint tabnum;
#ifndef G_OS_WIN32
+ guint64 parent;
guint kill_parent;
gboolean print_xid;
#endif
@@ -406,24 +421,19 @@
guint timeout;
gchar *to_indicator;
gboolean show_remain;
- gboolean rules_hint;
gboolean always_selected;
-#if !GTK_CHECK_VERSION(3,0,0)
- gboolean dlg_sep;
-#endif
gboolean combo_always_editable;
- gboolean show_gtk_palette;
- gboolean expand_palette;
gboolean ignore_unknown;
GtkIconTheme *icon_theme;
GdkPixbuf *big_fallback_image;
GdkPixbuf *small_fallback_image;
gchar *term;
+ gchar *open_cmd;
+ gchar *date_format;
guint max_tab;
GtkPrintSettings *print_settings;
GtkPageSetup *page_setup;
-
} YadSettings;
extern YadSettings settings;
@@ -457,12 +467,14 @@
GtkWidget *list_create_widget (GtkWidget * dlg);
GtkWidget *multi_progress_create_widget (GtkWidget * dlg);
GtkWidget *notebook_create_widget (GtkWidget * dlg);
+GtkWidget *paned_create_widget (GtkWidget * dlg);
GtkWidget *progress_create_widget (GtkWidget * dlg);
GtkWidget *scale_create_widget (GtkWidget * dlg);
GtkWidget *text_create_widget (GtkWidget * dlg);
void confirm_overwrite_cb (GtkDialog * dlg, gint id, gpointer data);
void notebook_swallow_childs (void);
+void paned_swallow_childs (void);
void calendar_print_result (void);
void color_print_result (void);
@@ -472,6 +484,7 @@
void form_print_result (void);
void list_print_result (void);
void notebook_print_result (void);
+void paned_print_result (void);
void scale_print_result (void);
void text_print_result (void);
@@ -482,22 +495,26 @@
gint yad_about (void);
void notebook_close_childs (void);
+void paned_close_childs (void);
void read_settings (void);
void write_settings (void);
+void update_preview (GtkFileChooser * chooser, GtkWidget *p);
+
GdkPixbuf *get_pixbuf (gchar * name, YadIconSize size);
gchar **split_arg (const gchar * str);
YadNTabs *get_tabs (key_t key, gboolean create);
-GtkWidget *get_label (gchar *str, guint border);
+GtkWidget *get_label (gchar * str, guint border);
-char *escape_str (char *str);
+gchar *escape_str (gchar *str);
static inline void
-strip_new_line (gchar * str) {
+strip_new_line (gchar * str)
+{
gint nl = strlen (str) - 1;
if (str[nl] == '\n')