Projects
Extra
yad
Sign Up
Log In
Username
Password
We truncated the diff of some files because they were too big. If you want to see the full diff for every file,
click here
.
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 13
View file
yad.changes
Changed
@@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Jun 07 00:00:00 UTC 2011 - detlef@links2linux.de + +- new upstream version <0.12.1> + + * add icons to entry dialog + * add --details option to calendar dialog + * add new field types to form dialog: CBE for editable combo-boxes, DT for date field. + * and MFL for choose multiple files + * add user-specified doubleclick actions to list dialog + * makes YAD buildable under MS Windows + * code cleanups + +------------------------------------------------------------------- + Mon May 16 00:00:00 UTC 2011 - detlef@links2linux.de - new upstream version <0.11.0>
View file
yad.spec
Changed
@@ -1,7 +1,7 @@ # norootforbuild Name: yad -Version: 0.11.0 +Version: 0.12.1 Release: 1 Summary: A fork of Zenity with many improvements
View file
yad-0.11.0.tar.bz2/ChangeLog -> yad-0.12.1.tar.bz2/ChangeLog
Changed
@@ -1,3 +1,83 @@ +2011-05-30 07:04 ananasik + + * configure.ac, data/yad.1, po/de.po, po/ru.po, po/sk.po, po/uk.po, + src/form.c, src/option.c, src/yad.h: add editable combo-box field + to form dialog + +2011-05-28 17:55 ananasik + + * TODO, configure.ac, data/yad.1, po/de.po, po/ru.po, po/sk.po, + po/uk.po, src/browser.c, src/calendar.c, src/dnd.c, src/entry.c, + src/font.c, src/form.c, src/icons.c, src/list.c, src/main.c, + src/notification.c, src/option.c, src/progress.c, src/text.c, + src/util.c, src/yad.h: add double-click action for list dialog + +2011-05-28 17:21 ananasik + + * TODO, configure.ac, data/yad.1, po/de.po, po/ru.po, po/sk.po, + po/uk.po, src/calendar.xpm, src/entry.c, src/option.c, src/yad.h: + add icons to entry dialog + +2011-05-28 16:26 ananasik + + * data/yad.1, po/de.po, po/ru.po, po/sk.po, po/uk.po, + src/calendar.c, src/option.c, src/yad.h: add --details to + calendar dialog + +2011-05-28 11:08 ananasik + + * data/yad.1, po/de.po, po/ru.po, po/sk.po, po/uk.po, + src/calendar.c, src/form.c, src/option.c, src/yad.h: add multiple + files selection and date fields to form dialog + +2011-05-25 03:53 ananasik + + * src/icons.c, src/main.c, src/option.c, src/yad.h: add patch for + build yad under windows + +2011-05-24 14:32 ananasik + + * data/Makefile.am, data/zenity.sh, src/Makefile.am, + src/yad-zenity.sh: move zenity wrapper to data + +2011-05-24 14:26 ananasik + + * src/yad-zenity.sh: add zenity wrapper + +2011-05-24 13:50 ananasik + + * TODO: update TODO + +2011-05-24 13:48 ananasik + + * src/Makefile.am, src/yad-zenity.sh: add template for zenity + wrapper + +2011-05-21 05:18 ananasik + + * data/yad.1, po/de.po, po/ru.po, po/sk.po, po/uk.po: fix typo in + man page + +2011-05-16 10:46 ananasik + + * data/yad.1: update man page + +2011-05-11 09:31 ananasik + + * src/list.c: remove deprecated functions + +2011-05-11 09:23 ananasik + + * ChangeLog, src/list.c: + +2011-05-08 07:37 ananasik + + * configure.ac: bump version to 0.11.0 + +2011-05-08 07:36 ananasik + + * src/list.c: add tooltips to list dialog + 2011-04-25 13:12 ananasik * data/yad.1, po/de.po, po/ru.po, po/sk.po, po/uk.po, src/list.c,
View file
yad-0.11.0.tar.bz2/NEWS -> yad-0.12.1.tar.bz2/NEWS
Changed
@@ -1,3 +1,20 @@ +Version 0.12.0 + - add icons to entry dialog + - add --details option to calendar dialog + - add new field types to form dialog: CBE for editable combo-boxes, DT for date field + and MFL for choose multiple files + - add user-specified doubleclick actions to list dialog + - makes YAD buildable under MS Windows + - code cleanups + +Version 0.11.0 + - new --skip-taskbar option for hiding yad window from taskbar and pager + - add --search-column option to list dialog for set quicksearch column number + - add --elipsize option to list dialog for shortened long text in text columns + - add tooltips for list dialog. when tooltip column is not specified tooltips + shows content of cell under mouse + - add markup for entry labels in entry and form dialogs + Version 0.10.2 - fix wrong memory allocation when handling makrup text - fix reading data from stdin in text dialogs
View file
yad-0.11.0.tar.bz2/TODO -> yad-0.12.1.tar.bz2/TODO
Changed
@@ -1,2 +1,3 @@ - Parse ESC sequences in text-info dialog +
View file
yad-0.11.0.tar.bz2/aclocal.m4 -> yad-0.12.1.tar.bz2/aclocal.m4
Changed
@@ -1150,7 +1150,7 @@ AC_DEFUN(IT_PO_SUBDIR, AC_PREREQ(2.53)dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. dnl -dnl The following CONFIG_COMMANDS should be exetuted at the very end +dnl The following CONFIG_COMMANDS should be executed at the very end dnl of config.status. AC_CONFIG_COMMANDS_PRE( AC_CONFIG_COMMANDS($1/stamp-it,
View file
yad-0.11.0.tar.bz2/configure -> yad-0.12.1.tar.bz2/configure
Changed
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for YAD 0.11.0. +# Generated by GNU Autoconf 2.68 for YAD 0.12.1. # # Report bugs to <http://code.google.com/p/yad/issues/entry>. # @@ -560,8 +560,8 @@ # Identity of this package. PACKAGE_NAME='YAD' PACKAGE_TARNAME='yad' -PACKAGE_VERSION='0.11.0' -PACKAGE_STRING='YAD 0.11.0' +PACKAGE_VERSION='0.12.1' +PACKAGE_STRING='YAD 0.12.1' PACKAGE_BUGREPORT='http://code.google.com/p/yad/issues/entry' PACKAGE_URL='http://code.google.com/p/yad' @@ -1311,7 +1311,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.11.0 to adapt to many kinds of systems. +\`configure' configures YAD 0.12.1 to adapt to many kinds of systems. Usage: $0 OPTION... VAR=VALUE... @@ -1377,7 +1377,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of YAD 0.11.0:";; + short | recursive ) echo "Configuration of YAD 0.12.1:";; esac cat <<\_ACEOF @@ -1485,7 +1485,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -YAD configure 0.11.0 +YAD configure 0.12.1 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1854,7 +1854,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.11.0, which was +It was created by YAD $as_me 0.12.1, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2669,7 +2669,7 @@ # Define the identity of the package. PACKAGE='yad' - VERSION='0.11.0' + VERSION='0.12.1' cat >>confdefs.h <<_ACEOF @@ -6971,7 +6971,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.11.0, which was +This file was extended by YAD $as_me 0.12.1, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7038,7 +7038,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.11.0 +YAD config.status 0.12.1 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\"
View file
yad-0.11.0.tar.bz2/configure.ac -> yad-0.12.1.tar.bz2/configure.ac
Changed
@@ -1,4 +1,4 @@ -AC_INIT(YAD, 0.11.0, http://code.google.com/p/yad/issues/entry, yad, http://code.google.com/p/yad) +AC_INIT(YAD, 0.12.1, http://code.google.com/p/yad/issues/entry, yad, http://code.google.com/p/yad) AM_INIT_AUTOMAKE(1.11 foreign dist-xz no-dist-gzip) AM_SILENT_RULES(yes)
View file
yad-0.11.0.tar.bz2/data/Makefile.am -> yad-0.12.1.tar.bz2/data/Makefile.am
Changed
@@ -13,6 +13,6 @@ m4dir = $(datadir)/aclocal m4_DATA = yad.m4 -EXTRA_DIST = $(man_MANS) $(images_DATA) yad.spec.in yad.m4.in $(desktop_in_files) +EXTRA_DIST = $(man_MANS) $(images_DATA) yad.spec.in yad.m4.in $(desktop_in_files) zenity.sh DISTCLEAN_FILES = $(desktop_DATA) $(m4_DATA) yad.spec
View file
yad-0.11.0.tar.bz2/data/Makefile.in -> yad-0.12.1.tar.bz2/data/Makefile.in
Changed
@@ -208,7 +208,7 @@ images_DATA = yad.png m4dir = $(datadir)/aclocal m4_DATA = yad.m4 -EXTRA_DIST = $(man_MANS) $(images_DATA) yad.spec.in yad.m4.in $(desktop_in_files) +EXTRA_DIST = $(man_MANS) $(images_DATA) yad.spec.in yad.m4.in $(desktop_in_files) zenity.sh DISTCLEAN_FILES = $(desktop_DATA) $(m4_DATA) yad.spec all: all-am
View file
yad-0.11.0.tar.bz2/data/yad.1 -> yad-0.12.1.tar.bz2/data/yad.1
Changed
@@ -103,7 +103,7 @@ Add the dialog button. May be used several times. \fIID\fP is an exit code. \fIBUTTON\fP may be gtk stock item name for predefined buttons (like gtk-close or gtk-ok) or simple text label. Full list of stock items may be found in gtk-demo program, in snippet called \fI"Stock Items and Icon Browser"\fP. -If no buttons specified \fIOK\fP and \fICancel\fP buttons used. +If no buttons specified \fIOK\fP and \fICancel\fP buttons used. See \fBEXIT STATUS\fP section for more. .TP .B \-\-no-buttons Don't show buttons. @@ -140,7 +140,7 @@ .TP .B \-\-geometry=WIDTHxHEIGHT+X+Y Use standard X Window geometry notation for placing dialog. -When this option is used, \fIwidth\fP, \fIheidht\fP, \fImouse\fP and \fIcenter\fP options are +When this option is used, \fIwidth\fP, \fIheight\fP, \fImouse\fP and \fIcenter\fP options are ignored. .PP @@ -156,7 +156,17 @@ Set the calendar year. .TP .B \-\-date-format=PATTERN -Set the format for the returned date. +Set the format for the returned date. By default is `%x'. See \fIstrftime(3)\fP for more details. +.TP +.B \-\-details=FILENAME +Read days description from \IFILENAME\P. +.PP +File with days details must be in following format: +.IP +<date> <description> +.PP +\fIdate\fP field is date in format, specified with \fI\-\-date-format\fP option. \fIdescription\fP +is a string with date details, which may include Pango markup. .PP Color selection options @@ -198,9 +208,24 @@ .TP .B \-\-numeric Use spin button instead of text entry. Additional parameters in command line treats as minimum and maximum values and step value (in that order). All this values are optional. Default range is from 0 to 65535 with step 1. +.TP +.B \-\-licon +Set an icon on a left side of entry. +.TP +.B \-\-licon-action +Specify a command which will be run when the left icon clicked. Output of command will be set as entry text. +.TP +.B \-\-ricon +Set an icon on a right side of entry. +.TP +.B \-\-ricon-action +Specify a command which will be run when the right icon clicked. Output of command will be set as entry text. Any extra data specified in command line adds as an items of combo-box entry, except of numeric mode. +If icon specified and icon action is not given, click on icon just clear the entry. +Icons are available only for entry field. Numeric field or combo-boxes will ignore the icons. + .PP Iconbox options .TP @@ -263,16 +288,19 @@ Form options .TP .B \-\-field=LABEL:TYPE -Add field to form. Type may be \fIH\fP, \fIRO\fP, \fINUM\fP, \fICHK\fP, \fICB\fP, \fIFL\fP, \fIDIR\fP, \fIFN\fP or \fICLR\fP. +Add field to form. Type may be \fIH\fP, \fIRO\fP, \fINUM\fP, \fICHK\fP, \fICB\fP, \fICBE\fP, \fIFL\fP, \fIDIR\fP, \fIFN\fP, \fIMFL\fP, \fIDT\fP or \fICLR\fP. \fIH\fP - hidden field type. All characters are displayed as the invisible char. \fIRO\fP - field is in read-only mode. \fINUM\fP - field is a numeric. Initial value format for this field is \fIVALUE!RANGE!STEP\fP, where \fIRANGE\fP must be in form \fIMIN..MAX\fP. `!' is a default item separator. \fICHK\fP - checkbox field. Initial value is a case insensitive boolean constant (\fITRUE\fP or \fIFALSE\fP). \fICB\fP - combo-box field. Initial value is a list \fIVAL1!VAL2!...\fP. The separator is the same as in \fINUM\fP field. +\fICBE\fP - editable combo-box field. Initial value same as for combo-box. \fIFL\fP - file selection button. \fIDIR\fP - directory selection button. \fIFN\fP - font selection button. +\fMFL\fP - select multiple files. Value of this field is a list of files separated by \fIitem-separator\fP. +\fDT\fP - date field. \fICLR\fP - color selection button. .TP .B \-\-align=TYPE @@ -283,6 +311,9 @@ .TP .B \-\-item-separator=STRING Set separator character for combo-box or scale values. Default is `!'. +.TP +.B \-\-date-format=PATTERN +Set the format for the date fields (same as in calendar dialog). .PP Additional data in command line interprets as a default values for form fields. @@ -333,6 +364,9 @@ .TP .B \-\-ellipsize=TYPE Set ellipsize mode for text columns. \fITYPE\fP may be \fINONE\fP, \fISTART\fP, \fIMIDDLE\fP or \fIEND\fP. +.TP +.B \-\-dclick-action=CMD +Set the \fICMD\fP as a double-click command. When user double-clicked on row, CMD will be launched with values of all columns as an arguments. .PP Notification options
View file
yad-0.12.1.tar.bz2/data/zenity.sh
Added
@@ -0,0 +1,18 @@ + +function zenity () +{ + local ARGS + ARGS= + for a in "$@"; do + case $a in + --info) ARGS="$ARGS --image=gtk-dialog-info" ;; + --question) ARGS="$ARGS --image=gtk-dialog-question" ;; + --warning) ARGS="$ARGS --image=gtk-dialog-warning" ;; + --error) ARGS="$ARGS --image=gtk-dialog-error" ;; + *) ARGS="$ARGS $a" + esac + done + eval set -- $ARGS + yad $@ +} +export -f zenity
View file
yad-0.11.0.tar.bz2/po/de.po -> yad-0.12.1.tar.bz2/po/de.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: yad\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-25 16:09+0300\n" +"POT-Creation-Date: 2011-05-30 10:02+0300\n" "PO-Revision-Date: 2009-11-30 16:53+0100\n" "Last-Translator: Manfred Mueller aka Quax<mmueller@live-modules.org>\n" "Language-Team: German translations at Lin2Go <mmueller@live-modules.org>\n" @@ -64,27 +64,42 @@ "\n" "Basiert auf Zenity-Code\n" -#: ../src/entry.c:97 ../src/scale.c:39 +#: ../src/calendar.c:41 ../src/text.c:243 +#, c-format +msgid "Cannot open file '%s': %s\n" +msgstr "" + +#: ../src/entry.c:141 ../src/scale.c:39 #, c-format msgid "Maximum value must be greater than minimum value.\n" msgstr "Der Maximalwert muß kleiner als der Minimalwert sein.\n" -#: ../src/entry.c:103 ../src/scale.c:48 +#: ../src/entry.c:147 ../src/scale.c:48 #, c-format msgid "Initial value less than minimal.\n" msgstr "" -#: ../src/entry.c:108 ../src/scale.c:53 +#: ../src/entry.c:152 ../src/scale.c:53 #, fuzzy, c-format msgid "Initial value greater than maximum.\n" msgstr "Der Maximalwert muß kleiner als der Minimalwert sein.\n" -#: ../src/form.c:100 +#: ../src/form.c:42 +#, fuzzy +msgid "Select files" +msgstr "Datei öffnen" + +#: ../src/form.c:85 +#, fuzzy +msgid "Select date" +msgstr "Datei öffnen" + +#: ../src/form.c:205 #, fuzzy msgid "Select file" msgstr "Datei öffnen" -#: ../src/form.c:106 +#: ../src/form.c:211 msgid "Select folder" msgstr "" @@ -98,17 +113,17 @@ msgid "Unable to open directory %s: %s\n" msgstr "Kann Befehlszeile nicht einlesen: %s\n" -#: ../src/main.c:69 ../src/main.c:165 +#: ../src/main.c:71 ../src/main.c:167 #, c-format msgid "%d sec" msgstr "" -#: ../src/main.c:105 +#: ../src/main.c:107 #, c-format msgid "Error loading window icon %s: %s\n" msgstr "Fehler beim Laden von Fenster-Symbol %s: %s\n" -#: ../src/main.c:382 +#: ../src/main.c:384 #, c-format msgid "Unable parse command line: %s\n" msgstr "Kann Befehlszeile nicht einlesen: %s\n" @@ -132,15 +147,15 @@ msgid "Yad notification" msgstr "Yad Benachrichtigung" -#: ../src/list.c:508 +#: ../src/list.c:645 msgid "Add row" msgstr "Reihe hinzufügen" -#: ../src/list.c:517 +#: ../src/list.c:654 msgid "Delete row" msgstr "Reihe löschen" -#: ../src/list.c:546 +#: ../src/list.c:683 #, c-format msgid "No column titles specified for List dialog.\n" msgstr "Keine Spaltentitel für Listendialog angegeben\n" @@ -206,8 +221,8 @@ msgid "Set the dialog text" msgstr "Dialogtext angeben" -#: ../src/option.c:98 ../src/option.c:297 ../src/option.c:303 -#: ../src/option.c:309 ../src/option.c:413 ../src/option.c:651 +#: ../src/option.c:98 ../src/option.c:305 ../src/option.c:311 +#: ../src/option.c:317 ../src/option.c:445 ../src/option.c:695 msgid "TEXT" msgstr "TEXT" @@ -215,7 +230,7 @@ msgid "Set the dialog image" msgstr "Dialog-Symbol angeben" -#: ../src/option.c:104 +#: ../src/option.c:104 ../src/option.c:341 ../src/option.c:353 msgid "IMAGE" msgstr "SYMBOL" @@ -285,647 +300,680 @@ msgid "Don't show window in taskbar" msgstr "Spalten-Bezeichnung angeben" -#: ../src/option.c:196 +#: ../src/option.c:197 msgid "Send TERM to parent" msgstr "" -#: ../src/option.c:206 +#: ../src/option.c:208 msgid "Display calendar dialog" msgstr "Kalender-Dialog" -#: ../src/option.c:212 +#: ../src/option.c:214 msgid "Set the calendar day" msgstr "Kalender-Tag angeben" -#: ../src/option.c:213 +#: ../src/option.c:215 msgid "DAY" msgstr "TAG" -#: ../src/option.c:218 +#: ../src/option.c:220 msgid "Set the calendar month" msgstr "Kalender-Monat angeben" -#: ../src/option.c:219 +#: ../src/option.c:221 msgid "MONTH" msgstr "MONAT" -#: ../src/option.c:224 +#: ../src/option.c:226 msgid "Set the calendar year" msgstr "Kalender-Jahr angeben" -#: ../src/option.c:225 +#: ../src/option.c:227 msgid "YEAR" msgstr "Jahr" -#: ../src/option.c:230 +#: ../src/option.c:232 ../src/option.c:484 msgid "Set the format for the returned date" msgstr "Format des angezeigten Datums angeben" -#: ../src/option.c:231 ../src/option.c:494 +#: ../src/option.c:233 ../src/option.c:485 ../src/option.c:532 msgid "PATTERN" msgstr "FORMAT" -#: ../src/option.c:240 +#: ../src/option.c:238 +#, fuzzy +msgid "Set the filename with dates details" +msgstr "Dateinamen angeben" + +#: ../src/option.c:239 ../src/option.c:267 ../src/option.c:381 +#: ../src/option.c:844 +msgid "FILENAME" +msgstr "DATEINAME" + +#: ../src/option.c:248 msgid "Display color selection dialog" msgstr "Farbwahl-Dialog" -#: ../src/option.c:246 +#: ../src/option.c:254 msgid "Alias for --color" msgstr "" -#: ../src/option.c:252 +#: ../src/option.c:260 msgid "Set initial color value" msgstr "Wert der Anfangsfarbe angeben" -#: ../src/option.c:253 ../src/option.c:756 ../src/option.c:762 +#: ../src/option.c:261 ../src/option.c:802 ../src/option.c:808 msgid "COLOR" msgstr "FARBE"
View file
yad-0.11.0.tar.bz2/po/ru.po -> yad-0.12.1.tar.bz2/po/ru.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: YAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-25 16:09+0300\n" +"POT-Creation-Date: 2011-05-30 10:02+0300\n" "PO-Revision-Date: 2009-04-30 16:47+0300\n" "Last-Translator: Victor Ananjevsky <ananasik@gmail.com>\n" "Language-Team: Russian\n" @@ -66,26 +66,39 @@ "\n" "Основан на коде Zenity\n" -#: ../src/entry.c:97 ../src/scale.c:39 +#: ../src/calendar.c:41 ../src/text.c:243 +#, c-format +msgid "Cannot open file '%s': %s\n" +msgstr "Не могу открыть файл %s: %s\n" + +#: ../src/entry.c:141 ../src/scale.c:39 #, c-format msgid "Maximum value must be greater than minimum value.\n" msgstr "Максимальное значение должно быть больше, чем минимальное.\n" -#: ../src/entry.c:103 ../src/scale.c:48 +#: ../src/entry.c:147 ../src/scale.c:48 #, c-format msgid "Initial value less than minimal.\n" msgstr "Начальное значение меньше минимального.\n" -#: ../src/entry.c:108 ../src/scale.c:53 +#: ../src/entry.c:152 ../src/scale.c:53 #, c-format msgid "Initial value greater than maximum.\n" msgstr "Начальное значение больше маскимального.\n" -#: ../src/form.c:100 +#: ../src/form.c:42 +msgid "Select files" +msgstr "Выбрать файлы" + +#: ../src/form.c:85 +msgid "Select date" +msgstr "Выбрать дату" + +#: ../src/form.c:205 msgid "Select file" msgstr "Выбрать файл" -#: ../src/form.c:106 +#: ../src/form.c:211 msgid "Select folder" msgstr "Выбрать каталог" @@ -99,17 +112,17 @@ msgid "Unable to open directory %s: %s\n" msgstr "Не могу открыть каталог %s: %s\n" -#: ../src/main.c:69 ../src/main.c:165 +#: ../src/main.c:71 ../src/main.c:167 #, c-format msgid "%d sec" msgstr "%d сек" -#: ../src/main.c:105 +#: ../src/main.c:107 #, c-format msgid "Error loading window icon %s: %s\n" msgstr "Ошибка при загрузке иконки окна %s: %s\n" -#: ../src/main.c:382 +#: ../src/main.c:384 #, c-format msgid "Unable parse command line: %s\n" msgstr "Не удается разобрать командную строку: %s\n" @@ -133,15 +146,15 @@ msgid "Yad notification" msgstr "Диалог уведомлений" -#: ../src/list.c:508 +#: ../src/list.c:645 msgid "Add row" msgstr "Добавить строку" -#: ../src/list.c:517 +#: ../src/list.c:654 msgid "Delete row" msgstr "Удалить строку" -#: ../src/list.c:546 +#: ../src/list.c:683 #, c-format msgid "No column titles specified for List dialog.\n" msgstr "Не заданы заголовоки колонок для диалога со списком\n" @@ -206,8 +219,8 @@ msgid "Set the dialog text" msgstr "Задать текст диалога" -#: ../src/option.c:98 ../src/option.c:297 ../src/option.c:303 -#: ../src/option.c:309 ../src/option.c:413 ../src/option.c:651 +#: ../src/option.c:98 ../src/option.c:305 ../src/option.c:311 +#: ../src/option.c:317 ../src/option.c:445 ../src/option.c:695 msgid "TEXT" msgstr "ТЕКСТ" @@ -215,7 +228,7 @@ msgid "Set the dialog image" msgstr "Задать картинку диалога" -#: ../src/option.c:104 +#: ../src/option.c:104 ../src/option.c:341 ../src/option.c:353 msgid "IMAGE" msgstr "КАРТИНКА" @@ -283,237 +296,262 @@ msgid "Don't show window in taskbar" msgstr "Не показывать окно в панели задач" -#: ../src/option.c:196 +#: ../src/option.c:197 msgid "Send TERM to parent" msgstr "Послать TERM родителю" -#: ../src/option.c:206 +#: ../src/option.c:208 msgid "Display calendar dialog" msgstr "Отобразить диалог для выбора даты" -#: ../src/option.c:212 +#: ../src/option.c:214 msgid "Set the calendar day" msgstr "Задать день календаря" -#: ../src/option.c:213 +#: ../src/option.c:215 msgid "DAY" msgstr "ДЕНЬ" -#: ../src/option.c:218 +#: ../src/option.c:220 msgid "Set the calendar month" msgstr "Задать месяц календаря" -#: ../src/option.c:219 +#: ../src/option.c:221 msgid "MONTH" msgstr "МЕСЯЦ" -#: ../src/option.c:224 +#: ../src/option.c:226 msgid "Set the calendar year" msgstr "Задать год календаря" -#: ../src/option.c:225 +#: ../src/option.c:227 msgid "YEAR" msgstr "ГОД" -#: ../src/option.c:230 +#: ../src/option.c:232 ../src/option.c:484 msgid "Set the format for the returned date" msgstr "Задать формат возвращаемой даты" -#: ../src/option.c:231 ../src/option.c:494 +#: ../src/option.c:233 ../src/option.c:485 ../src/option.c:532 msgid "PATTERN" msgstr "ШАБЛОН" -#: ../src/option.c:240 +#: ../src/option.c:238 +msgid "Set the filename with dates details" +msgstr "Задать имя файла с описанием дат" + +#: ../src/option.c:239 ../src/option.c:267 ../src/option.c:381 +#: ../src/option.c:844 +msgid "FILENAME" +msgstr "ИМЯ_ФАЙЛА" + +#: ../src/option.c:248 msgid "Display color selection dialog" msgstr "Отобразить диалог для выбора цвета" -#: ../src/option.c:246 +#: ../src/option.c:254 msgid "Alias for --color" msgstr "Синоним для --color" -#: ../src/option.c:252 +#: ../src/option.c:260 msgid "Set initial color value" msgstr "Задать начальное значение цвета" -#: ../src/option.c:253 ../src/option.c:756 ../src/option.c:762 +#: ../src/option.c:261 ../src/option.c:802 ../src/option.c:808 msgid "COLOR" msgstr "ЦВЕТ" -#: ../src/option.c:258 +#: ../src/option.c:266 msgid "Set path to palette file. Default - "
View file
yad-0.11.0.tar.bz2/po/sk.po -> yad-0.12.1.tar.bz2/po/sk.po
Changed
@@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YAD 0.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-25 16:09+0300\n" +"POT-Creation-Date: 2011-05-30 10:02+0300\n" "PO-Revision-Date: 2011-03-27 18:30+0200\n" "Last-Translator: Slavko <linux@slavino.sk>\n" "Language-Team: Slovak <nomail>\n" @@ -64,26 +64,41 @@ "\n" "Založený na kóde Zenity\n" -#: ../src/entry.c:97 ../src/scale.c:39 +#: ../src/calendar.c:41 ../src/text.c:243 +#, c-format +msgid "Cannot open file '%s': %s\n" +msgstr "Nemožno otvoriť súbor '%s': %s\n" + +#: ../src/entry.c:141 ../src/scale.c:39 #, c-format msgid "Maximum value must be greater than minimum value.\n" msgstr "Maximálna hodnota musí byť väčšia ako minimálna.\n" -#: ../src/entry.c:103 ../src/scale.c:48 +#: ../src/entry.c:147 ../src/scale.c:48 #, c-format msgid "Initial value less than minimal.\n" msgstr "Počiatočná hodnota je menšia ako minimálna.\n" -#: ../src/entry.c:108 ../src/scale.c:53 +#: ../src/entry.c:152 ../src/scale.c:53 #, c-format msgid "Initial value greater than maximum.\n" msgstr "Maximálna hodnota je väčšia ako minimálna.\n" -#: ../src/form.c:100 +#: ../src/form.c:42 +#, fuzzy +msgid "Select files" +msgstr "Vyberte súbor" + +#: ../src/form.c:85 +#, fuzzy +msgid "Select date" +msgstr "Vyberte pole" + +#: ../src/form.c:205 msgid "Select file" msgstr "Vyberte súbor" -#: ../src/form.c:106 +#: ../src/form.c:211 msgid "Select folder" msgstr "Vyberte pole" @@ -97,17 +112,17 @@ msgid "Unable to open directory %s: %s\n" msgstr "Nemožno otvoriť adresár %s: %s\n" -#: ../src/main.c:69 ../src/main.c:165 +#: ../src/main.c:71 ../src/main.c:167 #, c-format msgid "%d sec" msgstr "%d s" -#: ../src/main.c:105 +#: ../src/main.c:107 #, c-format msgid "Error loading window icon %s: %s\n" msgstr "Chyba načítania ikony okna %s: %s\n" -#: ../src/main.c:382 +#: ../src/main.c:384 #, c-format msgid "Unable parse command line: %s\n" msgstr "Nemožno spracovať príkazový riadok: %s\n" @@ -131,15 +146,15 @@ msgid "Yad notification" msgstr "Yad upozornenie" -#: ../src/list.c:508 +#: ../src/list.c:645 msgid "Add row" msgstr "Pridať riadok" -#: ../src/list.c:517 +#: ../src/list.c:654 msgid "Delete row" msgstr "Odstrániť riadok" -#: ../src/list.c:546 +#: ../src/list.c:683 #, c-format msgid "No column titles specified for List dialog.\n" msgstr "Neboli zadané mená stĺpcov pre dialóg Zoznam.\n" @@ -204,8 +219,8 @@ msgid "Set the dialog text" msgstr "Nastaviť text dialógu" -#: ../src/option.c:98 ../src/option.c:297 ../src/option.c:303 -#: ../src/option.c:309 ../src/option.c:413 ../src/option.c:651 +#: ../src/option.c:98 ../src/option.c:305 ../src/option.c:311 +#: ../src/option.c:317 ../src/option.c:445 ../src/option.c:695 msgid "TEXT" msgstr "TEXT" @@ -213,7 +228,7 @@ msgid "Set the dialog image" msgstr "Nastaviť obrázok dialógu" -#: ../src/option.c:104 +#: ../src/option.c:104 ../src/option.c:341 ../src/option.c:353 msgid "IMAGE" msgstr "OBRÁZOK" @@ -282,291 +297,321 @@ msgid "Don't show window in taskbar" msgstr "Nezobrazovať tlačidlá" -#: ../src/option.c:196 +#: ../src/option.c:197 msgid "Send TERM to parent" msgstr "Poslať TERM rodičovi" -#: ../src/option.c:206 +#: ../src/option.c:208 msgid "Display calendar dialog" msgstr "Zobraziť dialóg Kalendár" -#: ../src/option.c:212 +#: ../src/option.c:214 msgid "Set the calendar day" msgstr "Nastaviť deň kalendára" -#: ../src/option.c:213 +#: ../src/option.c:215 msgid "DAY" msgstr "DEŇ" -#: ../src/option.c:218 +#: ../src/option.c:220 msgid "Set the calendar month" msgstr "nastaviť mesiac kalendára" -#: ../src/option.c:219 +#: ../src/option.c:221 msgid "MONTH" msgstr "MESIAC" -#: ../src/option.c:224 +#: ../src/option.c:226 msgid "Set the calendar year" msgstr "Nastaviť rok kalendára" -#: ../src/option.c:225 +#: ../src/option.c:227 msgid "YEAR" msgstr "ROK" -#: ../src/option.c:230 +#: ../src/option.c:232 ../src/option.c:484 msgid "Set the format for the returned date" msgstr "Nastaviť formát vráteného dátumu" -#: ../src/option.c:231 ../src/option.c:494 +#: ../src/option.c:233 ../src/option.c:485 ../src/option.c:532 msgid "PATTERN" msgstr "VZOR" -#: ../src/option.c:240 +#: ../src/option.c:238 +#, fuzzy +msgid "Set the filename with dates details" +msgstr "Nastaviť meno súboru" + +#: ../src/option.c:239 ../src/option.c:267 ../src/option.c:381 +#: ../src/option.c:844 +msgid "FILENAME" +msgstr "MENO_SÚBORU" + +#: ../src/option.c:248 msgid "Display color selection dialog" msgstr "Zobraziť dialóg Výber farby" -#: ../src/option.c:246 +#: ../src/option.c:254 msgid "Alias for --color" msgstr "Alias pre --color" -#: ../src/option.c:252 +#: ../src/option.c:260 msgid "Set initial color value" msgstr "Nastaviť počiatočnú hodnotu farby" -#: ../src/option.c:253 ../src/option.c:756 ../src/option.c:762 +#: ../src/option.c:261 ../src/option.c:802 ../src/option.c:808 msgid "COLOR" msgstr "FARBA"
View file
yad-0.11.0.tar.bz2/po/uk.po -> yad-0.12.1.tar.bz2/po/uk.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: YAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-25 16:09+0300\n" +"POT-Creation-Date: 2011-05-30 10:02+0300\n" "PO-Revision-Date: 2009-04-30 16:47+0300\n" "Last-Translator: Victor Ananjevsky <ananasik@gmail.com>\n" "Language-Team: Ukrainian\n" @@ -63,26 +63,39 @@ "\n" "Базується на коді Zenity\n" -#: ../src/entry.c:97 ../src/scale.c:39 +#: ../src/calendar.c:41 ../src/text.c:243 +#, c-format +msgid "Cannot open file '%s': %s\n" +msgstr "Не можу відкрити файл %s: %s\n" + +#: ../src/entry.c:141 ../src/scale.c:39 #, c-format msgid "Maximum value must be greater than minimum value.\n" msgstr "Максимальне значення повинно бути більше, ніж мінімальне.\n" -#: ../src/entry.c:103 ../src/scale.c:48 +#: ../src/entry.c:147 ../src/scale.c:48 #, c-format msgid "Initial value less than minimal.\n" msgstr "Початкове значення менше за мінімальне.\n" -#: ../src/entry.c:108 ../src/scale.c:53 +#: ../src/entry.c:152 ../src/scale.c:53 #, c-format msgid "Initial value greater than maximum.\n" msgstr "Початкове значенння більше за маскимальне.\n" -#: ../src/form.c:100 +#: ../src/form.c:42 +msgid "Select files" +msgstr "Обрати файли" + +#: ../src/form.c:85 +msgid "Select date" +msgstr "Обрати дату" + +#: ../src/form.c:205 msgid "Select file" msgstr "Обрати файл" -#: ../src/form.c:106 +#: ../src/form.c:211 msgid "Select folder" msgstr "Обрати каталог" @@ -96,17 +109,17 @@ msgid "Unable to open directory %s: %s\n" msgstr "Не можу відкрити каталог %s: %s\n" -#: ../src/main.c:69 ../src/main.c:165 +#: ../src/main.c:71 ../src/main.c:167 #, c-format msgid "%d sec" msgstr "%d сек" -#: ../src/main.c:105 +#: ../src/main.c:107 #, c-format msgid "Error loading window icon %s: %s\n" msgstr "Помилка при загрузці іконки вікна %s: %s\n" -#: ../src/main.c:382 +#: ../src/main.c:384 #, c-format msgid "Unable parse command line: %s\n" msgstr "Не вдається розібрати командну строку: %s\n" @@ -130,15 +143,15 @@ msgid "Yad notification" msgstr "Діалог повідомлень" -#: ../src/list.c:508 +#: ../src/list.c:645 msgid "Add row" msgstr "Добавити строку" -#: ../src/list.c:517 +#: ../src/list.c:654 msgid "Delete row" msgstr "Видалити строку" -#: ../src/list.c:546 +#: ../src/list.c:683 #, c-format msgid "No column titles specified for List dialog.\n" msgstr "Не задані заголовоки колонок для діалога зі списком\n" @@ -203,8 +216,8 @@ msgid "Set the dialog text" msgstr "Задати текст діалога" -#: ../src/option.c:98 ../src/option.c:297 ../src/option.c:303 -#: ../src/option.c:309 ../src/option.c:413 ../src/option.c:651 +#: ../src/option.c:98 ../src/option.c:305 ../src/option.c:311 +#: ../src/option.c:317 ../src/option.c:445 ../src/option.c:695 msgid "TEXT" msgstr "ТЕКСТ" @@ -212,7 +225,7 @@ msgid "Set the dialog image" msgstr "Задати картинку діалога" -#: ../src/option.c:104 +#: ../src/option.c:104 ../src/option.c:341 ../src/option.c:353 msgid "IMAGE" msgstr "КАРТИНКА" @@ -280,237 +293,262 @@ msgid "Don't show window in taskbar" msgstr "Не показувати вікно у панелі задач" -#: ../src/option.c:196 +#: ../src/option.c:197 msgid "Send TERM to parent" msgstr "Послати TERM родителю" -#: ../src/option.c:206 +#: ../src/option.c:208 msgid "Display calendar dialog" msgstr "ВІдобразити діалог для вибору дати" -#: ../src/option.c:212 +#: ../src/option.c:214 msgid "Set the calendar day" msgstr "Задати день календаря" -#: ../src/option.c:213 +#: ../src/option.c:215 msgid "DAY" msgstr "ДЕНЬ" -#: ../src/option.c:218 +#: ../src/option.c:220 msgid "Set the calendar month" msgstr "Задати місяць календаря" -#: ../src/option.c:219 +#: ../src/option.c:221 msgid "MONTH" msgstr "МІСЯЦЬ" -#: ../src/option.c:224 +#: ../src/option.c:226 msgid "Set the calendar year" msgstr "Задати год календаря" -#: ../src/option.c:225 +#: ../src/option.c:227 msgid "YEAR" msgstr "ГОД" -#: ../src/option.c:230 +#: ../src/option.c:232 ../src/option.c:484 msgid "Set the format for the returned date" msgstr "Задати формат відображення дати" -#: ../src/option.c:231 ../src/option.c:494 +#: ../src/option.c:233 ../src/option.c:485 ../src/option.c:532 msgid "PATTERN" msgstr "ШАБЛОН" -#: ../src/option.c:240 +#: ../src/option.c:238 +msgid "Set the filename with dates details" +msgstr "Задати им'я файла з описанням дат" + +#: ../src/option.c:239 ../src/option.c:267 ../src/option.c:381 +#: ../src/option.c:844 +msgid "FILENAME" +msgstr "ИМ'Я_ФАЙЛА" + +#: ../src/option.c:248 msgid "Display color selection dialog" msgstr "Відобразити діалог для вибору коліра" -#: ../src/option.c:246 +#: ../src/option.c:254 msgid "Alias for --color" msgstr "Синоним для --color" -#: ../src/option.c:252 +#: ../src/option.c:260 msgid "Set initial color value" msgstr "Задати початковий колір" -#: ../src/option.c:253 ../src/option.c:756 ../src/option.c:762 +#: ../src/option.c:261 ../src/option.c:802 ../src/option.c:808 msgid "COLOR" msgstr "КОЛІР" -#: ../src/option.c:258 +#: ../src/option.c:266 msgid "Set path to palette file. Default - "
View file
yad-0.11.0.tar.bz2/src/Makefile.am -> yad-0.12.1.tar.bz2/src/Makefile.am
Changed
@@ -38,6 +38,6 @@ DISTCLEANFILES = -EXTRA_DIST = +EXTRA_DIST = calendar.xpm
View file
yad-0.11.0.tar.bz2/src/Makefile.in -> yad-0.12.1.tar.bz2/src/Makefile.in
Changed
@@ -245,7 +245,7 @@ @BUILD_IB_TRUE@yad_icon_browser_CFLAGS = $(YAD_CFLAGS) @BUILD_IB_TRUE@yad_icon_browser_LDADD = $(YAD_LIBS) DISTCLEANFILES = -EXTRA_DIST = +EXTRA_DIST = calendar.xpm all: all-am .SUFFIXES:
View file
yad-0.11.0.tar.bz2/src/browser.c -> yad-0.12.1.tar.bz2/src/browser.c
Changed
@@ -66,9 +66,9 @@ GtkTreeIter iter; GdkPixbuf *pb, *spb; - spb = pb = gtk_icon_theme_load_icon (data->theme, i->data, size, + spb = pb = gtk_icon_theme_load_icon (data->theme, i->data, size, GTK_ICON_LOOKUP_GENERIC_FALLBACK, NULL); - + if (pb) { /* scale pixbuf if needed */ @@ -89,7 +89,7 @@ g_free (i->data); } g_list_free (icons); - + return store; } @@ -164,7 +164,7 @@ gtk_tree_view_set_model (GTK_TREE_VIEW (data->icon_list), GTK_TREE_MODEL (store)); } -gint +gint main (gint argc, gchar *argv) { IconBrowserData *data; @@ -220,11 +220,11 @@ gtk_box_pack_start (GTK_BOX (box), w, FALSE, FALSE, 2); data->image = gtk_image_new (); gtk_box_pack_start (GTK_BOX (w), data->image, FALSE, FALSE, 2); - + data->label = gtk_label_new (""); gtk_misc_set_alignment (GTK_MISC (data->label), 0, 0.5); gtk_box_pack_start (GTK_BOX (w), data->label, TRUE, TRUE, 2); - + /* create icon browser */ p = gtk_hpaned_new (); gtk_paned_set_position (GTK_PANED (p), 150); @@ -243,7 +243,7 @@ data->cat_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store)); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (data->cat_list), TRUE); gtk_container_add (GTK_CONTAINER (w), data->cat_list); - + sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (data->cat_list)); g_signal_connect (G_OBJECT (sel), "changed", G_CALLBACK (select_cat), data);
View file
yad-0.11.0.tar.bz2/src/calendar.c -> yad-0.12.1.tar.bz2/src/calendar.c
Changed
@@ -19,10 +19,70 @@ * */ +#include <errno.h> + #include "yad.h" static GtkWidget *calendar; +static GHashTable *details; + +static void +parse_details () +{ + FILE *f; + + details = g_hash_table_new (g_str_hash, g_str_equal); + + /* open details file */ + f = fopen (options.calendar_data.details, "r"); + if (f == NULL) + { + g_printerr (_("Cannot open file '%s': %s\n"), + options.common_data.uri, g_strerror (errno)); + return; + } + + /* read details file */ + while (!feof (f)) + { + gchar buf4096, **dtl; + + /* read string */ + memset (buf, 0, 4096); + fgets (buf, 4096, f); + if (strlen (buf) > 0) + { + dtl = g_strsplit (buf, " ", 2); + g_hash_table_insert (details, dtl0, dtl1); + } + } + + fclose (f); +} + +static gchar * +get_details (GtkCalendar *cal, + guint year, guint month, guint day, + gpointer data) +{ + GDate *d; + gchar time_string128; + gchar *str = NULL; + + d = g_date_new_dmy (day, month + 1, year); + if (g_date_valid (d)) + { + g_date_strftime (time_string, 127, options.common_data.date_format, d); + str = (gchar *) g_hash_table_lookup (details, time_string); + } + g_date_free (d); + + if (str) + return g_strdup (str); + return str; +} + static void double_click_cb (GtkWidget *w, gpointer data) { @@ -36,8 +96,6 @@ w = calendar = gtk_calendar_new (); - /* FIXME: add "show details" to widget */ - if (options.calendar_data.month > 0 || options.calendar_data.year > 0) gtk_calendar_select_month (GTK_CALENDAR (w), options.calendar_data.month - 1, @@ -46,6 +104,17 @@ gtk_calendar_select_day (GTK_CALENDAR (w), options.calendar_data.day); + if (options.calendar_data.details) + { + parse_details (); + gtk_calendar_set_detail_func (GTK_CALENDAR (w), get_details, NULL, NULL); + } + + gtk_calendar_set_display_options (GTK_CALENDAR (w), + GTK_CALENDAR_SHOW_HEADING | + GTK_CALENDAR_SHOW_DAY_NAMES | + GTK_CALENDAR_SHOW_WEEK_NUMBERS); + g_signal_connect (w, "day-selected-double-click", G_CALLBACK (double_click_cb), dlg); @@ -56,15 +125,11 @@ calendar_print_result (void) { guint day, month, year; - gchar *format = options.calendar_data.date_format; gchar time_string128; GDate *date = NULL; - if (format == NULL) - format = "%x"; - - gtk_calendar_get_date (GTK_CALENDAR (calendar), &day, &month, &year); - date = g_date_new_dmy (year, month + 1, day); - g_date_strftime (time_string, 127, format, date); + gtk_calendar_get_date (GTK_CALENDAR (calendar), &year, &month, &day); + date = g_date_new_dmy (day, month + 1, year); + g_date_strftime (time_string, 127, options.common_data.date_format, date); g_print ("%s\n", time_string); }
View file
yad-0.12.1.tar.bz2/src/calendar.xpm
Added
@@ -0,0 +1,98 @@ +/* XPM */ +static const char * calendar_xpm = { +"16 16 79 1", +" c None", +". c #898D88", +"+ c #898B86", +"@ c #8B8D89", +"# c #945D04", +"$ c #8F5A02", +"% c #8E5902", +"& c #878984", +"* c #BFC0BB", +"= c #D8D9D7", +"- c #945D05", +"; c #D9AC65", +"> c #DEB36F", +", c #A5A7A3", +"' c #E6E8E5", +") c #A9AAA7", +"! c #DFB370", +"~ c #DFB470", +"{ c #F8F8F8", +" c #E0B571", +"^ c #DCB069", +"/ c #555753", +"( c #D3D5D2", +"_ c #989A95", +": c #D4D6D3", +"< c #E0B671", +" c #DEB26E", +"} c #FFFFFF", +"| c #C1C2BF", +"1 c #91938F", +"2 c #C2C3C0", +"3 c #E1B671", +"4 c #F5F5F5", +"5 c #FDFDFD", +"6 c #E6E6E6", +"7 c #DEB26D", +"8 c #808080", +"9 c #686868", +"0 c #5C5C5C", +"a c #989898", +"b c #DEB26C", +"c c #CFCFCF", +"d c #3F3F3F", +"e c #E2B671", +"f c #DFB36C", +"g c #6A6A6A", +"h c #282828", +"i c #A1A1A1", +"j c #E2B570", +"k c #E0E0E0", +"l c #2B2B2B", +"m c #959691", +"n c #888A85", +"o c #646661", +"p c #E2B670", +"q c #616161", +"r c #656565", +"s c #636363", +"t c #8F8F8F", +"u c #EEEEED", +"v c #979893", +"w c #646662", +"x c #E3B670", +"y c #D3D7CF", +"z c #DFB26B", +"A c #E4B76F", +"B c #DBAD64", +"C c #E0B36B", +"D c #E1B46C", +"E c #E1B36C", +"F c #E1B46D", +"G c #E2B56D", +"H c #E2B46D", +"I c #E2B66E", +"J c #E3B56F", +"K c #E3B66F", +"L c #E4B66F", +"M c #DFB169", +"N c #945F05", +" .+@ .+@ ", +"#$%%&*&%%&=&%%$-", +"$;>>,')!~,{)^$", +"%>//&(_//&:_//<%", +"%/}|12}}|1|}/3%", +"%/}45466454}/3%", +"%7/}66890a66}/3%", +"%b/}6666cd66}/e%", +"%f/}666ghi66}/j%", +"%f/}6666kl6mnop%", +"%f/}66qrst6&u/p%", +"%f/}}}}}}}}vnwx%", +"%f/yyyyyyyyyy/x%", +"%z////////////A%", +"$BCDEFFGHGIJKLM$", +"-$%%%%%%%%%%%%$N"};
View file
yad-0.11.0.tar.bz2/src/dnd.c -> yad-0.12.1.tar.bz2/src/dnd.c
Changed
@@ -35,7 +35,7 @@ { gchar **uris; gint i = 0; - + uris = gtk_selection_data_get_uris (sel); if (!uris) return; @@ -95,7 +95,7 @@ tgts = gtk_target_table_new_from_list (tlist, &ntgts); - gtk_drag_dest_set (w, GTK_DEST_DEFAULT_ALL, tgts, ntgts, + gtk_drag_dest_set (w, GTK_DEST_DEFAULT_ALL, tgts, ntgts, GDK_ACTION_COPY | GDK_ACTION_MOVE); g_signal_connect (G_OBJECT (w), "drag_data_received", G_CALLBACK (drop_data_cb), NULL);
View file
yad-0.11.0.tar.bz2/src/entry.c -> yad-0.12.1.tar.bz2/src/entry.c
Changed
@@ -30,6 +30,50 @@ gtk_dialog_response (GTK_DIALOG (data), YAD_RESPONSE_OK); } +static void +icon_cb (GtkEntry *entry, GtkEntryIconPosition pos, + GdkEventButton *event, gpointer data) +{ + if (event->button == 1) + { + gchar *cmd = NULL; + + 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; + } + + if (cmd) + { + FILE *pf; + gchar buf1024; + GString *str; + + str = g_string_new (""); + pf = popen (cmd, "r"); + while (fgets (buf, sizeof (buf), pf)) + g_string_append (str, buf); + if (pclose (pf) == 0) + { + if (str->strstr->len - 1 == '\n') + str->strstr->len - 1 = '\0'; + gtk_entry_set_text (GTK_ENTRY (entry), str->str); + } + g_string_free (str, TRUE); + } + else + gtk_entry_set_text (GTK_ENTRY (entry), ""); + + /* move cursor to the end of text */ + gtk_editable_set_position (GTK_EDITABLE (entry), -1); + } +} + static GtkTreeModel * create_completion_model (void) { @@ -185,10 +229,31 @@ gtk_entry_completion_set_text_column (completion, 0); } + + if (options.entry_data.licon) + { + GdkPixbuf *pb = get_pixbuf (options.entry_data.licon, YAD_SMALL_ICON); + + if (pb) + { + gtk_entry_set_icon_from_pixbuf (GTK_ENTRY (entry), GTK_ENTRY_ICON_PRIMARY, pb); + g_signal_connect (G_OBJECT (entry), "icon-press", G_CALLBACK (icon_cb), NULL); + } + } + if (options.entry_data.ricon) + { + GdkPixbuf *pb = get_pixbuf (options.entry_data.ricon, YAD_SMALL_ICON); + + if (pb) + { + gtk_entry_set_icon_from_pixbuf (GTK_ENTRY (entry), GTK_ENTRY_ICON_SECONDARY, pb); + g_signal_connect (G_OBJECT (entry), "icon-press", G_CALLBACK (icon_cb), NULL); + } + } } + if (!is_combo) - g_signal_connect (G_OBJECT (entry), "activate", - G_CALLBACK (entry_activate_cb), dlg); + g_signal_connect (G_OBJECT (entry), "activate", G_CALLBACK (entry_activate_cb), dlg); gtk_box_pack_start (GTK_BOX (w), c, TRUE, TRUE, 1);
View file
yad-0.11.0.tar.bz2/src/font.c -> yad-0.12.1.tar.bz2/src/font.c
Changed
@@ -28,7 +28,7 @@ static void realize_cb (GtkWidget *w, gpointer d) { - gtk_font_selection_set_font_name (GTK_FONT_SELECTION (w), options.common_data.font); + gtk_font_selection_set_font_name (GTK_FONT_SELECTION (w), options.common_data.font); } GtkWidget *
View file
yad-0.11.0.tar.bz2/src/form.c -> yad-0.12.1.tar.bz2/src/form.c
Changed
@@ -21,6 +21,8 @@ #include "yad.h" +#include "calendar.xpm" + static GSList *fields = NULL; static void @@ -29,6 +31,103 @@ gtk_dialog_response (GTK_DIALOG (data), YAD_RESPONSE_OK); } +static void +select_files_cb (GtkEntry *entry, GtkEntryIconPosition pos, + GdkEventButton *event, gpointer data) +{ + GtkWidget *dlg; + + if (event->button == 1) + { + dlg = gtk_file_chooser_dialog_new (_("Select files"), + GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (entry))), + GTK_FILE_CHOOSER_ACTION_OPEN, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, + NULL ); + gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dlg), TRUE); + + if (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_ACCEPT) + { + GSList *files, *ptr; + GString *str; + + str = g_string_new (""); + files = ptr = gtk_file_chooser_get_uris (GTK_FILE_CHOOSER (dlg)); + + while (ptr) + { + if (ptr->data) + { + gchar *fn = g_filename_from_uri ((gchar *) ptr->data, NULL, NULL); + g_string_append (str, fn); + g_string_append (str, options.common_data.item_separator); + g_free (fn); + } + ptr = ptr->next; + } + + gtk_entry_set_text (entry, str->str); + + g_slist_free (files); + g_string_free (str, TRUE); + } + + gtk_widget_destroy (dlg); + } +} + +static void +select_date_cb (GtkEntry *entry, GtkEntryIconPosition pos, + GdkEventButton *event, gpointer data) +{ + GtkWidget *dlg, *cal; + + if (event->button == 1) + { + GDate *d; + + dlg = gtk_dialog_new_with_buttons (_("Select date"), + GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (entry))), + GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, + NULL ); + cal = gtk_calendar_new (); + gtk_widget_show (cal); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + cal, TRUE, TRUE, 5); + + d = g_date_new (); + g_date_set_parse (d, gtk_entry_get_text (entry)); + if (g_date_valid (d)) + { + gtk_calendar_select_day (GTK_CALENDAR (cal), g_date_get_day (d)); + gtk_calendar_select_month (GTK_CALENDAR (cal), + g_date_get_month (d) - 1, + g_date_get_year (d)); + } + g_date_free (d); + + if (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_ACCEPT) + { + guint day, month, year; + gchar *format = options.common_data.date_format; + gchar time_string128; + + 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); + gtk_entry_set_text (entry, time_string); + g_date_free (d); + } + gtk_widget_destroy (dlg); + } +} + GtkWidget * form_create_widget (GtkWidget *dlg) { @@ -37,6 +136,7 @@ if (options.form_data.fields) { GtkWidget *l, *e; + GdkPixbuf *pb; guint i, fc = g_slist_length (options.form_data.fields); w = gtk_table_new (fc, 2, FALSE); @@ -77,15 +177,15 @@ case YAD_FIELD_NUM: e = gtk_spin_button_new_with_range (0.0, 65525.0, 1.0); gtk_table_attach (GTK_TABLE (w), e, 1, 2, i, i + 1, GTK_EXPAND | GTK_FILL, 0, 5, 5); - fields = g_slist_append (fields, e); + fields = g_slist_append (fields, e); break; - + case YAD_FIELD_CHECK: e = gtk_check_button_new_with_label (fld->name); gtk_table_attach (GTK_TABLE (w), e, 0, 2, i, i + 1, GTK_EXPAND | GTK_FILL, 0, 5, 5); - fields = g_slist_append (fields, e); + fields = g_slist_append (fields, e); break; - + case YAD_FIELD_COMBO: #if GTK_CHECK_VERSION(2,24,0) e = gtk_combo_box_text_new (); @@ -96,6 +196,16 @@ fields = g_slist_append (fields, e); break; + case YAD_FIELD_COMBO_ENTRY: +#if GTK_CHECK_VERSION(2,24,0) + e = gtk_combo_box_text_new_with_entry (); +#else + e = gtk_combo_box_entry_new_text (); +#endif + gtk_table_attach (GTK_TABLE (w), e, 1, 2, i, i + 1, GTK_EXPAND | GTK_FILL, 0, 5, 5); + fields = g_slist_append (fields, e); + break; + case YAD_FIELD_FILE: e = gtk_file_chooser_button_new (_("Select file"), GTK_FILE_CHOOSER_ACTION_OPEN); gtk_table_attach (GTK_TABLE (w), e, 1, 2, i, i + 1, GTK_EXPAND | GTK_FILL, 0, 5, 5); @@ -119,6 +229,27 @@ gtk_table_attach (GTK_TABLE (w), e, 1, 2, i, i + 1, GTK_EXPAND | GTK_FILL, 0, 5, 5); fields = g_slist_append (fields, e); break; + + case YAD_FIELD_MFILE: + e = gtk_entry_new (); + 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), e); + g_signal_connect (G_OBJECT (e), "activate", G_CALLBACK (form_activate_cb), dlg); + gtk_table_attach (GTK_TABLE (w), e, 1, 2, i, i + 1, GTK_EXPAND | GTK_FILL, 0, 5, 5); + fields = g_slist_append (fields, e); + break; + + case YAD_FIELD_DATE: + e = gtk_entry_new (); + pb = gdk_pixbuf_new_from_xpm_data (calendar_xpm); + gtk_entry_set_icon_from_pixbuf (GTK_ENTRY (e), GTK_ENTRY_ICON_SECONDARY, pb); + g_object_unref (pb); + g_signal_connect (G_OBJECT (e), "icon-press", G_CALLBACK (select_date_cb), e); + g_signal_connect (G_OBJECT (e), "activate", G_CALLBACK (form_activate_cb), dlg); + gtk_table_attach (GTK_TABLE (w), e, 1, 2, i, i + 1, GTK_EXPAND | GTK_FILL, 0, 5, 5); + fields = g_slist_append (fields, e); + break; } } @@ -137,6 +268,8 @@ case YAD_FIELD_SIMPLE: case YAD_FIELD_HIDDEN: case YAD_FIELD_READ_ONLY: + case YAD_FIELD_MFILE: + case YAD_FIELD_DATE: gtk_entry_set_text (GTK_ENTRY (g_slist_nth_data (fields, i)), options.extra_datai); break; @@ -160,7 +293,7 @@ gdouble step = g_strtod (s2, NULL); gtk_spin_button_set_increments (GTK_SPIN_BUTTON (e), step, step); } - }
View file
yad-0.11.0.tar.bz2/src/icons.c -> yad-0.12.1.tar.bz2/src/icons.c
Changed
@@ -325,10 +325,10 @@ G_TYPE_STRING, G_TYPE_BOOLEAN); gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (store), - options.icons_data.sort_by_name ? COL_NAME : COL_FILENAME, + options.icons_data.sort_by_name ? COL_NAME : COL_FILENAME, options.icons_data.descend ? GTK_SORT_DESCENDING : GTK_SORT_ASCENDING); - if (!options.icons_data.compact) + if (!options.icons_data.compact) { icon_view = gtk_icon_view_new_with_model (GTK_TREE_MODEL (store)); gtk_icon_view_set_text_column (GTK_ICON_VIEW (icon_view), COL_NAME); @@ -361,7 +361,7 @@ /* handle directory */ if (options.icons_data.directory) read_dir (store); - else if (options.icons_data.stdin) + else if (options.icons_data.stdinput) { /* read from stdin */ GIOChannel *channel; @@ -377,7 +377,7 @@ g_object_unref (store); - if (!options.icons_data.compact) + if (!options.icons_data.compact) g_signal_connect (G_OBJECT (icon_view), "item-activated", G_CALLBACK (activate_cb), NULL); else g_signal_connect (G_OBJECT (icon_view), "row-activated", G_CALLBACK (activate_cb), NULL);
View file
yad-0.11.0.tar.bz2/src/list.c -> yad-0.12.1.tar.bz2/src/list.c
Changed
@@ -242,7 +242,7 @@ { YadColumn *col = (YadColumn *) g_slist_nth_data (options.list_data.columns, i); - if (i == options.list_data.hide_column - 1 || + if (i == options.list_data.hide_column - 1 || i == fore_col || i == back_col || i == font_col) continue; @@ -307,7 +307,7 @@ if (col->type != YAD_COLUMN_CHECK || col->type != YAD_COLUMN_IMAGE) { - if (i == options.list_data.expand_column - 1 || + if (i == options.list_data.expand_column - 1 || options.list_data.expand_column == 0) gtk_tree_view_column_set_expand (column, TRUE); } @@ -378,8 +378,8 @@ if (column_count == n_columns) { /* add eliipsize */ - gtk_list_store_set (GTK_LIST_STORE (model), &iter, column_count, - options.list_data.ellipsize, -1); + gtk_list_store_set (GTK_LIST_STORE (model), &iter, column_count, + options.list_data.ellipsize, -1); /* We're starting a new row */ column_count = 0; row_count++; @@ -402,11 +402,11 @@ gtk_list_store_set (GTK_LIST_STORE (model), &iter, column_count, FALSE, -1); break; case YAD_COLUMN_NUM: - gtk_list_store_set (GTK_LIST_STORE (model), &iter, column_count, + gtk_list_store_set (GTK_LIST_STORE (model), &iter, column_count, g_ascii_strtoll (string->str, NULL, 10), -1); break; case YAD_COLUMN_FLOAT: - gtk_list_store_set (GTK_LIST_STORE (model), &iter, column_count, + gtk_list_store_set (GTK_LIST_STORE (model), &iter, column_count, g_ascii_strtod (string->str, NULL), -1); break; case YAD_COLUMN_IMAGE: @@ -535,23 +535,79 @@ double_click_cb (GtkTreeView *view, GtkTreePath *path, GtkTreeViewColumn *column, gpointer data) { - if (options.list_data.checkbox) + GtkTreeModel *model; + GtkTreeIter iter; + + model = gtk_tree_view_get_model (view); + + if (options.list_data.dclick_action) { - GtkTreeModel *model; - GtkTreeIter iter; + GString *cmd; + + cmd = g_string_new (options.list_data.dclick_action); - model = gtk_tree_view_get_model (view); if (gtk_tree_model_get_iter (model, &iter, path)) - { - gboolean chk; + { + gint i; - gtk_tree_model_get (model, &iter, 0, &chk, -1); - chk = !chk; - gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, chk, -1); - } + for (i = 0; i < gtk_tree_model_get_n_columns (model) - 1; i++) + { + YadColumn *col = (YadColumn *) g_slist_nth_data (options.list_data.columns, i); + switch (col->type) + { + case YAD_COLUMN_CHECK: + { + gboolean bval; + gtk_tree_model_get (model, &iter, i, &bval, -1); + g_string_append_printf (cmd, " %s", bval ? "TRUE" : "FALSE"); + break; + } + case YAD_COLUMN_NUM: + { + gint64 nval; + gtk_tree_model_get (model, &iter, i, &nval, -1); + g_string_append_printf (cmd, " %d", nval); + break; + } + case YAD_COLUMN_FLOAT: + { + gdouble nval; + gtk_tree_model_get (model, &iter, i, &nval, -1); + g_string_append_printf (cmd, " %lf", nval); + break; + } + default: + { + gchar *cval, *uval; + gtk_tree_model_get (model, &iter, i, &cval, -1); + uval = unescape_markup (cval); + g_string_append_printf (cmd, " %s", uval); + g_free (uval); + break; + } + } + } + } + + g_spawn_command_line_async (cmd->str, NULL); + g_string_free (cmd, TRUE); } else - gtk_dialog_response (GTK_DIALOG (data), YAD_RESPONSE_OK); + { + if (options.list_data.checkbox) + { + if (gtk_tree_model_get_iter (model, &iter, path)) + { + gboolean chk; + + gtk_tree_model_get (model, &iter, 0, &chk, -1); + chk = !chk; + gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, chk, -1); + } + } + else + gtk_dialog_response (GTK_DIALOG (data), YAD_RESPONSE_OK); + } } void
View file
yad-0.11.0.tar.bz2/src/main.c -> yad-0.12.1.tar.bz2/src/main.c
Changed
@@ -28,6 +28,7 @@ YadOptions options; GtkWidget *dialog = NULL; +#if !defined(_WIN32) static void sa_usr1 (gint sig) { @@ -39,6 +40,7 @@ { gtk_dialog_response (GTK_DIALOG (dialog), YAD_RESPONSE_CANCEL); } +#endif static gboolean timeout_cb (gpointer data) @@ -119,7 +121,7 @@ gtk_window_set_decorated (GTK_WINDOW (dlg), !options.data.undecorated); gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dlg), options.data.skip_taskbar); gtk_window_set_skip_pager_hint (GTK_WINDOW (dlg), options.data.skip_taskbar); - + /* set window size and position */ if (!options.data.geometry) { @@ -145,7 +147,7 @@ /* add top label widgets */ hbox = hbox2 = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), hbox, TRUE, TRUE, 5); vbox = gtk_vbox_new (FALSE, 0); @@ -285,7 +287,7 @@ /* parse geometry, if given. must be after showing widget */ if (options.data.geometry) gtk_window_parse_geometry (GTK_WINDOW (dlg), options.data.geometry); - + gtk_widget_show (dlg); /* set timeout */ @@ -342,7 +344,7 @@ gint ret = 0; gchar *tmp_sep; struct sigaction sa; - + setlocale (LC_ALL, ""); #ifdef ENABLE_NLS @@ -361,7 +363,7 @@ if (options.data.icon_theme) { settings.icon_theme = gtk_icon_theme_new (); - gtk_icon_theme_set_custom_theme (settings.icon_theme, + gtk_icon_theme_set_custom_theme (settings.icon_theme, options.data.icon_theme); } else @@ -388,14 +390,16 @@ tmp_sep = g_strcompress (options.common_data.separator); options.common_data.separator = tmp_sep; tmp_sep = g_strcompress (options.common_data.item_separator); - options.common_data.item_separator = tmp_sep; + options.common_data.item_separator = tmp_sep; +#if !defined(_WIN32) /* set signal handlers */ bzero (&sa, sizeof (struct sigaction)); sa.sa_handler = sa_usr1; sigaction (SIGUSR1, &sa, NULL); sa.sa_handler = sa_usr2; sigaction (SIGUSR2, &sa, NULL); +#endif switch (options.mode) { @@ -428,18 +432,22 @@ else if (options.data.buttons && !(ret & 1)) print_result (); } +#if !defined(_WIN32) /* autokill option for progress dialog */ if (!options.kill_parent) { - if (options.mode == YAD_MODE_PROGRESS && + if (options.mode == YAD_MODE_PROGRESS && options.progress_data.autokill && ret != YAD_RESPONSE_OK) kill (getppid (), 1); } +#endif } +#if !defined(_WIN32) if (options.kill_parent) - kill (getppid (), SIGTERM); + kill (getppid (), SIGTERM); +#endif return ret; }
View file
yad-0.11.0.tar.bz2/src/notification.c -> yad-0.12.1.tar.bz2/src/notification.c
Changed
@@ -108,7 +108,7 @@ } static gboolean -middle_quit_cb (GtkStatusIcon * icon, GdkEventButton * ev, +middle_quit_cb (GtkStatusIcon * icon, GdkEventButton * ev, gpointer data) { if (ev->button == 2) @@ -246,7 +246,7 @@ gboolean state = gtk_status_icon_get_blinking (status_icon); gtk_status_icon_set_blinking (status_icon, !state); } - else + else #endif if (!g_ascii_strcasecmp (value, "false")) gtk_status_icon_set_visible (status_icon, FALSE); @@ -338,7 +338,7 @@ /* quit on middle click (like press Esc) */ g_signal_connect (status_icon, "button-press-event", - G_CALLBACK (middle_quit_cb), NULL); + G_CALLBACK (middle_quit_cb), NULL); if (options.notification_data.listen) {
View file
yad-0.11.0.tar.bz2/src/option.c -> yad-0.12.1.tar.bz2/src/option.c
Changed
@@ -189,12 +189,14 @@ &options.data.skip_taskbar, N_("Don't show window in taskbar"), NULL }, +#if !defined(_WIN32) { "kill-parent", 0, 0, G_OPTION_ARG_NONE, &options.kill_parent, N_("Send TERM to parent"), NULL }, +#endif { NULL } }; @@ -224,11 +226,17 @@ N_("Set the calendar year"), N_("YEAR") }, { "date-format", 0, - 0, + G_OPTION_FLAG_NOALIAS, G_OPTION_ARG_STRING, - &options.calendar_data.date_format, + &options.common_data.date_format, N_("Set the format for the returned date"), N_("PATTERN") }, + { "details", 0, + 0, + G_OPTION_ARG_FILENAME, + &options.calendar_data.details, + N_("Set the filename with dates details"), + N_("FILENAME") }, { NULL } }; @@ -325,6 +333,30 @@ &options.common_data.editable, N_("Allow changes to text in combo-box"), NULL }, + { "licon", 0, + 0, + G_OPTION_ARG_FILENAME, + &options.entry_data.licon, + N_("Set the left entry icon"), + N_("IMAGE") }, + { "licon-action", 0, + 0, + G_OPTION_ARG_STRING, + &options.entry_data.licon_action, + N_("Set the left entry icon action"), + N_("CMD") }, + { "ricon", 0, + 0, + G_OPTION_ARG_FILENAME, + &options.entry_data.ricon, + N_("Set the right entry icon"), + N_("IMAGE") }, + { "ricon-action", 0, + 0, + G_OPTION_ARG_STRING, + &options.entry_data.ricon_action, + N_("Set the right entry icon action"), + N_("CMD") }, { NULL } }; @@ -425,7 +457,7 @@ 0, G_OPTION_ARG_CALLBACK, add_field, - N_("Add field to form (TYPE - H, RO, NUM, CHK, CB, FL, DIR, FN or CLR)"), + N_("Add field to form (TYPE - H, RO, NUM, CHK, CB, CBE, FL, DIR, FN, MFL, DT or CLR)"), N_("LABEL:TYPE") }, { "align", 0, 0, @@ -445,6 +477,12 @@ &options.common_data.item_separator, N_("Set separator character for combobox or scale data"), N_("SEPARATOR") }, + { "date-format", 0, + G_OPTION_FLAG_NOALIAS, + G_OPTION_ARG_STRING, + &options.common_data.date_format, + N_("Set the format for the returned date"), + N_("PATTERN") }, { NULL } }; @@ -476,7 +514,7 @@ { "stdin", 0, 0, G_OPTION_ARG_NONE, - &options.icons_data.stdin, + &options.icons_data.stdinput, N_("Read data from stdin"), NULL }, { "item-width", 0, @@ -599,6 +637,12 @@ &options.list_data.limit, N_("Set the limit of rows in list"), N_("NUMBER") }, + { "dclick-action", 0, + 0, + G_OPTION_ARG_STRING, + &options.list_data.dclick_action, + N_("Set double-click action"), + N_("CMD") }, { NULL } }; @@ -668,12 +712,14 @@ /* xgettext: no-c-format */ N_("Dismiss the dialog when 100% has been reached"), NULL }, +#if !defined(_WIN32) { "auto-kill", 0, 0, G_OPTION_ARG_NONE, &options.progress_data.autokill, N_("Kill parent process if cancel button is pressed"), NULL }, +#endif { "rtl", 0, 0, G_OPTION_ARG_NONE, @@ -921,6 +967,8 @@ fld->type = YAD_FIELD_CHECK; else if (g_ascii_strcasecmp (fstr1, "CB") == 0) fld->type = YAD_FIELD_COMBO; + else if (g_ascii_strcasecmp (fstr1, "CBE") == 0) + fld->type = YAD_FIELD_COMBO_ENTRY; else if (g_ascii_strcasecmp (fstr1, "FL") == 0) fld->type = YAD_FIELD_FILE; else if (g_ascii_strcasecmp (fstr1, "DIR") == 0) @@ -929,6 +977,10 @@ fld->type = YAD_FIELD_FONT; else if (g_ascii_strcasecmp (fstr1, "CLR") == 0) fld->type = YAD_FIELD_COLOR; + else if (g_ascii_strcasecmp (fstr1, "MFL") == 0) + fld->type = YAD_FIELD_MFILE; + else if (g_ascii_strcasecmp (fstr1, "DT") == 0) + fld->type = YAD_FIELD_DATE; else fld->type = YAD_FIELD_SIMPLE; } @@ -1072,7 +1124,9 @@ /* Set default mode */ options.mode = YAD_MODE_MESSAGE; options.extra_data = NULL; +#if !defined(_WIN32) options.kill_parent = FALSE; +#endif /* Initialize general data */ options.data.dialog_title = NULL; @@ -1111,12 +1165,13 @@ options.common_data.multi = FALSE; options.common_data.editable = FALSE; options.common_data.command = NULL; + options.common_data.date_format = "%x"; /* Initialize calendar data */ - options.calendar_data.date_format = NULL; options.calendar_data.day = -1; options.calendar_data.month = -1; options.calendar_data.year = -1; + options.calendar_data.details = NULL; /* Initialize color data */ options.color_data.init_color = NULL; @@ -1130,6 +1185,10 @@ options.entry_data.hide_text = FALSE; options.entry_data.completion = FALSE; options.entry_data.numeric = FALSE; + options.entry_data.licon = NULL; + options.entry_data.licon_action = NULL; + options.entry_data.ricon = NULL; + options.entry_data.ricon_action = NULL; /* Initialize file data */ options.file_data.directory = FALSE; @@ -1149,7 +1208,7 @@ options.icons_data.directory = NULL; options.icons_data.compact = FALSE; options.icons_data.generic = FALSE; - options.icons_data.stdin = FALSE; + options.icons_data.stdinput = FALSE; options.icons_data.width = -1; options.icons_data.term = settings.term; options.icons_data.sort_by_name = FALSE; @@ -1166,6 +1225,7 @@ options.list_data.search_column = 0; options.list_data.limit = 0; options.list_data.ellipsize = PANGO_ELLIPSIZE_NONE; + options.list_data.dclick_action = NULL; /* Initialize notification data */ options.notification_data.listen = FALSE; @@ -1175,7 +1235,9 @@ options.progress_data.percentage = 0;
View file
yad-0.11.0.tar.bz2/src/progress.c -> yad-0.12.1.tar.bz2/src/progress.c
Changed
@@ -155,7 +155,7 @@ gtk_progress_bar_set_text (GTK_PROGRESS_BAR (w), options.progress_data.progress_text); #if GTK_CHECK_VERSION (2,91,0) - gtk_progress_bar_set_inverted (GTK_PROGRESS_BAR (w), + gtk_progress_bar_set_inverted (GTK_PROGRESS_BAR (w), options.progress_data.rtl); #else if (options.progress_data.rtl)
View file
yad-0.11.0.tar.bz2/src/text.c -> yad-0.12.1.tar.bz2/src/text.c
Changed
@@ -38,7 +38,7 @@ 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) && + if ((key->keyval == GDK_Return || key->keyval == GDK_KP_Enter) && (key->state & GDK_CONTROL_MASK)) #endif gtk_dialog_response (GTK_DIALOG (data), YAD_RESPONSE_OK); @@ -54,26 +54,26 @@ GtkTextIter end = *iter; gchar *url, *cmdline; - if (ev->type == GDK_BUTTON_PRESS) + if (ev->type == GDK_BUTTON_PRESS) { - GdkEventButton *bev = (GdkEventButton *) ev; + GdkEventButton *bev = (GdkEventButton *) ev; if (bev->button == 1) { gtk_text_iter_backward_to_tag_toggle (&start, tag); 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); g_free (url); - + g_spawn_command_line_async (cmdline, NULL); - + g_free (cmdline); return TRUE; } } - + return FALSE; } @@ -91,14 +91,14 @@ ev->x, ev->y, &x, &y); gtk_text_view_get_iter_at_location (GTK_TEXT_VIEW (w), &iter, x, y); - + tags = gtk_text_iter_get_tags (&iter); for (tagp = tags; tagp != NULL; tagp = tagp->next) { GtkTextTag *tag = tagp->data; gint link = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tag), "is_link")); - if (link) + if (link) { hovering = TRUE; break; @@ -115,7 +115,7 @@ gdk_window_set_cursor (gtk_text_view_get_window (GTK_TEXT_VIEW (w), GTK_TEXT_WINDOW_TEXT), normal); } - if (tags) + if (tags) g_slist_free (tags); gdk_window_get_pointer (gtk_widget_get_window (w), NULL, NULL, NULL); @@ -140,16 +140,16 @@ do { gint sp, ep, spos, epos; - + g_match_info_fetch_pos (match, 0, &sp, &ep); - + /* positions are in bytes, not character, so here we must normalize it*/ spos = g_utf8_pointer_to_offset (text, text + sp); epos = g_utf8_pointer_to_offset (text, text + ep); gtk_text_buffer_get_iter_at_offset (buf, &start, spos); gtk_text_buffer_get_iter_at_offset (buf, &end, epos); - + gtk_text_buffer_apply_tag (buf, tag, &start, &end); } while (g_match_info_next (match, NULL)); @@ -221,7 +221,7 @@ g_string_free (string, TRUE); } - + return TRUE; } @@ -358,12 +358,12 @@ if (options.text_data.uri) { GRegex *regex; - - regex = g_regex_new (YAD_URL_REGEX, + + regex = g_regex_new (YAD_URL_REGEX, G_REGEX_CASELESS | G_REGEX_OPTIMIZE | G_REGEX_EXTENDED, G_REGEX_MATCH_NOTEMPTY, NULL); - + /* Create text tag for URI */ tag = gtk_text_buffer_create_tag (text_buffer, NULL, "foreground", "blue", @@ -371,11 +371,11 @@ 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); - + /* Create cursors */ hand = gdk_cursor_new (GDK_HAND2); normal= gdk_cursor_new (GDK_XTERM); - g_signal_connect (G_OBJECT (text_view), "motion-notify-event", + g_signal_connect (G_OBJECT (text_view), "motion-notify-event", G_CALLBACK (motion_cb), NULL); g_signal_connect_after (G_OBJECT (text_buffer), "changed", G_CALLBACK (linkify_cb), regex);
View file
yad-0.11.0.tar.bz2/src/util.c -> yad-0.12.1.tar.bz2/src/util.c
Changed
@@ -212,9 +212,9 @@ if (!str) return NULL; - + len = strlen (str); - res = (char *) calloc (len + 1, sizeof (char)); + res = (char *) calloc (len + 1, sizeof (char)); while (*buf) { @@ -269,8 +269,8 @@ if (!str) return NULL; - - res = calloc (strlen (str) + 1, sizeof (char)); + + res = calloc (strlen (str) + 1, sizeof (char)); while (*buf) { @@ -302,11 +302,11 @@ resi = '\''; buf += 5; } - } + } else resi = *buf++; i++; } - + return res; }
View file
yad-0.11.0.tar.bz2/src/yad.h -> yad-0.12.1.tar.bz2/src/yad.h
Changed
@@ -62,10 +62,13 @@ YAD_FIELD_NUM, YAD_FIELD_CHECK, YAD_FIELD_COMBO, + YAD_FIELD_COMBO_ENTRY, YAD_FIELD_FILE, + YAD_FIELD_MFILE, YAD_FIELD_DIR, YAD_FIELD_FONT, YAD_FIELD_COLOR, + YAD_FIELD_DATE, } YadFieldType; typedef enum { @@ -133,7 +136,7 @@ gint day; gint month; gint year; - gchar *date_format; + gchar *details; } YadCalendarData; typedef struct { @@ -149,6 +152,10 @@ gboolean hide_text; gboolean completion; gboolean numeric; + gchar *licon; + gchar *licon_action; + gchar *ricon; + gchar *ricon_action; } YadEntryData; typedef struct { @@ -174,7 +181,7 @@ gboolean generic; gboolean descend; gboolean sort_by_name; - gboolean stdin; + gboolean stdinput; guint width; gchar *term; } YadIconsData; @@ -190,6 +197,7 @@ gint search_column; guint limit; PangoEllipsizeMode ellipsize; + gchar *dclick_action; } YadListData; typedef struct { @@ -200,7 +208,9 @@ gchar *progress_text; gboolean pulsate; gboolean autoclose; +#if !defined(_WIN32) gboolean autokill; +#endif gdouble percentage; gboolean rtl; } YadProgressData; @@ -220,7 +230,7 @@ typedef struct { gchar *fore; gchar *back; - gboolean wrap; + gboolean wrap; GtkJustification justify; gint margins; gboolean tail; @@ -235,6 +245,7 @@ gboolean editable; gboolean multi; gchar *command; + gchar *date_format; } YadCommonData; typedef struct { @@ -258,7 +269,9 @@ gchar **extra_data; +#if !defined(_WIN32) gboolean kill_parent; +#endif } YadOptions; extern YadOptions options;
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.