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 18
View file
yad.changes
Changed
@@ -1,4 +1,22 @@ ------------------------------------------------------------------- +Tue Aug 16 00:00:00 UTC 2011 - detlef@links2linux.de + +- new upstream version <0.13.0> + + * fixes for icons in entry dialog + * add icons for editable combo-boxes in entry dialog + * add new field types for form dialog - labels and buttons + * fix blinking behavior in notification icon. + * some improvements in user-defined double-click action for list dialog + * dialog text can be selected if --selectable-labels specified + * fix image clipping in gtk+-3.0 + * fix tooltips in list dialog + * fix wrapping dialog's text + * add --border option for set margins around dialog widgets + * add names for widgets for customize dialog look&feel through .gtkrc + * fix handling window icon + +------------------------------------------------------------------- Sat Jul 02 00:00:00 UTC 2011 - detlef@links2linux.de - new upstream version <0.12.4>
View file
yad.spec
Changed
@@ -1,7 +1,7 @@ # norootforbuild Name: yad -Version: 0.12.4 +Version: 0.13.0 Release: 1 Summary: A fork of Zenity with many improvements
View file
yad-0.12.4.tar.bz2/ChangeLog -> yad-0.13.0.tar.bz2/ChangeLog
Changed
@@ -1,3 +1,144 @@ +2011-07-31 17:59 ananasik + + * src/main.c: + +2011-07-31 14:36 ananasik + + * src/main.c: fix handling window icon + +2011-07-31 08:30 ananasik + + * src/progress.c: fix formatting + +2011-07-31 08:29 ananasik + + * src/progress.c: fix leaks in progressbar + +2011-07-30 11:11 ananasik + + * po/sk.po: update slovak translation + +2011-07-29 15:13 ananasik + + * data/yad.1, po/de.po, po/ru.po, po/sk.po, po/uk.po, src/option.c: + update man and translations + +2011-07-29 14:27 ananasik + + * src/calendar.c, src/color.c, src/entry.c, src/file.c, src/font.c, + src/form.c, src/icons.c, src/list.c, src/main.c, src/progress.c, + src/scale.c, src/text.c: add names to widgets + +2011-07-29 13:51 ananasik + + * src/main.c, src/option.c, src/yad.h: add --borders option + +2011-07-28 12:51 ananasik + + * data/yad.1, po/de.po, po/ru.po, po/sk.po, po/uk.po, src/option.c: + update man and translation + +2011-07-28 12:41 ananasik + + * src/form.c, src/main.c: fix wrapping text in dialog text and form + label field + +2011-07-28 11:27 ananasik + + * src/list.c: fix tooltips in list dialog + +2011-07-28 10:57 ananasik + + * src/form.c, src/main.c, src/option.c, src/yad.h: selectable text + in labels enabled through comman-line + +2011-07-28 10:33 ananasik + + * src/main.c: fix image clipping with gtk+-3.0 + +2011-07-28 05:28 ananasik + + * src/form.c, src/main.c: add uri's handler to labels + +2011-07-28 05:10 ananasik + + * src/form.c: set labels fileds selectable in form dialog + +2011-07-28 04:43 ananasik + + * src/main.c: set dialog text selectable + +2011-07-26 04:32 ananasik + + * src/form.c: remove relief for button fields in form dialog + +2011-07-26 04:29 ananasik + + * data/yad.1, src/list.c: extend format of double-click command in + list dialog + +2011-07-25 07:01 ananasik + + * src/notification.c: fix blinking behavior in notification icon + +2011-07-25 06:01 ananasik + + * src/main.c: + +2011-07-25 05:20 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 --column option in form + dialog + +2011-07-24 06:53 ananasik + + * 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 button field to form + +2011-07-24 06:07 ananasik + + * 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 label field to form + +2011-07-24 05:43 ananasik + + * src/entry.c: fix double action in entry icons + +2011-07-19 09:37 ananasik + + * src/browser.c, src/color.c, src/entry.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: small fix in entry + +2011-06-29 05:01 ananasik + + * ChangeLog, NEWS, configure.ac: release 0.12.4 + +2011-06-29 04:56 ananasik + + * data/yad.1, src/list.c: fix Enter behavior in list dialog + +2011-06-29 04:28 ananasik + + * src/list.c: fix handling image fileds values in output + +2011-06-27 06:10 ananasik + + * 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/icons.c, src/list.c, src/main.c, src/notification.c, + src/option.c, src/progress.c, src/scale.c, src/text.c, + src/util.c, src/yad.h: update source license information + +2011-06-27 06:03 ananasik + + * 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/icons.c, src/list.c, src/main.c, src/notification.c, + src/option.c, src/progress.c, src/scale.c, src/text.c, + src/util.c, src/yad.h: update source license information + 2011-06-24 17:14 ananasik * ChangeLog, NEWS: release 0.12.3
View file
yad-0.12.4.tar.bz2/NEWS -> yad-0.13.0.tar.bz2/NEWS
Changed
@@ -1,3 +1,17 @@ +Version 0.13.0 + - fixes for icons in entry dialog + - add icons for editable combo-boxes in entry dialog + - add new field types for form dialog - labels and buttons + - fix blinking behavior in notification icon + - some improvements in user-defined double-click action for list dialog + - dialog text can be selected if --selectable-labels specified + - fix image clipping in gtk+-3.0 + - fix tooltips in list dialog + - fix wrapping dialog's text + - add --border option for set margins around dialog widgets + - add names for widgets for customize dialog look&feel through .gtkrc + - fix handling window icon + Version 0.12.4 - fix output for image fields in list dialog - fix Enter behavior in list dialog
View file
yad-0.12.4.tar.bz2/configure -> yad-0.13.0.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.12.4. +# Generated by GNU Autoconf 2.68 for YAD 0.13.0. # # 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.12.4' -PACKAGE_STRING='YAD 0.12.4' +PACKAGE_VERSION='0.13.0' +PACKAGE_STRING='YAD 0.13.0' 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.12.4 to adapt to many kinds of systems. +\`configure' configures YAD 0.13.0 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.12.4:";; + short | recursive ) echo "Configuration of YAD 0.13.0:";; 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.12.4 +YAD configure 0.13.0 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.12.4, which was +It was created by YAD $as_me 0.13.0, 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.12.4' + VERSION='0.13.0' 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.12.4, which was +This file was extended by YAD $as_me 0.13.0, 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.12.4 +YAD config.status 0.13.0 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\"
View file
yad-0.12.4.tar.bz2/configure.ac -> yad-0.13.0.tar.bz2/configure.ac
Changed
@@ -1,4 +1,4 @@ -AC_INIT(YAD, 0.12.4, http://code.google.com/p/yad/issues/entry, yad, http://code.google.com/p/yad) +AC_INIT(YAD, 0.13.0, 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.12.4.tar.bz2/data/yad.1 -> yad-0.13.0.tar.bz2/data/yad.1
Changed
@@ -115,7 +115,10 @@ Always print result. .TP .B \-\-dialog-sep -Show separator between dialog and buttons. +Show separator between dialog and buttons. Works only with gtk+-2.0. +.TP +.B \-\-borders=NUM +Set dialog window borders. .TP .B \-\-sticky Make window visible on all desktops. @@ -142,6 +145,10 @@ Use standard X Window geometry notation for placing dialog. When this option is used, \fIwidth\fP, \fIheight\fP, \fImouse\fP and \fIcenter\fP options are ignored. +.TP +.B \-\-selectable-labels +If set, user can select dialog's text and copy it to clipboard. +This option also affects on label fields in form dialog. .PP Calendar options @@ -288,7 +295,7 @@ Form options .TP .B \-\-field=LABEL:TYPE -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. +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, \fICLR\fP,\fIBTN\fP or \fILBL\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, @@ -302,10 +309,15 @@ \fIMFL\fP - select multiple files. Value of this field is a list of files separated by \fIitem-separator\fP. \fIDT\fP - date field. \fICLR\fP - color selection button. +\fIBTN\fP - button field. Initial value is a command runs when button is clicked. +\fILBL\fP - text label. If field name is empty, horisontal separator line will be shown. .TP .B \-\-align=TYPE Set alignment of fields labels. Possible types are \fIleft\fP, \fIcenter\fP or \fIright\fP. Default is left. .TP +.B \-\-columns=NUMBER +Set number of columns in form. Fields will be placed from top to bottom. +.TP .B \-\-separator=STRING Set output separator character. Default is `|'. .TP @@ -366,8 +378,9 @@ 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. By default double-click selects row and act as \fIOK\fP button for simple lists, set the checkbox if \fI\-\-checklist\fP specified and do nothing when list run with \fI\-\-multiple\fP option. +Set the \fICMD\fP as a double-click command. When user double-clicked on row, \fICMD\fP will be launched with values of all columns as an arguments. By default double-click selects row and act as \fIOK\fP button for simple lists, set the checkbox if \fI\-\-checklist\fP specified and do nothing when list run with \fI\-\-multiple\fP option. When double-click specified \fIEnter\fP acts as a double-click and \fICtrl+Enter\fP acts as an \fIOK\fP button. +\fICMD\fP may contain a special character `%s' for setting a position for arguments. By default arguments will be concatenated to the end of \fICMD\fP. .PP Notification options @@ -550,6 +563,51 @@ .TP Exit codes for user-specified buttons must be specified in command line. Even exit code mean to print result, odd just return exit code. +.SH WIDGETS NAMES +.TP +The look and feel of yad's dialogs can be customized through gtkrc file. Here is the names of yad's widgets: + +.TS +tab (@); +l l l. +.B +Widget name@Widget type@Description +_ +yad-dialog-window@GtkDialog@Dialog window +yad-dialog-image@GtkImage@Dialog image +yad-dialog-label@GtkLabel@Dialog text +yad-calendar-widget@GtkCalendar@Calendar widget +yad-color-widget@GtkColorChooser@Color selection widget +yad-color-palette@GtkTreeView@Predefined colors list +yad-entry-label@GtkLabel@Entry label +yad-entry-widget@GtkEntry@Entry widget +yad-entry-spin@GtkSpinButton@Entry widget for numeric values +yad-entry-combo@GtkComboBox@Entry widget with combo +yad-entry-edit-combo@GtkComboBoxEntry@Entry widget with editable combo +yad-file-widget@GtkFileChooser@File selection widget +yad-font-widget@GtkFontChooser@Font selection widget +yad-form-flabel@GtkLabel@Field label in form +yad-form-button@GtkButton@Button field in form +yad-form-entry@GtkEntrfy@Entry field in form +yad-form-spin@GtkSpinButton@Numeric entry field in form +yad-form-check@GtkCheckButton@Checkbox field in form +yad-form-combo@GtkComboBox@Combo field in form +yad-form-edit-combo@GtkComboBoxEntry@Editable combo field in form +yad-form-file@GtkFileChooserButton@File or directory field in form +yad-form-font@GtkFontChooserButton@Font field in form +yad-form-color@GtkColorChooserButton@Color field in form +yad-form-label@GtkLabel@Label field in form +yad-form-separator@GtkHSeparator@ Separator in form +yad-icons-full@GtkIconView@Icons widget for normal mode +yad-icons-compact@GtkTreeView@Icons widget for compact mode +yad-list-widget@GtkTreeView@List widget +yad-progress-widget@GtkProgressBar@Progressbar widget +yad-vscale-widget@GtkScale@Vertical scale widget +yad-hscale-widget@GtkScale@Horizontal scale widget +yad-text-widget@GtkTextView@Text info widget +yad-timeout-indicator@GtkProgreeBar@Timeout indicator +.TE + .SH EXAMPLES Display a file selector with the title \fISelect a file to remove\fP. The file selected is returned on standard output.
View file
yad-0.12.4.tar.bz2/po/de.po -> yad-0.13.0.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-06-18 20:38+0300\n" +"POT-Creation-Date: 2011-07-29 18:04+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" @@ -17,28 +17,27 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: PoEdit 1.4.2\n" -#: ../src/about.c:32 +#: ../src/about.c:30 msgid "translator-credits" msgstr "" "Victor Ananjevsky <ananasik@gmail.com>\n" "Manfred Mueller aka Quax <mmueller@live-modules.org>" -#: ../src/about.c:34 +#: ../src/about.c:32 #, fuzzy msgid "" -"This program 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.\n" +"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.\n" "\n" -"This program 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.\n" +"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.\n" "\n" "You should have received a copy of the GNU General Public License along with " -"this program; if not, write to the Free Software Foundation, Inc., 59 Temple " -"Place, Suite 330, Boston, MA 02111-1307 USA." +"YAD. If not, see <http://www.gnu.org/licenses/>." msgstr "" " Dieses Programm ist freie Software. Sie können es unter den Bedingungen der " "GNU General Public License, wie von der Free Software Foundation " @@ -52,7 +51,7 @@ "Falls nicht, schreiben Sie an die Free Software Foundation, Inc., 51 " "Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. " -#: ../src/about.c:53 +#: ../src/about.c:50 msgid "" "Yet Another Dialog\n" "(show dialog boxes from shell scripts)\n" @@ -64,947 +63,961 @@ "\n" "Basiert auf Zenity-Code\n" -#: ../src/calendar.c:41 ../src/text.c:243 +#: ../src/calendar.c:39 ../src/text.c:241 #, c-format msgid "Cannot open file '%s': %s\n" msgstr "" -#: ../src/entry.c:141 ../src/scale.c:39 +#: ../src/entry.c:145 ../src/scale.c:37 #, 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:147 ../src/scale.c:48 +#: ../src/entry.c:151 ../src/scale.c:46 #, c-format msgid "Initial value less than minimal.\n" msgstr "" -#: ../src/entry.c:152 ../src/scale.c:53 +#: ../src/entry.c:156 ../src/scale.c:51 #, fuzzy, c-format msgid "Initial value greater than maximum.\n" msgstr "Der Maximalwert muß kleiner als der Minimalwert sein.\n" -#: ../src/form.c:42 +#: ../src/form.c:53 #, fuzzy msgid "Select files" msgstr "Datei öffnen" -#: ../src/form.c:90 +#: ../src/form.c:101 #, fuzzy msgid "Select date" msgstr "Datei öffnen" -#: ../src/form.c:210 +#: ../src/form.c:233 #, fuzzy msgid "Select file" msgstr "Datei öffnen" -#: ../src/form.c:216 +#: ../src/form.c:240 msgid "Select folder" msgstr "" -#: ../src/icons.c:249 +#: ../src/icons.c:247 #, fuzzy, c-format msgid "Unable to parse file %s: %s\n" msgstr "Kann Befehlszeile nicht einlesen: %s\n" -#: ../src/icons.c:266 +#: ../src/icons.c:264 #, fuzzy, c-format msgid "Unable to open directory %s: %s\n" msgstr "Kann Befehlszeile nicht einlesen: %s\n" -#: ../src/main.c:71 ../src/main.c:167 +#: ../src/main.c:69 ../src/main.c:205 #, c-format msgid "%d sec" msgstr "" -#: ../src/main.c:107 +#: ../src/main.c:112 #, c-format msgid "Error loading window icon %s: %s\n" msgstr "Fehler beim Laden von Fenster-Symbol %s: %s\n" -#: ../src/main.c:386 +#: ../src/main.c:437 #, c-format msgid "Unable parse command line: %s\n" msgstr "Kann Befehlszeile nicht einlesen: %s\n" -#: ../src/notification.c:72 +#: ../src/notification.c:70 #, fuzzy, c-format msgid "Could not load notification icon '%s': %s\n" msgstr "Kann Benachrichtigungs-Symbol '%s' nicht laden: %s" -#: ../src/notification.c:236 +#: ../src/notification.c:234 #, c-format msgid "Invalid UTF-8 in tooltip!\n" msgstr "Ungültiger UTF-8 Eintrag im Tool-Tip!\n" -#: ../src/notification.c:289 +#: ../src/notification.c:297 #, c-format msgid "Unknown command '%s'\n" msgstr "Befehl '%s' unbekannt\n" -#: ../src/notification.c:325 +#: ../src/notification.c:333 msgid "Yad notification" msgstr "Yad Benachrichtigung" -#: ../src/list.c:645 +#: ../src/list.c:666 msgid "Add row" msgstr "Reihe hinzufügen" -#: ../src/list.c:654 +#: ../src/list.c:675 msgid "Delete row" msgstr "Reihe löschen" -#: ../src/list.c:683 +#: ../src/list.c:704 #, c-format msgid "No column titles specified for List dialog.\n" msgstr "Keine Spaltentitel für Listendialog angegeben\n" -#: ../src/option.c:55 +#: ../src/option.c:53 msgid "Set the dialog title" msgstr "Dialogtitel angeben" -#: ../src/option.c:56 +#: ../src/option.c:54 msgid "TITLE" msgstr "TITEL" -#: ../src/option.c:61 +#: ../src/option.c:59 msgid "Set the window icon" msgstr "Fenster-Symbol angeben" -#: ../src/option.c:62 +#: ../src/option.c:60 msgid "ICONPATH" msgstr "SYMBOLPFAD" -#: ../src/option.c:67 +#: ../src/option.c:65
View file
yad-0.12.4.tar.bz2/po/ru.po -> yad-0.13.0.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-06-18 20:38+0300\n" +"POT-Creation-Date: 2011-07-29 18:04+0300\n" "PO-Revision-Date: 2009-04-30 16:47+0300\n" "Last-Translator: Victor Ananjevsky <ananasik@gmail.com>\n" "Language-Team: Russian\n" @@ -19,25 +19,24 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: ../src/about.c:32 +#: ../src/about.c:30 msgid "translator-credits" msgstr "Виктор Ананьевский <ananasik@gmail.com>" -#: ../src/about.c:34 +#: ../src/about.c:32 msgid "" -"This program 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.\n" +"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.\n" "\n" -"This program 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.\n" +"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.\n" "\n" "You should have received a copy of the GNU General Public License along with " -"this program; if not, write to the Free Software Foundation, Inc., 59 Temple " -"Place, Suite 330, Boston, MA 02111-1307 USA." +"YAD. If not, see <http://www.gnu.org/licenses/>." msgstr "" "YAD - свободное программное обеспечение; вы можете распространять его и/или " "модифицировать на условиях Универсальной общественной лицензии GNU версии 3 " @@ -50,11 +49,9 @@ "обратитесь к Универсальной Общественной Лицензии GNU.\n" "\n" "Вы должны получить копию лицензии GNU c программой. Если лицензия не была " -"получена, известите об этом Фонд свободного программного обеспечения по " -"адресу Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, " -"MA 02111-1307 USA." +"получена, смотрите <http://www.gnu.org/licenses/>." -#: ../src/about.c:53 +#: ../src/about.c:50 msgid "" "Yet Another Dialog\n" "(show dialog boxes from shell scripts)\n" @@ -66,492 +63,510 @@ "\n" "Основан на коде Zenity\n" -#: ../src/calendar.c:41 ../src/text.c:243 +#: ../src/calendar.c:39 ../src/text.c:241 #, c-format msgid "Cannot open file '%s': %s\n" msgstr "Не могу открыть файл %s: %s\n" -#: ../src/entry.c:141 ../src/scale.c:39 +#: ../src/entry.c:145 ../src/scale.c:37 #, c-format msgid "Maximum value must be greater than minimum value.\n" msgstr "Максимальное значение должно быть больше, чем минимальное.\n" -#: ../src/entry.c:147 ../src/scale.c:48 +#: ../src/entry.c:151 ../src/scale.c:46 #, c-format msgid "Initial value less than minimal.\n" msgstr "Начальное значение меньше минимального.\n" -#: ../src/entry.c:152 ../src/scale.c:53 +#: ../src/entry.c:156 ../src/scale.c:51 #, c-format msgid "Initial value greater than maximum.\n" msgstr "Начальное значение больше маскимального.\n" -#: ../src/form.c:42 +#: ../src/form.c:53 msgid "Select files" msgstr "Выбрать файлы" -#: ../src/form.c:90 +#: ../src/form.c:101 msgid "Select date" msgstr "Выбрать дату" -#: ../src/form.c:210 +#: ../src/form.c:233 msgid "Select file" msgstr "Выбрать файл" -#: ../src/form.c:216 +#: ../src/form.c:240 msgid "Select folder" msgstr "Выбрать каталог" -#: ../src/icons.c:249 +#: ../src/icons.c:247 #, c-format msgid "Unable to parse file %s: %s\n" msgstr "Не могу разобрать файл %s: %s\n" -#: ../src/icons.c:266 +#: ../src/icons.c:264 #, c-format msgid "Unable to open directory %s: %s\n" msgstr "Не могу открыть каталог %s: %s\n" -#: ../src/main.c:71 ../src/main.c:167 +#: ../src/main.c:69 ../src/main.c:205 #, c-format msgid "%d sec" msgstr "%d сек" -#: ../src/main.c:107 +#: ../src/main.c:112 #, c-format msgid "Error loading window icon %s: %s\n" msgstr "Ошибка при загрузке иконки окна %s: %s\n" -#: ../src/main.c:386 +#: ../src/main.c:437 #, c-format msgid "Unable parse command line: %s\n" msgstr "Не удается разобрать командную строку: %s\n" -#: ../src/notification.c:72 +#: ../src/notification.c:70 #, c-format msgid "Could not load notification icon '%s': %s\n" msgstr "Не удается загрузить иконку '%s': %s\n" -#: ../src/notification.c:236 +#: ../src/notification.c:234 #, c-format msgid "Invalid UTF-8 in tooltip!\n" msgstr "Неверная последовательность UTF-8 в подсказке!\n" -#: ../src/notification.c:289 +#: ../src/notification.c:297 #, c-format msgid "Unknown command '%s'\n" msgstr "Неизвестная команда '%s'\n" -#: ../src/notification.c:325 +#: ../src/notification.c:333 msgid "Yad notification" msgstr "Диалог уведомлений" -#: ../src/list.c:645 +#: ../src/list.c:666 msgid "Add row" msgstr "Добавить строку" -#: ../src/list.c:654 +#: ../src/list.c:675 msgid "Delete row" msgstr "Удалить строку" -#: ../src/list.c:683 +#: ../src/list.c:704 #, c-format msgid "No column titles specified for List dialog.\n" msgstr "Не заданы заголовоки колонок для диалога со списком\n" -#: ../src/option.c:55 +#: ../src/option.c:53 msgid "Set the dialog title" msgstr "Задать заголовок диалога" -#: ../src/option.c:56 +#: ../src/option.c:54 msgid "TITLE" msgstr "ЗАГОЛОВОК" -#: ../src/option.c:61 +#: ../src/option.c:59 msgid "Set the window icon" msgstr "Задать значок диалога" -#: ../src/option.c:62 +#: ../src/option.c:60 msgid "ICONPATH" msgstr "ЗНАЧОК" -#: ../src/option.c:67 +#: ../src/option.c:65 msgid "Set the width"
View file
yad-0.12.4.tar.bz2/po/sk.po -> yad-0.13.0.tar.bz2/po/sk.po
Changed
@@ -6,10 +6,10 @@ # msgid "" msgstr "" -"Project-Id-Version: YAD 0.6.0\n" +"Project-Id-Version: YAD 0.12.90\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-18 20:38+0300\n" -"PO-Revision-Date: 2011-03-27 18:30+0200\n" +"POT-Creation-Date: 2011-07-29 18:04+0300\n" +"PO-Revision-Date: 2011-07-30 07:41+0200\n" "Last-Translator: Slavko <linux@slavino.sk>\n" "Language-Team: Slovak <nomail>\n" "Language: \n" @@ -18,41 +18,38 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: ../src/about.c:32 +#: ../src/about.c:30 msgid "translator-credits" msgstr "Slavko <linux@slavino.sk>" -#: ../src/about.c:34 +#: ../src/about.c:32 msgid "" -"This program 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.\n" +"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.\n" "\n" -"This program 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.\n" +"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.\n" "\n" "You should have received a copy of the GNU General Public License along with " -"this program; if not, write to the Free Software Foundation, Inc., 59 Temple " -"Place, Suite 330, Boston, MA 02111-1307 USA." +"YAD. If not, see <http://www.gnu.org/licenses/>." msgstr "" -"Tento program je slobodný softvér; môžete ho redistribuovať a/alebo " -"modifikovať podľa podmienok GNU General Public License ako je zverejnená " -"Free Software Foundation; buď verzie 3 Licencie alebo (ak chcete) akejkoľvek " -"novšej verzie.\n" +"YAD je slobodný softvér; môžete ho redistribuovať a/alebo modifikovať podľa " +"podmienok GNU General Public License ako je zverejnená Free Software " +"Foundation; buď verzie 3 Licencie alebo (ak chcete) akejkoľvek novšej " +"verzie.\n" "\n" -"Tento program je distribuovaný v nádeji, že bude užitočný, ale BEZ " -"AKEJKOĽVEK ZÁRUKY; dokonca bez implicitnej záruky POUŽITEĽNOSTI alebo " -"VHODNOSTI PRE PRÍSLUŠNÝ CIEĽ. Ďalšie detaily hľadajte v GNU General Public " -"License.\n" +"YAD je distribuovaný v nádeji, že bude užitočný, ale BEZ AKEJKOĽVEK ZÁRUKY; " +"dokonca bez implicitnej záruky POUŽITEĽNOSTI alebo VHODNOSTI PRE PRÍSLUŠNÝ " +"CIEĽ. Ďalšie detaily hľadajte v GNU General Public License.\n" "\n" -"Kópiu GNU General Public License musíte dostať s týmto programom; ak nie, " -"napíšte si o ňu Free Software Foundation, Inc., 51 Franklin Street, Fifth " -"Floor, Boston, MA 02110-1301, USA." +"Kópiu GNU General Public License by ste mali dostať spolu s YAD. Ak nie, " +"pozrite si <http://www.gnu.org/licenses/>." -#: ../src/about.c:53 +#: ../src/about.c:50 msgid "" "Yet Another Dialog\n" "(show dialog boxes from shell scripts)\n" @@ -64,923 +61,930 @@ "\n" "Založený na kóde Zenity\n" -#: ../src/calendar.c:41 ../src/text.c:243 +#: ../src/calendar.c:39 ../src/text.c:241 #, 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 +#: ../src/entry.c:145 ../src/scale.c:37 #, 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:147 ../src/scale.c:48 +#: ../src/entry.c:151 ../src/scale.c:46 #, c-format msgid "Initial value less than minimal.\n" msgstr "Počiatočná hodnota je menšia ako minimálna.\n" -#: ../src/entry.c:152 ../src/scale.c:53 +#: ../src/entry.c:156 ../src/scale.c:51 #, c-format msgid "Initial value greater than maximum.\n" msgstr "Maximálna hodnota je väčšia ako minimálna.\n" -#: ../src/form.c:42 -#, fuzzy +#: ../src/form.c:53 msgid "Select files" -msgstr "Vyberte súbor" +msgstr "Vyberte súbory" -#: ../src/form.c:90 -#, fuzzy +#: ../src/form.c:101 msgid "Select date" -msgstr "Vyberte pole" +msgstr "Vyberte dátum" -#: ../src/form.c:210 +#: ../src/form.c:233 msgid "Select file" msgstr "Vyberte súbor" -#: ../src/form.c:216 +#: ../src/form.c:240 msgid "Select folder" msgstr "Vyberte pole" -#: ../src/icons.c:249 +#: ../src/icons.c:247 #, c-format msgid "Unable to parse file %s: %s\n" msgstr "Nemožno spracovať súbor %s: %s\n" -#: ../src/icons.c:266 +#: ../src/icons.c:264 #, c-format msgid "Unable to open directory %s: %s\n" msgstr "Nemožno otvoriť adresár %s: %s\n" -#: ../src/main.c:71 ../src/main.c:167 +#: ../src/main.c:69 ../src/main.c:205 #, c-format msgid "%d sec" msgstr "%d s" -#: ../src/main.c:107 +#: ../src/main.c:112 #, c-format msgid "Error loading window icon %s: %s\n" msgstr "Chyba načítania ikony okna %s: %s\n" -#: ../src/main.c:386 +#: ../src/main.c:437 #, c-format msgid "Unable parse command line: %s\n" msgstr "Nemožno spracovať príkazový riadok: %s\n" -#: ../src/notification.c:72 +#: ../src/notification.c:70 #, c-format msgid "Could not load notification icon '%s': %s\n" msgstr "Nemožno načítať ikonu upozornenia '%s': %s\n" -#: ../src/notification.c:236 +#: ../src/notification.c:234 #, c-format msgid "Invalid UTF-8 in tooltip!\n" msgstr "Neplatné UTF-8 v nástrojovom tipe!\n" -#: ../src/notification.c:289 +#: ../src/notification.c:297 #, c-format msgid "Unknown command '%s'\n" msgstr "Neznámy príkaz '%s'\n" -#: ../src/notification.c:325 +#: ../src/notification.c:333 msgid "Yad notification" msgstr "Yad upozornenie" -#: ../src/list.c:645 +#: ../src/list.c:666 msgid "Add row" msgstr "Pridať riadok" -#: ../src/list.c:654 +#: ../src/list.c:675 msgid "Delete row" msgstr "Odstrániť riadok" -#: ../src/list.c:683 +#: ../src/list.c:704 #, c-format msgid "No column titles specified for List dialog.\n" msgstr "Neboli zadané mená stĺpcov pre dialóg Zoznam.\n" -#: ../src/option.c:55 +#: ../src/option.c:53
View file
yad-0.12.4.tar.bz2/po/uk.po -> yad-0.13.0.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-06-18 20:38+0300\n" +"POT-Creation-Date: 2011-07-29 18:04+0300\n" "PO-Revision-Date: 2009-04-30 16:47+0300\n" "Last-Translator: Victor Ananjevsky <ananasik@gmail.com>\n" "Language-Team: Ukrainian\n" @@ -19,25 +19,24 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: ../src/about.c:32 +#: ../src/about.c:30 msgid "translator-credits" msgstr "Віктор Ананьєвський <ananasik@gmail.com>" -#: ../src/about.c:34 +#: ../src/about.c:32 msgid "" -"This program 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.\n" +"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.\n" "\n" -"This program 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.\n" +"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.\n" "\n" "You should have received a copy of the GNU General Public License along with " -"this program; if not, write to the Free Software Foundation, Inc., 59 Temple " -"Place, Suite 330, Boston, MA 02111-1307 USA." +"YAD. If not, see <http://www.gnu.org/licenses/>." msgstr "" "YAD - це вільна програма; ви можете розповсюджувати її та/чи змінювати на " "умовах ліцензії GNU General Public License, що опублікована Free Software " @@ -48,10 +47,9 @@ "ЦІННОСТІ чи ПРИДАТНОСТІ ДЛЯ БУДЬ-ЯКИХ ЦІЛЕЙ. Докладніше про це дивіться GNU " "General Public License.\n" "Ви мали отримати копію GNU General Public License разом з цією програмою; " -"якщо це не так, напишіть у Free Software Foundation, Inc., 59 Temple Place, " -"Suite 330, Boston, MA 02111-1307 USA." +"якщо це не так, дивіться <http://www.gnu.org/licenses/>." -#: ../src/about.c:53 +#: ../src/about.c:50 msgid "" "Yet Another Dialog\n" "(show dialog boxes from shell scripts)\n" @@ -63,492 +61,510 @@ "\n" "Базується на коді Zenity\n" -#: ../src/calendar.c:41 ../src/text.c:243 +#: ../src/calendar.c:39 ../src/text.c:241 #, c-format msgid "Cannot open file '%s': %s\n" msgstr "Не можу відкрити файл %s: %s\n" -#: ../src/entry.c:141 ../src/scale.c:39 +#: ../src/entry.c:145 ../src/scale.c:37 #, c-format msgid "Maximum value must be greater than minimum value.\n" msgstr "Максимальне значення повинно бути більше, ніж мінімальне.\n" -#: ../src/entry.c:147 ../src/scale.c:48 +#: ../src/entry.c:151 ../src/scale.c:46 #, c-format msgid "Initial value less than minimal.\n" msgstr "Початкове значення менше за мінімальне.\n" -#: ../src/entry.c:152 ../src/scale.c:53 +#: ../src/entry.c:156 ../src/scale.c:51 #, c-format msgid "Initial value greater than maximum.\n" msgstr "Початкове значенння більше за маскимальне.\n" -#: ../src/form.c:42 +#: ../src/form.c:53 msgid "Select files" msgstr "Обрати файли" -#: ../src/form.c:90 +#: ../src/form.c:101 msgid "Select date" msgstr "Обрати дату" -#: ../src/form.c:210 +#: ../src/form.c:233 msgid "Select file" msgstr "Обрати файл" -#: ../src/form.c:216 +#: ../src/form.c:240 msgid "Select folder" msgstr "Обрати каталог" -#: ../src/icons.c:249 +#: ../src/icons.c:247 #, c-format msgid "Unable to parse file %s: %s\n" msgstr "Не можу розібрати файл %s: %s\n" -#: ../src/icons.c:266 +#: ../src/icons.c:264 #, c-format msgid "Unable to open directory %s: %s\n" msgstr "Не можу відкрити каталог %s: %s\n" -#: ../src/main.c:71 ../src/main.c:167 +#: ../src/main.c:69 ../src/main.c:205 #, c-format msgid "%d sec" msgstr "%d сек" -#: ../src/main.c:107 +#: ../src/main.c:112 #, c-format msgid "Error loading window icon %s: %s\n" msgstr "Помилка при загрузці іконки вікна %s: %s\n" -#: ../src/main.c:386 +#: ../src/main.c:437 #, c-format msgid "Unable parse command line: %s\n" msgstr "Не вдається розібрати командну строку: %s\n" -#: ../src/notification.c:72 +#: ../src/notification.c:70 #, c-format msgid "Could not load notification icon '%s': %s\n" msgstr "Не вдається завантажити іконку '%s': %s\n" -#: ../src/notification.c:236 +#: ../src/notification.c:234 #, c-format msgid "Invalid UTF-8 in tooltip!\n" msgstr "Неправильна послідовність UTF-8 у підказці!\n" -#: ../src/notification.c:289 +#: ../src/notification.c:297 #, c-format msgid "Unknown command '%s'\n" msgstr "Невідома команда '%s'\n" -#: ../src/notification.c:325 +#: ../src/notification.c:333 msgid "Yad notification" msgstr "Діалог повідомлень" -#: ../src/list.c:645 +#: ../src/list.c:666 msgid "Add row" msgstr "Добавити строку" -#: ../src/list.c:654 +#: ../src/list.c:675 msgid "Delete row" msgstr "Видалити строку" -#: ../src/list.c:683 +#: ../src/list.c:704 #, c-format msgid "No column titles specified for List dialog.\n" msgstr "Не задані заголовоки колонок для діалога зі списком\n" -#: ../src/option.c:55 +#: ../src/option.c:53 msgid "Set the dialog title" msgstr "Задати заголовок діалога" -#: ../src/option.c:56 +#: ../src/option.c:54 msgid "TITLE" msgstr "ЗАГОЛОВОК" -#: ../src/option.c:61 +#: ../src/option.c:59 msgid "Set the window icon" msgstr "Задати іконку діалога" -#: ../src/option.c:62 +#: ../src/option.c:60 msgid "ICONPATH" msgstr "ІКОНКА" -#: ../src/option.c:67 +#: ../src/option.c:65 msgid "Set the width" msgstr "Задати ширину вікна"
View file
yad-0.12.4.tar.bz2/src/browser.c -> yad-0.13.0.tar.bz2/src/browser.c
Changed
@@ -38,7 +38,7 @@ static gboolean key_press_cb (GtkWidget *w, GdkEventKey *ev, gpointer data) { -#if GTK_CHECK_VERSION (2,91,0) +#if GTK_CHECK_VERSION(3,0,0) if (ev->keyval == GDK_KEY_Escape) #else if (ev->keyval == GDK_Escape) @@ -213,12 +213,20 @@ g_signal_connect (G_OBJECT (data->win), "delete-event", G_CALLBACK (gtk_main_quit), NULL); g_signal_connect (G_OBJECT (data->win), "key-press-event", G_CALLBACK (key_press_cb), NULL); +#if !GTK_CHECK_VERSION(3,0,0) box = gtk_vbox_new (FALSE, 5); +#else + box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5); +#endif gtk_container_add (GTK_CONTAINER (data->win), box); gtk_container_set_border_width (GTK_CONTAINER (data->win), 5); /* create icon info box */ +#if !GTK_CHECK_VERSION(3,0,0) w = gtk_hbox_new (FALSE, 5); +#else + w = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); +#endif 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);
View file
yad-0.12.4.tar.bz2/src/calendar.c -> yad-0.13.0.tar.bz2/src/calendar.c
Changed
@@ -93,6 +93,7 @@ GtkWidget *w; w = calendar = gtk_calendar_new (); + gtk_widget_set_name (w, "yad-calendar-widget"); if (options.calendar_data.month > 0 || options.calendar_data.year > 0) gtk_calendar_select_month (GTK_CALENDAR (w),
View file
yad-0.12.4.tar.bz2/src/color.c -> yad-0.13.0.tar.bz2/src/color.c
Changed
@@ -114,9 +114,14 @@ { GtkWidget *w; +#if !GTK_CHECK_VERSION(3,0,0) w = gtk_vbox_new (FALSE, 2); +#else + w = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2); +#endif 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); if (options.color_data.init_color) { @@ -152,6 +157,7 @@ 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);
View file
yad-0.12.4.tar.bz2/src/entry.c -> yad-0.13.0.tar.bz2/src/entry.c
Changed
@@ -30,42 +30,42 @@ static void icon_cb (GtkEntry *entry, GtkEntryIconPosition pos, - GdkEventButton *event, gpointer data) + 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; - } + { + 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); - } + { + 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), ""); + gtk_entry_set_text (GTK_ENTRY (entry), ""); /* move cursor to the end of text */ gtk_editable_set_position (GTK_EDITABLE (entry), -1); @@ -84,11 +84,11 @@ if (options.extra_data) { while (options.extra_datai != NULL) - { - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, 0, options.extra_datai, -1); - i++; - } + { + gtk_list_store_append (store, &iter); + gtk_list_store_set (store, &iter, 0, options.extra_datai, -1); + i++; + } } return GTK_TREE_MODEL (store); @@ -99,15 +99,20 @@ { GtkWidget *c, *w = NULL; +#if !GTK_CHECK_VERSION(3,0,0) w = gtk_hbox_new (FALSE, 5); +#else + w = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); +#endif if (options.entry_data.entry_label) { GtkWidget *l = gtk_label_new (NULL); if (!options.data.no_markup) - gtk_label_set_markup (GTK_LABEL (l), options.entry_data.entry_label); + gtk_label_set_markup (GTK_LABEL (l), options.entry_data.entry_label); else - gtk_label_set_text (GTK_LABEL (l), options.entry_data.entry_label); + gtk_label_set_text (GTK_LABEL (l), options.entry_data.entry_label); + gtk_widget_set_name (l, "yad-entry-label"); gtk_box_pack_start (GTK_BOX (w), l, FALSE, FALSE, 1); } @@ -118,41 +123,42 @@ min = 0.0; max = 65535.0; step = 1.0; if (options.extra_data && *options.extra_data) - { - min = g_ascii_strtod (options.extra_data0, NULL); - if (options.extra_data1) - { - max = g_ascii_strtod (options.extra_data1, NULL); - if (options.extra_data2) - step = g_ascii_strtod (options.extra_data2, NULL); - } - } + { + min = g_ascii_strtod (options.extra_data0, NULL); + if (options.extra_data1) + { + max = g_ascii_strtod (options.extra_data1, NULL); + if (options.extra_data2) + step = g_ascii_strtod (options.extra_data2, NULL); + } + } c = entry = gtk_spin_button_new_with_range (min, max, step); + gtk_widget_set_name (entry, "yad-entry-spin"); if (options.entry_data.entry_text) - { - val = g_ascii_strtod (options.entry_data.entry_text, NULL); - - if (min >= max) - { - g_printerr (_("Maximum value must be greater than minimum value.\n")); - min = 0.0; max = 65535.0; - } - - if (val < min) - { - g_printerr (_("Initial value less than minimal.\n")); - val = min; - } - else if (val > max) - { - g_printerr (_("Initial value greater than maximum.\n")); - val = max; - } - - gtk_spin_button_set_value (GTK_SPIN_BUTTON (c), val); - } + { + val = g_ascii_strtod (options.entry_data.entry_text, NULL); + + if (min >= max) + { + g_printerr (_("Maximum value must be greater than minimum value.\n")); + min = 0.0; max = 65535.0; + } + + if (val < min) + { + g_printerr (_("Initial value less than minimal.\n")); + val = min; + } + else if (val > max) + { + g_printerr (_("Initial value greater than maximum.\n")); + val = max; + } + + gtk_spin_button_set_value (GTK_SPIN_BUTTON (c), val); + } } else if (!options.entry_data.completion && options.extra_data && *options.extra_data) @@ -160,98 +166,111 @@ gint i = 0; if (options.common_data.editable || settings.combo_always_editable) - { + { #if GTK_CHECK_VERSION(2,24,0) - c = gtk_combo_box_text_new_with_entry (); + c = gtk_combo_box_text_new_with_entry (); #else - c = gtk_combo_box_entry_new_text (); + c = gtk_combo_box_entry_new_text (); #endif - entry = gtk_bin_get_child (GTK_BIN (c)); - } + gtk_widget_set_name (c, "yad-entry-edit-combo");
View file
yad-0.12.4.tar.bz2/src/file.c -> yad-0.13.0.tar.bz2/src/file.c
Changed
@@ -79,6 +79,7 @@ } w = filechooser = gtk_file_chooser_widget_new (action); + gtk_widget_set_name (w, "yad-file-widget"); if (options.common_data.uri) {
View file
yad-0.12.4.tar.bz2/src/font.c -> yad-0.13.0.tar.bz2/src/font.c
Changed
@@ -35,6 +35,7 @@ GtkWidget *w; w = font = gtk_font_selection_new (); + gtk_widget_set_name (w, "yad-font-widget"); if (options.font_data.preview) gtk_font_selection_set_preview_text (GTK_FONT_SELECTION (w), options.font_data.preview);
View file
yad-0.12.4.tar.bz2/src/form.c -> yad-0.13.0.tar.bz2/src/form.c
Changed
@@ -24,52 +24,65 @@ static GSList *fields = NULL; static void +button_clicked_cb (GtkButton *b, gchar *action) +{ + if (action && action0) + g_spawn_command_line_async (action, NULL); +} + +static void form_activate_cb (GtkEntry *entry, gpointer data) { gtk_dialog_response (GTK_DIALOG (data), YAD_RESPONSE_OK); } +static void +text_size_allocate_cb (GtkWidget *w, GtkAllocation *al, gpointer data) +{ + gtk_widget_set_size_request (w, al->width, -1); +} + static void select_files_cb (GtkEntry *entry, GtkEntryIconPosition pos, - GdkEventButton *event, gpointer data) + 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_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); - } + { + 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); } @@ -77,7 +90,7 @@ static void select_date_cb (GtkEntry *entry, GtkEntryIconPosition pos, - GdkEventButton *event, gpointer data) + GdkEventButton *event, gpointer data) { GtkWidget *dlg, *cal; @@ -86,42 +99,42 @@ 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 ); + 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); + 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)); - } + { + 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); - } + { + 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); } } @@ -135,216 +148,282 @@ { GtkWidget *l, *e; GdkPixbuf *pb; - guint i, fc = g_slist_length (options.form_data.fields); + guint i, col, row, rows; + guint fc = g_slist_length (options.form_data.fields); + + row = col = 0; + rows = (fc + 1) / options.form_data.columns; - w = gtk_table_new (fc, 2, FALSE); + w = gtk_table_new (fc, 2 * options.form_data.columns, FALSE); /* create form */ for (i = 0; i < fc; i++) - { - YadField *fld = g_slist_nth_data (options.form_data.fields, i); - - /* add field label */ - if (fld->type != YAD_FIELD_CHECK) - { - l = gtk_label_new (NULL); - if (!options.data.no_markup) - gtk_label_set_markup (GTK_LABEL (l), fld->name); - else
View file
yad-0.12.4.tar.bz2/src/icons.c -> yad-0.13.0.tar.bz2/src/icons.c
Changed
@@ -329,6 +329,7 @@ if (!options.icons_data.compact) { icon_view = gtk_icon_view_new_with_model (GTK_TREE_MODEL (store)); + gtk_widget_set_name (icon_view, "yad-icons-full"); gtk_icon_view_set_text_column (GTK_ICON_VIEW (icon_view), COL_NAME); gtk_icon_view_set_pixbuf_column (GTK_ICON_VIEW (icon_view), COL_PIXBUF); gtk_icon_view_set_tooltip_column (GTK_ICON_VIEW (icon_view), COL_TOOLTIP); @@ -340,6 +341,7 @@ GtkTreeViewColumn *col; icon_view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store)); + gtk_widget_set_name (icon_view, "yad-icons-compact"); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (icon_view), FALSE); col = gtk_tree_view_column_new ();
View file
yad-0.12.4.tar.bz2/src/list.c -> yad-0.13.0.tar.bz2/src/list.c
Changed
@@ -31,7 +31,7 @@ static gboolean list_activate_cb (GtkWidget *widget, GdkEventKey *event, gpointer data) { -#if GTK_CHECK_VERSION (2,91,0) +#if GTK_CHECK_VERSION(3,0,0) if (event->keyval == GDK_KEY_Return || event->keyval == GDK_KEY_KP_Enter) #else if (event->keyval == GDK_Return || event->keyval == GDK_KP_Enter) @@ -107,6 +107,7 @@ GtkTreeModel *model = NULL; GtkTreePath *path = NULL; GtkTreeIter iter; + gint cnum = -1; if (gtk_tree_view_get_tooltip_context (GTK_TREE_VIEW (list_view), &x, &y, kmode, &model, &path, &iter)) @@ -121,27 +122,21 @@ { GtkTreeViewColumn *checkcol = (GtkTreeViewColumn*) node->data; + cnum++; if (x >= colx && x < (colx + gtk_tree_view_column_get_width (checkcol))) col = checkcol; else colx += gtk_tree_view_column_get_width (checkcol); + } g_list_free(cols); /* set tolltip */ if (col) { - gint cnum; - GList *cells; - GtkCellRenderer *cell; YadColumn *yc; gchar *text = NULL; - cells = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (col)); - cell = GTK_CELL_RENDERER (g_list_nth_data (cells, 0)); - cnum = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (cell), "column")); - g_list_free (cells); - yc = (YadColumn *) g_slist_nth_data (options.list_data.columns, cnum); switch (yc->type) { @@ -546,9 +541,10 @@ if (options.list_data.dclick_action) { - GString *cmd; + gchar *cmd; + GString *args; - cmd = g_string_new (options.list_data.dclick_action); + args = g_string_new (""); if (gtk_tree_model_get_iter (model, &iter, path)) { @@ -563,26 +559,26 @@ { gboolean bval; gtk_tree_model_get (model, &iter, i, &bval, -1); - g_string_append_printf (cmd, " %s", bval ? "TRUE" : "FALSE"); + g_string_append_printf (args, " %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); + g_string_append_printf (args, " %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); + g_string_append_printf (args, " %lf", nval); break; } case YAD_COLUMN_IMAGE: { - g_string_append_printf (cmd, " ''"); + g_string_append_printf (args, " ''"); break; } case YAD_COLUMN_ATTR_FORE: @@ -594,7 +590,7 @@ gchar *cval, *uval; gtk_tree_model_get (model, &iter, i, &cval, -1); uval = unescape_markup (cval); - g_string_append_printf (cmd, " %s", uval); + g_string_append_printf (args, " '%s'", uval); g_free (uval); break; } @@ -602,8 +598,20 @@ } } - g_spawn_command_line_async (cmd->str, NULL); - g_string_free (cmd, TRUE); + if (g_strstr_len (options.list_data.dclick_action, -1, "%s")) + { + static GRegex *regex = NULL; + + if (!regex) + regex = g_regex_new ("\%s", G_REGEX_OPTIMIZE, 0, NULL); + cmd = g_regex_replace_literal (regex, options.list_data.dclick_action, -1, 0, args->str, 0, NULL); + } + else + cmd = g_strdup_printf ("%s %s", options.list_data.dclick_action, args->str); + g_string_free (args, TRUE); + + g_spawn_command_line_async (cmd, NULL); + g_free (cmd); } else { @@ -705,6 +713,7 @@ model = create_model (n_columns); 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_reorderable (GTK_TREE_VIEW (list_view), options.common_data.editable);
View file
yad-0.12.4.tar.bz2/src/main.c -> yad-0.13.0.tar.bz2/src/main.c
Changed
@@ -75,6 +75,12 @@ return TRUE; } +static void +text_size_allocate_cb (GtkWidget *w, GtkAllocation *al, gpointer data) +{ + gtk_widget_set_size_request (w, al->width, -1); +} + GtkWidget * create_dialog () { @@ -84,33 +90,30 @@ GtkWidget *text; GtkWidget *main_widget = NULL; GtkWidget *topb = NULL; - GError *err = NULL; /* create dialog window */ dlg = gtk_dialog_new (); gtk_window_set_title (GTK_WINDOW (dlg), options.data.dialog_title); -#if !GTK_CHECK_VERSION (2,91,0) +#if !GTK_CHECK_VERSION(3,0,0) gtk_dialog_set_has_separator (GTK_DIALOG (dlg), options.data.dialog_sep); #endif + gtk_widget_set_name (dlg, "yad-dialog-window"); /* set window icon */ if (options.data.window_icon) { - if (g_file_test (options.data.window_icon, G_FILE_TEST_EXISTS)) - { - gtk_window_set_icon_from_file (GTK_WINDOW (dlg), - options.data.window_icon, &err); - if (err) - { - g_printerr (_("Error loading window icon %s: %s\n"), - options.data.window_icon, err->message); - g_error_free (err); - } - } - else - gtk_window_set_icon_name (GTK_WINDOW (dlg), options.data.window_icon); + GdkPixbuf *pb; + + pb = get_pixbuf (options.data.window_icon, YAD_SMALL_ICON); + gtk_window_set_icon (GTK_WINDOW (dlg), pb); + g_object_unref (pb); } + /* set window borders */ + if (options.data.borders == -1) + options.data.borders = (gint) gtk_container_get_border_width (GTK_CONTAINER (dlg)); + gtk_container_set_border_width (GTK_CONTAINER (dlg), (guint) options.data.borders); + /* set window behavior */ if (options.data.sticky) gtk_window_stick (GTK_WINDOW (dlg)); @@ -144,38 +147,46 @@ } /* add top label widgets */ +#if !GTK_CHECK_VERSION(3,0,0) hbox = hbox2 = gtk_hbox_new (FALSE, 0); +#else + hbox = hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); +#endif gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), hbox, TRUE, TRUE, 5); +#if !GTK_CHECK_VERSION(3,0,0) vbox = gtk_vbox_new (FALSE, 0); +#else + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); +#endif /* add timeout indicator */ if (topb) { if (g_ascii_strcasecmp (options.data.to_indicator, "top") == 0) { -#if !GTK_CHECK_VERSION (2,91,0) +#if !GTK_CHECK_VERSION(3,0,0) gtk_progress_bar_set_orientation (GTK_PROGRESS_BAR (topb), GTK_PROGRESS_LEFT_TO_RIGHT); #endif gtk_box_pack_start (GTK_BOX (vbox), topb, FALSE, FALSE, 2); } else if (g_ascii_strcasecmp (options.data.to_indicator, "bottom") == 0) { -#if !GTK_CHECK_VERSION (2,91,0) +#if !GTK_CHECK_VERSION(3,0,0) gtk_progress_bar_set_orientation (GTK_PROGRESS_BAR (topb), GTK_PROGRESS_LEFT_TO_RIGHT); #endif gtk_box_pack_end (GTK_BOX (vbox), topb, FALSE, FALSE, 2); } else if (g_ascii_strcasecmp (options.data.to_indicator, "left") == 0) { -#if !GTK_CHECK_VERSION (2,91,0) +#if !GTK_CHECK_VERSION(3,0,0) gtk_progress_bar_set_orientation (GTK_PROGRESS_BAR (topb), GTK_PROGRESS_BOTTOM_TO_TOP); #endif gtk_box_pack_start (GTK_BOX (hbox), topb, FALSE, FALSE, 2); } else if (g_ascii_strcasecmp (options.data.to_indicator, "right") == 0) { -#if !GTK_CHECK_VERSION (2,91,0) +#if !GTK_CHECK_VERSION(3,0,0) gtk_progress_bar_set_orientation (GTK_PROGRESS_BAR (topb), GTK_PROGRESS_BOTTOM_TO_TOP); #endif gtk_box_pack_end (GTK_BOX (hbox), topb, FALSE, FALSE, 2); @@ -183,7 +194,7 @@ if (settings.show_remain) { gchar *lbl = g_strdup_printf (_("%d sec"), options.data.timeout); -#if GTK_CHECK_VERSION (2,91,0) +#if GTK_CHECK_VERSION(3,0,0) gtk_progress_bar_set_show_text (GTK_PROGRESS_BAR (topb), TRUE); #endif gtk_progress_bar_set_text (GTK_PROGRESS_BAR (topb), lbl); @@ -196,7 +207,11 @@ if (options.data.image_on_top) { +#if !GTK_CHECK_VERSION(3,0,0) hbox2 = gtk_hbox_new (FALSE, 0); +#else + hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); +#endif gtk_box_pack_start (GTK_BOX (vbox), hbox2, FALSE, FALSE, 0); } @@ -208,18 +223,21 @@ image = gtk_image_new_from_pixbuf (pb); g_object_unref (pb); + gtk_widget_set_name (image, "yad-dialog-image"); gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0); - gtk_misc_set_padding (GTK_MISC (image), 5, 5); gtk_box_pack_start (GTK_BOX (hbox2), image, FALSE, FALSE, 2); } if (options.data.dialog_text) { gchar *buf = g_strcompress (options.data.dialog_text); + text = gtk_label_new (NULL); if (!options.data.no_markup) - gtk_label_set_markup (GTK_LABEL (text), buf); + gtk_label_set_markup (GTK_LABEL (text), buf); else gtk_label_set_text (GTK_LABEL (text), buf); + gtk_widget_set_name (text, "yad-dialog-label"); + gtk_label_set_selectable (GTK_LABEL (text), options.data.selectable_labels); gtk_misc_set_alignment (GTK_MISC (text), 0.0, 0.5); if (options.data.geometry || options.data.width != -1) gtk_label_set_line_wrap (GTK_LABEL (text), TRUE); @@ -227,6 +245,9 @@ gtk_box_pack_start (GTK_BOX (hbox2), text, FALSE, FALSE, 2); else gtk_box_pack_start (GTK_BOX (vbox), text, FALSE, FALSE, 2); + g_signal_connect_after (G_OBJECT (text), "size-allocate", + G_CALLBACK (text_size_allocate_cb), NULL); + g_free (buf); } @@ -393,11 +414,11 @@ settings.icon_theme = gtk_icon_theme_get_default (); gtk_icon_size_lookup (GTK_ICON_SIZE_DIALOG, &w, &h); settings.big_fallback_image = - gtk_icon_theme_load_icon (settings.icon_theme, "unknown", MIN (w, h), + gtk_icon_theme_load_icon (settings.icon_theme, "yad", MIN (w, h), GTK_ICON_LOOKUP_GENERIC_FALLBACK, NULL); gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &w, &h); settings.small_fallback_image = - gtk_icon_theme_load_icon (settings.icon_theme, "unknown", MIN (w, h), + gtk_icon_theme_load_icon (settings.icon_theme, "yad", MIN (w, h), GTK_ICON_LOOKUP_GENERIC_FALLBACK, NULL); ctx = yad_create_context ();
View file
yad-0.12.4.tar.bz2/src/notification.c -> yad-0.13.0.tar.bz2/src/notification.c
Changed
@@ -216,8 +216,8 @@ icon = g_strstrip (value); if (gtk_status_icon_get_visible (status_icon) && - gtk_status_icon_is_embedded (status_icon)) - set_icon (); + gtk_status_icon_is_embedded (status_icon)) + set_icon (); } else if (!g_ascii_strcasecmp (command, "tooltip")) { @@ -235,7 +235,7 @@ } else if (!g_ascii_strcasecmp (command, "visible")) { -#if !GTK_CHECK_VERSION(2,91,0) +#if !GTK_CHECK_VERSION(3,0,0) if (!g_ascii_strcasecmp (value, "blink")) { gboolean state = gtk_status_icon_get_blinking (status_icon); @@ -243,21 +243,31 @@ } else #endif - if (!g_ascii_strcasecmp (value, "false")) - gtk_status_icon_set_visible (status_icon, FALSE); - else - gtk_status_icon_set_visible (status_icon, TRUE); + if (!g_ascii_strcasecmp (value, "false")) + { + gtk_status_icon_set_visible (status_icon, FALSE); +#if !GTK_CHECK_VERSION(3,0,0) + gtk_status_icon_set_blinking (status_icon, FALSE); +#endif + } + else + { + gtk_status_icon_set_visible (status_icon, TRUE); +#if !GTK_CHECK_VERSION(3,0,0) + gtk_status_icon_set_blinking (status_icon, FALSE); +#endif + } } else if (!g_ascii_strcasecmp (command, "action")) { g_free (action); action = g_strdup (value); } - else if (!g_ascii_strcasecmp (command, "quit")) - { - exit_code = YAD_RESPONSE_OK; - gtk_main_quit (); - } + else if (!g_ascii_strcasecmp (command, "quit")) + { + exit_code = YAD_RESPONSE_OK; + gtk_main_quit (); + } else if (!g_ascii_strcasecmp (command, "menu")) { MenuData *mdata;
View file
yad-0.12.4.tar.bz2/src/option.c -> yad-0.13.0.tar.bz2/src/option.c
Changed
@@ -130,7 +130,7 @@ &options.data.no_markup, N_("Don't use pango markup language in dialog's text"), NULL }, -#if !GTK_CHECK_VERSION (2,91,0) +#if !GTK_CHECK_VERSION(3,0,0) { "dialog-sep", 0, 0, G_OPTION_ARG_NONE, @@ -138,12 +138,24 @@ N_("Add separator between dialog and buttons"), NULL }, #endif + { "borders", 0, + 0, + G_OPTION_ARG_INT, + &options.data.borders, + N_("Set window borders"), + N_("NUMBER") }, { "always-print-result", 0, 0, G_OPTION_ARG_NONE, &options.data.always_print, N_("Always print result"), NULL }, + { "selectable-labels", 0, + 0, + G_OPTION_ARG_NONE, + &options.data.selectable_labels, + N_("Dialog text can be selected"), + NULL }, /* window settings */ { "sticky", 0, 0, @@ -455,7 +467,7 @@ 0, G_OPTION_ARG_CALLBACK, add_field, - N_("Add field to form (TYPE - H, RO, NUM, CHK, CB, CBE, FL, DIR, FN, MFL, DT or CLR)"), + N_("Add field to form (TYPE - H, RO, NUM, CHK, CB, CBE, FL, DIR, FN, MFL, DT, CLR, BTN or LBL)"), N_("LABEL:TYPE") }, { "align", 0, 0, @@ -463,6 +475,12 @@ set_align, N_("Set alignment of fileds labels (left, center or right)"), N_("TYPE") }, + { "columns", 0, + 0, + G_OPTION_ARG_INT, + &options.form_data.columns, + N_("Set number of columns in form"), + N_("NUMBER") }, { "separator", 0, G_OPTION_FLAG_NOALIAS, G_OPTION_ARG_STRING, @@ -979,6 +997,10 @@ fld->type = YAD_FIELD_MFILE; else if (g_ascii_strcasecmp (fstr1, "DT") == 0) fld->type = YAD_FIELD_DATE; + else if (g_ascii_strcasecmp (fstr1, "BTN") == 0) + fld->type = YAD_FIELD_BUTTON; + else if (g_ascii_strcasecmp (fstr1, "LBL") == 0) + fld->type = YAD_FIELD_LABEL; else fld->type = YAD_FIELD_SIMPLE; } @@ -1140,11 +1162,13 @@ options.data.to_indicator = settings.to_indicator; options.data.buttons = NULL; options.data.no_buttons = FALSE; -#if !GTK_CHECK_VERSION (2,91,0) +#if !GTK_CHECK_VERSION(3,0,0) options.data.dialog_sep = settings.dlg_sep; #endif + options.data.borders = -1; options.data.no_markup = FALSE; options.data.always_print = FALSE; + options.data.selectable_labels = FALSE; /* Initialize window options */ options.data.sticky = FALSE; @@ -1201,6 +1225,7 @@ /* Initialize form data */ options.form_data.fields = NULL; options.form_data.align = 0.0; + options.form_data.columns = 1; /* Initialize icons data */ options.icons_data.directory = NULL;
View file
yad-0.12.4.tar.bz2/src/progress.c -> yad-0.13.0.tar.bz2/src/progress.c
Changed
@@ -51,73 +51,68 @@ string = g_string_new (NULL); if (options.progress_data.pulsate) - { - if (pulsate_timeout == -1) - pulsate_timeout = g_timeout_add (100, pulsate_progress_bar, NULL); - } + { + if (pulsate_timeout == -1) + pulsate_timeout = g_timeout_add (100, pulsate_progress_bar, NULL); + } while (channel->is_readable != TRUE); do - { - gint status; - - do - { - status = - g_io_channel_read_line_string (channel, string, NULL, &err); - - while (gtk_events_pending ()) - gtk_main_iteration (); - - } - while (status == G_IO_STATUS_AGAIN); - - if (status != G_IO_STATUS_NORMAL) - { - if (err) - { - g_printerr ("yad_progress_handle_stdin(): %s", - err->message); - g_error_free (err); - err = NULL; - } - continue; - } - - if (!g_ascii_strncasecmp (string->str, "#", 1)) - { - gchar *match; - -#if GTK_CHECK_VERSION (2,91,0) - gtk_progress_bar_set_show_text (GTK_PROGRESS_BAR (progress_bar), TRUE); -#endif - /* We have a comment, so let's try to change the label */ - match = g_strstr_len (string->str, string->len, "#"); - match++; - /* FIXME: g_strcompress() return newly allocated string. so there is a little memory leak */ - gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progress_bar), - g_strcompress (g_strstrip (match))); - } - else - { - if (!g_ascii_isdigit (*(string->str))) - continue; - - /* Now try to convert the thing to a number */ - percentage = atoi (string->str); - if (percentage >= 100) - { - gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress_bar), 1.0); - if (options.progress_data.autoclose) - gtk_dialog_response (GTK_DIALOG (data), YAD_RESPONSE_OK); - } - else - gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress_bar), - percentage / 100.0); - } - - } + { + gint status; + + do + { + status = + g_io_channel_read_line_string (channel, string, NULL, &err); + + while (gtk_events_pending ()) + gtk_main_iteration (); + + } + while (status == G_IO_STATUS_AGAIN); + + if (status != G_IO_STATUS_NORMAL) + { + if (err) + { + g_printerr ("yad_progress_handle_stdin(): %s", + err->message); + g_error_free (err); + err = NULL; + } + continue; + } + + if (string->str0 == '#') + { + gchar *match; + + /* We have a comment, so let's try to change the label */ + match = g_strcompress (g_strstrip (string->str + 1)); + gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progress_bar), match); + g_free (match); + } + else + { + if (!g_ascii_isdigit (*(string->str))) + continue; + + /* Now try to convert the thing to a number */ + percentage = atoi (string->str); + if (percentage >= 100) + { + gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress_bar), 1.0); + if (options.progress_data.autoclose) + gtk_dialog_response (GTK_DIALOG (data), YAD_RESPONSE_OK); + } + else + gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress_bar), + percentage / 100.0); + } + + } while (g_io_channel_get_buffer_condition (channel) == G_IO_IN); g_string_free (string, TRUE); } @@ -127,13 +122,13 @@ gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress_bar), 1.0); if (options.progress_data.pulsate) - { - g_source_remove (pulsate_timeout); - pulsate_timeout = -1; - } + { + g_source_remove (pulsate_timeout); + pulsate_timeout = -1; + } if (options.progress_data.autoclose) - gtk_dialog_response (GTK_DIALOG (data), YAD_RESPONSE_OK); + gtk_dialog_response (GTK_DIALOG (data), YAD_RESPONSE_OK); g_io_channel_shutdown (channel, TRUE, NULL); return FALSE; @@ -148,25 +143,26 @@ GIOChannel *channel; w = progress_bar = gtk_progress_bar_new (); + gtk_widget_set_name (w, "yad-progress-widget"); +#if GTK_CHECK_VERSION(3,0,0) + gtk_progress_bar_set_show_text (GTK_PROGRESS_BAR (w), TRUE); +#endif if (options.progress_data.percentage > -1) gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress_bar), - options.progress_data.percentage / 100.0); + options.progress_data.percentage / 100.0); if (options.progress_data.progress_text) { -#if GTK_CHECK_VERSION (2,91,0) - gtk_progress_bar_set_show_text (GTK_PROGRESS_BAR (w), TRUE); -#endif gtk_progress_bar_set_text (GTK_PROGRESS_BAR (w), - options.progress_data.progress_text); + options.progress_data.progress_text); } -#if GTK_CHECK_VERSION (2,91,0) +#if GTK_CHECK_VERSION(3,0,0) gtk_progress_bar_set_inverted (GTK_PROGRESS_BAR (w), - options.progress_data.rtl); + options.progress_data.rtl); #else if (options.progress_data.rtl) gtk_progress_bar_set_orientation (GTK_PROGRESS_BAR (w), - GTK_PROGRESS_RIGHT_TO_LEFT); + GTK_PROGRESS_RIGHT_TO_LEFT); #endif channel = g_io_channel_unix_new (0);
View file
yad-0.12.4.tar.bz2/src/scale.c -> yad-0.13.0.tar.bz2/src/scale.c
Changed
@@ -60,6 +60,7 @@ w = scale = gtk_vscale_new_with_range (options.scale_data.min_value, options.scale_data.max_value, options.scale_data.step); + gtk_widget_set_name (w, "yad-vscale-widget"); gtk_range_set_inverted (GTK_RANGE (w), !options.scale_data.invert); } else @@ -67,6 +68,7 @@ w = scale = gtk_hscale_new_with_range (options.scale_data.min_value, options.scale_data.max_value, options.scale_data.step); + gtk_widget_set_name (w, "yad-hscale-widget"); gtk_range_set_inverted (GTK_RANGE (w), options.scale_data.invert); } gtk_range_set_value (GTK_RANGE (w), options.scale_data.value);
View file
yad-0.12.4.tar.bz2/src/text.c -> yad-0.13.0.tar.bz2/src/text.c
Changed
@@ -32,7 +32,7 @@ static gboolean key_press_cb (GtkWidget *w, GdkEventKey *key, gpointer data) { -#if GTK_CHECK_VERSION (2,91,0) +#if GTK_CHECK_VERSION(3,0,0) if ((key->keyval == GDK_KEY_Return || key->keyval == GDK_KEY_KP_Enter) && (key->state & GDK_CONTROL_MASK)) #else @@ -312,6 +312,7 @@ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); text_view = gtk_text_view_new (); + gtk_widget_set_name (text_view, "yad-text-widget"); text_buffer = gtk_text_buffer_new (NULL); gtk_text_view_set_buffer (GTK_TEXT_VIEW (text_view), text_buffer); gtk_text_view_set_justification (GTK_TEXT_VIEW (text_view), options.text_data.justify);
View file
yad-0.12.4.tar.bz2/src/util.c -> yad-0.13.0.tar.bz2/src/util.c
Changed
@@ -34,7 +34,7 @@ kf = g_key_file_new (); -#if !GTK_CHECK_VERSION (2,91,0) +#if !GTK_CHECK_VERSION(3,0,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 @@ -82,7 +82,7 @@ settings.show_remain = FALSE; settings.rules_hint = TRUE; settings.always_selected = FALSE; -#if !GTK_CHECK_VERSION (2,91,0) +#if !GTK_CHECK_VERSION(3,0,0) settings.dlg_sep = FALSE; #endif settings.combo_always_editable = FALSE; @@ -99,7 +99,7 @@ if (g_key_file_load_from_file (kf, filename, G_KEY_FILE_NONE, NULL)) { -#if !GTK_CHECK_VERSION (2,91,0) +#if !GTK_CHECK_VERSION(3,0,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
View file
yad-0.12.4.tar.bz2/src/yad.h -> yad-0.13.0.tar.bz2/src/yad.h
Changed
@@ -67,6 +67,8 @@ YAD_FIELD_FONT, YAD_FIELD_COLOR, YAD_FIELD_DATE, + YAD_FIELD_BUTTON, + YAD_FIELD_LABEL, } YadFieldType; typedef enum { @@ -113,13 +115,15 @@ gchar *dialog_image; gboolean image_on_top; gchar *icon_theme; -#if !GTK_CHECK_VERSION (2,91,0) +#if !GTK_CHECK_VERSION(3,0,0) gboolean dialog_sep; #endif + gint borders; GSList *buttons; gboolean no_buttons; gboolean no_markup; gboolean always_print; + gboolean selectable_labels; /* window settings */ gboolean sticky; gboolean fixed; @@ -171,6 +175,7 @@ typedef struct { GSList *fields; gdouble align; + guint columns; } YadFormData; typedef struct { @@ -282,7 +287,7 @@ gboolean show_remain; gboolean rules_hint; gboolean always_selected; -#if !GTK_CHECK_VERSION (2,91,0) +#if !GTK_CHECK_VERSION(3,0,0) gboolean dlg_sep; #endif gboolean combo_always_editable;
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
.