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 27
View file
yad.changes
Changed
@@ -1,4 +1,241 @@ ------------------------------------------------------------------- +Tue May 3 17:37:34 UTC 2016 - aloisio@gmx.com + +- Update to 0.36.2 + * honor precision for floats in numeric fields of form and + entry dialogs + * fix settings title and icon for browser mode in html dialog + Version 0.36.1: + * fix quoting buttons commands in form dialog + Version 0.36.0: + * add --no-selection option to list dialog + * improve --center option + * add spell checking support for text field in form and + text-info dialog + * add gtksourceview support to text-info dialog + * fix setting initial value for numeric text entry in entry + dialog + * do not close print dialog when preview button is clicked + * add --monitor option to icon dialog + * change default font for text-info and print text files to + Monospace + * quote field values for button callback in form dialog + Version 0.35.0: + * add BAR column type to list dialog + * add SZ column type to list dialog (displays human readable + sizes) + * add --show-cursor option to text dialog + * fix handling leading spaces in button callback of form + dialog + * fix --show-hidden behavior + * switch float output from %g to %f + * fix setting custom bg color in text-info dialog for gtk3 + Version 0.34.2: + * fix clearing fields in form when --cycle-read is using + Version 0.34.1: + * fix expander + * update man page + Version 0.34.0: + * add --select-action option to list dialog + * add --separate-output option to font dialog + * honor --quoted-output option in font dialog + * add --show-hidden option to file selection dialogs + * add --watch-bar to multi-progress dialog + * improve handling of autoclosing event in multi-progress + dialog + * improve output of color values in form dialog + * fix build with gtk+-3.0 and webkit-3.0 + Version 0.33.1: + * fix timeout handling + Version 0.33.0: + * add --picture dialog, a simple image viewer + * add --focus-field option to form dialog for set initially + focused field + * add --complete option for extended completions in entry + fields + * add ability to fill form data through stdin + * fix handling empty data in form dialog + * improvements in browser mode of html dialog + * add --float-precision option + * improve output of floating point numbers + Version 0.32.0: + * enable rules-hint for icons list in icon browser + * add --splash options (thanks to Konstantin Baierer) + * add --no-focus option + * fix timeout progressbar layout for gtk3 builds + * add --num-output option for output index of active element + in combo-boxes + Version 0.31.3: + * fix setting default value for completion entry in form + dialog + Version 0.31.2: + * fix segfault in list dialog when separators enabled but --sep-value is unset + Version 0.31.1: + * fix segfault in html dialog + Version 0.31.0: + * add separators to list dialog + * use YAD_OPTIONS variable for specify default yad arguments + * add --no-rules-hint option to list dialog + * add parameters for controlling palettes in color selection + * remove some entries from settings file + * set default open command and date format through the settings + file + * add additional filter settings for file selection dialogs + * apply filter and preview settings to all of file selection + dialogs + * fix settings custom icon theme + Version 0.30.1: + * fix parsing paned orientation + Version 0.30.0: + * add paned dialog + * add --parent-win option to make dialog transient for special + window + * add --uri-color option for setting text color of URIs in + text-info dialog + Version 0.29.1: + * fix build without HTML dialog + Version 0.29.0: + * fix focus problems in html dialog + * set default encoding from locale for html widget + * fix quoted output in form dialog + * add --no-escape option to prevent close dialog when Esc is + pressed + * show gtk version within --version and about dialog + * fix build with gcc 5.x + Version 0.28.1: + * fix incorrect rows output order in form dialog + Version 0.28.0: + * add HTML dialog + * add different output formats for color dialog + * add mnemonic feature for field labels in form and entry + dialogs + * add completion entry as field type in form dialog + * add output by rows in form dialog when layout with several + columns is used + * fix labels in multiprogress dialog + * fix print to file in print dialog + * fix setup arguments for double-click action in list dialog + * update man page + Version 0.27.0: + * add --hidden option to notification icon + * add --tooltip-column option to list dialog + * add --gtkrc option + * fix detection of expandind columns in list dialog + * fix markup handling + * add YAD_XID variable for dialogs children + * code cleanup for remove deprecated api + Version 0.26.1: + * fix output in list dialog for check and radiolists + * fix button alignment in form dialog + * don't add last item separator in multifile field of form + dialog + Version 0.26.0: + * double-click actions in list dialog can change values in + current row + * impove handling of markup text in list dialog + * add FBTN field type (relief buttons) to form dialog + * add buttons with custom icons + * add labels with icons for tab labels in notebook dialog + * remove --align option for notebook dialog + * numeric entries aligned to the right side + Version 0.25.1: + * use normal window hints for dialog windows + * fix menu in notification icon (issue #196) + Version 0.25.0: + * add --menu option for notification icon + * add --maximized and --fullscreen options + * unify --listen option for different kind of dialogs + * replace --stdin option by --listen in icon dialog + Version 0.24.1: + * fix parsing menu in notification dialog + Version 0.24.0: + * add --auto-close option for multi-progress dialog + * add --image-path option + * add --no-click option to list dialog + * allow clear text in text-info dialog with ^L + * new translations + * bug fixes + Version 0.23.1: + * wait for child termination in notebook dialog + * honour custom width and height settings in unresizable + dialogs + Version 0.23.0: + * add --quoted-output option for file, form and list dialogs + * add default values for combo-box field in form dialog + * fix dialogs responses when working in notebook mode + Version 0.22.1: + * fix resize of dialog text + * fix usage of stock items in popup menu of notification icon + Version 0.22.0: + * add scale field to form dialog + * fix form layout on gtk+-3.0 + * fix borders around child dialogs in notebook + * fix handle stdin for icons dialog in compact mode + * fix dialog text alignment + * add italian translation + * update man page + Version 0.21.0: + * add optional scrollbars for form dialog + * add "duplicate row" menu entry for editable lists + * some fixes in man page + Version 0.20.3: + * update slovak translation + * use double-ckick for selecting date in form dialog + * fix check field layout in form dialog for gtk3 + Version 0.20.2: + * fix tooltips in list dialog + Version 0.20.1: + * fix --kill-parent option + Version 0.20.0: + * default value for combo-box can be specified by --entry-text + from one of existings entries in list + * add --single-click option for icon dialog + * add log window to progress dialog + * fix geometry settings for unresizable windows + * fix layout on gtk3 + * add custom signals for --kill-parent option + Version 0.19.1: + * use current path as a default folder for file selection dialogs + * fix parsing .desktop files in icons dialog
View file
yad.spec
Changed
@@ -1,20 +1,34 @@ -# norootforbuild - -Name: yad -Version: 0.16.3 -Release: 1 - -Summary: A fork of Zenity with many improvements -License: GPLv3 -Group: Development/Tools/GUI Builders -URL: http://code.google.com/p/yad/ - -Source0: %{name}-%{version}.tar.bz2 - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot - -BuildRequires: gtk2-devel intltool pkgconfig update-desktop-files - +# +# spec file for package yad +# +# Copyright (c) 2016 Packman Team <packman@links2linux.de> +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.links2linux.org/ +# + + +Name: yad +Version: 0.36.2 +Release: 0 +Summary: A fork of Zenity with many improvements +License: GPL-3.0 +Group: Development/Tools/GUI Builders +Url: http://yad-dialog.sourceforge.net/ +Source0: https://sourceforge.net/projects/yad-dialog/files/%{name}-%{version}.tar.xz +BuildRequires: intltool +BuildRequires: pkgconfig +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: update-desktop-files +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Yad (yet another dialog) is a fork of Zenity with many improvements, such as @@ -27,25 +41,21 @@ for the long time, but many interesting ideas which are ignored by developers/maintainers were in GNOME Bugzilla. - %prep -%setup -q -n %{name}-%{version} +%setup -q %build -%configure --enable-icon-browser -%__make %{?jobs:-j%{jobs}} +%configure --enable-icon-browser --with-gtk=gtk3 +make %{?_smp_mflags} %install -%makeinstall +make %{?_smp_mflags} DESTDIR=%{buildroot} install %find_lang %{name} %suse_update_desktop_file -r %{name}-icon-browser Utility DesktopUtility -%clean -rm -rf "%{buildroot}" - %files -f %{name}.lang %defattr(-,root,root,-) @@ -57,6 +67,4 @@ %{_datadir}/aclocal/%{name}.m4 %{_mandir}/man1/%{name}.1.gz - %changelog -
View file
yad-0.16.3.tar.bz2/depcomp
Deleted
@@ -1,630 +0,0 @@ -#! /bin/sh -# depcomp - compile a program generating dependencies as side-effects - -scriptversion=2009-04-28.21; # UTC - -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free -# Software Foundation, Inc. - -# 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 2, or (at your option) -# any later version. - -# 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. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>. - -case $1 in - '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: depcomp --help --version PROGRAM ARGS - -Run PROGRAMS ARGS to compile a file, generating dependencies -as side-effects. - -Environment variables: - depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. - DEPDIR directory where to store dependencies. - depfile Dependency file to output. - tmpdepfile Temporary file to use when outputing dependencies. - libtool Whether libtool is used (yes/no). - -Report bugs to <bug-automake@gnu.org>. -EOF - exit $? - ;; - -v | --v*) - echo "depcomp $scriptversion" - exit $? - ;; -esac - -if test -z "$depmode" || test -z "$source" || test -z "$object"; then - echo "depcomp: Variables source, object and depmode must be set" 1>&2 - exit 1 -fi - -# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. -depfile=${depfile-`echo "$object" | - sed 's|^\\/*$|'${DEPDIR-.deps}'/&|;s|\.\(^.*\)$|.P\1|;s|Pobj$|Po|'`} -tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\(^.*\)$/.T\1/'`} - -rm -f "$tmpdepfile" - -# Some modes work just like other modes, but use different flags. We -# parameterize here, but still list the modes in the big case below, -# to make depend.m4 easier to write. Note that we *cannot* use a case -# here, because this file can only contain one case statement. -if test "$depmode" = hp; then - # HP compiler uses -M and no extra arg. - gccflag=-M - depmode=gcc -fi - -if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout -fi - -cygpath_u="cygpath -u -f -" -if test "$depmode" = msvcmsys; then - # This is just like msvisualcpp but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u="sed s,\\\\\\\\,/,g" - depmode=msvisualcpp -fi - -case "$depmode" in -gcc3) -## gcc 3 implements dependency tracking that does exactly what -## we want. Yay! Note: for some reason libtool 1.4 doesn't like -## it if -MD -MP comes after the -MF stuff. Hmm. -## Unfortunately, FreeBSD c89 acceptance of flags depends upon -## the command line argument order; so add the flags where they -## appear in depend2.am. Note that the slowdown incurred here -## affects only configure: in makefiles, %FASTDEP% shortcuts this. - for arg - do - case $arg in - -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;; - *) set fnord "$@" "$arg" ;; - esac - shift # fnord - shift # $arg - done - "$@" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - mv "$tmpdepfile" "$depfile" - ;; - -gcc) -## There are various ways to get dependency output from gcc. Here's -## why we pick this rather obscure method: -## - Don't want to use -MD because we'd like the dependencies to end -## up in a subdir. Having to rename by hand is ugly. -## (We might end up doing this anyway to support other compilers.) -## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). -## - Using -M directly means running the compiler twice (even worse -## than renaming). - if test -z "$gccflag"; then - gccflag=-MD, - fi - "$@" -Wp,"$gccflag$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. - sed -e 's/^^:*: / /' \ - -e 's/^'$alpha':\/^:*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. -## The problem is that when a header file which appears in a .P file -## is deleted, the dependency causes make to die (because there is -## typically no way to rebuild the header). We avoid this by adding -## dummy dependencies for each header file. Too bad gcc doesn't do -## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory -## that the space means something, we add a space to the output as -## well. -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -hp) - # This case exists only to let depend.m4 do its work. It works by - # looking at the text of this script. This case will never be run, - # since it is checked for above. - exit 1 - ;; - -sgi) - if test "$libtool" = yes; then - "$@" "-Wp,-MDupdate,$tmpdepfile" - else - "$@" -MDupdate "$tmpdepfile" - fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - - if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files - echo "$object : \\" > "$depfile" - - # Clip off the initial element (the dependent). Don't try to be - # clever and replace this with sed code, as IRIX sed won't handle - # lines with more than a fixed number of characters (4096 in - # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the - # dependency line. - tr ' ' ' -' < "$tmpdepfile" \
View file
yad-0.16.3.tar.bz2/install-sh
Deleted
@@ -1,520 +0,0 @@ -#!/bin/sh -# install - install a program, script, or datafile - -scriptversion=2009-04-28.21; # UTC - -# This originates from X11R5 (mit/util/scripts/install.sh), which was -# later released in X11R6 (xc/config/util/install.sh) with the -# following copyright and license. -# -# Copyright (C) 1994 X Consortium -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to -# deal in the Software without restriction, including without limitation the -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -# sell copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- -# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# -# Except as contained in this notice, the name of the X Consortium shall not -# be used in advertising or otherwise to promote the sale, use or other deal- -# ings in this Software without prior written authorization from the X Consor- -# tium. -# -# -# FSF changes to this file are in the public domain. -# -# Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it -# when there is no Makefile. -# -# This script is compatible with the BSD install script, but was written -# from scratch. - -nl=' -' -IFS=" "" $nl" - -# set DOITPROG to echo to test this script - -# Don't use :- since 4.3BSD and earlier shells don't like it. -doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi - -# Put in absolute file names if you don't have them in your path; -# or use environment vars. - -chgrpprog=${CHGRPPROG-chgrp} -chmodprog=${CHMODPROG-chmod} -chownprog=${CHOWNPROG-chown} -cmpprog=${CMPPROG-cmp} -cpprog=${CPPROG-cp} -mkdirprog=${MKDIRPROG-mkdir} -mvprog=${MVPROG-mv} -rmprog=${RMPROG-rm} -stripprog=${STRIPPROG-strip} - -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - -posix_mkdir= - -# Desired mode of installed file. -mode=0755 - -chgrpcmd= -chmodcmd=$chmodprog -chowncmd= -mvcmd=$mvprog -rmcmd="$rmprog -f" -stripcmd= - -src= -dst= -dir_arg= -dst_arg= - -copy_on_change=false -no_target_directory= - -usage="\ -Usage: $0 OPTION... -T SRCFILE DSTFILE - or: $0 OPTION... SRCFILES... DIRECTORY - or: $0 OPTION... -t DIRECTORY SRCFILES... - or: $0 OPTION... -d DIRECTORIES... - -In the 1st form, copy SRCFILE to DSTFILE. -In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. -In the 4th, create DIRECTORIES. - -Options: - --help display this help and exit. - --version display version info and exit. - - -c (ignored) - -C install only if different (preserve the last data modification time) - -d create directories instead of installing files. - -g GROUP $chgrpprog installed files to GROUP. - -m MODE $chmodprog installed files to MODE. - -o USER $chownprog installed files to USER. - -s $stripprog installed files. - -t DIRECTORY install into DIRECTORY. - -T report an error if DSTFILE is a directory. - -Environment variables override the default commands: - CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG - RMPROG STRIPPROG -" - -while test $# -ne 0; do - case $1 in - -c) ;; - - -C) copy_on_change=true;; - - -d) dir_arg=true;; - - -g) chgrpcmd="$chgrpprog $2" - shift;; - - --help) echo "$usage"; exit $?;; - - -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *''*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; - - -o) chowncmd="$chownprog $2" - shift;; - - -s) stripcmd=$stripprog;; - - -t) dst_arg=$2 - shift;; - - -T) no_target_directory=true;; - - --version) echo "$0 $scriptversion"; exit $?;; - - --) shift - break;; - - -*) echo "$0: invalid option: $1" >&2 - exit 1;; - - *) break;; - esac - shift -done - -if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then - # When -d is used, all remaining arguments are directories to create. - # When -t is used, the destination is already specified. - # Otherwise, the last argument is the destination. Remove it from $@. - for arg - do - if test -n "$dst_arg"; then - # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dst_arg" - shift # fnord - fi - shift # arg - dst_arg=$arg - done -fi - -if test $# -eq 0; then - if test -z "$dir_arg"; then - echo "$0: no input file specified." >&2 - exit 1 - fi - # It's OK to call `install-sh -d' without argument. - # This can happen when creating conditional directories. - exit 0
View file
yad-0.16.3.tar.bz2/missing
Deleted
@@ -1,376 +0,0 @@ -#! /bin/sh -# Common stub for a few missing GNU programs while installing. - -scriptversion=2009-04-28.21; # UTC - -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. - -# 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 2, or (at your option) -# any later version. - -# 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. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 -fi - -run=: -sed_output='s/.* --output =\(^ *\).*/\1/p' -sed_minuso='s/.* -o \(^ *\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi - -msg="missing on your system" - -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; - - -h|--h|--he|--hel|--help) - echo "\ -$0 OPTION... PROGRAM ARGUMENT... - -Handle \`PROGRAM ARGUMENT...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. - -Options: - -h, --help display this help and exit - -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails - -Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.ch', if possible, from existing .ch - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.ch', if possible, from existing .ch - -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. - -Send bug reports to <bug-automake@gnu.org>." - exit $? - ;; - - -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing $scriptversion (GNU Automake)" - exit $? - ;; - - -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 - ;; - -esac - -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; - - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^ *ACM_CONFIG_HEADER(\(^)*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^^:*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te*) - echo 1>&2 "\
View file
yad-0.16.3.tar.bz2/ChangeLog -> yad-0.36.2.tar.xz/ChangeLog
Changed
@@ -1,3 +1,2154 @@ +2016-04-30 13:43 v1c0nt + + * src/html.c: fix settings title and icon for browser mode in html + dialog + +2016-04-30 11:16 v1c0nt + + * src/entry.c, src/form.c: honor precision for floats in numeric + fields of form and entry dialogs + +2016-04-28 16:59 v1c0nt + + * ChangeLog, NEWS: release 0.36.1 + +2016-04-28 16:58 v1c0nt + + * configure.ac, data/yad.1, src/form.c, src/util.c, src/yad.h: fix + man page + +2016-04-28 10:42 v1c0nt + + * src/form.c: fix set button command in form + +2016-04-28 08:15 v1c0nt + + * src/form.c: fix set button command in form when data reads from + stdin + +2016-04-27 16:59 v1c0nt + + * src/form.c, src/util.c, src/yad.h: fix hadling double quotes in + form callback + +2016-04-26 13:19 v1c0nt + + * ChangeLog, NEWS: release 0.36.0 + +2016-04-26 13:12 v1c0nt + + * configure.ac: bump version to 0.36.0. prepare to release + +2016-04-26 13:05 v1c0nt + + * po/ru.po, po/uk.po: update translations + +2016-04-26 12:58 v1c0nt + + * data/yad.1, src/about.c: improve about dialog + +2016-04-26 10:49 v1c0nt + + * ChangeLog, src/list.c, src/util.c, src/yad.h: cleanup + +2016-04-26 10:29 v1c0nt + + * src/form.c: quote argument in form button callbacks + +2016-04-26 10:22 v1c0nt + + * src/form.c: quote argument in form button callbacks + +2016-04-22 14:35 v1c0nt + + * configure.ac: bump version + +2016-04-22 14:35 v1c0nt + + * src/text.c: use Monospace as default font for text-info dialog + +2016-04-22 14:32 v1c0nt + + * src/option.c, src/text.c, src/yad.h: add --lang option to + source-info + +2016-04-22 14:07 v1c0nt + + * configure.ac, src/Makefile.am, src/text.c, src/yad.h: add initial + support of gtksourceview + +2016-04-15 03:58 v1c0nt + + * data/yad.1, po/ru.po, po/uk.po, src/icons.c, src/option.c, + src/yad.h: add --monitor option to icons dialog + +2016-04-14 16:59 v1c0nt + + * configure.ac: prepare for dir monitoring + +2016-04-14 15:19 v1c0nt + + * src/icons.c: some cleanups in icon dialog + +2016-04-13 18:16 v1c0nt + + * src/list.c, src/util.c: + +2016-04-13 15:04 v1c0nt + + * src/print.c: do not close print dialog when preview is clicked + +2016-04-13 09:19 v1c0nt + + * src/print.c: change default font for text in print dialog + +2016-04-04 09:18 v1c0nt + + * README.md, src/entry.c: fix setting initial value for numeric + text entry + +2016-04-03 02:44 v1c0nt + + * Makefile.am, data/Makefile.am: + +2016-04-03 02:40 v1c0nt + + * README, README.md, data/get-lang.c: + +2016-04-02 11:23 v1c0nt + + * configure.ac, src/Makefile.am, src/form.c, src/yad.h: fix spell + buildings + +2016-04-02 11:20 v1c0nt + + * configure.ac, data/yad.1, po/ru.po, po/uk.po, src/option.c, + src/text.c, src/yad.h: add optional spell checking + +2016-03-26 06:51 v1c0nt + + * src/main.c: use CENTER_ALWAYS when --center is specified + +2016-03-25 06:07 v1c0nt + + * TODO, data/yad.1, po/ru.po, po/uk.po, src/list.c, src/option.c, + src/yad.h: add --no-selection option to list dialog + +2016-03-21 06:23 v1c0nt + + * TODO: update TODO + +2016-03-20 20:36 v1c0nt + + * TODO: update TODO + +2016-03-20 20:32 v1c0nt + + * TODO: update TODO + +2016-03-20 10:54 v1c0nt + + * ChangeLog, NEWS: release 0.35.0 + +2016-03-20 10:52 v1c0nt + + * data/yad.1, src/list.c, src/option.c, src/yad.h: fuck, forget to + add sz column type + +2016-03-20 10:28 v1c0nt + + * ChangeLog, NEWS, configure.ac: bump version to 0.35.0. prepare to + release + +2016-03-20 10:12 v1c0nt + + * data/yad.1, po/ru.po, po/uk.po, src/font.c, src/list.c, + src/option.c, src/yad.h: add BAR column to list dialog + +2016-03-10 08:58 v1c0nt + + * src/text.c: fix setting custom bg color in text-info dialog for + gtk3 + +2016-03-07 18:51 v1c0nt + + * src/entry.c, src/form.c, src/list.c: switch float output from %g + to %f + +2016-03-02 14:17 v1c0nt + + * src/file.c, src/form.c, src/util.c, src/yad.h: fix --show-hidden + behavior + +2016-03-01 17:00 v1c0nt + + * src/form.c: fix handling leading spaces in button callback of + form dialog + +2016-02-28 07:36 v1c0nt + + * README: update README + +2016-02-28 07:17 v1c0nt + + * src/text.c: cleanup + +2016-02-28 07:11 v1c0nt + + * configure.ac, data/yad.1, po/ru.po, po/uk.po, src/option.c, + src/text.c, src/yad.h: add --show-cursor option to text dialog.
View file
yad-0.16.3.tar.bz2/Makefile.am -> yad-0.36.2.tar.xz/Makefile.am
Changed
@@ -2,5 +2,3 @@ SUBDIRS = src po data EXTRA_DIST = COPYING ChangeLog NEWS README AUTHORS TODO THANKS - -
View file
yad-0.16.3.tar.bz2/Makefile.in -> yad-0.36.2.tar.xz/Makefile.in
Changed
@@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,61 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\\ \ *) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs$$bs $$bs *//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -dEDm) skip_next=yes;; \ + -JT) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -32,51 +86,91 @@ PRE_UNINSTALL = : POST_UNINSTALL = : subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(top_srcdir)/configure AUTHORS COPYING ChangeLog NEWS THANKS \ - TODO depcomp install-sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(am__DIST_COMMON) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir dist dist-all distcheck +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + cscope distdir dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config.h.in +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items$$0 = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(top_srcdir)/build/compile $(top_srcdir)/build/install-sh \ + $(top_srcdir)/build/missing AUTHORS COPYING ChangeLog NEWS \ + README THANKS TODO build/compile build/depcomp \ + build/install-sh build/missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d "$(distdir)" \ - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr "$(distdir)"; }; } + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi +am__post_remove_distdir = $(am__remove_distdir) am__relativize = \ dir0=`pwd`; \ sed_first='s,^\(^/*\)/.*$$,\1,'; \ @@ -104,7 +198,10 @@ reldir="$$dir2" GZIP_ENV = --best DIST_ARCHIVES = $(distdir).tar.xz +DIST_TARGETS = dist-xz distuninstallcheck_listfiles = find . -type f -print +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@
View file
yad-0.16.3.tar.bz2/NEWS -> yad-0.36.2.tar.xz/NEWS
Changed
@@ -1,3 +1,251 @@ +Version 0.36.2 + - honor precision for floats in numeric fields of form and entry dialogs + - fix settings title and icon for browser mode in html dialog + +Version 0.36.1 + - fix quoting buttons commands in form dialog + +Version 0.36.0 + - add --no-selection option to list dialog + - improve --center option + - add spell checking support for text field in form and text-info dialog + - add gtksourceview support to text-info dialog + - fix setting initial value for numeric text entry in entry dialog + - do not close print dialog when preview button is clicked + - add --monitor option to icon dialog + - change default font for text-info and print text files to Monospace + - quote field values for button callback in form dialog + +Version 0.35.0 + - add BAR column type to list dialog + - add SZ column type to list dialog (displays human readable sizes) + - add --show-cursor option to text dialog + - fix handling leading spaces in button callback of form dialog + - fix --show-hidden behavior + - switch float output from %g to %f + - fix setting custom bg color in text-info dialog for gtk3 + +Version 0.34.2 + - fix clearing fields in form when --cycle-read is using + +Version 0.34.1 + - fix expander + - update man page + +Version 0.34.0 + - add --select-action option to list dialog + - add --separate-output option to font dialog + - honor --quoted-output option in font dialog + - add --show-hidden option to file selection dialogs + - add --watch-bar to multi-progress dialog + - improve handling of autoclosing event in multi-progress dialog + - improve output of color values in form dialog + - fix build with gtk+-3.0 and webkit-3.0 + +Version 0.33.1 + - fix timeout handling + +Version 0.33.0 + - add --picture dialog, a simple image viewer + - add --focus-field option to form dialog for set initialy fosuced field + - add --complete option for extended completions in entry fields + - add ability to fill form data through stdin + - fix handling empty data in form dialog + - improvements in browser mode of html dialog + - add --float-precision option + - improve output of floating point numbers + +Version 0.32.0 + - enable rules-hint for icons list in icon browser + - add --splash options (thanks to Konstantin Baierer) + - add --no-focus option + - fix timeout progressbar layout for gtk3 builds + - add --num-output option for output index of active element in combo-boxes + +Version 0.31.3 + - fix setting default value for completion entry in form dialog + +Version 0.31.2 + - fix segfault in list dialog when separators enabled but --sep-value is unset + +Version 0.31.1 + - fix segfault in html dialog + +Version 0.31.0 + - add separators to list dialog + - use YAD_OPTIONS variable for specify default yad arguments + - add --no-rules-hint option to list dialog + - add parameters for controlling palettes in color selection + - remove some entries from settings file + - set default open command and date format through the settings file + - add additional filter settings for file selection dialogs + - apply filter and preview settings to all of file selection dialogs + - fix settings custom icon theme + +Version 0.30.1 + - fix parsing paned orientation + +Version 0.30.0 + - add paned dialog + - add --parent-win option to make dialog transient for special window + - add --uri-color option for setting text color of URIs in text-info dialog + +Version 0.29.1 + - fix build without HTML dialog + +Version 0.29.0 + - fix focus problems in html dialog + - set default encoding from locale for html widget + - fix quoted output in form dialog + - add --no-escape option to prevent close dialog when Esc is pressed + - show gtk version within --version and about dialog + - fix build with gcc 5.x + +Version 0.28.1 + - fix incorrect rows output order in form dialog + +Version 0.28.0 + - add HTML dialog + - add different output formats for color dialog + - add mnemonic feature for field labels in form and entry dialogs + - add completion entry as field type in form dialog + - add output by rows in form dialog when layout with several columns is used + - fix labels in multiprogress dialog + - fix print to file in print dialog + - fix setup arguments for double-click action in list dialog + - update man page + +Version 0.27.0 + - add --hidden option to notification icon + - add --tooltip-column option to list dialog + - add --gtkrc option + - fix detection of expandind columns in list dialog + - fix markup handling + - add YAD_XID variable for dialogs children + - code cleanup for remove deprecated api + +Version 0.26.1 + - fix output in list dialog for check and radiolists + - fix button alignment in form dialog + - don't add last item separator in multifile field of form dialog + +Version 0.26.0 + - double-click actions in list dialog can change values in current row + - impove handling of markup text in list dialog + - add FBTN field type (relief buttons) to form dialog + - add buttons with custom icons + - add labels with icons for tab labels in notebook dialog + - remove --align option for notebook dialog + - numeric entries aligned to the right side + +Version 0.25.1 + - use normal window hints for dialog windows + - fix menu in notification icon (issue #196) + +Version 0.25.0 + - add --menu option for notification icon + - add --maximized and --fullscreen options + - unify --listen option for different kind of dialogs + - replace --stdin option by --listen in icon dialog + +Vesrion 0.24.1 + - fix parsing menu in notification dialog + +Version 0.24.0 + - add --auto-close option for multi-progress dialog + - add --image-path option + - add --no-click option to list dialog + - allow clear text in text-info dialog with ^L + - new translations + - bug fixes + +Version 0.23.1 + - wait for child termination in notebook dialog + - honour custom width and height settings in unresizable dialogs + +Version 0.23.0 + - add --quoted-output option for file, form and list dialogs + - add default values for combo-box field in form dialog + - fix dialogs responses when working in notebook mode + +Version 0.22.1 + - fix resize of dialog text + - fix usage of stock items in popup menu of notification icon + +Version 0.22.0 + - add scale field to form dialog + - fix form layout on gtk+-3.0 + - fix borders around child dialogs in notebook + - fix handle stdin for icons dialog in compact mode + - fix dialog text alignment + - add italian translation + - update man page + +Version 0.21.0 + - add optional scrollbars for form dialog + - add "duplicate row" menu entry for editable lists + - some fixes in man page + +Version 0.20.3 + - update slovak translation + - use double-ckick for selecting date in form dialog + - fix check field layout in form dialog for gtk3 + +Version 0.20.2 + - fix tooltips in list dialog + +Version 0.20.1 + - fix --kill-parent option +
View file
yad-0.16.3.tar.bz2/README -> yad-0.36.2.tar.xz/README
Changed
@@ -1,10 +1,31 @@ -Yet Another Dialog -======================= +# Yet Another Dialog +================== Program allows you to display GTK+ dialog boxes from command line or shell scripts. YAD depends on GTK+ only. Minimal GTK+ version is 2.16.0 This software is licensed under the GPL v.3 -Project homepage: http://code.google.com/p/yad/ -Example usage: http://code.google.com/p/yad/wiki/Examples +Project homepage: https://sourceforge.net/projects/yad-dialog/ +Example usage: https://sourceforge.net/p/yad-dialog/wiki/browse_pages/ Maillist: http://groups.google.com/group/yad-common + +Some miscellaneous stuff can be found in data directory including notify-send script +and simple zenity-compatible wrapper + +# Building SVN version +==================== +Before run the standard ./configure && make && make install procedure +you need to generate build scripts. This can be done by running command + +`autoreconf -ivf` + +For successfully build you may need to install the following packages: +* GNU Autotools (https://www.gnu.org/software/autoconf/ http://www.gnu.org/software/automake/) +* Intltool >= 0.40.0 (http://freedesktop.org/wiki/Software/intltool/) +* GTK+ >= 2.16.0 (http://www.gtk.org) +with appropriate *-dev* packages depends on your distro + +# Spell check +=========== +Get list of supported spell checking languages +`gcc $(pkg-config --cflags --libs glib-2.0 gtkspell3-2.0) -o get-lang data/get-lang.c`
View file
yad-0.16.3.tar.bz2/TODO -> yad-0.36.2.tar.xz/TODO
Changed
@@ -1,5 +1,5 @@ -- Parse ESC sequences in text-info dialog (or something like wiki syntax) -- DBus support (?) -- Common search dialog for list and text dialogs -- Use item-separator in filters of file dialog (?) -- Add scale field for form dialog +- add actions to list, text-info and icons dialogs +- use optional gtksourceview in text-info dialog +- done add option for disable selection in list dialog +- add slideshow to picture dialog (reading uris from stdin) +- add single model for completion and combo-boxes
View file
yad-0.16.3.tar.bz2/aclocal.m4 -> yad-0.36.2.tar.xz/aclocal.m4
Changed
@@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +# generated automatically by aclocal 1.15 -*- Autoconf -*- + +# Copyright (C) 1996-2014 Free Software Foundation, Inc. -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,15 +11,16 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef(AC_CONFIG_MACRO_DIRS, m4_defun(_AM_CONFIG_MACRO_DIRS, )m4_defun(AC_CONFIG_MACRO_DIRS, _AM_CONFIG_MACRO_DIRS($@))) m4_ifndef(AC_AUTOCONF_VERSION, m4_copy(m4_PACKAGE_VERSION, AC_AUTOCONF_VERSION))dnl -m4_if(m4_defn(AC_AUTOCONF_VERSION), 2.68,, -m4_warning(this file was generated for autoconf 2.68. +m4_if(m4_defn(AC_AUTOCONF_VERSION), 2.69,, +m4_warning(this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.)) +To do so, use the procedure documented by the package, typically 'autoreconf'.)) -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2002-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -31,10 +32,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN(AM_AUTOMAKE_VERSION, -am__api_version='1.11' +am__api_version='1.15' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if($1, 1.11.1, , +m4_if($1, 1.15, , AC_FATAL(Do not call $0, use AM_INIT_AUTOMAKE($1).))dnl ) @@ -50,22 +51,22 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN(AM_SET_CURRENT_AUTOMAKE_VERSION, -AM_AUTOMAKE_VERSION(1.11.1)dnl +AM_AUTOMAKE_VERSION(1.15)dnl m4_ifndef(AC_AUTOCONF_VERSION, m4_copy(m4_PACKAGE_VERSION, AC_AUTOCONF_VERSION))dnl _AM_AUTOCONF_VERSION(m4_defn(AC_AUTOCONF_VERSION))) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. # For projects using AC_CONFIG_AUX_DIR(foo), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. # # Of course, Automake must honor this variable whenever it calls a # tool from the auxiliary directory. The problem is that $srcdir (and @@ -84,7 +85,7 @@ # # The reason of the latter failure is that $top_srcdir and $ac_aux_dir # are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you +# harmless because $srcdir is '.', but things will broke when you # start a VPATH build or use an absolute $srcdir. # # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, @@ -102,30 +103,26 @@ # configured tree to be moved without reconfiguration. AC_DEFUN(AM_AUX_DIR_EXPAND, -dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ(2.50)dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +AC_REQUIRE(AC_CONFIG_AUX_DIR_DEFAULT)dnl +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` ) # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 - # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. AC_DEFUN(AM_CONDITIONAL, -AC_PREREQ(2.52)dnl - ifelse($1, TRUE, AC_FATAL($0: invalid condition: $1), - $1, FALSE, AC_FATAL($0: invalid condition: $1))dnl +AC_PREREQ(2.52)dnl + m4_if($1, TRUE, AC_FATAL($0: invalid condition: $1), + $1, FALSE, AC_FATAL($0: invalid condition: $1))dnl AC_SUBST($1_TRUE)dnl AC_SUBST($1_FALSE)dnl _AM_SUBST_NOTMAKE($1_TRUE)dnl @@ -144,16 +141,14 @@ Usually this means the macro was only invoked conditionally.) fi)) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 10 -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, # will think it sees a *use*, and therefore will trigger all it's # C support machinery. Also note that it means that autoscan, seeing @@ -163,7 +158,7 @@ # _AM_DEPENDENCIES(NAME) # ---------------------- # See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". # We try a few techniques and use that to set a single cache variable. # # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was @@ -176,12 +171,13 @@ AC_REQUIRE(AM_MAKE_INCLUDE)dnl AC_REQUIRE(AM_DEP_TRACK)dnl -ifelse($1, CC, depcc="$CC" am_compiler_list=, - $1, CXX, depcc="$CXX" am_compiler_list=, - $1, OBJC, depcc="$OBJC" am_compiler_list='gcc3 gcc', - $1, UPC, depcc="$UPC" am_compiler_list=, - $1, GCJ, depcc="$GCJ" am_compiler_list='gcc3 gcc', - depcc="$$1" am_compiler_list=) +m4_if($1, CC, depcc="$CC" am_compiler_list=, + $1, CXX, depcc="$CXX" am_compiler_list=, + $1, OBJC, depcc="$OBJC" am_compiler_list='gcc3 gcc', + $1, OBJCXX, depcc="$OBJCXX" am_compiler_list='gcc3 gcc', + $1, UPC, depcc="$UPC" am_compiler_list=, + $1, GCJ, depcc="$GCJ" am_compiler_list='gcc3 gcc', + depcc="$$1" am_compiler_list=) AC_CACHE_CHECK(dependency style of $depcc, am_cv_$1_dependencies_compiler_type, @@ -189,8 +185,9 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -229,16 +226,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o}
View file
yad-0.36.2.tar.xz/build
Added
+(directory)
View file
yad-0.36.2.tar.xz/build/compile
Added
@@ -0,0 +1,347 @@ +#! /bin/sh +# Wrapper for compilers which do not understand '-c -o'. + +scriptversion=2012-10-14.11; # UTC + +# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Written by Tom Tromey <tromey@cygnus.com>. +# +# 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 2, or (at your option) +# any later version. +# +# 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. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to <bug-automake@gnu.org> or send patches to +# <automake-patches@gnu.org>. + +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /!/*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.oObBjJ) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker)
View file
yad-0.36.2.tar.xz/build/depcomp
Added
@@ -0,0 +1,791 @@ +#! /bin/sh +# depcomp - compile a program generating dependencies as side-effects + +scriptversion=2013-05-30.07; # UTC + +# Copyright (C) 1999-2014 Free Software Foundation, Inc. + +# 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 2, or (at your option) +# any later version. + +# 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. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>. + +case $1 in + '') + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: depcomp --help --version PROGRAM ARGS + +Run PROGRAMS ARGS to compile a file, generating dependencies +as side-effects. + +Environment variables: + depmode Dependency tracking mode. + source Source file read by 'PROGRAMS ARGS'. + object Object file output by 'PROGRAMS ARGS'. + DEPDIR directory where to store dependencies. + depfile Dependency file to output. + tmpdepfile Temporary file to use when outputting dependencies. + libtool Whether libtool is used (yes/no). + +Report bugs to <bug-automake@gnu.org>. +EOF + exit $? + ;; + -v | --v*) + echo "depcomp $scriptversion" + exit $? + ;; +esac + +# Get the directory component of the given path, and save it in the +# global variables '$dir'. Note that this directory component will +# be either empty or ending with a '/' character. This is deliberate. +set_dir_from () +{ + case $1 in + */*) dir=`echo "$1" | sed -e 's|/^/*$|/|'`;; + *) dir=;; + esac +} + +# Get the suffix-stripped basename of the given path, and save it the +# global variable '$base'. +set_base_from () +{ + base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.^.*$//'` +} + +# If no dependency file was actually created by the compiler invocation, +# we still have to create a dummy depfile, to avoid errors with the +# Makefile "include basename.Plo" scheme. +make_dummy_depfile () +{ + echo "#dummy" > "$depfile" +} + +# Factor out some common post-processing of the generated depfile. +# Requires the auxiliary global variable '$tmpdepfile' to be set. +aix_post_process_depfile () +{ + # If the compiler actually managed to produce a dependency file, + # post-process it. + if test -f "$tmpdepfile"; then + # Each line is of the form 'foo.o: dependency.h'. + # Do two passes, one to just change these to + # $object: dependency.h + # and one to simply output + # dependency.h: + # which is needed to avoid the deleted-header problem. + { sed -e "s,^.*\.$lower*:,$object:," < "$tmpdepfile" + sed -e "s,^.*\.$lower*:$tab *,," -e 's,$,:,' < "$tmpdepfile" + } > "$depfile" + rm -f "$tmpdepfile" + else + make_dummy_depfile + fi +} + +# A tabulation character. +tab=' ' +# A newline character. +nl=' +' +# Character ranges might be problematic outside the C locale. +# These definitions help. +upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ +lower=abcdefghijklmnopqrstuvwxyz +digits=0123456789 +alpha=${upper}${lower} + +if test -z "$depmode" || test -z "$source" || test -z "$object"; then + echo "depcomp: Variables source, object and depmode must be set" 1>&2 + exit 1 +fi + +# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. +depfile=${depfile-`echo "$object" | + sed 's|^\\/*$|'${DEPDIR-.deps}'/&|;s|\.\(^.*\)$|.P\1|;s|Pobj$|Po|'`} +tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\(^.*\)$/.T\1/'`} + +rm -f "$tmpdepfile" + +# Avoid interferences from the environment. +gccflag= dashmflag= + +# Some modes work just like other modes, but use different flags. We +# parameterize here, but still list the modes in the big case below, +# to make depend.m4 easier to write. Note that we *cannot* use a case +# here, because this file can only contain one case statement. +if test "$depmode" = hp; then + # HP compiler uses -M and no extra arg. + gccflag=-M + depmode=gcc +fi + +if test "$depmode" = dashXmstdout; then + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout +fi + +cygpath_u="cygpath -u -f -" +if test "$depmode" = msvcmsys; then + # This is just like msvisualcpp but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvisualcpp +fi + +if test "$depmode" = msvc7msys; then + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 +fi + +if test "$depmode" = xlc; then + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. + gccflag=-qmakedep=gcc,-MF + depmode=gcc +fi + +case "$depmode" in +gcc3) +## gcc 3 implements dependency tracking that does exactly what +## we want. Yay! Note: for some reason libtool 1.4 doesn't like +## it if -MD -MP comes after the -MF stuff. Hmm. +## Unfortunately, FreeBSD c89 acceptance of flags depends upon +## the command line argument order; so add the flags where they +## appear in depend2.am. Note that the slowdown incurred here +## affects only configure: in makefiles, %FASTDEP% shortcuts this. + for arg + do + case $arg in + -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;; + *) set fnord "$@" "$arg" ;; + esac + shift # fnord + shift # $arg + done + "$@" + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat + fi + mv "$tmpdepfile" "$depfile" + ;; +
View file
yad-0.36.2.tar.xz/build/install-sh
Added
@@ -0,0 +1,501 @@ +#!/bin/sh +# install - install a program, script, or datafile + +scriptversion=2013-12-25.23; # UTC + +# This originates from X11R5 (mit/util/scripts/install.sh), which was +# later released in X11R6 (xc/config/util/install.sh) with the +# following copyright and license. +# +# Copyright (C) 1994 X Consortium +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Except as contained in this notice, the name of the X Consortium shall not +# be used in advertising or otherwise to promote the sale, use or other deal- +# ings in this Software without prior written authorization from the X Consor- +# tium. +# +# +# FSF changes to this file are in the public domain. +# +# Calling this script install-sh is preferred over install.sh, to prevent +# 'make' implicit rules from creating a file called install from it +# when there is no Makefile. +# +# This script is compatible with the BSD install script, but was written +# from scratch. + +tab=' ' +nl=' +' +IFS=" $tab$nl" + +# Set DOITPROG to "echo" to test this script. + +doit=${DOITPROG-} +doit_exec=${doit:-exec} + +# Put in absolute file names if you don't have them in your path; +# or use environment vars. + +chgrpprog=${CHGRPPROG-chgrp} +chmodprog=${CHMODPROG-chmod} +chownprog=${CHOWNPROG-chown} +cmpprog=${CMPPROG-cmp} +cpprog=${CPPROG-cp} +mkdirprog=${MKDIRPROG-mkdir} +mvprog=${MVPROG-mv} +rmprog=${RMPROG-rm} +stripprog=${STRIPPROG-strip} + +posix_mkdir= + +# Desired mode of installed file. +mode=0755 + +chgrpcmd= +chmodcmd=$chmodprog +chowncmd= +mvcmd=$mvprog +rmcmd="$rmprog -f" +stripcmd= + +src= +dst= +dir_arg= +dst_arg= + +copy_on_change=false +is_target_a_directory=possibly + +usage="\ +Usage: $0 OPTION... -T SRCFILE DSTFILE + or: $0 OPTION... SRCFILES... DIRECTORY + or: $0 OPTION... -t DIRECTORY SRCFILES... + or: $0 OPTION... -d DIRECTORIES... + +In the 1st form, copy SRCFILE to DSTFILE. +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +In the 4th, create DIRECTORIES. + +Options: + --help display this help and exit. + --version display version info and exit. + + -c (ignored) + -C install only if different (preserve the last data modification time) + -d create directories instead of installing files. + -g GROUP $chgrpprog installed files to GROUP. + -m MODE $chmodprog installed files to MODE. + -o USER $chownprog installed files to USER. + -s $stripprog installed files. + -t DIRECTORY install into DIRECTORY. + -T report an error if DSTFILE is a directory. + +Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG + RMPROG STRIPPROG +" + +while test $# -ne 0; do + case $1 in + -c) ;; + + -C) copy_on_change=true;; + + -d) dir_arg=true;; + + -g) chgrpcmd="$chgrpprog $2" + shift;; + + --help) echo "$usage"; exit $?;; + + -m) mode=$2 + case $mode in + *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *''*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; + + -o) chowncmd="$chownprog $2" + shift;; + + -s) stripcmd=$stripprog;; + + -t) + is_target_a_directory=always + dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | =\(\)!) dst_arg=./$dst_arg;; + esac + shift;; + + -T) is_target_a_directory=never;; + + --version) echo "$0 $scriptversion"; exit $?;; + + --) shift + break;; + + -*) echo "$0: invalid option: $1" >&2 + exit 1;; + + *) break;; + esac + shift +done + +# We allow the use of options -d and -T together, by making -d +# take the precedence; this is for compatibility with GNU install. + +if test -n "$dir_arg"; then + if test -n "$dst_arg"; then + echo "$0: target directory not allowed when installing a directory." >&2 + exit 1 + fi +fi + +if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then + # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dst_arg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dst_arg" + shift # fnord + fi + shift # arg + dst_arg=$arg + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | =\(\)!) dst_arg=./$dst_arg;; + esac + done +fi + +if test $# -eq 0; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1
View file
yad-0.36.2.tar.xz/build/missing
Added
@@ -0,0 +1,215 @@ +#! /bin/sh +# Common wrapper for a few potentially missing GNU programs. + +scriptversion=2013-10-28.13; # UTC + +# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. + +# 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 2, or (at your option) +# any later version. + +# 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. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +if test $# -eq 0; then + echo 1>&2 "Try '$0 --help' for more information" + exit 1 +fi + +case $1 in + + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; + + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; + + -h|--h|--he|--hel|--help) + echo "\ +$0 OPTION... PROGRAM ARGUMENT... + +Run 'PROGRAM ARGUMENT...', returning a proper advice when this fails due +to PROGRAM being missing or too old. + +Options: + -h, --help display this help and exit + -v, --version output version information and exit + +Supported PROGRAM values: + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man + +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. + +Send bug reports to <bug-automake@gnu.org>." + exit $? + ;; + + -v|--v|--ve|--ver|--vers|--versi|--versio|--version) + echo "missing $scriptversion (GNU Automake)" + exit $? + ;; + + -*) + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" + exit 1 + ;; + +esac + +# Run the given program, remember its exit status. +"$@"; st=$? + +# If it succeeded, we are done. +test $st -eq 0 && exit 0 + +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi + +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'autom4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac
View file
yad-0.16.3.tar.bz2/config.h.in -> yad-0.36.2.tar.xz/config.h.in
Changed
@@ -15,6 +15,12 @@ /* Define if the GNU gettext() function is already present or preinstalled. */ #undef HAVE_GETTEXT +/* Define this if you have glib gio framework */ +#undef HAVE_GIO + +/* Define this if you have webkit installed */ +#undef HAVE_HTML + /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H @@ -27,6 +33,12 @@ /* Define to 1 if you have the <memory.h> header file. */ #undef HAVE_MEMORY_H +/* Define this if you need GtkSourceView support */ +#undef HAVE_SOURCEVIEW + +/* Define this if you need spell check support */ +#undef HAVE_SPELL + /* Define to 1 if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H
View file
yad-0.16.3.tar.bz2/configure -> yad-0.36.2.tar.xz/configure
Changed
@@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for YAD 0.16.3. +# Generated by GNU Autoconf 2.69 for YAD 0.36.2. # -# Report bugs to <http://code.google.com/p/yad/issues/entry>. +# Report bugs to <https://sourceforge.net/p/yad-dialog/tickets/>. # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -136,6 +134,31 @@ # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -169,7 +192,8 @@ else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -214,21 +238,25 @@ if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -239,10 +267,10 @@ $as_echo "$0: be upgraded to zsh 4.3.4 or later." else $as_echo "$0: Please tell bug-autoconf@gnu.org and -$0: http://code.google.com/p/yad/issues/entry about your -$0: system, including any error possibly output before this -$0: message. Then install a modern shell, or manually run -$0: the script under such a shell if you do have one." +$0: https://sourceforge.net/p/yad-dialog/tickets/ about +$0: your system, including any error possibly output before +$0: this message. Then install a modern shell, or manually +$0: run the script under such a shell if you do have one." fi exit 1 fi @@ -331,6 +359,14 @@ } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -452,6 +488,10 @@ chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $0, causing all sort of problems # (the dirname of $0 is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -486,16 +526,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -507,28 +547,8 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???sx*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%^_$as_cr_alnum%_%g'" @@ -560,10 +580,10 @@ # Identity of this package. PACKAGE_NAME='YAD' PACKAGE_TARNAME='yad' -PACKAGE_VERSION='0.16.3' -PACKAGE_STRING='YAD 0.16.3' -PACKAGE_BUGREPORT='http://code.google.com/p/yad/issues/entry'
View file
yad-0.16.3.tar.bz2/configure.ac -> yad-0.36.2.tar.xz/configure.ac
Changed
@@ -1,4 +1,6 @@ -AC_INIT(YAD, 0.16.3, http://code.google.com/p/yad/issues/entry, yad, http://code.google.com/p/yad) +AC_INIT(YAD, 0.36.2, https://sourceforge.net/p/yad-dialog/tickets/, yad, https://sourceforge.net/projects/yad-dialog/) +AC_CONFIG_AUX_DIR(build) + AM_INIT_AUTOMAKE(1.11 foreign dist-xz no-dist-gzip) AM_SILENT_RULES(yes) @@ -14,48 +16,121 @@ AC_PROG_CC AC_ARG_WITH(gtk, - gtkver="$withval", gtkver="gtk2") -AC_ARG_WITH(gtk, AS_HELP_STRING(--with-gtk=gtk2|gtk3,set the GTK+ version to use (default - gtk2)), case "$with_gtk" in - gtk2|gtk3) ;; - *) AC_MSG_ERROR(invalid gtk version specified) ;; - esac, - with_gtk=gtk2) -AC_MSG_RESULT($with_gtk) + gtk2|gtk3) ;; + *) AC_MSG_ERROR(invalid gtk version specified) ;; + esac, + with_gtk=gtk2) case "$with_gtk" in gtk3) GTK_MODULE="gtk+-3.0" GTK_REQUIRED="3.0.0" GTK_PRINT="gtk+-unix-print-3.0" + WEBKIT="webkitgtk-3.0" + SPELL="gtkspell3-3.0" + SOURCEVIEW="gtksourceview-3.0" ;; gtk2) GTK_MODULE="gtk+-2.0" GTK_REQUIRED="2.16.0" GTK_PRINT="gtk+-unix-print-2.0" + WEBKIT="webkit-1.0" + SPELL="gtkspell3-2.0" + SOURCEVIEW="gtksourceview-2.0" ;; esac -PKG_CHECK_MODULES(YAD, $GTK_MODULE >= $GTK_REQUIRED $GTK_PRINT) -AC_SUBST(YAD_CFLAGS) -AC_SUBST(YAD_LIBS) +PKG_CHECK_MODULES(GTK, $GTK_MODULE >= $GTK_REQUIRED $GTK_PRINT) +AC_SUBST(GTK_CFLAGS) +AC_SUBST(GTK_LIBS) GTK_DISABLE_DEPRECATED -dnl icon browser -AC_ARG_ENABLE(icon-browser, - AS_HELP_STRING(--enable-icon-browser, - Build YAD icon browser), - build_ib=$enableval, build_ib=no) -AM_CONDITIONAL(BUILD_IB, test x$build_ib = xyes) - dnl rgb.txt +with_rgb="/etc/X11/rgb.txt" AC_ARG_WITH(rgb, AS_HELP_STRING(--with-rgb=PATH, set path to rgb.txt file (default - /etc/X11/rgb.txt)), AC_DEFINE_UNQUOTED(RGB_FILE, "$withval", Path to rgb.txt file), AC_DEFINE(RGB_FILE, "/etc/X11/rgb.txt", Path to rgb.txt file)) +dnl html widget +AC_ARG_ENABLE(html, + AS_HELP_STRING(--enable-html, + Build YAD with HTML widget), + build_html=$enableval, build_html=yes) +if test x$build_html = xyes; then + PKG_CHECK_MODULES(HTML, $WEBKIT, have_html=yes, have_html=no) +else + have_html=no +fi +AC_SUBST(HTML_CFLAGS) +AC_SUBST(HTML_LIBS) +AM_CONDITIONAL(HTML, test x$have_html = xyes) + +if test x$have_html = xyes; then + AC_DEFINE(HAVE_HTML, 1, Define this if you have webkit installed) +fi + +dnl gio support +AC_ARG_ENABLE(gio, + AS_HELP_STRING(--enable-gio, + Build YAD with GIO support), + build_gio=$enableval, build_gio=yes) +if test x$build_gio = xyes; then + PKG_CHECK_MODULES(GIO, gio-2.0, have_gio=yes, have_gio=no) +else + have_gio=no +fi +AC_SUBST(GIO_CFLAGS) +AC_SUBST(GIO_LIBS) + +if test x$have_gio = xyes; then + AC_DEFINE(HAVE_GIO, 1, Define this if you have glib gio framework) +fi + +dnl spell check +AC_ARG_ENABLE(spell, + AS_HELP_STRING(--enable-spell, + Build YAD with Spell check support (default - no)), + with_spell=$enableval, with_spell=no) +if test x$with_spell = xyes; then + PKG_CHECK_MODULES(SPELL, $SPELL, have_spell=yes, have_spell=no) +else + have_spell=no +fi +AC_SUBST(SPELL_CFLAGS) +AC_SUBST(SPELL_LIBS) + +if test x$have_spell = xyes; then + AC_DEFINE(HAVE_SPELL, 1, Define this if you need spell check support) +fi + +dnl sourceview +AC_ARG_ENABLE(sourceview, + AS_HELP_STRING(--enable-sourceview, + Build YAD with GtkSourceView support (default - no)), + with_sourceview=$enableval, with_sourceview=no) +if test x$with_spell = xyes; then + PKG_CHECK_MODULES(SOURCEVIEW, $SOURCEVIEW, have_sourceview=yes, have_sourceview=no) +else + have_sourceview=no +fi +AC_SUBST(SOURCEVIEW_CFLAGS) +AC_SUBST(SOURCEVIEW_LIBS) + +if test x$have_sourceview = xyes; then + AC_DEFINE(HAVE_SOURCEVIEW, 1, Define this if you need GtkSourceView support) +fi + +dnl icon browser +AC_ARG_ENABLE(icon-browser, + AS_HELP_STRING(--enable-icon-browser, + Build YAD icon browser), + build_ib=$enableval, build_ib=no) +AM_CONDITIONAL(BUILD_IB, test x$build_ib = xyes) + # ******************************* # Internationalization # ******************************* @@ -93,5 +168,12 @@ AC_OUTPUT echo -echo "Build icon browser - $build_ib" +echo "Build configuratioh:" +echo " GTK+ version - $with_gtk" +echo " Path to rgb.txt - $with_rgb" +echo " HTML widget - $have_html" +echo " Spell checking - $have_spell" +echo " GtkSourceView - $have_sourceview" +echo " GIO support - $have_gio" +echo " Icon browser - $build_ib" echo
View file
yad-0.16.3.tar.bz2/data/Makefile.am -> yad-0.36.2.tar.xz/data/Makefile.am
Changed
@@ -12,6 +12,6 @@ m4dir = $(datadir)/aclocal m4_DATA = yad.m4 -EXTRA_DIST = $(desktop_in_files) zenity.sh +EXTRA_DIST = $(desktop_in_files) zenity.sh notify-send get-lang.c DISTCLEAN_FILES = $(desktop_DATA) $(m4_DATA) yad.spec
View file
yad-0.16.3.tar.bz2/data/Makefile.in -> yad-0.36.2.tar.xz/data/Makefile.in
Changed
@@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\\ \ *) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs$$bs $$bs *//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -dEDm) skip_next=yes;; \ + -JT) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -33,33 +87,43 @@ PRE_UNINSTALL = : POST_UNINSTALL = : subdir = data -DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/yad.m4.in \ - $(srcdir)/yad.spec.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = yad.m4 yad.spec CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -81,6 +145,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man1dir = $(mandir)/man1 am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(desktopdir)" \ "$(DESTDIR)$(m4dir)" @@ -89,12 +159,34 @@ DATA = $(desktop_DATA) $(m4_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items$$0 = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.in \ + $(srcdir)/yad.m4.in $(srcdir)/yad.spec.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -150,9 +242,15 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GIO_CFLAGS = @GIO_CFLAGS@ +GIO_LIBS = @GIO_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ +GTK_CFLAGS = @GTK_CFLAGS@ +GTK_LIBS = @GTK_LIBS@ +HTML_CFLAGS = @HTML_CFLAGS@ +HTML_LIBS = @HTML_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
View file
yad-0.36.2.tar.xz/data/get-lang.c
Added
@@ -0,0 +1,12 @@ +#include <glib.h> +#include <gtkspell/gtkspell.h> + +int main (int argc, char *argv) +{ + GList *lng; + + for (lng = gtk_spell_checker_get_language_list (); lng; lng = lng->next) + g_print ("%s\n", lng->data); + + return 0; +}
View file
yad-0.16.3.tar.bz2/data/icons/128x128/Makefile.in -> yad-0.36.2.tar.xz/data/icons/128x128/Makefile.in
Changed
@@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\\ \ *) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs$$bs $$bs *//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -dEDm) skip_next=yes;; \ + -JT) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -33,25 +87,36 @@ PRE_UNINSTALL = : POST_UNINSTALL = : subdir = data/icons/128x128 -DIST_COMMON = $(dist_icons_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(dist_icons_DATA) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -73,8 +138,16 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(iconsdir)" DATA = $(dist_icons_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -105,9 +178,15 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GIO_CFLAGS = @GIO_CFLAGS@ +GIO_LIBS = @GIO_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ +GTK_CFLAGS = @GTK_CFLAGS@ +GTK_LIBS = @GTK_LIBS@ +HTML_CFLAGS = @HTML_CFLAGS@ +HTML_LIBS = @HTML_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -119,6 +198,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -148,12 +231,14 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SOURCEVIEW_CFLAGS = @SOURCEVIEW_CFLAGS@ +SOURCEVIEW_LIBS = @SOURCEVIEW_LIBS@ +SPELL_CFLAGS = @SPELL_CFLAGS@ +SPELL_LIBS = @SPELL_LIBS@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ -YAD_CFLAGS = @YAD_CFLAGS@ -YAD_LIBS = @YAD_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -177,6 +262,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -213,7 +300,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/icons/128x128/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign data/icons/128x128/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -233,8 +319,11 @@ $(am__aclocal_m4_deps): install-dist_iconsDATA: $(dist_icons_DATA)
View file
yad-0.16.3.tar.bz2/data/icons/16x16/Makefile.in -> yad-0.36.2.tar.xz/data/icons/16x16/Makefile.in
Changed
@@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\\ \ *) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs$$bs $$bs *//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -dEDm) skip_next=yes;; \ + -JT) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -33,25 +87,36 @@ PRE_UNINSTALL = : POST_UNINSTALL = : subdir = data/icons/16x16 -DIST_COMMON = $(dist_icons_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(dist_icons_DATA) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -73,8 +138,16 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(iconsdir)" DATA = $(dist_icons_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -105,9 +178,15 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GIO_CFLAGS = @GIO_CFLAGS@ +GIO_LIBS = @GIO_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ +GTK_CFLAGS = @GTK_CFLAGS@ +GTK_LIBS = @GTK_LIBS@ +HTML_CFLAGS = @HTML_CFLAGS@ +HTML_LIBS = @HTML_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -119,6 +198,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -148,12 +231,14 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SOURCEVIEW_CFLAGS = @SOURCEVIEW_CFLAGS@ +SOURCEVIEW_LIBS = @SOURCEVIEW_LIBS@ +SPELL_CFLAGS = @SPELL_CFLAGS@ +SPELL_LIBS = @SPELL_LIBS@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ -YAD_CFLAGS = @YAD_CFLAGS@ -YAD_LIBS = @YAD_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -177,6 +262,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -213,7 +300,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/icons/16x16/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign data/icons/16x16/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -233,8 +319,11 @@ $(am__aclocal_m4_deps): install-dist_iconsDATA: $(dist_icons_DATA)
View file
yad-0.16.3.tar.bz2/data/icons/24x24/Makefile.in -> yad-0.36.2.tar.xz/data/icons/24x24/Makefile.in
Changed
@@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\\ \ *) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs$$bs $$bs *//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -dEDm) skip_next=yes;; \ + -JT) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -33,25 +87,36 @@ PRE_UNINSTALL = : POST_UNINSTALL = : subdir = data/icons/24x24 -DIST_COMMON = $(dist_icons_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(dist_icons_DATA) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -73,8 +138,16 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(iconsdir)" DATA = $(dist_icons_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -105,9 +178,15 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GIO_CFLAGS = @GIO_CFLAGS@ +GIO_LIBS = @GIO_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ +GTK_CFLAGS = @GTK_CFLAGS@ +GTK_LIBS = @GTK_LIBS@ +HTML_CFLAGS = @HTML_CFLAGS@ +HTML_LIBS = @HTML_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -119,6 +198,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -148,12 +231,14 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SOURCEVIEW_CFLAGS = @SOURCEVIEW_CFLAGS@ +SOURCEVIEW_LIBS = @SOURCEVIEW_LIBS@ +SPELL_CFLAGS = @SPELL_CFLAGS@ +SPELL_LIBS = @SPELL_LIBS@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ -YAD_CFLAGS = @YAD_CFLAGS@ -YAD_LIBS = @YAD_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -177,6 +262,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -213,7 +300,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/icons/24x24/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign data/icons/24x24/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -233,8 +319,11 @@ $(am__aclocal_m4_deps): install-dist_iconsDATA: $(dist_icons_DATA)
View file
yad-0.16.3.tar.bz2/data/icons/32x32/Makefile.in -> yad-0.36.2.tar.xz/data/icons/32x32/Makefile.in
Changed
@@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\\ \ *) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs$$bs $$bs *//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -dEDm) skip_next=yes;; \ + -JT) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -33,25 +87,36 @@ PRE_UNINSTALL = : POST_UNINSTALL = : subdir = data/icons/32x32 -DIST_COMMON = $(dist_icons_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(dist_icons_DATA) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -73,8 +138,16 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(iconsdir)" DATA = $(dist_icons_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -105,9 +178,15 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GIO_CFLAGS = @GIO_CFLAGS@ +GIO_LIBS = @GIO_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ +GTK_CFLAGS = @GTK_CFLAGS@ +GTK_LIBS = @GTK_LIBS@ +HTML_CFLAGS = @HTML_CFLAGS@ +HTML_LIBS = @HTML_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -119,6 +198,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -148,12 +231,14 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SOURCEVIEW_CFLAGS = @SOURCEVIEW_CFLAGS@ +SOURCEVIEW_LIBS = @SOURCEVIEW_LIBS@ +SPELL_CFLAGS = @SPELL_CFLAGS@ +SPELL_LIBS = @SPELL_LIBS@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ -YAD_CFLAGS = @YAD_CFLAGS@ -YAD_LIBS = @YAD_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -177,6 +262,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -213,7 +300,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/icons/32x32/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign data/icons/32x32/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -233,8 +319,11 @@ $(am__aclocal_m4_deps): install-dist_iconsDATA: $(dist_icons_DATA)
View file
yad-0.16.3.tar.bz2/data/icons/48x48/Makefile.in -> yad-0.36.2.tar.xz/data/icons/48x48/Makefile.in
Changed
@@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\\ \ *) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs$$bs $$bs *//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -dEDm) skip_next=yes;; \ + -JT) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -33,25 +87,36 @@ PRE_UNINSTALL = : POST_UNINSTALL = : subdir = data/icons/48x48 -DIST_COMMON = $(dist_icons_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(dist_icons_DATA) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -73,8 +138,16 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(iconsdir)" DATA = $(dist_icons_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -105,9 +178,15 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GIO_CFLAGS = @GIO_CFLAGS@ +GIO_LIBS = @GIO_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ +GTK_CFLAGS = @GTK_CFLAGS@ +GTK_LIBS = @GTK_LIBS@ +HTML_CFLAGS = @HTML_CFLAGS@ +HTML_LIBS = @HTML_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -119,6 +198,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -148,12 +231,14 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SOURCEVIEW_CFLAGS = @SOURCEVIEW_CFLAGS@ +SOURCEVIEW_LIBS = @SOURCEVIEW_LIBS@ +SPELL_CFLAGS = @SPELL_CFLAGS@ +SPELL_LIBS = @SPELL_LIBS@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ -YAD_CFLAGS = @YAD_CFLAGS@ -YAD_LIBS = @YAD_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -177,6 +262,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -213,7 +300,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/icons/48x48/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign data/icons/48x48/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -233,8 +319,11 @@ $(am__aclocal_m4_deps): install-dist_iconsDATA: $(dist_icons_DATA)
View file
yad-0.16.3.tar.bz2/data/icons/96x96/Makefile.in -> yad-0.36.2.tar.xz/data/icons/96x96/Makefile.in
Changed
@@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\\ \ *) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs$$bs $$bs *//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -dEDm) skip_next=yes;; \ + -JT) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -33,25 +87,36 @@ PRE_UNINSTALL = : POST_UNINSTALL = : subdir = data/icons/96x96 -DIST_COMMON = $(dist_icons_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(dist_icons_DATA) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -73,8 +138,16 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(iconsdir)" DATA = $(dist_icons_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -105,9 +178,15 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GIO_CFLAGS = @GIO_CFLAGS@ +GIO_LIBS = @GIO_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ +GTK_CFLAGS = @GTK_CFLAGS@ +GTK_LIBS = @GTK_LIBS@ +HTML_CFLAGS = @HTML_CFLAGS@ +HTML_LIBS = @HTML_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -119,6 +198,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -148,12 +231,14 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SOURCEVIEW_CFLAGS = @SOURCEVIEW_CFLAGS@ +SOURCEVIEW_LIBS = @SOURCEVIEW_LIBS@ +SPELL_CFLAGS = @SPELL_CFLAGS@ +SPELL_LIBS = @SPELL_LIBS@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ -YAD_CFLAGS = @YAD_CFLAGS@ -YAD_LIBS = @YAD_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -177,6 +262,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -213,7 +300,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/icons/96x96/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign data/icons/96x96/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -233,8 +319,11 @@ $(am__aclocal_m4_deps): install-dist_iconsDATA: $(dist_icons_DATA)
View file
yad-0.16.3.tar.bz2/data/icons/Makefile.in -> yad-0.36.2.tar.xz/data/icons/Makefile.in
Changed
@@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,61 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\\ \ *) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs$$bs $$bs *//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -dEDm) skip_next=yes;; \ + -JT) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -32,39 +86,72 @@ PRE_UNINSTALL = : POST_UNINSTALL = : subdir = data/icons -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items$$0 = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -120,9 +207,15 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GIO_CFLAGS = @GIO_CFLAGS@ +GIO_LIBS = @GIO_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ +GTK_CFLAGS = @GTK_CFLAGS@ +GTK_LIBS = @GTK_LIBS@ +HTML_CFLAGS = @HTML_CFLAGS@ +HTML_LIBS = @HTML_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -134,6 +227,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -163,12 +260,14 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SOURCEVIEW_CFLAGS = @SOURCEVIEW_CFLAGS@ +SOURCEVIEW_LIBS = @SOURCEVIEW_LIBS@ +SPELL_CFLAGS = @SPELL_CFLAGS@ +SPELL_LIBS = @SPELL_LIBS@ STRIP = @STRIP@ USE_NLS = @USE_NLS@
View file
yad-0.36.2.tar.xz/data/notify-send
Added
@@ -0,0 +1,29 @@ +#! /bin/bash + +# Defaults +APP="notification" +TIMEOUT=600 +ICON="dialog-information" +TITLE= +BODY= + +# Parse command line +OPTIND=1 +while getopts a:i:t: opt ; do + case "$opt" in + a) APP=$OPTARG ;; + i) ICON=$OPTARG ;; + t) TIMEOUT=$OPTARG ;; + esac +done +shift $(($OPTIND - 1)) + "$1" == '--' && shift + +TITLE="$1" +shift +BODY="$@" + +gdbus call --session --dest org.freedesktop.Notifications \ + --object-path /org/freedesktop/Notifications \ + --method org.freedesktop.Notifications.Notify \ + "$APP" 0 "$ICON" "$TITLE" "$BODY" "" "{}" $TIMEOUT &> /dev/null
View file
yad-0.16.3.tar.bz2/data/yad.1 -> yad-0.36.2.tar.xz/data/yad.1
Changed
@@ -1,14 +1,14 @@ -.TH YAD 1 "Marth 24, 2011" +.TH YAD 1 "March 3, 2015" .SH NAME -yad \- display GTK+ dialogs +yad \- display GTK+ dialogs in shell scripts .SH SYNOPSIS .B yad -.RI options +.RI OPTIONS .SH DESCRIPTION \fBYAD\fP is a program that will display GTK+ dialogs, and return -(either in the return code, or on standard output) the users +(either in the return code or on standard output) the users input. This allows you to present information, and ask for information from the user, from all manner of shell scripts. .PP @@ -18,8 +18,7 @@ This program follows the usual GNU command line syntax, with long options starting with two dashes (`-'). -.PP -Dialog options +.SS Dialog options .TP .B \-\-calendar Display calendar dialog. @@ -45,12 +44,18 @@ .B \-\-form Display form dialog .TP +.B \-\-html +Display HTML dialog +.TP .B \-\-list Display list dialog .TP .B \-\-multi-progress Display multi progress bars dialog. .TP +.B \-\-notebook +Display notebook dialog. +.TP .B \-\-notification Display notification icon. .TP @@ -66,73 +71,89 @@ .B \-\-scale Display scale dialog. -.PP -General options +.SS General options .TP -.B \-\-title=TITLE +.B \-\-title=\fITITLE\fP Set the dialog title. .TP -.B \-\-window-icon=ICONPATH +.B \-\-window-icon=\fIICON\fP Set the window icon. .TP -.B \-\-width=WIDTH +.B \-\-width=\fIWIDTH\fP Set the dialog width. .TP -.B \-\-height=HEIGHT +.B \-\-height=\fIHEIGHT\fP Set the dialog height. .TP -.B \-\-timeout=TIMEOUT +.B \-\-timeout=\fITIMEOUT\fP Set the dialog timeout in seconds. .TP -.B \-\-timeout-indicator=POSITION +.B \-\-timeout-indicator=\fIPOSITION\fP Show timeout indicator in given position. Positions are \fItop\fP, \fIbottom\fP, \fIleft\fP or \fIright\fP. -Style of indicator may be set through the gtkrc file. +Style of indicator may be set through the gtkrc file. See \fIhttp://code.google.com/p/yad/wiki/TimeoutIndicator\fP for details. .TP -.B \-\-kill-parent -Send SIGTERM to parent process. +.B \-\-parent-win=\fIXID\fP +Specify a parent window for the dialog. This makes \fIYAD\fP possible to use as embedded GUI tool. +.TP +.B \-\-kill-parent\fI=SIGNAL\fP +Send SIGNAL to parent process. Default value of SIGNAL is a SIGTERM. +SIGNAL may be specified by it's number or symbolic name with or without SIG prefix. +See signal(7) for details about signals. .TP -.B --print-xid -Print X Window Id of a dialog window to the stderr. +.B \-\-plug=\fIKEY\fP +Run dialog in plug mode for swallow as a notebook tab. See \fINOTEBOOK\fP section for more. .TP -.B \-\-text=STRING +.B \-\-tabnum=\fINUMBER\fP +Set the tab number for plugged dialog. See \fINOTEBOOK\fP section for more. +.TP +.B \-\-text=\fISTRING\fP Set the dialog text. .TP -.B \-\-image=IMAGE +.B \-\-text-align=\fITYPE\fP +Set type of dialog text justification. \fITYPE\fP may be \fIleft\fP, \fIright\fP, \fIcenter\fP or \fIfill\fP. +.TP +.B \-\-image=\fIIMAGE\fP Set the dialog image which appears on the left side of dialog. \fIIMAGE\fP might be file name or icon name from current icon theme. .TP .B \-\-image-on-top Show image above main widget instead of left. This option is always on for print dialog. .TP -.B \-\-icon-theme=THEME +.B \-\-icon-theme=\fITHEME\fP Use specified GTK icon theme instead of default. .TP -.B \-\-expander=TEXT +.B \-\-expander=\fITEXT\fP Hide main widget with expander. \fITEXT\fP is an optional argument with expander's label. .TP -.B \-\-button=BUTTON:ID +.B \-\-button=\fIBUTTON:ID\fP Add the dialog button. May be used multiply times. \fIID\fP is an exit code or a command. -\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. +\fIBUTTON\fP may be gtk stock item name for predefined buttons (like gtk-close or gtk-ok) or text in a form +\fILABEL!ICON!TOOLTIP\fP where `!' is an item separator. +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. See \fBEXIT STATUS\fP section for more. If \fIID\fP have a non-numeric value it treats like a command and click on such button doesn't close the dialog. -If command have a `%d' template, \fIYAD\fP replace it with value of his pid. - .TP .B \-\-no-buttons Don't show buttons. .TP +.B \-\-buttons-layout=\fITYPE\fP +Set buttons layout type. Possible types are: \fIspread\fP, \fIedge\fP, \fIstart\fP, \fIend\fP or \fIcenter\fP. +Default is \fIend\fP. +.TP .B \-\-no-markup Don't use pango markup in dialog's text. .TP +.B \-\-no-escape +Don't close dialog if \fIEscape\fP was pressed. +.TP .B \-\-always-print-result -Always print result. +Print result for aby of the return codes. This options doesn't work if timeout was reached or \fIEscape\fP was pressed. .TP .B \-\-dialog-sep Show separator between dialog and buttons. Works only with gtk+-2.0. .TP -.B \-\-borders=NUM +.B \-\-borders=\fINUM\fP Set dialog window borders. .TP .B \-\-sticky @@ -156,32 +177,59 @@ .B \-\-skip-taskbar Don't show window in taskbar and pager. .TP -.B \-\-geometry=WIDTHxHEIGHT+X+Y +.B \-\-maximized +Run dialog window maximized. +.TP +.B \-\-fullscreen +Run dialog in fullscreen mode. This option may not work on all window managers. +.TP +.B \-\-splash +Open window with "splashscreen" window hints. For details see description of \fI_NET_WM_WINDOW_TYPE_SPLASH\fP +in EWMH specification. The behavior of dialog with this option is HIGHLY DEPENDS on settings of your window manager. +.TP +.B \-\-no-focus +Dialog window never take focus. +.TP +.B \-\-geometry=\fIWIDTHxHEIGHT+X+Y\fP 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. +If set, user can select dialog's text and copy it to clipboard. +This option also affects on label fields in form dialog. +.TP +.B \-\-image-path=\fIPATH\fP +Add specified path to the standard list of directories for looking for icons. This option can be used multiply times. +.TP +.B \-\-rest=\fIFILENAME\fP +Read extra arguments from given file instead of command line. Each line of a file treats as a single argument. +.TP +.B \-\-gtkrc=\fIFILENAME\fP +Read and parse additional GTK+ settings from given file. This option doesn't work with GTK+-3.x builds. +.TP
View file
yad-0.16.3.tar.bz2/po/LINGUAS -> yad-0.36.2.tar.xz/po/LINGUAS
Changed
@@ -4,6 +4,9 @@ # de fr +it +pt_BR ru sk uk +zh_TW
View file
yad-0.16.3.tar.bz2/po/Makefile.in.in -> yad-0.36.2.tar.xz/po/Makefile.in.in
Changed
@@ -49,14 +49,14 @@ XGETTEXT = @XGETTEXT@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist -GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot +MSGMERGE = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist +GENPOT = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot ALL_LINGUAS = @ALL_LINGUAS@ PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi) -USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep '^$$lang$$' $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep '^$$lang$$'`"; then printf "$$lang "; fi; done; fi) +USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi) USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) @@ -73,15 +73,20 @@ .SUFFIXES: .SUFFIXES: .po .pox .gmo .mo .msg .cat +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +INTLTOOL_V_MSGFMT = $(INTLTOOL__v_MSGFMT_$(V)) +INTLTOOL__v_MSGFMT_= $(INTLTOOL__v_MSGFMT_$(AM_DEFAULT_VERBOSITY)) +INTLTOOL__v_MSGFMT_0 = @echo " MSGFMT" $@; + .po.pox: $(MAKE) $(GETTEXT_PACKAGE).pot $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox .po.mo: - $(MSGFMT) -o $@ $< + $(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $< .po.gmo: - file=`echo $* | sed 's,.*/,,'`.gmo \ + $(INTLTOOL_V_MSGFMT)file=`echo $* | sed 's,.*/,,'`.gmo \ && rm -f $$file && $(GMSGFMT) -o $$file $< .po.cat: @@ -129,7 +134,7 @@ done # Empty stubs to satisfy archaic automake needs -dvi info tags TAGS ID: +dvi info ctags tags CTAGS TAGS ID: # Define this as empty until I found a useful application. install-exec installcheck:
View file
yad-0.16.3.tar.bz2/po/POTFILES.in -> yad-0.36.2.tar.xz/po/POTFILES.in
Changed
@@ -4,6 +4,7 @@ src/file.c src/font.c src/form.c +src/html.c src/icons.c src/main.c src/notification.c @@ -11,9 +12,12 @@ src/list.c src/option.c src/multi-progress.c +src/paned.c +src/picture.c src/print.c src/progress.c src/color.c src/text.c src/browser.c +src/notebook.c data/yad-icon-browser.desktop.in
View file
yad-0.16.3.tar.bz2/po/de.po -> yad-0.36.2.tar.xz/po/de.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: yad\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-21 11:42+0200\n" +"POT-Creation-Date: 2014-02-07 09:25+0200\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" @@ -63,1042 +63,1226 @@ "\n" "Basiert auf Zenity-Code\n" -#: ../src/calendar.c:39 ../src/text.c:241 +#: ../src/calendar.c:39 ../src/text.c:389 #, c-format msgid "Cannot open file '%s': %s\n" msgstr "" -#: ../src/entry.c:158 ../src/scale.c:39 +#: ../src/entry.c:172 ../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:164 ../src/scale.c:48 +#: ../src/entry.c:179 ../src/scale.c:48 #, c-format msgid "Initial value less than minimal.\n" msgstr "" -#: ../src/entry.c:169 ../src/scale.c:53 +#: ../src/entry.c:184 ../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:305 +#: ../src/form.c:372 #, fuzzy msgid "Select files" msgstr "Datei öffnen" -#: ../src/form.c:369 +#: ../src/form.c:380 +#, fuzzy +msgid "Select folders" +msgstr "Datei öffnen" + +#: ../src/form.c:443 #, fuzzy msgid "Select or create file" msgstr "Datei öffnen" -#: ../src/form.c:378 +#: ../src/form.c:451 msgid "Select or create folder" msgstr "" -#: ../src/form.c:411 +#: ../src/form.c:488 #, fuzzy msgid "Select date" msgstr "Datei öffnen" -#: ../src/form.c:546 +#: ../src/form.c:689 #, fuzzy msgid "Select file" msgstr "Datei öffnen" -#: ../src/form.c:553 +#: ../src/form.c:703 msgid "Select folder" msgstr "" -#: ../src/icons.c:247 +#: ../src/icons.c:321 #, fuzzy, c-format msgid "Unable to parse file %s: %s\n" msgstr "Kann Befehlszeile nicht einlesen: %s\n" -#: ../src/icons.c:264 +#: ../src/icons.c:338 #, fuzzy, c-format msgid "Unable to open directory %s: %s\n" msgstr "Kann Befehlszeile nicht einlesen: %s\n" -#: ../src/main.c:89 ../src/main.c:229 +#: ../src/main.c:102 ../src/main.c:233 #, c-format msgid "%d sec" msgstr "" -#: ../src/main.c:501 +#: ../src/main.c:656 #, c-format -msgid "Unable parse command line: %s\n" +msgid "Unable to parse command line: %s\n" msgstr "Kann Befehlszeile nicht einlesen: %s\n" -#: ../src/notification.c:82 +#: ../src/notification.c:118 #, fuzzy, c-format msgid "Could not load notification icon '%s': %s\n" msgstr "Kann Benachrichtigungs-Symbol '%s' nicht laden: %s" -#: ../src/notification.c:261 +#: ../src/notification.c:301 #, c-format msgid "Invalid UTF-8 in tooltip!\n" msgstr "Ungültiger UTF-8 Eintrag im Tool-Tip!\n" -#: ../src/notification.c:323 +#: ../src/notification.c:345 #, c-format msgid "Unknown command '%s'\n" msgstr "Befehl '%s' unbekannt\n" -#: ../src/notification.c:359 +#: ../src/notification.c:380 msgid "Yad notification" msgstr "Yad Benachrichtigung" -#: ../src/list.c:703 +#: ../src/list.c:856 msgid "Add row" msgstr "Reihe hinzufügen" -#: ../src/list.c:712 +#: ../src/list.c:863 msgid "Delete row" msgstr "Reihe löschen" -#: ../src/list.c:741 +#: ../src/list.c:870 +#, fuzzy +msgid "Duplicate row" +msgstr "Reihe löschen" + +#: ../src/list.c:897 #, c-format msgid "No column titles specified for List dialog.\n" msgstr "Keine Spaltentitel für Listendialog angegeben\n" -#: ../src/option.c:62 +#: ../src/option.c:69 msgid "Set the dialog title" msgstr "Dialogtitel angeben" -#: ../src/option.c:63 +#: ../src/option.c:70 msgid "TITLE" msgstr "TITEL" -#: ../src/option.c:68 +#: ../src/option.c:75 msgid "Set the window icon" msgstr "Fenster-Symbol angeben" -#: ../src/option.c:69 +#: ../src/option.c:76 msgid "ICONPATH" msgstr "SYMBOLPFAD" -#: ../src/option.c:74 +#: ../src/option.c:81 msgid "Set the width" msgstr "Breite angeben" -#: ../src/option.c:75 +#: ../src/option.c:82 msgid "WIDTH" msgstr "BREITE" -#: ../src/option.c:80 +#: ../src/option.c:87 msgid "Set the height" msgstr "Höhe angeben" -#: ../src/option.c:81 +#: ../src/option.c:88 msgid "HEIGHT" msgstr "HÖHE" -#: ../src/option.c:86 +#: ../src/option.c:93 #, fuzzy msgid "Set the window geometry" msgstr "Fenster-Symbol angeben" -#: ../src/option.c:87 +#: ../src/option.c:94 msgid "WxH+X+Y" msgstr "" -#: ../src/option.c:92 +#: ../src/option.c:99 msgid "Set dialog timeout in seconds" msgstr "Ablaufzeit in Sekunden angeben"
View file
yad-0.16.3.tar.bz2/po/fr.po -> yad-0.36.2.tar.xz/po/fr.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: YAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-21 11:42+0200\n" +"POT-Creation-Date: 2014-02-07 09:25+0200\n" "PO-Revision-Date: \n" "Last-Translator: Yannou90 <windaube.non.merci@gmail.com>\n" "Language-Team: Français\n" @@ -71,538 +71,606 @@ "\n" "Basé sur le code Zenity\n" -#: ../src/calendar.c:39 ../src/text.c:241 +#: ../src/calendar.c:39 ../src/text.c:389 #, c-format msgid "Cannot open file '%s': %s\n" msgstr "Impossible d'ouvrir le fichier '%s': %s\n" -#: ../src/entry.c:158 ../src/scale.c:39 +#: ../src/entry.c:172 ../src/scale.c:39 #, c-format msgid "Maximum value must be greater than minimum value.\n" msgstr "La valeur minimale doit être inférieure à la valeur maximale.\n" -#: ../src/entry.c:164 ../src/scale.c:48 +#: ../src/entry.c:179 ../src/scale.c:48 #, c-format msgid "Initial value less than minimal.\n" msgstr "Valeur initial inférieur à la minimal.\n" -#: ../src/entry.c:169 ../src/scale.c:53 +#: ../src/entry.c:184 ../src/scale.c:53 #, c-format msgid "Initial value greater than maximum.\n" msgstr "Valeur initial supérieur à la maximal.\n" -#: ../src/form.c:305 +#: ../src/form.c:372 msgid "Select files" msgstr "Sélectionner _tous les fichiers" -#: ../src/form.c:369 +#: ../src/form.c:380 +#, fuzzy +msgid "Select folders" +msgstr "Choisir un répertoire" + +#: ../src/form.c:443 msgid "Select or create file" msgstr "Sélectionner ou créer le fichier" -#: ../src/form.c:378 +#: ../src/form.c:451 msgid "Select or create folder" msgstr "Sélectionner ou créer le dossier" -#: ../src/form.c:411 +#: ../src/form.c:488 msgid "Select date" msgstr "Sélectionner une date" -#: ../src/form.c:546 +#: ../src/form.c:689 msgid "Select file" msgstr "Sélectionner le fichier" -#: ../src/form.c:553 +#: ../src/form.c:703 msgid "Select folder" msgstr "Choisir un répertoire" -#: ../src/icons.c:247 +#: ../src/icons.c:321 #, c-format msgid "Unable to parse file %s: %s\n" msgstr "Impossible d'analyser le fichier %s: %s\n" -#: ../src/icons.c:264 +#: ../src/icons.c:338 #, c-format msgid "Unable to open directory %s: %s\n" msgstr "impossible d'ouvrir le répertoire %s: %s\n" -#: ../src/main.c:89 ../src/main.c:229 +#: ../src/main.c:102 ../src/main.c:233 #, c-format msgid "%d sec" msgstr "%d sec" -#: ../src/main.c:501 +#: ../src/main.c:656 #, c-format -msgid "Unable parse command line: %s\n" +msgid "Unable to parse command line: %s\n" msgstr "Impossible d'analyser la ligne de commande: %s\n" -#: ../src/notification.c:82 +#: ../src/notification.c:118 #, c-format msgid "Could not load notification icon '%s': %s\n" msgstr "Impossible de charger l'icône de notification '%s': %s\n" -#: ../src/notification.c:261 +#: ../src/notification.c:301 #, c-format msgid "Invalid UTF-8 in tooltip!\n" msgstr "Charactère UTF-8 invalide du tooltip!\n" -#: ../src/notification.c:323 +#: ../src/notification.c:345 #, c-format msgid "Unknown command '%s'\n" msgstr "Commande inconnue: '%s'\n" -#: ../src/notification.c:359 +#: ../src/notification.c:380 msgid "Yad notification" msgstr "Yad notification" -#: ../src/list.c:703 +#: ../src/list.c:856 msgid "Add row" msgstr "Ajouter une ligne" -#: ../src/list.c:712 +#: ../src/list.c:863 msgid "Delete row" msgstr "Supprimer la ligne" -#: ../src/list.c:741 +#: ../src/list.c:870 +#, fuzzy +msgid "Duplicate row" +msgstr "Supprimer la ligne" + +#: ../src/list.c:897 #, c-format msgid "No column titles specified for List dialog.\n" msgstr "Pas de titre de colonne spécifié pour liste.\n" -#: ../src/option.c:62 +#: ../src/option.c:69 msgid "Set the dialog title" msgstr "Définit le titre" -#: ../src/option.c:63 +#: ../src/option.c:70 msgid "TITLE" msgstr "TITRE" -#: ../src/option.c:68 +#: ../src/option.c:75 msgid "Set the window icon" msgstr "Définir l'icône de la fenêtre" -#: ../src/option.c:69 +#: ../src/option.c:76 msgid "ICONPATH" msgstr "ICONPATH" -#: ../src/option.c:74 +#: ../src/option.c:81 msgid "Set the width" msgstr "Définir la largeur" -#: ../src/option.c:75 +#: ../src/option.c:82 msgid "WIDTH" msgstr "LARGEUR" -#: ../src/option.c:80 +#: ../src/option.c:87 msgid "Set the height" msgstr "Définir la hauteur" -#: ../src/option.c:81 +#: ../src/option.c:88 msgid "HEIGHT" msgstr "HAUTEUR" -#: ../src/option.c:86 +#: ../src/option.c:93 msgid "Set the window geometry" msgstr "Définir la géométrie de la fenêtre" -#: ../src/option.c:87 +#: ../src/option.c:94 msgid "WxH+X+Y" msgstr "WxH+X+Y" -#: ../src/option.c:92 +#: ../src/option.c:99 msgid "Set dialog timeout in seconds" msgstr "Sélectionner le compte à rebourt en seconde de la boite de dialogue" -#: ../src/option.c:93 +#: ../src/option.c:100 msgid "TIMEOUT" msgstr "EXPIRATION"
View file
yad-0.36.2.tar.xz/po/it.po
Added
@@ -0,0 +1,1396 @@ +# French translation for YAD +# This file is distributed under the same license as the YAD package. +# +# Yannou90 <windaube.non.merci@gmail.com>, 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: YAD\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-02-07 09:25+0200\n" +"PO-Revision-Date: \n" +"Last-Translator: Yannou90 <windaube.non.merci@gmail.com>\n" +"Language-Team: Français\n" +"Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: French\n" +"X-Poedit-Country: FRANCE\n" +"X-Poedit-SourceCharset: utf-8\n" +"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:30 +msgid "translator-credits" +msgstr "" +"Stephen Kennedy <steve9000@users.sourceforge.net>, 2003\n" +"Jonathan Ernst <jonathan@ernstfamily.ch>, 2006\n" +"Claude Paroz <claude@2xlibre.net>, 2006-2010\n" +"Robert-André Mauchin <zebob.m@pengzone.org>, 2007\n" +"Bruno Brouard <annoa.b@gmail.com>, 2009-2010\n" +"Yannou90 <windaube.non.merci@gmail.com>, 2011" + +#: ../src/about.c:32 +msgid "" +"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" +"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 " +"YAD. If not, see <http://www.gnu.org/licenses/>." +msgstr "" +"YAD è software libero; puoi ridistribuirlo e/o modificarlo secondo i termini " +"della licenza GNU General Public License come pubblicato dalla Free Software " +"Foundation; sia la versione 3 della Licenza, o (a tua scelta) tutte le " +"versioni successive.\n" +"\n" +"YAD è distribuito nella speranza che sia utile, ma SENZA NESSUNA GARANZIA; " +"senza neppure la garanzia implicita di COMMERCIABILITÀ o IDONEITÀ PER UN " +"PARTICOLARE SCOPO. Vedi la GNU General Public License per maggiori " +"dettagli.\n" +"\n" +"Dovreste aver ricevuto una copia della GNU General Public License con YAD; " +"se così non fosse, vedi <http://www.gnu.org/licenses/>." + +#: ../src/about.c:50 +msgid "" +"Yet Another Dialog\n" +"(show dialog boxes from shell scripts)\n" +"\n" +"Based on Zenity code\n" +msgstr "" +"Yet Another dialogue\n" +"(mostra finestre di dialogo con script shell)\n" +"\n" +"Basato sul codice di Zenity\n" + +#: ../src/calendar.c:39 ../src/text.c:389 +#, c-format +msgid "Cannot open file '%s': %s\n" +msgstr "Impossibile aprire il file '%s': %s\n" + +#: ../src/entry.c:172 ../src/scale.c:39 +#, c-format +msgid "Maximum value must be greater than minimum value.\n" +msgstr "Il massimo valore deve essere più grande del valore minimo.\n" + +#: ../src/entry.c:179 ../src/scale.c:48 +#, c-format +msgid "Initial value less than minimal.\n" +msgstr "Valore iniziale minore del minimo.\n" + +#: ../src/entry.c:184 ../src/scale.c:53 +#, c-format +msgid "Initial value greater than maximum.\n" +msgstr "Valore iniziale maggiore del massimo.\n" + +#: ../src/form.c:372 +msgid "Select files" +msgstr "Seleziona i file" + +#: ../src/form.c:380 +msgid "Select folders" +msgstr "Seleziona le cartelle" + +#: ../src/form.c:443 +msgid "Select or create file" +msgstr "Seleziona o crea un file" + +#: ../src/form.c:451 +msgid "Select or create folder" +msgstr "Seleziona o crea una cartella" + +#: ../src/form.c:488 +msgid "Select date" +msgstr "Seleziona la data" + +#: ../src/form.c:689 +msgid "Select file" +msgstr "Seleziona il file" + +#: ../src/form.c:703 +msgid "Select folder" +msgstr "Seleziona una cartella" + +#: ../src/icons.c:321 +#, c-format +msgid "Unable to parse file %s: %s\n" +msgstr "Impossibile parsificare il file %s: %s\n" + +#: ../src/icons.c:338 +#, c-format +msgid "Unable to open directory %s: %s\n" +msgstr "Impossibile aprire la cartella %s: %s\n" + +#: ../src/main.c:102 ../src/main.c:233 +#, c-format +msgid "%d sec" +msgstr "%d sec" + +#: ../src/main.c:656 +#, c-format +msgid "Unable to parse command line: %s\n" +msgstr "Impossibile parsificare la linea di comando: %s\n" + +#: ../src/notification.c:118 +#, c-format +msgid "Could not load notification icon '%s': %s\n" +msgstr "Impossible caricare l'icona di notifica '%s': %s\n" + +#: ../src/notification.c:301 +#, c-format +msgid "Invalid UTF-8 in tooltip!\n" +msgstr "Carattere UTF-8 invalido nel suggerimento!\n" + +#: ../src/notification.c:345 +#, c-format +msgid "Unknown command '%s'\n" +msgstr "Commando sconosciuto: '%s'\n" + +#: ../src/notification.c:380 +msgid "Yad notification" +msgstr "Notifica Yad" + +#: ../src/list.c:856 +msgid "Add row" +msgstr "Aggiungi la linea" + +#: ../src/list.c:863 +msgid "Delete row" +msgstr "Cancella la linea" + +#: ../src/list.c:870 +#, fuzzy +msgid "Duplicate row" +msgstr "Duplica la linea" + +#: ../src/list.c:897 +#, c-format +msgid "No column titles specified for List dialog.\n" +msgstr "Nessun titolo specificato per la finestra di dialogo a liste.\n" + +#: ../src/option.c:69 +msgid "Set the dialog title" +msgstr "Configura il titolo della finestra di dialogo" + +#: ../src/option.c:70 +msgid "TITLE" +msgstr "TITOLO" + +#: ../src/option.c:75 +msgid "Set the window icon" +msgstr "Configura l'icona della finestra" + +#: ../src/option.c:76 +msgid "ICONPATH" +msgstr "ICONPATH" + +#: ../src/option.c:81 +msgid "Set the width" +msgstr "Configura la larghezza" + +#: ../src/option.c:82
View file
yad-0.36.2.tar.xz/po/pt_BR.po
Added
@@ -0,0 +1,1343 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: Brazilian\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-02-07 09:25+0200\n" +"PO-Revision-Date: 2013-10-27 02:12-0300\n" +"Last-Translator: Gustavo Soares de Lima <gustavo@logicus.com.br>\n" +"Language-Team: Brazilian\n" +"Language: Brazilian Portuguese\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.5.4\n" + +#: ../src/about.c:30 +msgid "translator-credits" +msgstr "Gustavo Soares de Lima <gustavo@logicus.com.br>" + +#: ../src/about.c:32 +msgid "" +"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" +"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 " +"YAD. If not, see <http://www.gnu.org/licenses/>." +msgstr "" +"Yad é Software Livre. Você pode modificá-lo e redistribuí-lo sob os termos " +"da licença GNU (tanto da versão 3 como de qualquer outra a seu critério) " +"conforme as diretrizes da Free Software Fundation.\n" +"\n" +"O Yad é distribuído na esperança de ser útil. Mas lembre-se que isto é SEM " +"QUALQUER GARANTIA, inclusive garantia de comercialização ou adequação a um " +"determinado fim. Para maiores informação leia a Licença GNU.\n" +"\n" +"Junto ao Yad você recebeu uma cópia da Licença GNU. Caso não encontre-a leia " +"em <http://www.gnu.org.licenses/>." + +#: ../src/about.c:50 +msgid "" +"Yet Another Dialog\n" +"(show dialog boxes from shell scripts)\n" +"\n" +"Based on Zenity code\n" +msgstr "" +"Yet Another Dialog\n" +"(Mostra caixas de diálogo a partir de shell scripts)\n" +"Baseado no código do Zenity\n" + +#: ../src/calendar.c:39 ../src/text.c:389 +#, c-format +msgid "Cannot open file '%s': %s\n" +msgstr "Não foi possível abrir o arquivo '%s': %s\n" + +#: ../src/entry.c:172 ../src/scale.c:39 +#, c-format +msgid "Maximum value must be greater than minimum value.\n" +msgstr "O valor máximo deve ser maior do que o valor mínimo.\n" + +#: ../src/entry.c:179 ../src/scale.c:48 +#, c-format +msgid "Initial value less than minimal.\n" +msgstr "Valor inicial inferior ao mínimo.\n" + +#: ../src/entry.c:184 ../src/scale.c:53 +#, c-format +msgid "Initial value greater than maximum.\n" +msgstr "Valor inicial maior que o máximo.\n" + +#: ../src/form.c:372 +msgid "Select files" +msgstr "Selecione os arquivos" + +#: ../src/form.c:380 +msgid "Select folders" +msgstr "Selecione as pastas" + +#: ../src/form.c:443 +msgid "Select or create file" +msgstr "Selecionar ou criar arquivo" + +#: ../src/form.c:451 +msgid "Select or create folder" +msgstr "Selecionar ou criar pasta" + +#: ../src/form.c:488 +msgid "Select date" +msgstr "Selecione a data" + +#: ../src/form.c:689 +msgid "Select file" +msgstr "Selecione o arquivo" + +#: ../src/form.c:703 +msgid "Select folder" +msgstr "Selecioine a pasta" + +#: ../src/icons.c:321 +#, c-format +msgid "Unable to parse file %s: %s\n" +msgstr "Não foi possível analisar o arquivo %s: %s\n" + +#: ../src/icons.c:338 +#, c-format +msgid "Unable to open directory %s: %s\n" +msgstr "Não foi possível abrir o diretório %s: %s\n" + +#: ../src/main.c:102 ../src/main.c:233 +#, c-format +msgid "%d sec" +msgstr "" + +#: ../src/main.c:656 +#, c-format +msgid "Unable to parse command line: %s\n" +msgstr "Não foi possível analisar a linha de comando: %s\n" + +#: ../src/notification.c:118 +#, c-format +msgid "Could not load notification icon '%s': %s\n" +msgstr "Não foi possível carregar o ícone de notificação '%s': %s\n" + +#: ../src/notification.c:301 +#, c-format +msgid "Invalid UTF-8 in tooltip!\n" +msgstr "UTF-8 inválido!\n" + +#: ../src/notification.c:345 +#, c-format +msgid "Unknown command '%s'\n" +msgstr "Comando desconhecido '%s'\n" + +#: ../src/notification.c:380 +msgid "Yad notification" +msgstr "Notificação do Yad" + +#: ../src/list.c:856 +msgid "Add row" +msgstr "Adicionar linha" + +#: ../src/list.c:863 +msgid "Delete row" +msgstr "Deletar linha" + +#: ../src/list.c:870 +msgid "Duplicate row" +msgstr "Duplicar linha" + +#: ../src/list.c:897 +#, c-format +msgid "No column titles specified for List dialog.\n" +msgstr "Nenhum título especificado para coluna da lista de diálogo.\n" + +#: ../src/option.c:69 +msgid "Set the dialog title" +msgstr "Defina o título do diálogo" + +#: ../src/option.c:70 +msgid "TITLE" +msgstr "TÍTULO" + +#: ../src/option.c:75 +msgid "Set the window icon" +msgstr "Defina o ícone da janela" + +#: ../src/option.c:76 +msgid "ICONPATH" +msgstr "ICONECAMINHO" + +#: ../src/option.c:81 +msgid "Set the width" +msgstr "Defina a largura" + +#: ../src/option.c:82 +msgid "WIDTH" +msgstr "LARGURA" + +#: ../src/option.c:87 +msgid "Set the height" +msgstr "Defina a altura" + +#: ../src/option.c:88 +msgid "HEIGHT" +msgstr "ALTURA" + +#: ../src/option.c:93 +msgid "Set the window geometry" +msgstr "Defina a geometria da janela"
View file
yad-0.16.3.tar.bz2/po/ru.po -> yad-0.36.2.tar.xz/po/ru.po
Changed
@@ -1,21 +1,20 @@ # Russian translation for YAD # This file is distributed under the same license as the YAD package. # -# Victor Ananjevsky <ananasik@gmail.com>, 2009-2011. +# Victor Ananjevsky <ananasik@gmail.com>, 2009-2016. # msgid "" msgstr "" "Project-Id-Version: YAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-21 11:42+0200\n" +"POT-Creation-Date: 2016-04-26 15:58+0300\n" "PO-Revision-Date: 2009-04-30 16:47+0300\n" "Last-Translator: Victor Ananjevsky <ananasik@gmail.com>\n" -"Language-Team: Russian\n" -"Language: \n" +"Language-Team: \n" +"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.2\n" "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" @@ -51,143 +50,179 @@ "Вы должны получить копию лицензии GNU c программой. Если лицензия не была " "получена, смотрите <http://www.gnu.org/licenses/>." -#: ../src/about.c:50 +#: ../src/about.c:43 +#, c-format msgid "" "Yet Another Dialog\n" "(show dialog boxes from shell scripts)\n" "\n" "Based on Zenity code\n" +"\n" +"Built with Webkit\n" +"Built with GtkSourceView\n" +"Built with GtkSpell\n" +"Using GTK+ %d.%d.%d\n" msgstr "" "Yet Another Dialog\n" "(Программа для отображения диалоговых окон из скриптов оболочки)\n" "\n" "Основан на коде Zenity\n" +"\n" +"Собран с поддержкой Webkit\n" +"Собран с поддержкой GtkSourceView\n" +"Собран с поддержкой GtkSpell\n" +"Используется GTK+ %d.%d.%d\n" -#: ../src/calendar.c:39 ../src/text.c:241 +#: ../src/calendar.c:39 ../src/text.c:401 #, c-format msgid "Cannot open file '%s': %s\n" msgstr "Не могу открыть файл %s: %s\n" -#: ../src/entry.c:158 ../src/scale.c:39 +#: ../src/entry.c:174 ../src/scale.c:39 #, c-format msgid "Maximum value must be greater than minimum value.\n" msgstr "Максимальное значение должно быть больше, чем минимальное.\n" -#: ../src/entry.c:164 ../src/scale.c:48 +#: ../src/entry.c:181 ../src/scale.c:48 #, c-format msgid "Initial value less than minimal.\n" msgstr "Начальное значение меньше минимального.\n" -#: ../src/entry.c:169 ../src/scale.c:53 +#: ../src/entry.c:186 ../src/scale.c:53 #, c-format msgid "Initial value greater than maximum.\n" msgstr "Начальное значение больше маскимального.\n" -#: ../src/form.c:305 +#: ../src/form.c:420 msgid "Select files" -msgstr "Выбрать файлы" +msgstr "Выбор файлов" -#: ../src/form.c:369 +#: ../src/form.c:428 +msgid "Select folders" +msgstr "Выбор каталогов" + +#: ../src/form.c:507 msgid "Select or create file" -msgstr "Выбрать или создать файл" +msgstr "Выбор или создание файла" -#: ../src/form.c:378 +#: ../src/form.c:515 msgid "Select or create folder" -msgstr "Выбрать или создать каталог" +msgstr "Выбор или создание каталога" -#: ../src/form.c:411 +#: ../src/form.c:566 msgid "Select date" -msgstr "Выбрать дату" +msgstr "Выбор даты" -#: ../src/form.c:546 +#: ../src/form.c:856 msgid "Select file" -msgstr "Выбрать файл" +msgstr "Выбор файла" -#: ../src/form.c:553 +#: ../src/form.c:884 msgid "Select folder" -msgstr "Выбрать каталог" +msgstr "Выбор каталога" + +#: ../src/html.c:124 +msgid "YAD - Select File" +msgstr "YAD - Выбор файла" -#: ../src/icons.c:247 +#: ../src/html.c:156 +msgid "Open URI" +msgstr "Открыть URI" + +#: ../src/html.c:164 +msgid "Enter URI or file name:" +msgstr "Введите URI или имя файла:" + +#: ../src/icons.c:322 #, c-format msgid "Unable to parse file %s: %s\n" msgstr "Не могу разобрать файл %s: %s\n" -#: ../src/icons.c:264 +#: ../src/icons.c:339 #, c-format msgid "Unable to open directory %s: %s\n" msgstr "Не могу открыть каталог %s: %s\n" -#: ../src/main.c:89 ../src/main.c:229 +#: ../src/main.c:94 ../src/main.c:441 #, c-format msgid "%d sec" msgstr "%d сек" -#: ../src/main.c:501 +#: ../src/main.c:670 ../src/main.c:677 +#, c-format +msgid "Unable to parse YAD_OPTIONS: %s\n" +msgstr "Не могу разобрать YAD_OPTIONS: %s\n" + +#: ../src/main.c:688 #, c-format -msgid "Unable parse command line: %s\n" +msgid "Unable to parse command line: %s\n" msgstr "Не удается разобрать командную строку: %s\n" -#: ../src/notification.c:82 +#: ../src/notification.c:118 #, c-format msgid "Could not load notification icon '%s': %s\n" msgstr "Не удается загрузить иконку '%s': %s\n" -#: ../src/notification.c:261 +#: ../src/notification.c:301 #, c-format msgid "Invalid UTF-8 in tooltip!\n" msgstr "Неверная последовательность UTF-8 в подсказке!\n" -#: ../src/notification.c:323 +#: ../src/notification.c:345 #, c-format msgid "Unknown command '%s'\n" msgstr "Неизвестная команда '%s'\n" -#: ../src/notification.c:359 +#: ../src/notification.c:380 msgid "Yad notification" msgstr "Диалог уведомлений" -#: ../src/list.c:703 +#: ../src/list.c:918 msgid "Add row" msgstr "Добавить строку" -#: ../src/list.c:712 +#: ../src/list.c:925 msgid "Delete row" msgstr "Удалить строку" -#: ../src/list.c:741 +#: ../src/list.c:932 +msgid "Duplicate row" +msgstr "Скопировать строку" + +#: ../src/list.c:971 #, c-format
View file
yad-0.16.3.tar.bz2/po/sk.po -> yad-0.36.2.tar.xz/po/sk.po
Changed
@@ -2,21 +2,31 @@ # Slovenský preklad balíka YAD. # Copyright (C) 2010 THE YAD'S COPYRIGHT HOLDER # This file is distributed under the same license as the YAD package. -# Slavko <linux@slavino.sk>, 2010, 2011. +# Slavko <linux@slavino.sk>, 2010, 2011, 2013. # msgid "" msgstr "" "Project-Id-Version: YAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-21 11:42+0200\n" -"PO-Revision-Date: 2011-09-05 07:57+0200\n" +"POT-Creation-Date: 2014-02-07 09:25+0200\n" +"PO-Revision-Date: 2013-03-30 08:10+0100\n" "Last-Translator: Slavko <linux@slavino.sk>\n" -"Language-Team: Slovak <debian-l10n-slovak@lists.debian.org>\n" +"Language-Team: slovenčina <debian-l10n-slovak@lists.debian.org>\n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-POFile-SpellExtra: font Public Foundation ČASLIMIT Free RD RAW spread\n" +"X-POFile-SpellExtra: save LBL xterm URI pango redistribuovať button SFL\n" +"X-POFile-SpellExtra: stderr NORM CESTAIKON right FLT HD NONE bottom\n" +"X-POFile-SpellExtra: rrrrggggbbbb RTL MFL END MIDDLE 100 CBE PULSE\n" +"X-POFile-SpellExtra: MENOSÚBORU pdf BTN MENOFONTU color XEMBED Yad FL FN\n" +"X-POFile-SpellExtra: ps start NUM MDIR IMG CB GTK YAD spin CLR Software RO\n" +"X-POFile-SpellExtra: raw General GNU Window shell UTF-8 file DT CDIR DIR\n" +"X-POFile-SpellExtra: fill VZOR1 VZOR2 Slavko IMAGE rrggbb TXT WxH CHK\n" +"X-POFile-SpellExtra: License START end ID stdin edge left GenericName\n" +"X-POFile-SpellExtra: expanderom\n" #: ../src/about.c:30 msgid "translator-credits" @@ -61,589 +71,661 @@ "\n" "Založený na kóde Zenity\n" -#: ../src/calendar.c:39 ../src/text.c:241 +#: ../src/calendar.c:39 ../src/text.c:389 #, c-format msgid "Cannot open file '%s': %s\n" msgstr "Nemožno otvoriť súbor '%s': %s\n" -#: ../src/entry.c:158 ../src/scale.c:39 +#: ../src/entry.c:172 ../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:164 ../src/scale.c:48 +#: ../src/entry.c:179 ../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:169 ../src/scale.c:53 +#: ../src/entry.c:184 ../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:305 +#: ../src/form.c:372 msgid "Select files" msgstr "Vyberte súbory" -#: ../src/form.c:369 -#, fuzzy +#: ../src/form.c:380 +msgid "Select folders" +msgstr "Vyberte adresáre" + +#: ../src/form.c:443 msgid "Select or create file" -msgstr "Vyberte súbor" +msgstr "Vyberte alebo vytvorte súbor" -#: ../src/form.c:378 -#, fuzzy +#: ../src/form.c:451 msgid "Select or create folder" -msgstr "Vyberte pole" +msgstr "Vyberte alebo vytvorte adresár" -#: ../src/form.c:411 +#: ../src/form.c:488 msgid "Select date" msgstr "Vyberte dátum" -#: ../src/form.c:546 +#: ../src/form.c:689 msgid "Select file" msgstr "Vyberte súbor" -#: ../src/form.c:553 +#: ../src/form.c:703 msgid "Select folder" -msgstr "Vyberte pole" +msgstr "Vyberte adresár" -#: ../src/icons.c:247 +#: ../src/icons.c:321 #, c-format msgid "Unable to parse file %s: %s\n" msgstr "Nemožno spracovať súbor %s: %s\n" -#: ../src/icons.c:264 +#: ../src/icons.c:338 #, c-format msgid "Unable to open directory %s: %s\n" msgstr "Nemožno otvoriť adresár %s: %s\n" -#: ../src/main.c:89 ../src/main.c:229 +#: ../src/main.c:102 ../src/main.c:233 #, c-format msgid "%d sec" msgstr "%d s" -#: ../src/main.c:501 +#: ../src/main.c:656 #, c-format -msgid "Unable parse command line: %s\n" +msgid "Unable to parse command line: %s\n" msgstr "Nemožno spracovať príkazový riadok: %s\n" -#: ../src/notification.c:82 +#: ../src/notification.c:118 #, c-format msgid "Could not load notification icon '%s': %s\n" msgstr "Nemožno načítať ikonu upozornenia '%s': %s\n" -#: ../src/notification.c:261 +#: ../src/notification.c:301 #, c-format msgid "Invalid UTF-8 in tooltip!\n" msgstr "Neplatné UTF-8 v nástrojovom tipe!\n" -#: ../src/notification.c:323 +#: ../src/notification.c:345 #, c-format msgid "Unknown command '%s'\n" msgstr "Neznámy príkaz '%s'\n" -#: ../src/notification.c:359 +#: ../src/notification.c:380 msgid "Yad notification" msgstr "Informačná ikona Yad" -#: ../src/list.c:703 +#: ../src/list.c:856 msgid "Add row" msgstr "Pridá riadok" -#: ../src/list.c:712 +#: ../src/list.c:863 msgid "Delete row" msgstr "Odstráni riadok" -#: ../src/list.c:741 +#: ../src/list.c:870 +#, fuzzy +msgid "Duplicate row" +msgstr "Odstráni riadok" + +#: ../src/list.c:897 #, 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:62 +#: ../src/option.c:69 msgid "Set the dialog title" msgstr "Nastaví názov dialógu" -#: ../src/option.c:63 +#: ../src/option.c:70 msgid "TITLE" msgstr "NÁZOV" -#: ../src/option.c:68 +#: ../src/option.c:75 msgid "Set the window icon" msgstr "Nastaví ikonu okna" -#: ../src/option.c:69 +#: ../src/option.c:76 msgid "ICONPATH" msgstr "CESTA_IKON" -#: ../src/option.c:74 +#: ../src/option.c:81 msgid "Set the width" msgstr "Nastaví šírku" -#: ../src/option.c:75 +#: ../src/option.c:82 msgid "WIDTH"
View file
yad-0.16.3.tar.bz2/po/uk.po -> yad-0.36.2.tar.xz/po/uk.po
Changed
@@ -1,21 +1,20 @@ # Ukrainian translation for YAD # This file is distributed under the same license as the YAD package. # -# Victor Ananjevsky <ananasik@gmail.com>, 2011. +# Victor Ananjevsky <ananasik@gmail.com>, 2011-2016. # msgid "" msgstr "" "Project-Id-Version: YAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-21 11:42+0200\n" +"POT-Creation-Date: 2016-04-26 15:58+0300\n" "PO-Revision-Date: 2009-04-30 16:47+0300\n" "Last-Translator: Victor Ananjevsky <ananasik@gmail.com>\n" -"Language-Team: Ukrainian\n" -"Language: \n" +"Language-Team: \n" +"Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.2\n" "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" @@ -39,153 +38,191 @@ "YAD. If not, see <http://www.gnu.org/licenses/>." msgstr "" "YAD - це вільна програма; ви можете розповсюджувати її та/чи змінювати на " -"умовах ліцензії GNU General Public License, що опублікована Free Software " -"Foundation; версії 2 цієї ліцензії, чи (на вашу думку) будь-якою більш " -"пізнішої версії.\n" +"умовах Загальної громадської ліцензії GNU, опублікованої Фондом вільного " +"програмного забезпечення; або версії 3 цієї ліцензії, або (на ваш вибір) " +"будь-якої пізнішої версії.\n" "Ця програма розповсюджується в сподіванні на те, що вона буде корисною, але " "БЕЗ БУДЬ-ЯКИХ ГАРАНТІЙ, в тому числі без неявної гарантії КОМЕРЦІЙНОЇ " -"ЦІННОСТІ чи ПРИДАТНОСТІ ДЛЯ БУДЬ-ЯКИХ ЦІЛЕЙ. Докладніше про це дивіться GNU " -"General Public License.\n" -"Ви мали отримати копію GNU General Public License разом з цією програмою; " -"якщо це не так, дивіться <http://www.gnu.org/licenses/>." +"ЦІННОСТІ чи ПРИДАТНОСТІ ДЛЯ БУДЬ-ЯКИХ ЦІЛЕЙ. Докладніше про це дивіться " +"Загальну громадську ліцензію GNU.\n" +"Ви мали отримати копію Загальної громадської ліцензії GNU разом з цією " +"програмою; якщо це не так, дивіться <http://www.gnu.org/licenses/>." -#: ../src/about.c:50 +#: ../src/about.c:43 +#, c-format msgid "" "Yet Another Dialog\n" "(show dialog boxes from shell scripts)\n" "\n" "Based on Zenity code\n" +"\n" +"Built with Webkit\n" +"Built with GtkSourceView\n" +"Built with GtkSpell\n" +"Using GTK+ %d.%d.%d\n" msgstr "" "Yet Another Dialog\n" -"(Програма для відображення диалогових вікон із скриптов оболонки)\n" +"(Програма для відображення діалогових вікон зі сценаріїв оболонки)\n" +"\n" +"Основана на коді Zenity\n" "\n" -"Базується на коді Zenity\n" +"Вбудована підтримка Webkit\n" +"Вбудована підтримка GtkSourceView\n" +"Вбудована підтримка GtkSpell\n" +"Використовується GTK+ %d.%d.%d\n" -#: ../src/calendar.c:39 ../src/text.c:241 +#: ../src/calendar.c:39 ../src/text.c:401 #, c-format msgid "Cannot open file '%s': %s\n" msgstr "Не можу відкрити файл %s: %s\n" -#: ../src/entry.c:158 ../src/scale.c:39 +#: ../src/entry.c:174 ../src/scale.c:39 #, c-format msgid "Maximum value must be greater than minimum value.\n" -msgstr "Максимальне значення повинно бути більше, ніж мінімальне.\n" +msgstr "Максимальне значення повинне бути більше за мінімальне.\n" -#: ../src/entry.c:164 ../src/scale.c:48 +# # FIXME: "Initial value IS less than minimal.\n" +#: ../src/entry.c:181 ../src/scale.c:48 #, c-format msgid "Initial value less than minimal.\n" -msgstr "Початкове значення менше за мінімальне.\n" +msgstr "Початкове значення - менше за мінімальне.\n" -#: ../src/entry.c:169 ../src/scale.c:53 +# # FIXME: "Initial value IS greater than maximum.\n" +#: ../src/entry.c:186 ../src/scale.c:53 #, c-format msgid "Initial value greater than maximum.\n" -msgstr "Початкове значенння більше за маскимальне.\n" +msgstr "Початкове значення - більше за максимальне.\n" -#: ../src/form.c:305 +#: ../src/form.c:420 msgid "Select files" -msgstr "Обрати файли" +msgstr "Вибір файлу" -#: ../src/form.c:369 +#: ../src/form.c:428 +msgid "Select folders" +msgstr "Вибір каталогів" + +#: ../src/form.c:507 msgid "Select or create file" -msgstr "Обрати або створити файл" +msgstr "Вибір або створення файлу" -#: ../src/form.c:378 +#: ../src/form.c:515 msgid "Select or create folder" -msgstr "Обрати або створити каталог" +msgstr "Вибір або створення каталогу" -#: ../src/form.c:411 +#: ../src/form.c:566 msgid "Select date" -msgstr "Обрати дату" +msgstr "Вибір дати" -#: ../src/form.c:546 +#: ../src/form.c:856 msgid "Select file" -msgstr "Обрати файл" +msgstr "Вибір файлу" -#: ../src/form.c:553 +#: ../src/form.c:884 msgid "Select folder" -msgstr "Обрати каталог" +msgstr "Вибір каталогу" + +#: ../src/html.c:124 +msgid "YAD - Select File" +msgstr "YAD - Вибір файлу" -#: ../src/icons.c:247 +#: ../src/html.c:156 +msgid "Open URI" +msgstr "Відкрити URI" + +#: ../src/html.c:164 +msgid "Enter URI or file name:" +msgstr "Введіть URI або ім'я файлу:" + +#: ../src/icons.c:322 #, c-format msgid "Unable to parse file %s: %s\n" msgstr "Не можу розібрати файл %s: %s\n" -#: ../src/icons.c:264 +#: ../src/icons.c:339 #, c-format msgid "Unable to open directory %s: %s\n" msgstr "Не можу відкрити каталог %s: %s\n" -#: ../src/main.c:89 ../src/main.c:229 +#: ../src/main.c:94 ../src/main.c:441 #, c-format msgid "%d sec" msgstr "%d сек" -#: ../src/main.c:501 +#: ../src/main.c:670 ../src/main.c:677 +#, c-format +msgid "Unable to parse YAD_OPTIONS: %s\n" +msgstr "Не можу розібрати YAD_OPTIONS: %s\n" + +#: ../src/main.c:688 #, c-format -msgid "Unable parse command line: %s\n" -msgstr "Не вдається розібрати командну строку: %s\n" +msgid "Unable to parse command line: %s\n" +msgstr "Не вдається розібрати командний рядок: %s\n" -#: ../src/notification.c:82 +#: ../src/notification.c:118 #, c-format msgid "Could not load notification icon '%s': %s\n" msgstr "Не вдається завантажити іконку '%s': %s\n" -#: ../src/notification.c:261 +#: ../src/notification.c:301 #, c-format msgid "Invalid UTF-8 in tooltip!\n" msgstr "Неправильна послідовність UTF-8 у підказці!\n" -#: ../src/notification.c:323 +#: ../src/notification.c:345 #, c-format
View file
yad-0.36.2.tar.xz/po/zh_TW.po
Added
@@ -0,0 +1,1357 @@ +# Traditional Chinese Messages for yad. +# Copyright (C) 2012 The yad Project (msgids). +# This file is distributed under the same license as the yad package. +# Wei-Lun Chao <chaoweilun@gmail.com>, 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: yad 0.17.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-02-07 09:25+0200\n" +"PO-Revision-Date: 2012-02-28 16:08+0800\n" +"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n" +"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n" +"Language: zh_TW\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../src/about.c:30 +msgid "translator-credits" +msgstr "趙惟倫 <chaoweilun@gmail.com>" + +#: ../src/about.c:32 +msgid "" +"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" +"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 " +"YAD. If not, see <http://www.gnu.org/licenses/>." +msgstr "" +"YAD 是自由軟體；遵循由自由軟體基金會發布的 GNU 通用公共授權，您可以再次散布它" +"和/或修改它；可以依據版本 3 的授權，或 (您自行選擇的) 任何後續的版本。\n" +"\n" +"YAD 的發行是希望該它能夠有用，但是沒有任何擔保；亦無對於某一特定目的之適售性" +"與適用性的暗示性擔保。參看 GNU 通用公共授權以獲得更多細節。\n" +"\n" +"您應該已收到隨附於 YAD 的 GNU 通用公共授權複本。如果沒有，參看 <http://www." +"gnu.org/licenses/>。" + +#: ../src/about.c:50 +msgid "" +"Yet Another Dialog\n" +"(show dialog boxes from shell scripts)\n" +"\n" +"Based on Zenity code\n" +msgstr "" +"Yet Another Dialog\n" +"(從命令稿顯示對話框)\n" +"\n" +"基於 Zenity 程式碼\n" + +#: ../src/calendar.c:39 ../src/text.c:389 +#, c-format +msgid "Cannot open file '%s': %s\n" +msgstr "無法開啟檔案『%s』：%s\n" + +#: ../src/entry.c:172 ../src/scale.c:39 +#, c-format +msgid "Maximum value must be greater than minimum value.\n" +msgstr "最大值必須大於最小值。\n" + +#: ../src/entry.c:179 ../src/scale.c:48 +#, c-format +msgid "Initial value less than minimal.\n" +msgstr "初始值少於最小值。\n" + +#: ../src/entry.c:184 ../src/scale.c:53 +#, c-format +msgid "Initial value greater than maximum.\n" +msgstr "初始值大於最大值。\n" + +#: ../src/form.c:372 +msgid "Select files" +msgstr "選取檔案" + +#: ../src/form.c:380 +msgid "Select folders" +msgstr "選取資料夾" + +#: ../src/form.c:443 +msgid "Select or create file" +msgstr "選取或建立檔案" + +#: ../src/form.c:451 +msgid "Select or create folder" +msgstr "選取或建立資料夾" + +#: ../src/form.c:488 +msgid "Select date" +msgstr "選取日期" + +#: ../src/form.c:689 +msgid "Select file" +msgstr "選取檔案" + +#: ../src/form.c:703 +msgid "Select folder" +msgstr "選取資料夾" + +#: ../src/icons.c:321 +#, c-format +msgid "Unable to parse file %s: %s\n" +msgstr "無法剖析檔案 %s：%s\n" + +#: ../src/icons.c:338 +#, c-format +msgid "Unable to open directory %s: %s\n" +msgstr "無法開啟目錄 %s：%s\n" + +#: ../src/main.c:102 ../src/main.c:233 +#, c-format +msgid "%d sec" +msgstr "%d 秒" + +#: ../src/main.c:656 +#, c-format +msgid "Unable to parse command line: %s\n" +msgstr "無法剖析命令列：%s\n" + +#: ../src/notification.c:118 +#, c-format +msgid "Could not load notification icon '%s': %s\n" +msgstr "無法載入通知圖示『%s』：%s\n" + +#: ../src/notification.c:301 +#, c-format +msgid "Invalid UTF-8 in tooltip!\n" +msgstr "在提示框中無效的 UTF-8！\n" + +#: ../src/notification.c:345 +#, c-format +msgid "Unknown command '%s'\n" +msgstr "不明命令『%s』\n" + +#: ../src/notification.c:380 +msgid "Yad notification" +msgstr "Yad 通知" + +#: ../src/list.c:856 +msgid "Add row" +msgstr "加入列" + +#: ../src/list.c:863 +msgid "Delete row" +msgstr "刪除列" + +#: ../src/list.c:870 +#, fuzzy +msgid "Duplicate row" +msgstr "刪除列" + +#: ../src/list.c:897 +#, c-format +msgid "No column titles specified for List dialog.\n" +msgstr "沒有指定的欄標題用於清單對話框。\n" + +#: ../src/option.c:69 +msgid "Set the dialog title" +msgstr "設定對話框標題" + +#: ../src/option.c:70 +msgid "TITLE" +msgstr "標題" + +#: ../src/option.c:75 +msgid "Set the window icon" +msgstr "設定視窗圖示" + +#: ../src/option.c:76 +msgid "ICONPATH" +msgstr "圖示路徑" + +#: ../src/option.c:81 +msgid "Set the width" +msgstr "設定寬度" + +#: ../src/option.c:82 +msgid "WIDTH" +msgstr "寬度" + +#: ../src/option.c:87 +msgid "Set the height" +msgstr "設定高度" + +#: ../src/option.c:88 +msgid "HEIGHT" +msgstr "高度" + +#: ../src/option.c:93 +msgid "Set the window geometry" +msgstr "設定視窗幾何位置"
View file
yad-0.16.3.tar.bz2/src/Makefile.am -> yad-0.36.2.tar.xz/src/Makefile.am
Changed
@@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -DLOCALEDIR=\""$(datadir)/locale"\" \ @DISABLE_DEPRECATED@ @@ -16,8 +16,11 @@ icons.c \ list.c \ multi-progress.c \ + notebook.c \ notification.c \ option.c \ + paned.c \ + picture.c \ print.c \ progress.c \ scale.c \ @@ -27,13 +30,17 @@ yad.h \ calendar.xpm -yad_CFLAGS = $(YAD_CFLAGS) -yad_LDADD = $(YAD_LIBS) +if HTML +yad_SOURCES += html.c +endif + +yad_CFLAGS = $(GTK_CFLAGS) $(HTML_CFLAGS) $(SPELL_CFLAGS) $(SOURCEVIEW_CFLAGS) +yad_LDADD = $(GTK_LIBS) $(HTML_LIBS) $(SPELL_LIBS) $(SOURCEVIEW_LIBS) if BUILD_IB bin_PROGRAMS += yad-icon-browser yad_icon_browser_SOURCES = browser.c -yad_icon_browser_CFLAGS = $(YAD_CFLAGS) -yad_icon_browser_LDADD = $(YAD_LIBS) +yad_icon_browser_CFLAGS = $(GTK_CFLAGS) +yad_icon_browser_LDADD = $(GTK_LIBS) endif
View file
yad-0.16.3.tar.bz2/src/Makefile.in -> yad-0.36.2.tar.xz/src/Makefile.in
Changed
@@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\\ \ *) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs$$bs $$bs *//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -dEDm) skip_next=yes;; \ + -JT) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -33,14 +87,15 @@ PRE_UNINSTALL = : POST_UNINSTALL = : bin_PROGRAMS = yad$(EXEEXT) $(am__EXEEXT_1) -@BUILD_IB_TRUE@am__append_1 = yad-icon-browser +@HTML_TRUE@am__append_1 = html.c +@BUILD_IB_TRUE@am__append_2 = yad-icon-browser subdir = src -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -48,17 +103,24 @@ @BUILD_IB_TRUE@am__EXEEXT_1 = yad-icon-browser$(EXEEXT) am__installdirs = "$(DESTDIR)$(bindir)" PROGRAMS = $(bin_PROGRAMS) +am__yad_SOURCES_DIST = about.c calendar.c color.c dnd.c entry.c file.c \ + font.c form.c icons.c list.c multi-progress.c notebook.c \ + notification.c option.c paned.c picture.c print.c progress.c \ + scale.c text.c util.c main.c yad.h calendar.xpm html.c +@HTML_TRUE@am__objects_1 = yad-html.$(OBJEXT) am_yad_OBJECTS = yad-about.$(OBJEXT) yad-calendar.$(OBJEXT) \ yad-color.$(OBJEXT) yad-dnd.$(OBJEXT) yad-entry.$(OBJEXT) \ yad-file.$(OBJEXT) yad-font.$(OBJEXT) yad-form.$(OBJEXT) \ yad-icons.$(OBJEXT) yad-list.$(OBJEXT) \ - yad-multi-progress.$(OBJEXT) yad-notification.$(OBJEXT) \ - yad-option.$(OBJEXT) yad-print.$(OBJEXT) \ + yad-multi-progress.$(OBJEXT) yad-notebook.$(OBJEXT) \ + yad-notification.$(OBJEXT) yad-option.$(OBJEXT) \ + yad-paned.$(OBJEXT) yad-picture.$(OBJEXT) yad-print.$(OBJEXT) \ yad-progress.$(OBJEXT) yad-scale.$(OBJEXT) yad-text.$(OBJEXT) \ - yad-util.$(OBJEXT) yad-main.$(OBJEXT) + yad-util.$(OBJEXT) yad-main.$(OBJEXT) $(am__objects_1) yad_OBJECTS = $(am_yad_OBJECTS) am__DEPENDENCIES_1 = -yad_DEPENDENCIES = $(am__DEPENDENCIES_1) +yad_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) yad_LINK = $(CCLD) $(yad_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o \ $@ am__yad_icon_browser_SOURCES_DIST = browser.c @@ -68,39 +130,75 @@ @BUILD_IB_TRUE@yad_icon_browser_DEPENDENCIES = $(am__DEPENDENCIES_1) yad_icon_browser_LINK = $(CCLD) $(yad_icon_browser_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp +depcomp = $(SHELL) $(top_srcdir)/build/depcomp am__depfiles_maybe = depfiles am__mv = mv -f -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -am__v_at_0 = @ +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(yad_SOURCES) $(yad_icon_browser_SOURCES) -DIST_SOURCES = $(yad_SOURCES) $(am__yad_icon_browser_SOURCES_DIST) +DIST_SOURCES = $(am__yad_SOURCES_DIST) \ + $(am__yad_icon_browser_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items$$0 = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags
View file
yad-0.16.3.tar.bz2/src/about.c -> yad-0.36.2.tar.xz/src/about.c
Changed
@@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with YAD. If not, see <http://www.gnu.org/licenses/>. * - * Copyright (C) 2008-2011, Victor Ananjevsky <ananasik@gmail.com> + * Copyright (C) 2008-2016, Victor Ananjevsky <ananasik@gmail.com> */ #include "yad.h" @@ -27,33 +27,48 @@ "Victor Ananjevsky <ananasik@gmail.com>", NULL }; - gchar *translators = _("translator-credits"); - gchar *license = - _("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" - "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 YAD. If not, see <http://www.gnu.org/licenses/>."); + const gchar *translators = N_("translator-credits"); + const gchar *license = + 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" + "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 YAD. If not, see <http://www.gnu.org/licenses/>."); + + gchar *comments = g_strdup_printf (_("Yet Another Dialog\n" + "(show dialog boxes from shell scripts)\n" + "\nBased on Zenity code\n\n" +#ifdef HAVE_HTML + "Built with Webkit\n" +#endif +#ifdef HAVE_SOURCEVIEW + "Built with GtkSourceView\n" +#endif +#ifdef HAVE_SPELL + "Built with GtkSpell\n" +#endif + "Using GTK+ %d.%d.%d\n"), + gtk_major_version, gtk_minor_version, gtk_micro_version); dialog = gtk_about_dialog_new (); gtk_window_set_icon_name (GTK_WINDOW (dialog), "yad"); - g_object_set (G_OBJECT (dialog), - "name", PACKAGE_NAME, - "version", PACKAGE_VERSION, - "copyright", "Copyright \xc2\xa9 2008-2011 Victor Ananjevsky <ananasik@gmail.com>", - "comments", _("Yet Another Dialog\n(show dialog boxes from shell scripts)\n\nBased on Zenity code\n"), - "authors", authors, - "website", PACKAGE_URL, - "translator-credits", translators, - "wrap-license", TRUE, "license", license, - "logo-icon-name", "yad", - NULL); + "name", PACKAGE_NAME, + "version", PACKAGE_VERSION, + "copyright", "Copyright \xc2\xa9 2008-2016, Victor Ananjevsky <ananasik@gmail.com>", + "comments", comments, + "authors", authors, + "website", PACKAGE_URL, + "translator-credits", translators, + "wrap-license", TRUE, + "license", license, + "logo-icon-name", "yad", + NULL); return gtk_dialog_run (GTK_DIALOG (dialog)); }
View file
yad-0.16.3.tar.bz2/src/browser.c -> yad-0.36.2.tar.xz/src/browser.c
Changed
@@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with YAD. If not, see <http://www.gnu.org/licenses/>. * - * Copyright (C) 2010-2011, Victor Ananjevsky <ananasik@gmail.com> + * Copyright (C) 2010-2016, Victor Ananjevsky <ananasik@gmail.com> */ #include <config.h> @@ -26,7 +26,9 @@ typedef struct { GtkWidget *win; GtkWidget *image; - GtkWidget *label; + GtkWidget *lname; + GtkWidget *lsize; + GtkWidget *lfile; GtkWidget *cat_list; GtkWidget *icon_list; @@ -36,9 +38,9 @@ } IconBrowserData; static gboolean -key_press_cb (GtkWidget *w, GdkEventKey *ev, gpointer data) +key_press_cb (GtkWidget * w, GdkEventKey * ev, gpointer data) { -#if GTK_CHECK_VERSION(3,0,0) +#if GTK_CHECK_VERSION(2,24,0) if (ev->keyval == GDK_KEY_Escape) #else if (ev->keyval == GDK_Escape) @@ -51,7 +53,7 @@ } static GtkListStore * -load_icon_cat (IconBrowserData *data, gchar *cat) +load_icon_cat (IconBrowserData * data, gchar * cat) { GtkListStore *store; GList *i, *icons; @@ -68,26 +70,25 @@ GtkTreeIter iter; GdkPixbuf *pb, *spb; - spb = pb = gtk_icon_theme_load_icon (data->theme, i->data, size, - GTK_ICON_LOOKUP_GENERIC_FALLBACK, NULL); + spb = pb = gtk_icon_theme_load_icon (data->theme, i->data, size, GTK_ICON_LOOKUP_GENERIC_FALLBACK, NULL); if (pb) - { - /* scale pixbuf if needed */ - w = gdk_pixbuf_get_width (pb); - h = gdk_pixbuf_get_height (pb); - if (w > size || h > size) - { - pb = gdk_pixbuf_scale_simple (spb, size, size, GDK_INTERP_BILINEAR); - g_object_unref (spb); - } - } + { + /* scale pixbuf if needed */ + w = gdk_pixbuf_get_width (pb); + h = gdk_pixbuf_get_height (pb); + if (w > size || h > size) + { + pb = gdk_pixbuf_scale_simple (spb, size, size, GDK_INTERP_BILINEAR); + g_object_unref (spb); + } + } gtk_list_store_append (store, &iter); gtk_list_store_set (store, &iter, 0, pb, 1, i->data, -1); if (pb) - g_object_unref (pb); + g_object_unref (pb); g_free (i->data); } g_list_free (icons); @@ -98,13 +99,13 @@ } static void -select_icon (GtkTreeSelection *sel, IconBrowserData *data) +select_icon (GtkTreeSelection * sel, IconBrowserData * data) { GtkTreeModel *model; GtkTreeIter iter; GtkIconInfo *info; gint *sz, i; - gchar *icon, *file, *lbl; + gchar *icon, *file; GString *sizes; if (!gtk_tree_selection_get_selected (sel, &model, &iter)) @@ -128,26 +129,26 @@ while (szi) { if (szi == -1) - g_string_append (sizes, _("scalable ")); + g_string_append (sizes, _("scalable ")); else - g_string_append_printf (sizes, "%dx%d ", szi, szi); + g_string_append_printf (sizes, "%dx%d ", szi, szi); i++; } /* free memory */ g_free (sz); - lbl = g_strdup_printf (_("<b>Name:</b> %s\n<b>Sizes:</b> %s\n<b>Filename:</b> %s"), - icon, sizes->str, file ? file : _("built-in")); - gtk_label_set_markup (GTK_LABEL (data->label), lbl); + gtk_label_set_text (GTK_LABEL (data->lname), icon); + gtk_label_set_text (GTK_LABEL (data->lsize), sizes->str); + gtk_label_set_text (GTK_LABEL (data->lfile), file ? file : _("built-in")); + g_string_free (sizes, TRUE); - g_free (lbl); if (info) gtk_icon_info_free (info); } static void -select_cat (GtkTreeSelection *sel, IconBrowserData *data) +select_cat (GtkTreeSelection * sel, IconBrowserData * data) { GtkTreeModel *model; GtkListStore *store; @@ -169,7 +170,7 @@ } gint -main (gint argc, gchar *argv) +main (gint argc, gchar * argv) { IconBrowserData *data; gchar **themes = NULL; @@ -178,11 +179,11 @@ GtkTreeSelection *sel; GtkTreeViewColumn *col; GtkCellRenderer *r; - GtkWidget *w, *p, *box; + GtkWidget *w, *p, *box, *t; GOptionEntry entrs = { - { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_STRING_ARRAY, &themes, NULL, NULL }, - { NULL } + {G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_STRING_ARRAY, &themes, NULL, NULL}, + {NULL} }; data = g_new0 (IconBrowserData, 1); @@ -225,28 +226,89 @@ /* create icon info box */ #if !GTK_CHECK_VERSION(3,0,0) - w = gtk_hbox_new (FALSE, 5); + t = gtk_table_new (3, 3, FALSE); + gtk_table_set_col_spacings (GTK_TABLE (t), 5); + gtk_table_set_row_spacings (GTK_TABLE (t), 5); +#else + t = gtk_grid_new (); + gtk_grid_set_row_spacing (GTK_GRID (t), 5); + gtk_grid_set_column_spacing (GTK_GRID (t), 5); +#endif + gtk_box_pack_start (GTK_BOX (box), t, FALSE, FALSE, 2); + + data->image = gtk_image_new_from_stock ("gtk-missing-image", GTK_ICON_SIZE_DIALOG); +#if !GTK_CHECK_VERSION(3,0,0) + gtk_table_attach (GTK_TABLE (t), data->image, 0, 1, 0, 3, GTK_FILL, 0, 0, 0); +#else + gtk_grid_attach (GTK_GRID (t), data->image, 0, 0, 1, 3); +#endif + + w = gtk_label_new (NULL); + gtk_label_set_markup (GTK_LABEL (w), _("<b>Name:</b>")); + gtk_misc_set_alignment (GTK_MISC (w), 0, 0.5); +#if !GTK_CHECK_VERSION(3,0,0) + gtk_table_attach (GTK_TABLE (t), w, 1, 2, 0, 1, GTK_FILL, 0, 0, 0); +#else + gtk_grid_attach (GTK_GRID (t), w, 1, 0, 1, 1); +#endif + data->lname = gtk_label_new (NULL); + gtk_label_set_selectable (GTK_LABEL (data->lname), TRUE); + gtk_misc_set_alignment (GTK_MISC (data->lname), 0, 0.5); +#if !GTK_CHECK_VERSION(3,0,0) + gtk_table_attach (GTK_TABLE (t), data->lname, 2, 3, 0, 1, GTK_FILL | GTK_EXPAND, 0, 0, 0); +#else + gtk_grid_attach (GTK_GRID (t), data->lname, 2, 0, 1, 1); + gtk_widget_set_hexpand (data->lname, TRUE); +#endif + + w = gtk_label_new (NULL); + gtk_label_set_markup (GTK_LABEL (w), _("<b>Sizes:</b>")); + gtk_misc_set_alignment (GTK_MISC (w), 0, 0.5); +#if !GTK_CHECK_VERSION(3,0,0) + gtk_table_attach (GTK_TABLE (t), w, 1, 2, 1, 2, GTK_FILL, 0, 0, 0); #else
View file
yad-0.16.3.tar.bz2/src/calendar.c -> yad-0.36.2.tar.xz/src/calendar.c
Changed
@@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with YAD. If not, see <http://www.gnu.org/licenses/>. * - * Copyright (C) 2008-2011, Victor Ananjevsky <ananasik@gmail.com> + * Copyright (C) 2008-2016, Victor Ananjevsky <ananasik@gmail.com> */ #include <errno.h> @@ -36,8 +36,7 @@ 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)); + g_printerr (_("Cannot open file '%s': %s\n"), options.common_data.uri, g_strerror (errno)); return; } @@ -50,19 +49,17 @@ memset (buf, 0, 4096); fgets (buf, 4096, f); if (strlen (buf) > 0) - { - dtl = g_strsplit (buf, " ", 2); - g_hash_table_insert (details, dtl0, dtl1); - } + { + 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) +get_details (GtkCalendar * cal, guint year, guint month, guint day, gpointer data) { GDate *d; gchar time_string128; @@ -82,13 +79,14 @@ } static void -double_click_cb (GtkWidget *w, gpointer data) +double_click_cb (GtkWidget * w, gpointer data) { - gtk_dialog_response (GTK_DIALOG (data), YAD_RESPONSE_OK); + if (options.plug == -1) + gtk_dialog_response (GTK_DIALOG (data), YAD_RESPONSE_OK); } GtkWidget * -calendar_create_widget (GtkWidget *dlg) +calendar_create_widget (GtkWidget * dlg) { GtkWidget *w; @@ -96,12 +94,9 @@ 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), - options.calendar_data.month - 1, - options.calendar_data.year); + gtk_calendar_select_month (GTK_CALENDAR (w), options.calendar_data.month - 1, options.calendar_data.year); if (options.calendar_data.day > 0) - gtk_calendar_select_day (GTK_CALENDAR (w), - options.calendar_data.day); + gtk_calendar_select_day (GTK_CALENDAR (w), options.calendar_data.day); if (options.calendar_data.details) { @@ -110,12 +105,10 @@ } gtk_calendar_set_display_options (GTK_CALENDAR (w), - GTK_CALENDAR_SHOW_HEADING | - GTK_CALENDAR_SHOW_DAY_NAMES | - GTK_CALENDAR_SHOW_WEEK_NUMBERS); + 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); + g_signal_connect (w, "day-selected-double-click", G_CALLBACK (double_click_cb), dlg); return w; }
View file
yad-0.16.3.tar.bz2/src/color.c -> yad-0.36.2.tar.xz/src/color.c
Changed
@@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with YAD. If not, see <http://www.gnu.org/licenses/>. * - * Copyright (C) 2008-2011, Victor Ananjevsky <ananasik@gmail.com> + * Copyright (C) 2008-2016, Victor Ananjevsky <ananasik@gmail.com> */ #include <errno.h> @@ -51,7 +51,8 @@ "................", "................", "................", - "................"}; + "................" + }; gchar cl = ". c #FFFFFF"; if (options.color_data.palette) @@ -67,13 +68,13 @@ store = gtk_list_store_new (3, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING); - while ((name = fgets (buf, sizeof(buf), fp)) != NULL) + while ((name = fgets (buf, sizeof (buf), fp)) != NULL) { gint r, g, b; gchar spec8; if (buf0 == '!') - continue; + continue; sscanf (buf, "%d %d %d", &r, &g, &b); @@ -82,8 +83,8 @@ cxpm1 = cl; pb = gdk_pixbuf_new_from_xpm_data ((const gchar **) cxpm); - while (g_ascii_isdigit(*name) || g_ascii_isspace(*name)) - name++; + while (g_ascii_isdigit (*name) || g_ascii_isspace (*name)) + name++; gtk_list_store_append (store, &iter); gtk_list_store_set (store, &iter, 0, pb, 1, spec, 2, g_strstrip (name), -1); @@ -95,7 +96,7 @@ } static void -palette_changed (GtkTreeSelection *sel, gpointer data) +palette_changed (GtkTreeSelection * sel, gpointer data) { GtkTreeModel *model; GtkTreeIter iter; @@ -107,12 +108,12 @@ gtk_tree_model_get (model, &iter, 1, &clr, -1); if (gdk_color_parse (clr, &c)) - gtk_color_selection_set_current_color (GTK_COLOR_SELECTION (color), &c); + gtk_color_selection_set_current_color (GTK_COLOR_SELECTION (color), &c); } } GtkWidget * -color_create_widget (GtkWidget *dlg) +color_create_widget (GtkWidget * dlg) { GtkWidget *w; @@ -124,13 +125,13 @@ color = gtk_color_selection_new (); gtk_widget_set_name (color, "yad-color-widget"); - gtk_color_selection_set_has_palette (GTK_COLOR_SELECTION (color), settings.show_gtk_palette); + gtk_color_selection_set_has_palette (GTK_COLOR_SELECTION (color), options.color_data.gtk_palette); if (options.color_data.init_color) { GdkColor c; if (gdk_color_parse (options.color_data.init_color, &c)) - gtk_color_selection_set_current_color (GTK_COLOR_SELECTION (color), &c); + gtk_color_selection_set_current_color (GTK_COLOR_SELECTION (color), &c); } gtk_box_pack_start (GTK_BOX (w), color, FALSE, FALSE, 2); @@ -139,66 +140,63 @@ GtkTreeModel *model; if ((model = create_palette ()) != NULL) - { - GtkWidget *exp, *sw, *list; - GtkCellRenderer *r; - GtkTreeViewColumn *col; - GtkTreeSelection *sel; - - /* create expander */ - exp = gtk_expander_new (_("Palette")); - gtk_expander_set_expanded (GTK_EXPANDER (exp), settings.expand_palette); - gtk_container_set_border_width (GTK_CONTAINER (exp), 5); - gtk_box_pack_start (GTK_BOX (w), exp, TRUE, TRUE, 2); - - /* create color list */ - sw = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), - GTK_SHADOW_ETCHED_IN); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), - GTK_POLICY_AUTOMATIC, - GTK_POLICY_AUTOMATIC); - gtk_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); - - /* add first columns */ - col = gtk_tree_view_column_new (); - gtk_tree_view_column_set_title (col, _("Color")); - - /* pixbuf */ - r = gtk_cell_renderer_pixbuf_new (); - gtk_tree_view_column_pack_start (col, r, FALSE); - gtk_tree_view_column_set_attributes (col, r, "pixbuf", 0, NULL); - - /* color value */ - r = gtk_cell_renderer_text_new (); - gtk_tree_view_column_pack_start (col, r, TRUE); - gtk_tree_view_column_set_attributes (col, r, "text", 1, NULL); - - gtk_tree_view_column_set_sort_column_id (col, 1); - gtk_tree_view_append_column (GTK_TREE_VIEW (list), col); - - /* add second column */ - r = gtk_cell_renderer_text_new (); - col = gtk_tree_view_column_new_with_attributes (_("Name"), r, "text", 2, NULL); - gtk_tree_view_column_set_sort_column_id (col, 2); - gtk_tree_view_append_column (GTK_TREE_VIEW (list), col); - - /* enable searching on Name column */ - gtk_tree_view_set_search_column (GTK_TREE_VIEW (list), 2); - - /* setup the selection handler */ - sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (list)); - gtk_tree_selection_set_mode (sel, GTK_SELECTION_SINGLE); - g_signal_connect (G_OBJECT (sel), "changed", G_CALLBACK (palette_changed), NULL); - - gtk_widget_show_all (exp); - } + { + GtkWidget *exp, *sw, *list; + GtkCellRenderer *r; + GtkTreeViewColumn *col; + GtkTreeSelection *sel; + + /* create expander */ + exp = gtk_expander_new (_("Palette")); + gtk_expander_set_expanded (GTK_EXPANDER (exp), options.color_data.expand_palette); + gtk_container_set_border_width (GTK_CONTAINER (exp), 5); + gtk_box_pack_start (GTK_BOX (w), exp, TRUE, TRUE, 2); + + /* create color list */ + sw = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), GTK_SHADOW_ETCHED_IN); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_widget_set_size_request (sw, -1, 75); + gtk_container_add (GTK_CONTAINER (exp), sw); + + list = gtk_tree_view_new_with_model (model); + gtk_widget_set_name (list, "yad-color-palette"); + g_object_unref (model); + gtk_container_add (GTK_CONTAINER (sw), list); + + /* add first columns */ + col = gtk_tree_view_column_new (); + gtk_tree_view_column_set_title (col, _("Color")); + + /* pixbuf */ + r = gtk_cell_renderer_pixbuf_new (); + gtk_tree_view_column_pack_start (col, r, FALSE); + gtk_tree_view_column_set_attributes (col, r, "pixbuf", 0, NULL); + + /* color value */ + r = gtk_cell_renderer_text_new (); + gtk_tree_view_column_pack_start (col, r, TRUE); + gtk_tree_view_column_set_attributes (col, r, "text", 1, NULL); + + gtk_tree_view_column_set_sort_column_id (col, 1); + gtk_tree_view_append_column (GTK_TREE_VIEW (list), col); + + /* add second column */ + r = gtk_cell_renderer_text_new (); + col = gtk_tree_view_column_new_with_attributes (_("Name"), r, "text", 2, NULL); + gtk_tree_view_column_set_sort_column_id (col, 2); + gtk_tree_view_append_column (GTK_TREE_VIEW (list), col); + + /* enable searching on Name column */ + gtk_tree_view_set_search_column (GTK_TREE_VIEW (list), 2); +
View file
yad-0.16.3.tar.bz2/src/dnd.c -> yad-0.36.2.tar.xz/src/dnd.c
Changed
@@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with YAD. If not, see <http://www.gnu.org/licenses/>. * - * Copyright (C) 2008-2011, Victor Ananjevsky <ananasik@gmail.com> + * Copyright (C) 2008-2016, Victor Ananjevsky <ananasik@gmail.com> */ #include <glib/gprintf.h> @@ -22,8 +22,8 @@ #include "yad.h" static void -drop_data_cb (GtkWidget *w, GdkDragContext *dc, gint x, gint y, - GtkSelectionData *sel, guint info, guint t, gpointer data) +drop_data_cb (GtkWidget * w, GdkDragContext * dc, gint x, gint y, + GtkSelectionData * sel, guint info, guint t, gpointer data) { GdkAtom stgt; @@ -39,49 +39,53 @@ return; while (urisi) - { - gchar *dstr = g_uri_unescape_string (urisi, NULL); - if (options.common_data.command) - { - gchar *action = g_strdup_printf ("%s '%s'", options.common_data.command, dstr); - g_spawn_command_line_async (action, NULL); - g_free (action); - } - else - { - g_printf ("%s\n", dstr); - fflush (stdout); - } - g_free (dstr); - i++; - } + { + gchar *dstr = g_uri_unescape_string (urisi, NULL); + if (options.common_data.command) + { + gchar *action = g_strdup_printf ("%s '%s'", options.common_data.command, dstr); + g_spawn_command_line_async (action, NULL); + g_free (action); + } + else + { + g_printf ("%s\n", dstr); + fflush (stdout); + } + g_free (dstr); + i++; + } g_strfreev (uris); } else if (gtk_targets_include_text (&stgt, 1)) { guchar *str = gtk_selection_data_get_text (sel); if (str) - { - gchar *dstr = g_uri_unescape_string ((const gchar *) str, NULL); - if (options.common_data.command) - { - gchar *action = g_strdup_printf ("%s '%s'", options.common_data.command, dstr); - g_spawn_command_line_async (action, NULL); - g_free (action); - } - else - { - g_printf ("%s\n", dstr); - fflush (stdout); - } - g_free (dstr); - g_free(str); - } + { + gchar *dstr = g_uri_unescape_string ((const gchar *) str, NULL); + if (options.common_data.command) + { + gchar *action, *arg; + + arg = g_shell_quote (dstr); + action = g_strdup_printf ("%s %s", options.common_data.command, arg); + g_free (arg); + g_spawn_command_line_async (action, NULL); + g_free (action); + } + else + { + g_printf ("%s\n", dstr); + fflush (stdout); + } + g_free (dstr); + g_free (str); + } } } void -dnd_init (GtkWidget *w) +dnd_init (GtkWidget * w) { GtkTargetList *tlist; GtkTargetEntry *tgts; @@ -93,10 +97,8 @@ tgts = gtk_target_table_new_from_list (tlist, &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); + 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); gtk_target_table_free (tgts, ntgts); gtk_target_list_unref (tlist); @@ -108,8 +110,8 @@ box = gtk_dialog_get_content_area (GTK_DIALOG (w)); if (!options.data.no_markup) - gtk_widget_set_tooltip_markup (box, options.data.dialog_text); + gtk_widget_set_tooltip_markup (box, options.data.dialog_text); else - gtk_widget_set_tooltip_text (box, options.data.dialog_text); + gtk_widget_set_tooltip_text (box, options.data.dialog_text); } }
View file
yad-0.16.3.tar.bz2/src/entry.c -> yad-0.36.2.tar.xz/src/entry.c
Changed
@@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with YAD. If not, see <http://www.gnu.org/licenses/>. * - * Copyright (C) 2008-2011, Victor Ananjevsky <ananasik@gmail.com> + * Copyright (C) 2008-2016, Victor Ananjevsky <ananasik@gmail.com> */ #include <gdk/gdkkeysyms.h> @@ -25,29 +25,30 @@ static gboolean is_combo = FALSE; static void -entry_activate_cb (GtkEntry *entry, gpointer data) +entry_activate_cb (GtkEntry * entry, gpointer data) { - gtk_dialog_response (GTK_DIALOG (data), YAD_RESPONSE_OK); + if (options.plug == -1) + gtk_dialog_response (GTK_DIALOG (data), YAD_RESPONSE_OK); } static gboolean -combo_activate_cb (GtkWidget *w, GdkEventKey *ev, gpointer data) +combo_activate_cb (GtkWidget * w, GdkEventKey * ev, gpointer data) { -#if GTK_CHECK_VERSION(3,0,0) +#if GTK_CHECK_VERSION(2,24,0) if (ev->keyval == GDK_KEY_Return || ev->keyval == GDK_KEY_KP_Enter) #else if (ev->keyval == GDK_Return || ev->keyval == GDK_KP_Enter) -#endif +#endif { - gtk_dialog_response (GTK_DIALOG (data), YAD_RESPONSE_OK); + if (options.plug == -1) + gtk_dialog_response (GTK_DIALOG (data), YAD_RESPONSE_OK); return TRUE; } return FALSE; } static void -icon_cb (GtkEntry *entry, GtkEntryIconPosition pos, - GdkEventButton *event, gpointer data) +icon_cb (GtkEntry * entry, GtkEntryIconPosition pos, GdkEventButton * event, gpointer data) { if (event->button == 1) { @@ -112,9 +113,9 @@ } GtkWidget * -entry_create_widget (GtkWidget *dlg) +entry_create_widget (GtkWidget * dlg) { - GtkWidget *c, *w = NULL; + GtkWidget *c, *l = NULL, *w = NULL; #if !GTK_CHECK_VERSION(3,0,0) w = gtk_hbox_new (FALSE, 5); @@ -124,11 +125,11 @@ 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); + l = gtk_label_new (NULL); + if (options.data.no_markup) + gtk_label_set_text_with_mnemonic (GTK_LABEL (l), options.entry_data.entry_label); else - gtk_label_set_text (GTK_LABEL (l), options.entry_data.entry_label); + gtk_label_set_markup_with_mnemonic (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); } @@ -136,21 +137,32 @@ if (options.entry_data.numeric) { gdouble min, max, step, val; + guint prec; - min = 0.0; max = 65535.0; step = 1.0; + min = 0.0; + max = 65535.0; + step = 1.0; + prec = 0; + val = 0.0; - if (options.extra_data && *options.extra_data) + if (options.extra_data && options.extra_data0) { 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); + if (options.extra_data3) { - max = g_ascii_strtod (options.extra_data1, NULL); - if (options.extra_data2) - step = g_ascii_strtod (options.extra_data2, NULL); + prec = (guint) g_ascii_strtoull (options.extra_data3, NULL, 0); + if (prec > 20) + prec = 20; } } c = entry = gtk_spin_button_new_with_range (min, max, step); + gtk_entry_set_alignment (GTK_ENTRY (c), 1.0); + gtk_spin_button_set_digits (GTK_SPIN_BUTTON (c), prec); gtk_widget_set_name (entry, "yad-entry-spin"); if (options.entry_data.entry_text) @@ -160,7 +172,8 @@ if (min >= max) { g_printerr (_("Maximum value must be greater than minimum value.\n")); - min = 0.0; max = 65535.0; + min = 0.0; + max = 65535.0; } if (val < min) @@ -173,14 +186,13 @@ g_printerr (_("Initial value greater than maximum.\n")); val = max; } - - gtk_spin_button_set_value (GTK_SPIN_BUTTON (c), val); } + + gtk_spin_button_set_value (GTK_SPIN_BUTTON (c), val); } - else if (!options.entry_data.completion && - options.extra_data && *options.extra_data) + else if (!options.entry_data.completion && options.extra_data && *options.extra_data) { - gint i = 0; + gint active, i; if (options.common_data.editable || settings.combo_always_editable) { @@ -189,22 +201,22 @@ #else c = gtk_combo_box_entry_new_text (); #endif - gtk_widget_set_name (c, "yad-entry-edit-combo"); + gtk_widget_set_name (c, "yad-entry-edit-combo"); entry = gtk_bin_get_child (GTK_BIN (c)); - 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); - } - 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); - } + 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); + } + 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); + } } else { @@ -213,12 +225,17 @@ #else c = entry = gtk_combo_box_new_text (); #endif - gtk_widget_set_name (c, "yad-entry-combo"); + gtk_widget_set_name (c, "yad-entry-combo"); is_combo = TRUE; } + i = 0; + active = -1; while (options.extra_datai != NULL) { + if (options.entry_data.entry_text && + g_ascii_strcasecmp (options.extra_datai, options.entry_data.entry_text) == 0) + active = i; #if GTK_CHECK_VERSION(2,24,0) gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (c), options.extra_datai); #else
View file
yad-0.16.3.tar.bz2/src/file.c -> yad-0.36.2.tar.xz/src/file.c
Changed
@@ -14,55 +14,55 @@ * You should have received a copy of the GNU General Public License * along with YAD. If not, see <http://www.gnu.org/licenses/>. * - * Copyright (C) 2008-2011, Victor Ananjevsky <ananasik@gmail.com> + * Copyright (C) 2008-2016, Victor Ananjevsky <ananasik@gmail.com> */ +#include <glib/gprintf.h> + #include "yad.h" static GtkWidget *filechooser; static void -file_activated_cb (GtkFileChooser *chooser, gpointer *data) +file_activated_cb (GtkFileChooser * chooser, gpointer data) { - gtk_dialog_response (GTK_DIALOG (data), YAD_RESPONSE_OK); + if (options.plug == -1) + gtk_dialog_response (GTK_DIALOG (data), YAD_RESPONSE_OK); } -void -confirm_overwrite_cb (GtkDialog *dlg, gint id, gpointer data) +gboolean +file_confirm_overwrite (GtkDialog * dlg) { - if (id != YAD_RESPONSE_OK) - return; - - if (options.file_data.save && - options.file_data.confirm_overwrite && - !options.common_data.multi) + if (options.file_data.save && options.file_data.confirm_overwrite && !options.common_data.multi) { gchar *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (filechooser)); if (g_file_test (filename, G_FILE_TEST_EXISTS)) - { - GtkWidget *d; - gint r; - gchar *buf; - - buf = g_strcompress (options.file_data.confirm_text); - d = gtk_message_dialog_new (GTK_WINDOW (dlg), GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, - "%s", buf); - g_free (buf); - r = gtk_dialog_run (GTK_DIALOG (d)); - gtk_widget_destroy (d); - if (r != GTK_RESPONSE_YES) - g_signal_stop_emission_by_name (dlg, "response"); - } + { + GtkWidget *d; + gint r; + gchar *buf; + + buf = g_strcompress (options.file_data.confirm_text); + d = gtk_message_dialog_new (GTK_WINDOW (dlg), GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, "%s", buf); + g_free (buf); + r = gtk_dialog_run (GTK_DIALOG (d)); + gtk_widget_destroy (d); + if (r != GTK_RESPONSE_YES) + return FALSE; + } } + + return TRUE; } GtkWidget * -file_create_widget (GtkWidget *dlg) +file_create_widget (GtkWidget * dlg) { GtkWidget *w; gchar *dir, *basename; + GList *filt; GtkFileChooserAction action = GTK_FILE_CHOOSER_ACTION_OPEN; if (options.file_data.directory) @@ -92,70 +92,33 @@ { basename = g_path_get_basename (options.common_data.uri); if (options.file_data.save) - gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (w), - basename); + gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (w), basename); else - gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (w), - options.common_data.uri); + gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (w), options.common_data.uri); g_free (basename); } g_free (dir); } + else + gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (w), g_get_current_dir ()); if (options.common_data.multi) gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (w), TRUE); - if (options.file_data.filter) + /* add preview */ + if (options.common_data.preview) { - /* Filter format: Executables | *.exe *.bat *.com */ - gint filter_i; - - for (filter_i = 0; options.file_data.filterfilter_i; filter_i++) - { - GtkFileFilter *filter = gtk_file_filter_new (); - gchar *filter_str = options.file_data.filterfilter_i; - gchar **pattern, **patterns; - gchar *name = NULL; - gint i; - - /* Set name */ - for (i = 0; filter_stri != '\0'; i++) - { - if (filter_stri == '|') - break; - } - - if (filter_stri == '|') - name = g_strstrip (g_strndup (filter_str, i)); - - if (name) - { - gtk_file_filter_set_name (filter, name); - - /* Point i to the right position for split */ - for (++i; filter_stri == ' '; i++); - } - else - { - gtk_file_filter_set_name (filter, filter_str); - i = 0; - } - - /* Get patterns */ - patterns = g_strsplit_set (filter_str + i, " ", -1); - - for (pattern = patterns; *pattern; pattern++) - gtk_file_filter_add_pattern (filter, *pattern); - - g_free (name); - g_strfreev (patterns); - - gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (w), filter); - } + GtkWidget *p = gtk_image_new (); + gtk_file_chooser_set_preview_widget (GTK_FILE_CHOOSER (w), p); + g_signal_connect (w, "update-preview", G_CALLBACK (update_preview), p); } - g_signal_connect (w, "file-activated", - G_CALLBACK (file_activated_cb), dlg); + /* add filters */ + for (filt = options.common_data.filters; filt; filt = filt->next) + gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (w), GTK_FILE_FILTER (filt->data)); + + g_signal_connect (w, "map", G_CALLBACK (filechooser_mapped), NULL); + g_signal_connect (w, "file-activated", G_CALLBACK (file_activated_cb), dlg); return w; } @@ -168,13 +131,18 @@ selections = gtk_file_chooser_get_filenames (GTK_FILE_CHOOSER (filechooser)); for (iter = selections; iter != NULL; iter = iter->next) { - g_print ("%s", - g_filename_to_utf8 ((gchar *) iter->data, -1, NULL, NULL, - NULL)); + if (options.common_data.quoted_output) + { + gchar *buf = g_shell_quote (g_filename_to_utf8 ((gchar *) iter->data, -1, NULL, NULL, NULL)); + g_printf ("%s", buf); + g_free (buf); + } + else + g_printf ("%s", g_filename_to_utf8 ((gchar *) iter->data, -1, NULL, NULL, NULL)); g_free (iter->data); if (iter->next != NULL) - g_print ("%s", options.common_data.separator); + g_printf ("%s", options.common_data.separator); } - g_print ("\n"); + g_printf ("\n"); g_slist_free (selections); }
View file
yad-0.16.3.tar.bz2/src/font.c -> yad-0.36.2.tar.xz/src/font.c
Changed
@@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with YAD. If not, see <http://www.gnu.org/licenses/>. * - * Copyright (C) 2008-2011, Victor Ananjevsky <ananasik@gmail.com> + * Copyright (C) 2008-2016, Victor Ananjevsky <ananasik@gmail.com> */ #include <errno.h> @@ -26,13 +26,13 @@ static GtkWidget *font; static void -realize_cb (GtkWidget *w, gpointer d) +realize_cb (GtkWidget * w, gpointer d) { gtk_font_selection_set_font_name (GTK_FONT_SELECTION (w), options.common_data.font); } GtkWidget * -font_create_widget (GtkWidget *dlg) +font_create_widget (GtkWidget * dlg) { GtkWidget *w; @@ -52,5 +52,46 @@ void font_print_result (void) { - g_printf ("%s\n", gtk_font_selection_get_font_name (GTK_FONT_SELECTION (font))); + if (options.font_data.separate_output) + { + PangoFontFace *face; + PangoFontFamily *family; + gint size; + + face = gtk_font_selection_get_face (GTK_FONT_SELECTION (font)); + family = gtk_font_selection_get_family (GTK_FONT_SELECTION (font)); + size = gtk_font_selection_get_size (GTK_FONT_SELECTION (font)); + + if (options.common_data.quoted_output) + { + gchar *q1 = g_shell_quote (pango_font_family_get_name (family)); + gchar *q2 = g_shell_quote (pango_font_face_get_face_name (face)); + + g_printf ("%s%s%s%s%d\n", q1, options.common_data.separator, q2, + options.common_data.separator, size / 1000); + + g_free (q1); + g_free (q2); + } + else + { + g_printf ("%s%s%s%s%d\n", pango_font_family_get_name (family), options.common_data.separator, + pango_font_face_get_face_name (face), options.common_data.separator, size / 1000); + } + } + else + { + gchar *fn = gtk_font_selection_get_font_name (GTK_FONT_SELECTION (font)); + + if (options.common_data.quoted_output) + { + gchar *buf = g_shell_quote (fn); + g_printf ("%s\n", buf); + g_free (buf); + } + else + g_printf ("%s\n", fn); + + g_free (fn); + } }
View file
yad-0.16.3.tar.bz2/src/form.c -> yad-0.36.2.tar.xz/src/form.c
Changed
@@ -14,9 +14,11 @@ * You should have received a copy of the GNU General Public License * along with YAD. If not, see <http://www.gnu.org/licenses/>. * - * Copyright (C) 2008-2011, Victor Ananjevsky <ananasik@gmail.com> + * Copyright (C) 2008-2016, Victor Ananjevsky <ananasik@gmail.com> */ +#include <ctype.h> +#include <stdlib.h> #include <glib/gprintf.h> #include "yad.h" @@ -26,11 +28,9 @@ static GSList *fields = NULL; static guint n_fields; -static void button_clicked_cb (GtkButton *b, gchar *action); - /* expand %N in command to fields values */ static GString * -expand_action (gchar *cmd) +expand_action (gchar * cmd) { GString *xcmd; guint i = 0; @@ -39,86 +39,124 @@ while (cmdi) { if (cmdi == '%') - { - i++; - if (g_ascii_isdigit (cmdi)) - { - YadField *fld; - gchar *buf; - guint num, j = i; - - /* get field num */ - while (g_ascii_isdigit (cmdj)) - j++; - buf = g_strndup (cmd + i, j - i); - num = g_ascii_strtoll (buf, NULL, 10); - g_free (buf); - if (num > 0 && num <= n_fields) - num--; - else - continue; - /* get field value */ - fld = g_slist_nth_data (options.form_data.fields, num); - switch (fld->type) - { - case YAD_FIELD_SIMPLE: - case YAD_FIELD_HIDDEN: - case YAD_FIELD_READ_ONLY: - case YAD_FIELD_MFILE: - case YAD_FIELD_FILE_SAVE: - case YAD_FIELD_DIR_CREATE: - case YAD_FIELD_DATE: - g_string_append (xcmd, gtk_entry_get_text (GTK_ENTRY (g_slist_nth_data (fields, num)))); - break; - case YAD_FIELD_NUM: - g_string_append_printf (xcmd, "%f", gtk_spin_button_get_value - (GTK_SPIN_BUTTON (g_slist_nth_data (fields, num)))); - break; - case YAD_FIELD_CHECK: - g_string_append (xcmd, gtk_toggle_button_get_active - (GTK_TOGGLE_BUTTON (g_slist_nth_data (fields, num))) ? "TRUE" : "FALSE"); - break; - case YAD_FIELD_COMBO: - case YAD_FIELD_COMBO_ENTRY: - g_string_append (xcmd, + { + i++; + if (g_ascii_isdigit (cmdi)) + { + YadField *fld; + gchar *buf, *arg; + guint num, j = i; + + /* get field num */ + while (g_ascii_isdigit (cmdj)) + j++; + buf = g_strndup (cmd + i, j - i); + num = g_ascii_strtoll (buf, NULL, 10); + g_free (buf); + if (num > 0 && num <= n_fields) + num--; + else + continue; + + /* get field value */ + arg = NULL; + fld = g_slist_nth_data (options.form_data.fields, num); + switch (fld->type) + { + case YAD_FIELD_SIMPLE: + case YAD_FIELD_HIDDEN: + case YAD_FIELD_READ_ONLY: + case YAD_FIELD_COMPLETE: + case YAD_FIELD_FILE_SAVE: + case YAD_FIELD_DIR_CREATE: + case YAD_FIELD_MFILE: + case YAD_FIELD_MDIR: + case YAD_FIELD_DATE: + buf = escape_char ((gchar *) gtk_entry_get_text (GTK_ENTRY (g_slist_nth_data (fields, num))), '"'); + arg = g_shell_quote (buf ? buf : ""); + g_free (buf); + break; + case YAD_FIELD_NUM: + { + guint prec = gtk_spin_button_get_digits (GTK_SPIN_BUTTON (g_slist_nth_data (fields, num))); + arg = g_strdup_printf ("%.*f", prec, gtk_spin_button_get_value (GTK_SPIN_BUTTON (g_slist_nth_data (fields, num)))); + break; + } + case YAD_FIELD_CHECK: + arg = g_strdup (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (g_slist_nth_data (fields, num))) ? "TRUE" : "FALSE"); + break; + case YAD_FIELD_COMBO: + case YAD_FIELD_COMBO_ENTRY: #if GTK_CHECK_VERSION(2,24,0) - gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (g_slist_nth_data (fields, num))) + buf = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (g_slist_nth_data (fields, num))); #else - gtk_combo_box_get_active_text (GTK_COMBO_BOX (g_slist_nth_data (fields, num))) + buf = gtk_combo_box_get_active_text (GTK_COMBO_BOX (g_slist_nth_data (fields, num))); #endif - ); - break; - case YAD_FIELD_FILE: - case YAD_FIELD_DIR: - g_string_append (xcmd, gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (g_slist_nth_data (fields, num)))); - break; - case YAD_FIELD_FONT: - g_string_append (xcmd, gtk_font_button_get_font_name (GTK_FONT_BUTTON (g_slist_nth_data (fields, num)))); - break; - case YAD_FIELD_COLOR: - { - GdkColor c; - - gtk_color_button_get_color (GTK_COLOR_BUTTON (g_slist_nth_data (fields, num)), &c); - buf = gdk_color_to_string (&c); - g_string_append (xcmd, buf); - g_free (buf); - break; - } - } - i = j; - } - else - { - g_string_append_c (xcmd, cmdi); - i++; - } - } + arg = g_shell_quote (buf ? buf : ""); + g_free (buf); + break; + case YAD_FIELD_SCALE: + arg = g_strdup_printf ("%d", (gint) gtk_range_get_value (GTK_RANGE (g_slist_nth_data (fields, num)))); + break; + case YAD_FIELD_FILE: + case YAD_FIELD_DIR: + arg = g_shell_quote (gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (g_slist_nth_data (fields, num)))); + break; + case YAD_FIELD_FONT: + arg = g_shell_quote (gtk_font_button_get_font_name (GTK_FONT_BUTTON (g_slist_nth_data (fields, num)))); + break; + case YAD_FIELD_COLOR: + { + GdkColor c; + GtkColorButton *cb = GTK_COLOR_BUTTON (g_slist_nth_data (fields, num)); + + gtk_color_button_get_color (cb, &c); + buf = get_color (&c, gtk_color_button_get_alpha (cb)); + arg = g_shell_quote (buf ? buf : ""); + g_free (buf); + break; + } + case YAD_FIELD_TEXT: + { + GtkTextBuffer *tb; + GtkTextIter b, e; + gchar *txt; + + tb = gtk_text_view_get_buffer (GTK_TEXT_VIEW (g_slist_nth_data (fields, num))); + gtk_text_buffer_get_bounds (tb, &b, &e); + txt = gtk_text_buffer_get_text (tb, &b, &e, FALSE); + + /* escape special chars */ + buf = escape_str (txt); + g_free (txt); + + /* escape quotes */ + txt = escape_char (buf, '"'); + g_free (buf); + + arg = g_shell_quote (txt ? txt : ""); + g_free (txt); + }
View file
yad-0.36.2.tar.xz/src/html.c
Added
@@ -0,0 +1,314 @@ +/* + * This file is part of YAD. + * + * YAD is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * YAD is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with YAD. If not, see <http://www.gnu.org/licenses/>. + * + * Copyright (C) 2008-2016, Victor Ananjevsky <ananasik@gmail.com> + */ + +#include <limits.h> +#include <stdlib.h> + +#include <glib/gprintf.h> +#include <webkit/webkit.h> + +#include "yad.h" + +static WebKitWebView *view; + +static GString *inbuf; + +static gboolean is_link = FALSE; +static gboolean is_loaded = FALSE; + +#ifndef PATH_MAX +#define PATH_MAX 4096 +#endif + +static void +load_uri (const gchar * uri) +{ + gchar *addr = NULL; + + if (!uri || !uri0) + return; + + if (g_file_test (uri, G_FILE_TEST_EXISTS)) + { + if (g_path_is_absolute (uri)) + addr = g_filename_to_uri (uri, NULL, NULL); + else + { + gchar *afn = g_new0 (gchar, PATH_MAX); + realpath (uri, afn); + addr = g_filename_to_uri (afn, NULL, NULL); + g_free (afn); + } + } + else + { + if (g_uri_parse_scheme (uri) == NULL) + addr = g_strdup_printf ("http://%s", uri); + else + addr = g_strdup (uri); + } + + if (addr) + { + webkit_web_view_load_uri (view, addr); + g_free (addr); + } + else + g_printerr ("yad_html_load_uri: cannot load uri '%s'\n", uri); +} + +static void +loaded_cb (WebKitWebView * v, WebKitWebFrame * f, gpointer d) +{ + is_loaded = TRUE; +} + +static gboolean +link_cb (WebKitWebView * v, WebKitWebFrame * f, WebKitNetworkRequest * r, + WebKitWebNavigationAction * act, WebKitWebPolicyDecision * pd, gpointer d) +{ + gchar *uri = (gchar *) webkit_network_request_get_uri (r); + + if (is_loaded && !options.html_data.browser) + { + if (options.html_data.print_uri) + g_printf ("%s\n", uri); + else + { + gchar *cmd = g_strdup_printf (settings.open_cmd, uri); + g_spawn_command_line_async (cmd, NULL); + g_free (cmd); + } + webkit_web_policy_decision_ignore (pd); + } + else + webkit_web_policy_decision_use (pd); + + return TRUE; +} + +static void +link_hover_cb (WebKitWebView * v, const gchar * t, const gchar * link, gpointer * d) +{ + if (link) + is_link = TRUE; + else + is_link = FALSE; +} + +static void +select_file_cb (GtkEntry * entry, GtkEntryIconPosition pos, GdkEventButton * ev, gpointer d) +{ + GtkWidget *dlg; + static gchar *dir = NULL; + + if (ev->button != 1 || pos != GTK_ENTRY_ICON_SECONDARY) + return; + + dlg = gtk_file_chooser_dialog_new (_("YAD - Select File"), + GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (entry))), + GTK_FILE_CHOOSER_ACTION_OPEN, + GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL); + if (dir) + gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dlg), dir); + + if (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_ACCEPT) + { + gchar *uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dlg)); + gtk_entry_set_text (entry, uri); + g_free (uri); + + /* keep current dir */ + g_free (dir); + dir = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dlg)); + } + + gtk_widget_destroy (dlg); +} + +static void +do_open_cb (GtkWidget * w, GtkDialog * dlg) +{ + gtk_dialog_response (dlg, GTK_RESPONSE_ACCEPT); +} + +static void +open_cb (GtkWidget * w, gpointer d) +{ + GtkWidget *dlg, *cnt, *lbl, *entry; + + dlg = gtk_dialog_new_with_buttons (_("Open URI"), + GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (view))), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); + gtk_window_set_default_size (GTK_WINDOW (dlg), 350, -1); + + cnt = gtk_dialog_get_content_area (GTK_DIALOG (dlg)); + + lbl = gtk_label_new (_("Enter URI or file name:")); + gtk_misc_set_alignment (GTK_MISC (lbl), 0, 0); + gtk_widget_show (lbl); + gtk_box_pack_start (GTK_BOX (cnt), lbl, TRUE, FALSE, 2); + + entry = gtk_entry_new (); + gtk_entry_set_icon_from_stock (GTK_ENTRY (entry), GTK_ENTRY_ICON_SECONDARY, "gtk-directory"); + gtk_widget_show (entry); + gtk_box_pack_start (GTK_BOX (cnt), entry, TRUE, FALSE, 2); + + g_signal_connect (G_OBJECT (entry), "icon-press", G_CALLBACK (select_file_cb), NULL); + g_signal_connect (G_OBJECT (entry), "activate", G_CALLBACK (do_open_cb), dlg); + + if (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_ACCEPT) + load_uri (gtk_entry_get_text (GTK_ENTRY (entry))); + + gtk_widget_destroy (dlg); +} + +static gboolean +menu_cb (WebKitWebView * view, GtkWidget * menu, WebKitHitTestResult * hit, gboolean kb, gpointer d) +{ + GtkWidget *mi; + + if (!is_link) + { + /* add open item */ + mi = gtk_separator_menu_item_new (); + gtk_widget_show (mi); + gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), mi); + + mi = gtk_image_menu_item_new_from_stock ("gtk-open", NULL); + gtk_widget_show (mi); + gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), mi); + g_signal_connect (G_OBJECT (mi), "activate", G_CALLBACK (open_cb), NULL); +
View file
yad-0.16.3.tar.bz2/src/icons.c -> yad-0.36.2.tar.xz/src/icons.c
Changed
@@ -14,12 +14,13 @@ * You should have received a copy of the GNU General Public License * along with YAD. If not, see <http://www.gnu.org/licenses/>. * - * Copyright (C) 2008-2011, Victor Ananjevsky <ananasik@gmail.com> + * Copyright (C) 2008-2016, Victor Ananjevsky <ananasik@gmail.com> */ #include "yad.h" static GtkWidget *icon_view; +static GtkListStore *store; enum { COL_FILENAME = 0, @@ -31,6 +32,11 @@ NUM_COLS }; +enum { + TYPE_APP, + TYPE_LINK +}; + typedef struct { gchar *name; gchar *comment; @@ -40,45 +46,91 @@ } DEntry; static void -activate_cb (GtkWidget *view, GtkTreePath *path, gpointer data) +select_cb (GObject * obj, gpointer data) +{ + static gboolean first_time = TRUE; + + if (!options.icons_data.compact) + { + GList *sel = gtk_icon_view_get_selected_items (GTK_ICON_VIEW (icon_view)); + if (sel) + gtk_icon_view_item_activated (GTK_ICON_VIEW (icon_view), (GtkTreePath *) sel->data); + g_list_foreach (sel, (GFunc) gtk_tree_path_free, NULL); + g_list_free (sel); + } + else + { + GtkTreeIter iter; + GtkTreeSelection *sel = (GtkTreeSelection *) obj; + + if (first_time) + { + /* don't activate item when dialog is appear and clear the selection */ + first_time = FALSE; + gtk_tree_selection_unselect_all (sel); + return; + } + + if (gtk_tree_selection_get_selected (sel, NULL, &iter)) + { + GtkTreeModel *model; + GtkTreePath *path; + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (icon_view)); + path = gtk_tree_model_get_path (model, &iter); + + gtk_tree_view_row_activated (GTK_TREE_VIEW (icon_view), path, (GtkTreeViewColumn *) data); + } + } +} + +static void +activate_cb (GtkWidget * view, GtkTreePath * path, gpointer data) { GtkTreeIter iter; GtkTreeModel *model; gchar *cmd; gboolean in_term; + if (!path) + return; + if (!options.icons_data.compact) model = gtk_icon_view_get_model (GTK_ICON_VIEW (view)); else model = gtk_tree_view_get_model (GTK_TREE_VIEW (view)); gtk_tree_model_get_iter (model, &iter, path); - gtk_tree_model_get (model, &iter, - COL_COMMAND, &cmd, - COL_TERM, &in_term, - -1); + gtk_tree_model_get (model, &iter, COL_COMMAND, &cmd, COL_TERM, &in_term, -1); - if (in_term) + if (cmd && cmd0) { - gchar *tcmd; + if (in_term) + { + gchar *tcmd; - tcmd = g_strdup_printf (options.icons_data.term, cmd); - g_spawn_command_line_async (tcmd, NULL); - g_free (tcmd); + tcmd = g_strdup_printf (options.icons_data.term, cmd); + g_spawn_command_line_async (tcmd, NULL); + g_free (tcmd); + } + else + g_spawn_command_line_async (cmd, NULL); } - else - g_spawn_command_line_async (cmd, NULL); } static gboolean -handle_stdin (GIOChannel * channel, - GIOCondition condition, gpointer data) +handle_stdin (GIOChannel * channel, GIOCondition condition, gpointer data) { static GtkTreeIter iter; static gint column_count = 1; static gint row_count = 0; static gboolean first_time = TRUE; - GtkTreeModel *model = gtk_icon_view_get_model (GTK_ICON_VIEW (icon_view)); + GtkTreeModel *model; + + if (!options.icons_data.compact) + model = gtk_icon_view_get_model (GTK_ICON_VIEW (icon_view)); + else + model = gtk_tree_view_get_model (GTK_TREE_VIEW (icon_view)); if (first_time) { @@ -92,23 +144,22 @@ GError *err = NULL; GString *string = g_string_new (NULL); - while (channel->is_readable != TRUE) ; + while (channel->is_readable != TRUE); do { - GdkPixbuf *pb; + GdkPixbuf *pb; gint status; do { - status = - g_io_channel_read_line_string (channel, string, NULL, &err); + status = g_io_channel_read_line_string (channel, string, NULL, &err); while (gtk_events_pending ()) gtk_main_iteration (); } while (status == G_IO_STATUS_AGAIN); - strip_new_line (string->str); + strip_new_line (string->str); if (status != G_IO_STATUS_NORMAL) { @@ -118,7 +169,9 @@ g_error_free (err); err = NULL; } - continue; + /* stop handling */ + g_io_channel_shutdown (channel, TRUE, NULL); + return FALSE; } if (column_count == NUM_COLS) @@ -127,45 +180,43 @@ column_count = 1; row_count++; gtk_list_store_append (GTK_LIST_STORE (model), &iter); - gtk_list_store_set (GTK_LIST_STORE (model), &iter, COL_FILENAME, "", -1); + gtk_list_store_set (GTK_LIST_STORE (model), &iter, COL_FILENAME, "", -1); } - switch (column_count) - { - case COL_NAME: - case COL_COMMAND: - gtk_list_store_set (GTK_LIST_STORE (model), &iter, column_count, string->str, -1); - break; - case COL_TOOLTIP: - { - gchar *val; - - val = escape_markup (string->str); - gtk_list_store_set (GTK_LIST_STORE (model), &iter, column_count, val, -1); - g_free (val); - break; - } - case COL_PIXBUF: - if (options.icons_data.compact) - if (*string->str) - pb = get_pixbuf (string->str, YAD_SMALL_ICON);
View file
yad-0.16.3.tar.bz2/src/list.c -> yad-0.36.2.tar.xz/src/list.c
Changed
@@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with YAD. If not, see <http://www.gnu.org/licenses/>. * - * Copyright (C) 2008-2011, Victor Ananjevsky <ananasik@gmail.com> + * Copyright (C) 2008-2016, Victor Ananjevsky <ananasik@gmail.com> */ #include <string.h> @@ -32,31 +32,37 @@ static gboolean list_activate_cb (GtkWidget *widget, GdkEventKey *event, gpointer data) { -#if GTK_CHECK_VERSION(3,0,0) +#if GTK_CHECK_VERSION(2,24,0) if (event->keyval == GDK_KEY_Return || event->keyval == GDK_KEY_KP_Enter) #else if (event->keyval == GDK_Return || event->keyval == GDK_KP_Enter) #endif { if (options.list_data.dclick_action) - { - /* FIXME: check this under gtk-3.0 */ - if (event->state & GDK_CONTROL_MASK) - gtk_dialog_response (GTK_DIALOG (data), YAD_RESPONSE_OK); - else - return FALSE; - } + { + /* FIXME: check this under gtk-3.0 */ + if (event->state & GDK_CONTROL_MASK) + { + if (options.plug == -1) + gtk_dialog_response (GTK_DIALOG (data), YAD_RESPONSE_OK); + } + else + return FALSE; + } else - gtk_dialog_response (GTK_DIALOG (data), YAD_RESPONSE_OK); + { + if (options.plug == -1) + gtk_dialog_response (GTK_DIALOG (data), YAD_RESPONSE_OK); + } return TRUE; } + return FALSE; } static void -toggled_cb (GtkCellRendererToggle *cell, - gchar *path_str, gpointer data) +toggled_cb (GtkCellRendererToggle *cell, gchar *path_str, gpointer data) { gint column; gboolean fixed; @@ -75,10 +81,34 @@ gtk_tree_path_free (path); } +static gboolean +runtoggle (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data) +{ + gint col = GPOINTER_TO_INT (data); + gtk_list_store_set (GTK_LIST_STORE (model), iter, col, FALSE, -1); + return FALSE; +} + +static void +rtoggled_cb (GtkCellRendererToggle *cell, gchar *path_str, gpointer data) +{ + gint column; + GtkTreeIter iter; + GtkTreePath *path = gtk_tree_path_new_from_string (path_str); + GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (list_view)); + + column = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (cell), "column")); + + gtk_tree_model_foreach (model, runtoggle, GINT_TO_POINTER (column)); + + gtk_tree_model_get_iter (model, &iter, path); + gtk_list_store_set (GTK_LIST_STORE (model), &iter, column, TRUE, -1); + + gtk_tree_path_free (path); +} + static void -cell_edited_cb (GtkCellRendererText * cell, - const gchar * path_string, - const gchar * new_text, gpointer data) +cell_edited_cb (GtkCellRendererText *cell, const gchar *path_string, const gchar *new_text, gpointer data) { gint column; GtkTreeIter iter; @@ -100,83 +130,8 @@ gtk_tree_path_free (path); } -static void -tooltip_cb (GtkWidget * w, gint x, gint y, - gboolean kmode, GtkTooltip * tip, - gpointer data) -{ - 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)) - { - GtkTreeViewColumn *col = NULL; - GList *cols, *node; - guint colx = 0; - - /* find current column */ - cols = gtk_tree_view_get_columns (GTK_TREE_VIEW (list_view)); - for (node = cols; node != NULL && col == NULL; node = node->next) - { - 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) - { - YadColumn *yc; - gchar *text = NULL; - - yc = (YadColumn *) g_slist_nth_data (options.list_data.columns, cnum); - switch (yc->type) - { - case YAD_COLUMN_NUM: - { - gint64 nval; - gtk_tree_model_get (model, &iter, cnum, &nval, -1); - text = g_strdup_printf ("%ld", nval); - break; - } - case YAD_COLUMN_FLOAT: - { - gdouble nval; - gtk_tree_model_get (model, &iter, cnum, &nval, -1); - text = g_strdup_printf ("%lf", nval); - break; - } - case YAD_COLUMN_TOOLTIP: - case YAD_COLUMN_TEXT: - { - gchar *cval; - gtk_tree_model_get (model, &iter, cnum, &cval, -1); - text = g_strdup_printf ("%s", cval); - break; - } - } - - if (text) - { - gtk_tooltip_set_text (tip, text); - g_free (text); - } - } - } -} - static gboolean -regex_search (GtkTreeModel *model, gint col, const gchar *key, - GtkTreeIter *iter, gpointer data) +regex_search (GtkTreeModel *model, gint col, const gchar *key, GtkTreeIter *iter, gpointer data) { static GRegex *pattern = NULL; static guint pos = 0; @@ -185,9 +140,8 @@ if (keypos) { if (pattern) - g_regex_unref (pattern); - pattern = g_regex_new (key, G_REGEX_CASELESS | G_REGEX_EXTENDED | G_REGEX_OPTIMIZE, - G_REGEX_MATCH_NOTEMPTY, NULL); + g_regex_unref (pattern); + pattern = g_regex_new (key, G_REGEX_CASELESS | G_REGEX_EXTENDED | G_REGEX_OPTIMIZE, G_REGEX_MATCH_NOTEMPTY, NULL); pos = strlen (key); } @@ -215,13 +169,18 @@ GType *ctypes; gint i; - ctypes = g_new0 (GType, n_columns + 1); + ctypes = g_new0 (GType, n_columns);
View file
yad-0.16.3.tar.bz2/src/main.c -> yad-0.36.2.tar.xz/src/main.c
Changed
@@ -14,15 +14,20 @@ * You should have received a copy of the GNU General Public License * along with YAD. If not, see <http://www.gnu.org/licenses/>. * - * Copyright (C) 2008-2011, Victor Ananjevsky <ananasik@gmail.com> + * Copyright (C) 2008-2016, Victor Ananjevsky <ananasik@gmail.com> */ +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> #include <locale.h> #include <stdlib.h> #include <signal.h> #include <stdio.h> +#include <unistd.h> #ifndef G_OS_WIN32 +# include <sys/shm.h> # include <gdk/gdkx.h> #endif @@ -31,104 +36,311 @@ YadOptions options; GtkWidget *dialog = NULL; +YadNTabs *tabs; +gint t_sem; + +void print_result (void); + #ifndef G_OS_WIN32 static void sa_usr1 (gint sig) { + if (options.plug != -1) + print_result (); + else gtk_dialog_response (GTK_DIALOG (dialog), YAD_RESPONSE_OK); } static void sa_usr2 (gint sig) { - gtk_dialog_response (GTK_DIALOG (dialog), YAD_RESPONSE_CANCEL); + if (options.plug != -1) + gtk_main_quit (); + else + gtk_dialog_response (GTK_DIALOG (dialog), YAD_RESPONSE_CANCEL); } #endif +static void +btn_cb (GtkWidget *b, gchar *cmd) +{ + if (cmd) + g_spawn_command_line_async (cmd, NULL); + else + { + gint resp = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (b), "resp")); + gtk_dialog_response (GTK_DIALOG (dialog), resp); + } +} + static gboolean timeout_cb (gpointer data) { + static guint count = 1; GtkWidget *w = (GtkWidget *) data; - gtk_dialog_response (GTK_DIALOG (w), YAD_RESPONSE_TIMEOUT); + if (options.data.timeout < count) + { + gtk_dialog_response (GTK_DIALOG (dialog), YAD_RESPONSE_TIMEOUT); + return FALSE; + } - return FALSE; + if (w) + { + gdouble percent = ((gdouble) options.data.timeout - count) / (gdouble) options.data.timeout; + gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (w), percent); + if (settings.show_remain) + { + gchar *lbl = g_strdup_printf (_("%d sec"), options.data.timeout - count); + gtk_progress_bar_set_text (GTK_PROGRESS_BAR (w), lbl); + g_free (lbl); + } + } + + count++; + + return TRUE; } +#if !GTK_CHECK_VERSION(3,0,0) static void -btn_cb (GtkButton *b, gchar *c) +text_size_allocate_cb (GtkWidget * w, GtkAllocation * al, gpointer data) { - gchar *cmd; - gint pid; + PangoLayout *pl = gtk_label_get_layout (GTK_LABEL (w)); -#if !defined(_WIN32) - pid = getpid (); + if (pango_layout_is_wrapped (pl)) + gtk_widget_set_size_request (w, al->width, -1); +} #endif - - cmd = g_strdup_printf (c, pid); - g_spawn_command_line_async (cmd, NULL); - g_free (cmd); + +static void +dlg_response_cb (GtkDialog *dlg, gint id, gint *data) +{ + if (options.mode == YAD_MODE_FILE) + { + /* show custom confirmation dialog */ + if (!file_confirm_overwrite (dlg)) + { + g_signal_stop_emission_by_name (dlg, "response"); + return; + } + } + + *data = id; + gtk_main_quit (); } -static gboolean -timeout_indicator_cb (gpointer data) +static GtkWidget * +create_layout (GtkWidget *dlg) { - static guint count = 1; - gdouble percent; - GtkWidget *w = (GtkWidget *) data; + GtkWidget *image, *text, *mw, *imw, *layout, *exp, *box; - if (!w) - return FALSE; + layout = image = text = mw = exp = NULL; - percent = - ((gdouble) options.data.timeout - count) / (gdouble) options.data.timeout; - gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (w), percent); - if (settings.show_remain) + /* create image */ + if (options.data.dialog_image) { - gchar *lbl = - g_strdup_printf (_("%d sec"), options.data.timeout - count); - gtk_progress_bar_set_text (GTK_PROGRESS_BAR (w), lbl); - g_free (lbl); + GdkPixbuf *pb = NULL; + + pb = get_pixbuf (options.data.dialog_image, YAD_BIG_ICON); + image = gtk_image_new_from_pixbuf (pb); + if (pb) + g_object_unref (pb); + + gtk_widget_set_name (image, "yad-dialog-image"); + gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0); } - count++; - return TRUE; -} + /* create text label */ + if (options.data.dialog_text) + { + /* for dnd's tooltip we don't need text label */ + if (options.mode != YAD_MODE_DND || !options.dnd_data.tooltip) + { + 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); + else + gtk_label_set_text (GTK_LABEL (text), buf); + g_free (buf); + + gtk_widget_set_name (text, "yad-dialog-label"); + gtk_label_set_line_wrap (GTK_LABEL (text), TRUE); + gtk_label_set_selectable (GTK_LABEL (text), options.data.selectable_labels); + gtk_label_set_justify (GTK_LABEL (text), options.data.text_align); + switch (options.data.text_align) + { + case GTK_JUSTIFY_LEFT: + case GTK_JUSTIFY_FILL: + gtk_misc_set_alignment (GTK_MISC (text), 0.0, 0.5); + break; + case GTK_JUSTIFY_CENTER: + gtk_misc_set_alignment (GTK_MISC (text), 0.5, 0.5); + break; + case GTK_JUSTIFY_RIGHT:
View file
yad-0.16.3.tar.bz2/src/multi-progress.c -> yad-0.36.2.tar.xz/src/multi-progress.c
Changed
@@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with YAD. If not, see <http://www.gnu.org/licenses/>. * - * Copyright (C) 2008-2011, Victor Ananjevsky <ananasik@gmail.com> + * Copyright (C) 2008-2016, Victor Ananjevsky <ananasik@gmail.com> */ #include <stdio.h> @@ -42,18 +42,17 @@ string = g_string_new (NULL); - while (channel->is_readable != TRUE) ; + while (channel->is_readable != TRUE); do { gint status, num; - GtkProgressBar *pb; - YadProgressBar *b; + GtkProgressBar *pb; + YadProgressBar *b; do { - status = - g_io_channel_read_line_string (channel, string, NULL, &err); + status = g_io_channel_read_line_string (channel, string, NULL, &err); while (gtk_events_pending ()) gtk_main_iteration (); @@ -69,43 +68,87 @@ g_error_free (err); err = NULL; } - continue; + /* stop handling */ + g_io_channel_shutdown (channel, TRUE, NULL); + return FALSE; } - value = g_strsplit(string->str, ":", 2); - num = atoi (value0) - 1; - if (num < 0 || num > nbars) - continue; - - pb = GTK_PROGRESS_BAR (g_slist_nth_data (progress_bars, num)); - b = (YadProgressBar *) g_slist_nth_data (options.multi_progress_data.bars, num); - - if (b->type == YAD_PROGRESS_PULSE) - gtk_progress_bar_pulse (pb); - else - { - if (value1 && value10 == '#') - { - 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 (pb, match); - g_free (match); - } - else - { - if (!value1 || !g_ascii_isdigit (*value1)) - continue; - - /* Now try to convert the thing to a number */ - percentage = atoi (value1); - if (percentage >= 100) - gtk_progress_bar_set_fraction (pb, 1.0); - else - gtk_progress_bar_set_fraction (pb, percentage / 100.0); - } - } + value = g_strsplit (string->str, ":", 2); + num = atoi (value0) - 1; + if (num < 0 || num > nbars - 1) + continue; + + pb = GTK_PROGRESS_BAR (g_slist_nth_data (progress_bars, num)); + b = (YadProgressBar *) g_slist_nth_data (options.multi_progress_data.bars, num); + + if (value1 && value10 == '#') + { + gchar *match, *p; + + /* We have a comment, so let's try to change the label */ + match = g_strcompress (value1 + 1); + p = g_strrstr (match, "\n"); + if (p) + *p = '\0'; + gtk_progress_bar_set_text (pb, match); + g_free (match); + } + else + { + if (value1 && b->type == YAD_PROGRESS_PULSE) + gtk_progress_bar_pulse (pb); + else + { + if (!value1 || !g_ascii_isdigit (*value1)) + continue; + + /* Now try to convert the thing to a number */ + percentage = atoi (value1); + if (percentage >= 100) + gtk_progress_bar_set_fraction (pb, 1.0); + else + gtk_progress_bar_set_fraction (pb, percentage / 100.0); + + /* Check if all of progress bars reaches 100% */ + if (options.progress_data.autoclose && options.plug == -1) + { + guint i; + gboolean close = TRUE; + gboolean need_close = FALSE; + + if (options.multi_progress_data.watch_bar > 0 && options.multi_progress_data.watch_bar <= nbars) + { + GtkProgressBar *cpb = GTK_PROGRESS_BAR (g_slist_nth_data (progress_bars, + options.multi_progress_data.watch_bar - 1)); + + need_close = TRUE; + if (gtk_progress_bar_get_fraction (cpb) != 1.0) + close = FALSE; + } + else + { + for (i = 0; i < nbars; i++) + { + GtkProgressBar *cpb = GTK_PROGRESS_BAR (g_slist_nth_data (progress_bars, i)); + YadProgressBar *cb = (YadProgressBar *) g_slist_nth_data (options.multi_progress_data.bars, i); + + if (cb->type != YAD_PROGRESS_PULSE) + { + need_close = TRUE; + if (gtk_progress_bar_get_fraction (cpb) != 1.0) + { + close = FALSE; + break; + } + } + } + } + + if (need_close && close) + gtk_dialog_response (GTK_DIALOG (data), YAD_RESPONSE_OK); + } + } + } } while (g_io_channel_get_buffer_condition (channel) == G_IO_IN); g_string_free (string, TRUE); @@ -130,10 +173,17 @@ nbars = g_slist_length (options.multi_progress_data.bars); if (nbars < 1) return NULL; + +#if !GTK_CHECK_VERSION(3,0,0) if (options.common_data.vertical) table = gtk_table_new (2, nbars, FALSE); else table = gtk_table_new (nbars, 2, FALSE); +#else + table = gtk_grid_new (); + gtk_grid_set_row_spacing (GTK_GRID (table), 2); + gtk_grid_set_column_spacing (GTK_GRID (table), 2); +#endif for (b = options.multi_progress_data.bars; b; b = b->next) { @@ -141,11 +191,24 @@ YadProgressBar *p = (YadProgressBar *) b->data; /* add label */ - l = gtk_label_new (p->name); + l = gtk_label_new (NULL); + if (options.data.no_markup) + gtk_label_set_text (GTK_LABEL (l), p->name); + else + gtk_label_set_markup (GTK_LABEL (l), p->name); + gtk_misc_set_alignment (GTK_MISC (l), options.common_data.align, 0.5); if (options.common_data.vertical) - gtk_table_attach (GTK_TABLE (table), l, i, i + 1, 1, 2, GTK_FILL, 0, 2, 2); +#if !GTK_CHECK_VERSION(3,0,0) + gtk_table_attach (GTK_TABLE (table), l, i, i + 1, 1, 2, GTK_FILL, 0, 2, 2); +#else + gtk_grid_attach (GTK_GRID (table), l, i, 1, 1, 1); +#endif else - gtk_table_attach (GTK_TABLE (table), l, 0, 1, i, i + 1, GTK_FILL, 0, 2, 2); +#if !GTK_CHECK_VERSION(3,0,0) + gtk_table_attach (GTK_TABLE (table), l, 0, 1, i, i + 1, GTK_FILL, 0, 2, 2); +#else + gtk_grid_attach (GTK_GRID (table), l, 0, i, 1, 1); +#endif /* add progress bar */
View file
yad-0.36.2.tar.xz/src/notebook.c
Added
@@ -0,0 +1,141 @@ +/* + * This file is part of YAD. + * + * YAD is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * YAD is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with YAD. If not, see <http://www.gnu.org/licenses/>. + * + * Copyright (C) 2008-2016, Victor Ananjevsky <ananasik@gmail.com> + */ + +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> +#include <stdlib.h> +#include <unistd.h> + +#include <sys/ipc.h> +#include <sys/shm.h> + +#include <X11/Xlib.h> +#include <X11/Xatom.h> +#include <X11/Xutil.h> +#include <gdk/gdk.h> + +#include "yad.h" + +static GtkWidget *notebook; + +GtkWidget * +notebook_create_widget (GtkWidget * dlg) +{ + GtkWidget *w; + GSList *tab; + + /* get shared memory */ + tabs = get_tabs (options.common_data.key, TRUE); + if (!tabs) + exit (-1); + + /* create widget */ + w = notebook = gtk_notebook_new (); + gtk_notebook_set_tab_pos (GTK_NOTEBOOK (w), options.notebook_data.pos); + gtk_container_set_border_width (GTK_CONTAINER (w), 5); + + /* add tabs */ + for (tab = options.notebook_data.tabs; tab; tab = tab->next) + { + GtkWidget *a, *s; + + a = gtk_alignment_new (0.5, 0.5, 1, 1); + gtk_alignment_set_padding (GTK_ALIGNMENT (a), + options.notebook_data.borders, options.notebook_data.borders, + options.notebook_data.borders, options.notebook_data.borders); + + s = gtk_socket_new (); + gtk_container_add (GTK_CONTAINER (a), s); + g_object_set_data (G_OBJECT (a), "socket", s); + + gtk_notebook_append_page (GTK_NOTEBOOK (w), a, get_label ((gchar *) tab->data, 0)); + } + + return w; +} + +void +notebook_swallow_childs (void) +{ + guint i, n_tabs; + + n_tabs = g_slist_length (options.notebook_data.tabs); + + /* wait until all children are register */ + while (tabs0.xid != n_tabs) + usleep (1000); + + for (i = 1; i <= n_tabs; i++) + { + GtkWidget *s = + GTK_WIDGET (g_object_get_data + (G_OBJECT (gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), i - 1)), "socket")); + + if (tabsi.pid != -1) + gtk_socket_add_id (GTK_SOCKET (s), tabsi.xid); + } +} + +void +notebook_print_result (void) +{ + guint i, n_tabs; + + n_tabs = g_slist_length (options.notebook_data.tabs); + for (i = 1; i <= n_tabs; i++) + { + if (tabsi.pid != -1) + kill (tabsi.pid, SIGUSR1); + } +} + +void +notebook_close_childs (void) +{ + guint i, n_tabs; + struct shmid_ds buf; + gboolean is_running = TRUE; + + n_tabs = g_slist_length (options.notebook_data.tabs); + for (i = 1; i <= n_tabs; i++) + { + if (tabsi.pid != -1) + kill (tabsi.pid, SIGUSR2); + } + + /* wait for stop subprocesses */ + while (is_running) + { + is_running = FALSE; + for (i = 1; i <= n_tabs; i++) + { + if (tabsi.pid != -1 && kill (tabsi.pid, 0) == 0) + { + is_running = TRUE; + break; + } + } + usleep (1000); + } + + /* cleanup shared memory */ + shmctl (tabs0.pid, IPC_RMID, &buf); + shmdt (tabs); +}
View file
yad-0.16.3.tar.bz2/src/notification.c -> yad-0.36.2.tar.xz/src/notification.c
Changed
@@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with YAD. If not, see <http://www.gnu.org/licenses/>. * - * Copyright (C) 2008-2011, Victor Ananjevsky <ananasik@gmail.com> + * Copyright (C) 2008-2016, Victor Ananjevsky <ananasik@gmail.com> */ #include <sys/stat.h> @@ -37,7 +37,7 @@ static gchar *icon = NULL; static gchar *action = NULL; -static GSList *menu_data; +static GSList *menu_data = NULL; static gint exit_code; static gint icon_size = 16; @@ -46,7 +46,7 @@ free_menu_data (gpointer data, gpointer udata) { MenuData *m = (MenuData *) data; - + g_free (m->name); g_free (m->action); g_free (m->icon); @@ -54,6 +54,44 @@ } static void +parse_menu_str (gchar * str) +{ + gchar **menu_vals; + gint i = 0; + + if (menu_data) + { + g_slist_foreach (menu_data, free_menu_data, NULL); + g_slist_free (menu_data); + menu_data = NULL; + } + + menu_vals = g_strsplit (str, options.common_data.separator, -1); + + while (menu_valsi != NULL) + { + MenuData *mdata = g_new0 (MenuData, 1); + gchar **s = g_strsplit (menu_valsi, options.common_data.item_separator, 3); + + if (s0) + { + mdata->name = g_strdup (s0); + if (s1) + { + mdata->action = g_strdup (s1); + if (s2) + mdata->icon = g_strdup (s2); + } + } + menu_data = g_slist_append (menu_data, mdata); + g_strfreev (s); + i++; + } + + g_strfreev (menu_vals); +} + +static void timeout_cb (gpointer data) { exit_code = YAD_RESPONSE_TIMEOUT; @@ -74,22 +112,19 @@ if (g_file_test (icon, G_FILE_TEST_EXISTS)) { - pixbuf = - gdk_pixbuf_new_from_file_at_scale (icon, icon_size, icon_size, - TRUE, &err); + pixbuf = gdk_pixbuf_new_from_file_at_scale (icon, icon_size, icon_size, TRUE, &err); if (err) { - g_printerr (_("Could not load notification icon '%s': %s\n"), - icon, err->message); + g_printerr (_("Could not load notification icon '%s': %s\n"), icon, err->message); g_clear_error (&err); } if (pixbuf) - { - gtk_status_icon_set_from_pixbuf (status_icon, pixbuf); - g_object_unref (pixbuf); - } + { + gtk_status_icon_set_from_pixbuf (status_icon, pixbuf); + g_object_unref (pixbuf); + } else - gtk_status_icon_set_from_icon_name (status_icon, "yad"); + gtk_status_icon_set_from_icon_name (status_icon, "yad"); } else gtk_status_icon_set_from_icon_name (status_icon, icon); @@ -106,8 +141,7 @@ static gboolean activate_cb (GtkWidget * widget, YadData * data) { - if ((action == NULL && !options.notification_data.listen) || - (action && g_ascii_strcasecmp (action, "quit") == 0)) + if ((action == NULL && !options.common_data.listen) || (action && g_ascii_strcasecmp (action, "quit") == 0)) { exit_code = YAD_RESPONSE_OK; gtk_main_quit (); @@ -119,8 +153,7 @@ } static gboolean -middle_quit_cb (GtkStatusIcon * icon, GdkEventButton * ev, - gpointer data) +middle_quit_cb (GtkStatusIcon * icon, GdkEventButton * ev, gpointer data) { if (ev->button == 2) { @@ -136,18 +169,20 @@ { gchar *cmd = (gchar *) data; - if (g_ascii_strcasecmp (cmd, "quit") == 0) + if (cmd) { - exit_code = YAD_RESPONSE_OK; - gtk_main_quit (); + if (g_ascii_strcasecmp (cmd, "quit") == 0) + { + exit_code = YAD_RESPONSE_OK; + gtk_main_quit (); + } + else + g_spawn_command_line_async (cmd, NULL); } - else - g_spawn_command_line_async (cmd, NULL); } static void -popup_menu_cb (GtkStatusIcon * icon, guint button, - guint activate_time, gpointer data) +popup_menu_cb (GtkStatusIcon * icon, guint button, guint activate_time, gpointer data) { GtkWidget *menu; GtkWidget *item; @@ -169,31 +204,32 @@ item = gtk_image_menu_item_new_with_mnemonic (d->name); if (pb) { - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), - gtk_image_new_from_pixbuf (pb)); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), gtk_image_new_from_pixbuf (pb)); g_object_unref (pb); } } else - item = gtk_menu_item_new_with_mnemonic (d->name); + { + GtkStockItem it; + if (gtk_stock_lookup (d->name, &it)) + item = gtk_image_menu_item_new_from_stock (d->name, NULL); + else + item = gtk_menu_item_new_with_mnemonic (d->name); + } g_signal_connect (GTK_MENU_ITEM (item), "activate", - G_CALLBACK (popup_menu_item_activate_cb), - (gpointer) d->action); + G_CALLBACK (popup_menu_item_activate_cb), (gpointer) d->action); } else - item = gtk_separator_menu_item_new (); + item = gtk_separator_menu_item_new (); gtk_widget_show (item); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); } - gtk_menu_popup (GTK_MENU (menu), NULL, NULL, - gtk_status_icon_position_menu, - icon, button, activate_time); + gtk_menu_popup (GTK_MENU (menu), NULL, NULL, gtk_status_icon_position_menu, icon, button, activate_time); } static gboolean -handle_stdin (GIOChannel * channel, - GIOCondition condition, gpointer data) +handle_stdin (GIOChannel * channel, GIOCondition condition, gpointer data) { if ((condition & G_IO_IN) != 0) { @@ -201,23 +237,21 @@ GError *err = NULL; string = g_string_new (NULL); - while (channel->is_readable == FALSE) ; + while (channel->is_readable == FALSE);
View file
yad-0.16.3.tar.bz2/src/option.c -> yad-0.36.2.tar.xz/src/option.c
Changed
@@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with YAD. If not, see <http://www.gnu.org/licenses/>. * - * Copyright (C) 2008-2011, Victor Ananjevsky <ananasik@gmail.com> + * Copyright (C) 2008-2016, Victor Ananjevsky <ananasik@gmail.com> */ #include <stdlib.h> @@ -26,15 +26,28 @@ static gboolean add_column (const gchar *, const gchar *, gpointer, GError **); static gboolean add_field (const gchar *, const gchar *, gpointer, GError **); static gboolean add_bar (const gchar *, const gchar *, gpointer, GError **); +static gboolean add_tab (const gchar *, const gchar *, gpointer, GError **); static gboolean add_scale_mark (const gchar *, const gchar *, gpointer, GError **); static gboolean add_palette (const gchar *, const gchar *, gpointer, GError **); static gboolean add_confirm_overwrite (const gchar *, const gchar *, gpointer, GError **); +static gboolean add_file_filter (const gchar *, const gchar *, gpointer, GError **); +static gboolean set_color_mode (const gchar *, const gchar *, gpointer, GError **); +static gboolean set_buttons_layout (const gchar *, const gchar *, gpointer, GError **); static gboolean set_align (const gchar *, const gchar *, gpointer, GError **); static gboolean set_justify (const gchar *, const gchar *, gpointer, GError **); +static gboolean set_tab_pos (const gchar *, const gchar *, gpointer, GError **); static gboolean set_scale_value (const gchar *, const gchar *, gpointer, GError **); static gboolean set_ellipsize (const gchar *, const gchar *, gpointer, GError **); static gboolean set_expander (const gchar *, const gchar *, gpointer, GError **); +static gboolean set_orient (const gchar *, const gchar *, gpointer, GError **); static gboolean set_print_type (const gchar *, const gchar *, gpointer, GError **); +static gboolean set_progress_log (const gchar *, const gchar *, gpointer, GError **); +static gboolean set_size (const gchar *, const gchar *, gpointer, GError **); +#ifndef G_OS_WIN32 +static gboolean parse_signal (const gchar *, const gchar *, gpointer, GError **); +#endif +static gboolean add_image_path (const gchar *, const gchar *, gpointer, GError **); +static gboolean set_complete_type (const gchar *, const gchar *, gpointer, GError **); static gboolean about_mode = FALSE; static gboolean version_mode = FALSE; @@ -45,975 +58,541 @@ static gboolean file_mode = FALSE; static gboolean font_mode = FALSE; static gboolean form_mode = FALSE; +#ifdef HAVE_HTML +static gboolean html_mode = FALSE; +#endif static gboolean icons_mode = FALSE; static gboolean list_mode = FALSE; static gboolean multi_progress_mode = FALSE; +static gboolean notebook_mode = FALSE; static gboolean notification_mode = FALSE; +static gboolean paned_mode = FALSE; +static gboolean picture_mode = FALSE; static gboolean print_mode = FALSE; static gboolean progress_mode = FALSE; static gboolean scale_mode = FALSE; static gboolean text_mode = FALSE; static GOptionEntry general_options = { - { "title", 0, - 0, - G_OPTION_ARG_STRING, - &options.data.dialog_title, - N_("Set the dialog title"), - N_("TITLE") }, - { "window-icon", 0, - 0, - G_OPTION_ARG_FILENAME, - &options.data.window_icon, - N_("Set the window icon"), - N_("ICONPATH") }, - { "width", 0, - 0, - G_OPTION_ARG_INT, - &options.data.width, - N_("Set the width"), - N_("WIDTH") }, - { "height", 0, - 0, - G_OPTION_ARG_INT, - &options.data.height, - N_("Set the height"), - N_("HEIGHT") }, - { "geometry", 0, - 0, - G_OPTION_ARG_STRING, - &options.data.geometry, - N_("Set the window geometry"), - N_("WxH+X+Y") }, - { "timeout", 0, - 0, - G_OPTION_ARG_INT, - &options.data.timeout, - N_("Set dialog timeout in seconds"), - N_("TIMEOUT") }, - { "timeout-indicator", 0, - 0, - G_OPTION_ARG_STRING, - &options.data.to_indicator, - N_("Show remaining time indicator (top, bottom, left, right)"), - N_("POS") }, - { "text", 0, - G_OPTION_FLAG_NOALIAS, - G_OPTION_ARG_STRING, - &options.data.dialog_text, - N_("Set the dialog text"), - N_("TEXT") }, - { "text-align", 0, - G_OPTION_FLAG_NOALIAS, - G_OPTION_ARG_CALLBACK, - set_text_align, - N_("Set the dialog text alignment (left, center, right)"), - N_("TYPE") }, - { "image", 0, - G_OPTION_FLAG_NOALIAS, - G_OPTION_ARG_FILENAME, - &options.data.dialog_image, - N_("Set the dialog image"), - N_("IMAGE") }, - { "image-on-top", 0, - G_OPTION_FLAG_NOALIAS, - G_OPTION_ARG_NONE, - &options.data.image_on_top, - N_("Show image above main widget"), - NULL }, - { "icon-theme", 0, - G_OPTION_FLAG_NOALIAS, - G_OPTION_ARG_STRING, - &options.data.icon_theme, - N_("Use specified icon theme instead of default"), - N_("THEME") }, - { "expander", 0, - G_OPTION_FLAG_OPTIONAL_ARG, - G_OPTION_ARG_CALLBACK, - set_expander, - N_("Hide main widget with expander"), - N_("TEXT") }, - { "button", 0, - 0, - G_OPTION_ARG_CALLBACK, - add_button, - N_("Add dialog button (may be used multiple times)"), - N_("NAME:ID") }, - { "no-buttons", 0, - 0, - G_OPTION_ARG_NONE, - &options.data.no_buttons, - N_("Don't show buttons"), - NULL }, - { "no-markup", 0, - 0, - G_OPTION_ARG_NONE, - &options.data.no_markup, - N_("Don't use pango markup language in dialog's text"), - NULL }, -#if !GTK_CHECK_VERSION(2,22,0) - { "dialog-sep", 0, - 0, - G_OPTION_ARG_NONE, - &options.data.dialog_sep, - N_("Add separator between dialog and buttons"), - NULL }, -#endif - { "borders", 0, - 0, - G_OPTION_ARG_INT, - &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 }, + { "title", 0, 0, G_OPTION_ARG_STRING, &options.data.dialog_title, + N_("Set the dialog title"), N_("TITLE") }, + { "window-icon", 0, 0, G_OPTION_ARG_FILENAME, &options.data.window_icon, + N_("Set the window icon"), N_("ICONPATH") }, + { "width", 0, 0, G_OPTION_ARG_INT, &options.data.width, + N_("Set the width"), N_("WIDTH") }, + { "height", 0, 0, G_OPTION_ARG_INT, &options.data.height, + N_("Set the height"), N_("HEIGHT") }, + { "geometry", 0, 0, G_OPTION_ARG_STRING, &options.data.geometry, + N_("Set the window geometry"), N_("WxH+X+Y") }, + { "timeout", 0, 0, G_OPTION_ARG_INT, &options.data.timeout, + N_("Set dialog timeout in seconds"), N_("TIMEOUT") }, + { "timeout-indicator", 0, 0, G_OPTION_ARG_STRING, &options.data.to_indicator, + N_("Show remaining time indicator (top, bottom, left, right)"), N_("POS") }, + { "text", 0, G_OPTION_FLAG_NOALIAS, G_OPTION_ARG_STRING, &options.data.dialog_text, + N_("Set the dialog text"), N_("TEXT") }, + { "text-align", 0, G_OPTION_FLAG_NOALIAS, G_OPTION_ARG_CALLBACK, set_text_align, + N_("Set the dialog text alignment (left, center, right, fill)"), N_("TYPE") }, + { "image", 0, G_OPTION_FLAG_NOALIAS, G_OPTION_ARG_FILENAME, &options.data.dialog_image, + N_("Set the dialog image"), N_("IMAGE") },
View file
yad-0.36.2.tar.xz/src/paned.c
Added
@@ -0,0 +1,124 @@ +/* + * This file is part of YAD. + * + * YAD is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * YAD is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with YAD. If not, see <http://www.gnu.org/licenses/>. + * + * Copyright (C) 2008-2016, Victor Ananjevsky <ananasik@gmail.com> + */ + +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> +#include <stdlib.h> +#include <unistd.h> + +#include <sys/ipc.h> +#include <sys/shm.h> + +#include <X11/Xlib.h> +#include <X11/Xatom.h> +#include <X11/Xutil.h> +#include <gdk/gdk.h> + +#include "yad.h" + +static GtkWidget *paned; + +GtkWidget * +paned_create_widget (GtkWidget * dlg) +{ + GtkWidget *w, *s; + + /* get shared memory */ + tabs = get_tabs (options.common_data.key, TRUE); + if (!tabs) + exit (-1); + + /* create widget */ + if (options.paned_data.orient == GTK_ORIENTATION_HORIZONTAL) + paned = w = gtk_hpaned_new (); + else + paned = w = gtk_vpaned_new (); + + gtk_paned_set_position (GTK_PANED (w), options.paned_data.splitter); + + s = gtk_socket_new (); + gtk_paned_add1 (GTK_PANED (w), s); + g_object_set_data (G_OBJECT (w), "s1", s); + + s = gtk_socket_new (); + gtk_paned_add2 (GTK_PANED (w), s); + g_object_set_data (G_OBJECT (w), "s2", s); + + return w; +} + +void +paned_swallow_childs (void) +{ + GtkWidget *s1, *s2; + + s1 = GTK_WIDGET (g_object_get_data (G_OBJECT (paned), "s1")); + s2 = GTK_WIDGET (g_object_get_data (G_OBJECT (paned), "s2")); + + /* wait until all children are register */ + while (tabs0.xid != 2) + usleep (1000); + + if (tabs1.pid != -1) + gtk_socket_add_id (GTK_SOCKET (s1), tabs1.xid); + if (tabs2.pid != -1) + gtk_socket_add_id (GTK_SOCKET (s2), tabs2.xid); +} + +void +paned_print_result (void) +{ + if (tabs1.pid != -1) + kill (tabs1.pid, SIGUSR1); + if (tabs2.pid != -1) + kill (tabs2.pid, SIGUSR1); +} + +void +paned_close_childs (void) +{ + guint i; + struct shmid_ds buf; + gboolean is_running = TRUE; + + if (tabs1.pid != -1) + kill (tabs1.pid, SIGUSR2); + if (tabs2.pid != -1) + kill (tabs2.pid, SIGUSR2); + + /* wait for stop subprocesses */ + while (is_running) + { + is_running = FALSE; + for (i = 1; i <= 3; i++) + { + if (tabsi.pid != -1 && kill (tabsi.pid, 0) == 0) + { + is_running = TRUE; + break; + } + } + usleep (1000); + } + + /* cleanup shared memory */ + shmctl (tabs0.pid, IPC_RMID, &buf); + shmdt (tabs); +}
View file
yad-0.36.2.tar.xz/src/picture.c
Added
@@ -0,0 +1,287 @@ +/* + * This file is part of YAD. + * + * YAD is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * YAD is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with YAD. If not, see <http://www.gnu.org/licenses/>. + * + * Copyright (C) 2008-2016, Victor Ananjevsky <ananasik@gmail.com> + */ + +#include "yad.h" + +static GtkWidget *picture; +static GtkWidget *viewport; +static GtkWidget *popup_menu; + +static GdkPixbufAnimation *anim_pb; +static GdkPixbuf *orig_pb; + +static gboolean loaded = FALSE; +static gboolean animated = FALSE; + +enum { + SIZE_FIT, + SIZE_ORIG, + SIZE_INC, + SIZE_DEC +}; + +enum { + ROTATE_LEFT, + ROTATE_RIGHT, + ROTATE_FLIP_VERT, + ROTATE_FLIP_HOR +}; + +static void +load_picture (gchar *filename) +{ + anim_pb = gdk_pixbuf_animation_new_from_file (filename, NULL); + orig_pb = gdk_pixbuf_animation_get_static_image (anim_pb); + + if (orig_pb) + { + if (gdk_pixbuf_animation_is_static_image (anim_pb)) + gtk_image_set_from_pixbuf (GTK_IMAGE (picture), orig_pb); + else + { + gtk_image_set_from_animation (GTK_IMAGE (picture), anim_pb); + animated = TRUE; + } + loaded = TRUE; + } + else + gtk_image_set_from_stock (GTK_IMAGE (picture), "gtk-missing-image", GTK_ICON_SIZE_DIALOG); +} + +void +picture_fit_to_window () +{ + gdouble width, height, ww, wh; + gdouble factor; + + if (animated) + return; + + width = gdk_pixbuf_get_width (orig_pb); + height = gdk_pixbuf_get_height (orig_pb); + + ww = gdk_window_get_width (gtk_viewport_get_view_window (GTK_VIEWPORT (viewport))); + wh = gdk_window_get_height (gtk_viewport_get_view_window (GTK_VIEWPORT (viewport))); + + factor = MIN (ww / width, wh / height); + if (factor < 1.0) + { + GdkPixbuf *pb = gdk_pixbuf_scale_simple (g_object_ref (orig_pb), width * factor, height * factor, GDK_INTERP_HYPER); + if (pb) + gtk_image_set_from_pixbuf (GTK_IMAGE (picture), pb); + } +} + +static void +change_size_cb (GtkWidget *w, gint type) +{ + gdouble width, height; + GdkPixbuf *new_pb, *pb = gtk_image_get_pixbuf (GTK_IMAGE (picture)); + + if (!pb) + { + g_printerr ("picture: can't get pixbuf\n"); + return; + } + + width = gdk_pixbuf_get_width (pb); + height = gdk_pixbuf_get_height (pb); + + switch (type) + { + case SIZE_FIT: + picture_fit_to_window (); + break; + case SIZE_ORIG: + gtk_image_set_from_pixbuf (GTK_IMAGE (picture), orig_pb); + break; + case SIZE_INC: + new_pb = gdk_pixbuf_scale_simple (pb, width + options.picture_data.inc, + height + options.picture_data.inc, GDK_INTERP_HYPER); + if (new_pb) + { + gtk_image_set_from_pixbuf (GTK_IMAGE (picture), new_pb); + g_object_unref (pb); + } + break; + case SIZE_DEC: + new_pb = gdk_pixbuf_scale_simple (pb, width - options.picture_data.inc, + height - options.picture_data.inc, GDK_INTERP_HYPER); + if (new_pb) + { + gtk_image_set_from_pixbuf (GTK_IMAGE (picture), new_pb); + g_object_unref (pb); + } + break; + } +} + +static void +rotate_cb (GtkWidget *w, gint type) +{ + GdkPixbuf *new_pb = NULL; + GdkPixbuf *pb = gtk_image_get_pixbuf (GTK_IMAGE (picture)); + + if (!pb) + { + g_printerr ("picture: can't get pixbuf\n"); + return; + } + + switch (type) + { + case ROTATE_LEFT: + new_pb = gdk_pixbuf_rotate_simple (pb, GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE); + break; + case ROTATE_RIGHT: + new_pb = gdk_pixbuf_rotate_simple (pb, GDK_PIXBUF_ROTATE_CLOCKWISE); + break; + case ROTATE_FLIP_VERT: + new_pb = gdk_pixbuf_flip (pb, FALSE); + break; + case ROTATE_FLIP_HOR: + new_pb = gdk_pixbuf_flip (pb, TRUE); + break; + } + + if (new_pb) + { + gtk_image_set_from_pixbuf (GTK_IMAGE (picture), new_pb); + g_object_unref (pb); + } +} + +static void +create_popup_menu () +{ + GtkWidget *mi; + + popup_menu = gtk_menu_new (); + + mi = gtk_image_menu_item_new_with_label (_("Fit to window")); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), + gtk_image_new_from_icon_name ("gtk-zoom-fit", GTK_ICON_SIZE_MENU)); + gtk_widget_show (mi); + gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), mi); + g_signal_connect (G_OBJECT (mi), "activate", G_CALLBACK (change_size_cb), GINT_TO_POINTER (SIZE_FIT)); + + mi = gtk_image_menu_item_new_with_label (_("Original size")); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), + gtk_image_new_from_icon_name ("gtk-zoom-100", GTK_ICON_SIZE_MENU)); + gtk_widget_show (mi); + gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), mi); + g_signal_connect (G_OBJECT (mi), "activate", G_CALLBACK (change_size_cb), GINT_TO_POINTER (SIZE_ORIG)); + + mi = gtk_image_menu_item_new_with_label (_("Increase size")); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), + gtk_image_new_from_icon_name ("gtk-zoom-in", GTK_ICON_SIZE_MENU)); + gtk_widget_show (mi); + gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), mi); + g_signal_connect (G_OBJECT (mi), "activate", G_CALLBACK (change_size_cb), GINT_TO_POINTER (SIZE_INC)); + + mi = gtk_image_menu_item_new_with_label (_("Decrease size")); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi),
View file
yad-0.16.3.tar.bz2/src/print.c -> yad-0.36.2.tar.xz/src/print.c
Changed
@@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with YAD. If not, see <http://www.gnu.org/licenses/>. * - * Copyright (C) 2008-2011, Victor Ananjevsky <ananasik@gmail.com> + * Copyright (C) 2008-2016, Victor Ananjevsky <ananasik@gmail.com> */ #include <sys/types.h> @@ -28,11 +28,8 @@ #define HEADER_GAP (3*72/25.4) #define HEADER_FONT "Sans 11" -#define FONTNAME "Sans" -#define FONTSIZE 12.0 - -static GtkPrintSettings *print_settings = NULL; -static GtkPageSetup *page_setup = NULL; +#define FONTNAME "Monospace" +#define FONTSIZE 11.0 static gchar **text; static gint nlines, npages; @@ -40,7 +37,7 @@ static PangoFontDescription *fdesc = NULL; static void -draw_header (GtkPrintContext *cnt, gint pn, gint pc) +draw_header (GtkPrintContext * cnt, gint pn, gint pc) { cairo_t *cr; PangoFontDescription *desc; @@ -66,7 +63,7 @@ pango_layout_get_pixel_size (layout, &tw, &th); } - cairo_move_to (cr, (pw - tw) / 2, (HEADER_HEIGHT - th) / 2); + cairo_move_to (cr, (pw - tw) / 2, (HEADER_HEIGHT - th) / 2); pango_cairo_show_layout (cr, layout); page = g_strdup_printf ("%d/%d", pn, pc); @@ -89,7 +86,7 @@ } static void -begin_print_text (GtkPrintOperation *op, GtkPrintContext *cnt, gpointer data) +begin_print_text (GtkPrintOperation * op, GtkPrintContext * cnt, gpointer data) { gchar *buf; gint i = 0; @@ -122,7 +119,7 @@ } static void -draw_page_text (GtkPrintOperation *op, GtkPrintContext *cnt, gint page, gpointer data) +draw_page_text (GtkPrintOperation * op, GtkPrintContext * cnt, gint page, gpointer data) { cairo_t *cr; PangoLayout *layout; @@ -139,22 +136,22 @@ pango_layout_set_font_description (layout, fdesc); cairo_move_to (cr, 0, HEADER_HEIGHT + HEADER_GAP); - + line = page * nlines; for (i = 0; i < nlines; i++) { - if (textline+i == NULL) + if (textline + i == NULL) break; - pango_layout_set_text (layout, textline+i, -1); + pango_layout_set_text (layout, textline + i, -1); pango_cairo_show_layout (cr, layout); cairo_rel_move_to (cr, 0, FONTSIZE); } - g_object_unref (layout); + g_object_unref (layout); } static void -draw_page_image (GtkPrintOperation *op, GtkPrintContext *cnt, gint page, gpointer data) +draw_page_image (GtkPrintOperation * op, GtkPrintContext * cnt, gint page, gpointer data) { cairo_t *cr; GdkPixbuf *pb, *spb; @@ -181,7 +178,7 @@ if (pw < iw || ph < ih) { factor = MIN (pw / iw, ph / ih); - factor = (factor > 1.0) ? 1.0 : factor; + factor = (factor > 1.0) ? 1.0 : factor; spb = gdk_pixbuf_scale_simple (pb, iw * factor, ih * factor, GDK_INTERP_HYPER); } else @@ -195,7 +192,7 @@ } static void -raw_print_done (GtkPrintJob *job, gint *ret, GError *err) +raw_print_done (GtkPrintJob * job, gint * ret, GError * err) { if (err) { @@ -206,7 +203,7 @@ } static void -size_allocate_cb (GtkWidget *w, GtkAllocation *al, gpointer data) +size_allocate_cb (GtkWidget * w, GtkAllocation * al, gpointer data) { gtk_widget_set_size_request (w, al->width, -1); } @@ -216,20 +213,20 @@ { GtkWidget *dlg; GtkWidget *box, *img, *lbl; - gchar *job_name = NULL; + gchar *uri, *job_name = NULL; GtkPrintCapabilities pcap; GtkPrintOperationAction act = GTK_PRINT_OPERATION_ACTION_PRINT; - gint ret = 0; + gint resp, ret = 0; GError *err = NULL; /* check if file is exists */ if (options.common_data.uri && options.common_data.uri0) { if (!g_file_test (options.common_data.uri, G_FILE_TEST_EXISTS)) - { - g_printerr (_("File %s not found.\n"), options.common_data.uri); - return 1; - } + { + g_printerr (_("File %s not found.\n"), options.common_data.uri); + return 1; + } } else { @@ -239,18 +236,26 @@ /* create print dialog */ dlg = gtk_print_unix_dialog_new (options.data.dialog_title, NULL); + gtk_window_set_type_hint (GTK_WINDOW (dlg), GDK_WINDOW_TYPE_HINT_NORMAL); gtk_print_unix_dialog_set_embed_page_setup (GTK_PRINT_UNIX_DIALOG (dlg), TRUE); pcap = GTK_PRINT_CAPABILITY_PAGE_SET | GTK_PRINT_CAPABILITY_COPIES | GTK_PRINT_CAPABILITY_COLLATE | GTK_PRINT_CAPABILITY_REVERSE | GTK_PRINT_CAPABILITY_NUMBER_UP | GTK_PRINT_CAPABILITY_NUMBER_UP_LAYOUT; - if (options.print_data.preview && options.print_data.type != YAD_PRINT_RAW) + if (options.common_data.preview && options.print_data.type != YAD_PRINT_RAW) pcap |= GTK_PRINT_CAPABILITY_PREVIEW; gtk_print_unix_dialog_set_manual_capabilities (GTK_PRINT_UNIX_DIALOG (dlg), pcap); - if (print_settings) - gtk_print_unix_dialog_set_settings (GTK_PRINT_UNIX_DIALOG (dlg), print_settings); - if (page_setup) - gtk_print_unix_dialog_set_page_setup (GTK_PRINT_UNIX_DIALOG (dlg), page_setup); + if (!settings.print_settings) + settings.print_settings = gtk_print_unix_dialog_get_settings (GTK_PRINT_UNIX_DIALOG (dlg)); + + uri = g_build_filename (g_get_current_dir (), "yad.pdf", NULL); + gtk_print_settings_set (settings.print_settings, "output-uri", g_filename_to_uri (uri, NULL, NULL)); + g_free (uri); + + gtk_print_unix_dialog_set_settings (GTK_PRINT_UNIX_DIALOG (dlg), settings.print_settings); + + if (settings.page_setup) + gtk_print_unix_dialog_set_page_setup (GTK_PRINT_UNIX_DIALOG (dlg), settings.page_setup); /* set window behavior */ gtk_widget_set_name (dlg, "yad-dialog-window"); @@ -265,8 +270,7 @@ /* set window size and position */ if (!options.data.geometry) { - gtk_window_set_default_size (GTK_WINDOW (dlg), - options.data.width, options.data.height); + gtk_window_set_default_size (GTK_WINDOW (dlg), options.data.width, options.data.height); if (options.data.center) gtk_window_set_position (GTK_WINDOW (dlg), GTK_WIN_POS_CENTER); else if (options.data.mouse) @@ -278,7 +282,7 @@ gtk_widget_realize (dlg); gtk_window_parse_geometry (GTK_WINDOW (dlg), options.data.geometry); } - + /* create yad's top box */ if (options.data.dialog_text || options.data.dialog_image) { @@ -289,131 +293,134 @@ #endif if (options.data.dialog_image) - { - GdkPixbuf *pb = NULL; + { + GdkPixbuf *pb = NULL;
View file
yad-0.16.3.tar.bz2/src/progress.c -> yad-0.36.2.tar.xz/src/progress.c
Changed
@@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with YAD. If not, see <http://www.gnu.org/licenses/>. * - * Copyright (C) 2008-2011, Victor Ananjevsky <ananasik@gmail.com> + * Copyright (C) 2008-2016, Victor Ananjevsky <ananasik@gmail.com> */ #include <stdio.h> @@ -27,6 +27,8 @@ #include "yad.h" static GtkWidget *progress_bar; +static GtkWidget *progress_log; +static GtkTextBuffer *log_buffer; static gboolean pulsate_progress_bar (gpointer user_data) @@ -54,7 +56,7 @@ pulsate_timeout = g_timeout_add (100, pulsate_progress_bar, NULL); } - while (channel->is_readable != TRUE) ; + while (channel->is_readable != TRUE); do { @@ -76,34 +78,52 @@ g_error_free (err); err = NULL; } - continue; + /* stop handling */ + g_io_channel_shutdown (channel, TRUE, NULL); + return FALSE; } if (string->str0 == '#') { gchar *match; - /* We have a comment, so let's try to change the label */ + /* We have a comment, so let's try to change the label or write it to the log */ match = g_strcompress (g_strstrip (string->str + 1)); - gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progress_bar), match); + if (options.progress_data.log) + { + gchar *logline; + GtkTextIter end; + + logline = g_strdup_printf ("%s\n", match); /* add new line */ + gtk_text_buffer_get_end_iter (log_buffer, &end); + gtk_text_buffer_insert (log_buffer, &end, logline, -1); + g_free (logline); + + /* scroll to end */ + while (gtk_events_pending ()) + gtk_main_iteration (); + gtk_text_buffer_get_end_iter (log_buffer, &end); + gtk_text_view_scroll_to_iter (GTK_TEXT_VIEW (progress_log), &end, 0, FALSE, 0, 0); + } + else + 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) + if (g_ascii_isdigit (*(string->str))) { - 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); + /* 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 && options.plug == -1) + gtk_dialog_response (GTK_DIALOG (data), YAD_RESPONSE_OK); + } + else + gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress_bar), percentage / 100.0); } - else - gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress_bar), - percentage / 100.0); } } @@ -121,7 +141,7 @@ pulsate_timeout = 0; } - if (options.progress_data.autoclose) + if (options.progress_data.autoclose && options.plug == -1) gtk_dialog_response (GTK_DIALOG (data), YAD_RESPONSE_OK); g_io_channel_shutdown (channel, TRUE, NULL); @@ -136,26 +156,61 @@ GtkWidget *w; GIOChannel *channel; - w = progress_bar = gtk_progress_bar_new (); - gtk_widget_set_name (w, "yad-progress-widget"); + // fix it when vertical specified #if GTK_CHECK_VERSION(3,0,0) - gtk_progress_bar_set_show_text (GTK_PROGRESS_BAR (w), TRUE); + w = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); +#else + w = gtk_vbox_new (FALSE, 0); #endif + progress_bar = gtk_progress_bar_new (); + gtk_widget_set_name (progress_bar, "yad-progress-widget"); + if (options.progress_data.log_on_top) + gtk_box_pack_end (GTK_BOX (w), progress_bar, FALSE, FALSE, 0); + else + gtk_box_pack_start (GTK_BOX (w), progress_bar, FALSE, FALSE, 0); + if (options.progress_data.percentage > 100) options.progress_data.percentage = 100; - gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (w), - options.progress_data.percentage / 100.0); + gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress_bar), options.progress_data.percentage / 100.0); if (options.progress_data.progress_text) - gtk_progress_bar_set_text (GTK_PROGRESS_BAR (w), - options.progress_data.progress_text); + gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progress_bar), options.progress_data.progress_text); #if GTK_CHECK_VERSION(3,0,0) - gtk_progress_bar_set_inverted (GTK_PROGRESS_BAR (w), - options.progress_data.rtl); + gtk_progress_bar_set_inverted (GTK_PROGRESS_BAR (progress_bar), 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_bar_set_orientation (GTK_PROGRESS_BAR (progress_bar), GTK_PROGRESS_RIGHT_TO_LEFT); +#endif + + if (options.progress_data.log) + { + GtkWidget *ex, *sw; + + ex = gtk_expander_new (options.progress_data.log); + gtk_expander_set_spacing (GTK_EXPANDER (ex), 2); + gtk_expander_set_expanded (GTK_EXPANDER (ex), options.progress_data.log_expanded); + gtk_box_pack_start (GTK_BOX (w), ex, TRUE, TRUE, 2); + + sw = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), GTK_SHADOW_ETCHED_IN); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_container_add (GTK_CONTAINER (ex), sw); + + progress_log = gtk_text_view_new (); + gtk_widget_set_name (progress_log, "yad-text-widget"); + gtk_widget_set_size_request (progress_log, -1, options.progress_data.log_height); + gtk_container_add (GTK_CONTAINER (sw), progress_log); + + log_buffer = gtk_text_buffer_new (NULL); + gtk_text_view_set_buffer (GTK_TEXT_VIEW (progress_log), log_buffer); + gtk_text_view_set_left_margin (GTK_TEXT_VIEW (progress_log), 5); + gtk_text_view_set_right_margin (GTK_TEXT_VIEW (progress_log), 5); + gtk_text_view_set_editable (GTK_TEXT_VIEW (progress_log), FALSE); + gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (progress_log), FALSE); + } +#if GTK_CHECK_VERSION(3,0,0) + else + gtk_progress_bar_set_show_text (GTK_PROGRESS_BAR (progress_bar), TRUE); #endif channel = g_io_channel_unix_new (0);
View file
yad-0.16.3.tar.bz2/src/scale.c -> yad-0.36.2.tar.xz/src/scale.c
Changed
@@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with YAD. If not, see <http://www.gnu.org/licenses/>. * - * Copyright (C) 2008-2011, Victor Ananjevsky <ananasik@gmail.com> + * Copyright (C) 2008-2016, Victor Ananjevsky <ananasik@gmail.com> */ #include "yad.h" @@ -22,13 +22,13 @@ static GtkWidget *scale; static void -value_changed_cb (GtkWidget *w, gpointer data) +value_changed_cb (GtkWidget * w, gpointer data) { g_print ("%.0f\n", gtk_range_get_value (GTK_RANGE (w))); } GtkWidget * -scale_create_widget (GtkWidget *dlg) +scale_create_widget (GtkWidget * dlg) { GtkWidget *w; GtkAdjustment *adj; @@ -44,15 +44,15 @@ if (options.scale_data.have_value) { if (options.scale_data.value < options.scale_data.min_value) - { - g_printerr (_("Initial value less than minimal.\n")); - options.scale_data.value = options.scale_data.min_value; - } + { + g_printerr (_("Initial value less than minimal.\n")); + options.scale_data.value = options.scale_data.min_value; + } else if (options.scale_data.value > options.scale_data.max_value) - { - g_printerr (_("Initial value greater than maximum.\n")); - options.scale_data.value = options.scale_data.max_value; - } + { + g_printerr (_("Initial value greater than maximum.\n")); + options.scale_data.value = options.scale_data.max_value; + } } else options.scale_data.value = options.scale_data.min_value; @@ -61,27 +61,32 @@ page = options.scale_data.page == -1 ? options.scale_data.step * 10 : options.scale_data.page; /* this type conversion needs only for gtk-2.0 */ adj = (GtkAdjustment *) gtk_adjustment_new ((double) options.scale_data.value, - (double) options.scale_data.min_value, - (double) options.scale_data.max_value, - (double) options.scale_data.step, - (double) page, 0.0); + (double) options.scale_data.min_value, + (double) options.scale_data.max_value, + (double) options.scale_data.step, (double) page, 0.0); if (options.common_data.vertical) { +#if GTK_CHECK_VERSION(3,0,0) + w = scale = gtk_scale_new (GTK_ORIENTATION_VERTICAL, GTK_ADJUSTMENT (adj)); +#else w = scale = gtk_vscale_new (GTK_ADJUSTMENT (adj)); - gtk_widget_set_name (w, "yad-vscale-widget"); +#endif gtk_range_set_inverted (GTK_RANGE (w), !options.scale_data.invert); } else { +#if GTK_CHECK_VERSION(3,0,0) + w = scale = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, GTK_ADJUSTMENT (adj)); +#else w = scale = gtk_hscale_new (GTK_ADJUSTMENT (adj)); - gtk_widget_set_name (w, "yad-hscale-widget"); +#endif gtk_range_set_inverted (GTK_RANGE (w), options.scale_data.invert); } + gtk_widget_set_name (w, "yad-scale-widget"); gtk_scale_set_digits (GTK_SCALE (w), 0); if (options.scale_data.print_partial) - g_signal_connect (G_OBJECT (w), "value-changed", - G_CALLBACK (value_changed_cb), NULL); + g_signal_connect (G_OBJECT (w), "value-changed", G_CALLBACK (value_changed_cb), NULL); if (options.scale_data.hide_value) gtk_scale_set_draw_value (GTK_SCALE (w), FALSE); @@ -94,10 +99,10 @@ pos = options.common_data.vertical ? GTK_POS_LEFT : GTK_POS_BOTTOM; for (; m; m = m->next) - { - YadScaleMark *mark = (YadScaleMark *) m->data; - gtk_scale_add_mark (GTK_SCALE (w), mark->value, pos, mark->name); - } + { + YadScaleMark *mark = (YadScaleMark *) m->data; + gtk_scale_add_mark (GTK_SCALE (w), mark->value, pos, mark->name); + } } return w;
View file
yad-0.16.3.tar.bz2/src/text.c -> yad-0.36.2.tar.xz/src/text.c
Changed
@@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with YAD. If not, see <http://www.gnu.org/licenses/>. * - * Copyright (C) 2008-2011, Victor Ananjevsky <ananasik@gmail.com> + * Copyright (C) 2008-2016, Victor Ananjevsky <ananasik@gmail.com> */ #include <errno.h> @@ -25,28 +25,170 @@ #include "yad.h" static GtkWidget *text_view; -static GtkTextBuffer *text_buffer; +static GObject *text_buffer; static GtkTextTag *tag; static GdkCursor *hand, *normal; +static gchar *pattern = NULL; +static gboolean new_search = TRUE; + +/* searching */ +static void +do_search (GtkWidget * e, GtkWidget * w) +{ + static gchar *text = NULL; + static guint offset; + static GRegex *regex = NULL; + GMatchInfo *match = NULL; + GtkTextIter begin, end; + + g_free (pattern); + pattern = g_strdup (gtk_entry_get_text (GTK_ENTRY (e))); + gtk_widget_destroy (w); + gtk_widget_queue_draw (text_view); + + if (new_search || gtk_text_buffer_get_modified (GTK_TEXT_BUFFER (text_buffer))) + { + /* get the text */ + g_free (text); + gtk_text_buffer_get_bounds (GTK_TEXT_BUFFER (text_buffer), &begin, &end); + text = gtk_text_buffer_get_text (GTK_TEXT_BUFFER (text_buffer), &begin, &end, FALSE); + offset = 0; + /* compile new regex */ + if (regex) + g_regex_unref (regex); + regex = g_regex_new (pattern, G_REGEX_EXTENDED | G_REGEX_OPTIMIZE, G_REGEX_MATCH_NOTEMPTY, NULL); + new_search = FALSE; + } + + /* search and select if found */ + if (g_regex_match (regex, text + offset, G_REGEX_MATCH_NOTEMPTY, &match)) + { + 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 + offset); + epos = g_utf8_pointer_to_offset (text, text + ep + offset); + + gtk_text_buffer_get_iter_at_offset (GTK_TEXT_BUFFER (text_buffer), &begin, spos); + gtk_text_buffer_get_iter_at_offset (GTK_TEXT_BUFFER (text_buffer), &end, epos); + + gtk_text_buffer_select_range (GTK_TEXT_BUFFER (text_buffer), &begin, &end); + gtk_text_view_scroll_to_iter (GTK_TEXT_VIEW (text_view), &begin, 0, FALSE, 0, 0); + + offset += epos; + + g_match_info_free (match); + match = NULL; + } + else + new_search = TRUE; +} static gboolean -key_press_cb (GtkWidget *w, GdkEventKey *key, gpointer data) +search_key_cb (GtkWidget * w, GdkEventKey * key, GtkWidget * win) { -#if GTK_CHECK_VERSION(3,0,0) - if ((key->keyval == GDK_KEY_Return || key->keyval == GDK_KEY_KP_Enter) && - (key->state & GDK_CONTROL_MASK)) +#if GTK_CHECK_VERSION(2,24,0) + if (key->keyval == GDK_KEY_Escape) #else - if ((key->keyval == GDK_Return || key->keyval == GDK_KP_Enter) && - (key->state & GDK_CONTROL_MASK)) + if (key->keyval == GDK_Escape) #endif - gtk_dialog_response (GTK_DIALOG (data), YAD_RESPONSE_OK); + { + gtk_widget_destroy (win); + return TRUE; + } + return FALSE; +} + +static void +search_changed (GtkWidget * w, gpointer d) +{ + new_search = TRUE; +} + +static void +show_search () +{ + GtkWidget *w, *f, *a, *e; + GdkEvent *fev; + + w = gtk_window_new (GTK_WINDOW_POPUP); + gtk_window_set_transient_for (GTK_WINDOW (w), GTK_WINDOW (gtk_widget_get_toplevel (text_view))); + gtk_window_set_position (GTK_WINDOW (w), GTK_WIN_POS_CENTER_ON_PARENT); + /* next two lines needs for get focus to search window */ + gtk_window_set_type_hint (GTK_WINDOW (w), GDK_WINDOW_TYPE_HINT_UTILITY); + gtk_window_set_modal (GTK_WINDOW (w), TRUE); + + g_signal_connect (G_OBJECT (w), "key-press-event", G_CALLBACK (search_key_cb), w); + + f = gtk_frame_new (NULL); + gtk_frame_set_shadow_type (GTK_FRAME (f), GTK_SHADOW_ETCHED_IN); + gtk_container_add (GTK_CONTAINER (w), f); + + a = gtk_alignment_new (0.5, 0.5, 1.0, 1.0); + gtk_alignment_set_padding (GTK_ALIGNMENT (a), 2, 2, 2, 2); + gtk_container_add (GTK_CONTAINER (f), a); + + e = gtk_entry_new (); + if (pattern) + gtk_entry_set_text (GTK_ENTRY (e), pattern); + gtk_container_add (GTK_CONTAINER (a), e); + + g_signal_connect (G_OBJECT (e), "activate", G_CALLBACK (do_search), w); + g_signal_connect (G_OBJECT (e), "changed", G_CALLBACK (search_changed), NULL); + g_signal_connect (G_OBJECT (e), "key-press-event", G_CALLBACK (search_key_cb), w); + + gtk_widget_show_all (w); + + /* send focus event to search entry (so complex due to popup window) */ + fev = gdk_event_new (GDK_FOCUS_CHANGE); + fev->focus_change.type = GDK_FOCUS_CHANGE; + fev->focus_change.in = TRUE; + fev->focus_change.window = gtk_widget_get_window (e); + if (fev->focus_change.window != NULL) + g_object_ref (fev->focus_change.window); +#if GTK_CHECK_VERSION(2,22,0) + gtk_widget_send_focus_change (e, fev); +#else + g_object_ref (e); + GTK_OBJECT_FLAGS (e) |= GTK_HAS_FOCUS; + gtk_widget_event (e, fev); + g_object_notify (G_OBJECT (e), "has-focus"); + g_object_unref (e); +#endif + gdk_event_free (fev); +} + +static gboolean +key_press_cb (GtkWidget * w, GdkEventKey * key, gpointer data) +{ +#if GTK_CHECK_VERSION(2,24,0) + if ((key->keyval == GDK_KEY_Return || key->keyval == GDK_KEY_KP_Enter) && (key->state & GDK_CONTROL_MASK)) +#else + if ((key->keyval == GDK_Return || key->keyval == GDK_KP_Enter) && (key->state & GDK_CONTROL_MASK)) +#endif + { + if (options.plug == -1) + gtk_dialog_response (GTK_DIALOG (data), YAD_RESPONSE_OK); + return TRUE; + } + +#if GTK_CHECK_VERSION(2,24,0) + if ((key->state & GDK_CONTROL_MASK) && (key->keyval == GDK_KEY_S || key->keyval == GDK_KEY_s)) +#else + if ((key->state & GDK_CONTROL_MASK) && (key->keyval == GDK_S || key->keyval == GDK_s)) +#endif + { + show_search (); + return TRUE; + } return FALSE; } static gboolean -tag_event_cb (GtkTextTag *tag, GObject *obj, GdkEvent *ev, - GtkTextIter *iter, gpointer d) +tag_event_cb (GtkTextTag * tag, GObject * obj, GdkEvent * ev, GtkTextIter * iter, gpointer d) { GtkTextIter start = *iter; GtkTextIter end = *iter; @@ -62,13 +204,13 @@ gtk_text_iter_forward_to_tag_toggle (&end, tag); url = gtk_text_iter_get_text (&start, &end); - cmdline = g_strdup_printf ("xdg-open '%s'", url); + cmdline = g_strdup_printf (settings.open_cmd, url); g_free (url); g_spawn_command_line_async (cmdline, NULL);
View file
yad-0.16.3.tar.bz2/src/util.c -> yad-0.36.2.tar.xz/src/util.c
Changed
@@ -14,16 +14,21 @@ * You should have received a copy of the GNU General Public License * along with YAD. If not, see <http://www.gnu.org/licenses/>. * - * Copyright (C) 2008-2011, Victor Ananjevsky <ananasik@gmail.com> + * Copyright (C) 2008-2016, Victor Ananjevsky <ananasik@gmail.com> */ +#ifndef _GNU_SOURCE +#define _GNU_SOURCE 1 +#endif + #include <stdlib.h> #include <string.h> #include <errno.h> -#include "yad.h" +#include <sys/ipc.h> +#include <sys/shm.h> -#define SETTINGS_FILE "yad.conf" +#include "yad.h" YadSettings settings; @@ -38,51 +43,50 @@ settings.timeout = 0; settings.to_indicator = "none"; settings.show_remain = FALSE; - settings.rules_hint = TRUE; - settings.always_selected = FALSE; -#if !GTK_CHECK_VERSION(2,22,0) - settings.dlg_sep = FALSE; -#endif settings.combo_always_editable = FALSE; - settings.show_gtk_palette = FALSE; - settings.expand_palette = FALSE; - settings.term = "xterm -e %s"; + settings.term = "xterm -e '%s'"; + settings.open_cmd = "xdg-open '%s'"; + settings.date_format = "%x"; + settings.ignore_unknown = TRUE; + settings.max_tab = 100; + + settings.print_settings = NULL; + settings.page_setup = NULL; - filename = g_build_filename (g_get_user_config_dir (), SETTINGS_FILE, NULL); + filename = g_build_filename (g_get_user_config_dir (), YAD_SETTINGS_FILE, NULL); if (g_file_test (filename, G_FILE_TEST_EXISTS)) { kf = g_key_file_new (); if (g_key_file_load_from_file (kf, filename, G_KEY_FILE_NONE, NULL)) - { -#if !GTK_CHECK_VERSION(2,22,0) - if (g_key_file_has_key (kf, "General", "dialog_separator", NULL)) - settings.dlg_sep = g_key_file_get_boolean (kf, "General", "dialog_separator", NULL); -#endif - if (g_key_file_has_key (kf, "General", "width", NULL)) - settings.width = g_key_file_get_integer (kf, "General", "width", NULL); - if (g_key_file_has_key (kf, "General", "height", NULL)) - settings.height = g_key_file_get_integer (kf, "General", "height", NULL); - if (g_key_file_has_key (kf, "General", "timeout", NULL)) - settings.timeout = g_key_file_get_integer (kf, "General", "timeout", NULL); - if (g_key_file_has_key (kf, "General", "timeout_indicator", NULL)) - settings.to_indicator = g_key_file_get_string (kf, "General", "timeout_indicator", NULL); - if (g_key_file_has_key (kf, "General", "show_remain", NULL)) - settings.show_remain = g_key_file_get_boolean (kf, "General", "show_remain", NULL); - if (g_key_file_has_key (kf, "General", "rules_hint", NULL)) - settings.rules_hint = g_key_file_get_boolean (kf, "General", "rules_hint", NULL); - if (g_key_file_has_key (kf, "General", "always_selected", NULL)) - settings.always_selected = g_key_file_get_boolean (kf, "General", "always_selected", NULL); - if (g_key_file_has_key (kf, "General", "combo_always_editable", NULL)) - settings.combo_always_editable = g_key_file_get_boolean (kf, "General", "combo_always_editable", NULL); - if (g_key_file_has_key (kf, "General", "show_gtk_palette", NULL)) - settings.show_gtk_palette = g_key_file_get_boolean (kf, "General", "show_gtk_palette", NULL); - if (g_key_file_has_key (kf, "General", "expand_palette", NULL)) - settings.expand_palette = g_key_file_get_boolean (kf, "General", "expand_palette", NULL); - if (g_key_file_has_key (kf, "General", "terminal", NULL)) - settings.term = g_key_file_get_string (kf, "General", "terminal", NULL); - } + { + if (g_key_file_has_key (kf, "General", "width", NULL)) + settings.width = g_key_file_get_integer (kf, "General", "width", NULL); + if (g_key_file_has_key (kf, "General", "height", NULL)) + settings.height = g_key_file_get_integer (kf, "General", "height", NULL); + if (g_key_file_has_key (kf, "General", "timeout", NULL)) + settings.timeout = g_key_file_get_integer (kf, "General", "timeout", NULL); + if (g_key_file_has_key (kf, "General", "timeout_indicator", NULL)) + settings.to_indicator = g_key_file_get_string (kf, "General", "timeout_indicator", NULL); + if (g_key_file_has_key (kf, "General", "show_remain", NULL)) + settings.show_remain = g_key_file_get_boolean (kf, "General", "show_remain", NULL); + if (g_key_file_has_key (kf, "General", "combo_always_editable", NULL)) + settings.combo_always_editable = g_key_file_get_boolean (kf, "General", "combo_always_editable", NULL); + if (g_key_file_has_key (kf, "General", "terminal", NULL)) + settings.term = g_key_file_get_string (kf, "General", "terminal", NULL); + if (g_key_file_has_key (kf, "General", "open_command", NULL)) + settings.open_cmd = g_key_file_get_string (kf, "General", "open_command", NULL); + if (g_key_file_has_key (kf, "General", "date_format", NULL)) + settings.date_format = g_key_file_get_string (kf, "General", "date_format", NULL); + if (g_key_file_has_key (kf, "General", "ignore_unknown_options", NULL)) + settings.ignore_unknown = g_key_file_get_boolean (kf, "General", "ignore_unknown_options", NULL); + if (g_key_file_has_key (kf, "General", "max_tab", NULL)) + settings.max_tab = g_key_file_get_integer (kf, "General", "max_tab", NULL); + + settings.print_settings = gtk_print_settings_new_from_key_file (kf, NULL, NULL); + settings.page_setup = gtk_page_setup_new_from_key_file (kf, NULL, NULL); + } g_key_file_free (kf); } @@ -100,41 +104,42 @@ kf = g_key_file_new (); -#if !GTK_CHECK_VERSION(2,22,0) - g_key_file_set_boolean (kf, "General", "dialog_separator", settings.dlg_sep); - g_key_file_set_comment (kf, "General", "dialog_separator", "Enable separator between dialog and buttons", NULL); -#endif g_key_file_set_integer (kf, "General", "width", settings.width); - g_key_file_set_comment (kf, "General", "width", "Default dialog width", NULL); + g_key_file_set_comment (kf, "General", "width", " Default dialog width", NULL); g_key_file_set_integer (kf, "General", "height", settings.height); - g_key_file_set_comment (kf, "General", "height", "Default dialog height", NULL); + g_key_file_set_comment (kf, "General", "height", " Default dialog height", NULL); g_key_file_set_integer (kf, "General", "timeout", settings.timeout); - g_key_file_set_comment (kf, "General", "timeout", "Default timeout (0 for no timeout)", NULL); - g_key_file_set_integer (kf, "General", "timeout_indicator", settings.timeout); - g_key_file_set_comment (kf, "General", "timeout_indicator", - "Position of timeout indicator (top, bottom, left, right, none)", NULL); + g_key_file_set_comment (kf, "General", "timeout", " Default timeout (0 for no timeout)", NULL); + g_key_file_set_string (kf, "General", "timeout_indicator", settings.to_indicator); + g_key_file_set_comment (kf, "General", "timeout_indicator", + " Position of timeout indicator (top, bottom, left, right, none)", NULL); g_key_file_set_boolean (kf, "General", "show_remain", settings.show_remain); - g_key_file_set_comment (kf, "General", "show_remain", "Show remain seconds in timeout indicator", NULL); - g_key_file_set_boolean (kf, "General", "rules_hint", settings.rules_hint); - g_key_file_set_comment (kf, "General", "rules_hint", "Enable rules hints in list widget", NULL); - g_key_file_set_boolean (kf, "General", "always_selected", settings.always_selected); - g_key_file_set_comment (kf, "General", "always_selected", "List widget always have a selection", NULL); + g_key_file_set_comment (kf, "General", "show_remain", " Show remain seconds in timeout indicator", NULL); g_key_file_set_boolean (kf, "General", "combo_always_editable", settings.combo_always_editable); - g_key_file_set_comment (kf, "General", "combo_always_editable", "Combo-box in entry dialog is always editable", NULL); - g_key_file_set_boolean (kf, "General", "show_gtk_palette", settings.show_gtk_palette); - g_key_file_set_comment (kf, "General", "show_gtk_palette", "Show GtkColorSelection palette", NULL); - g_key_file_set_boolean (kf, "General", "expand_palette", settings.expand_palette); - g_key_file_set_comment (kf, "General", "expand_palette", "Expand list of predefined colors in color dialog", NULL); + g_key_file_set_comment (kf, "General", "combo_always_editable", " Combo-box in entry dialog is always editable", NULL); g_key_file_set_string (kf, "General", "terminal", settings.term); - g_key_file_set_comment (kf, "General", "terminal", "Default terminal command (use %s for command template)", NULL); + g_key_file_set_comment (kf, "General", "terminal", " Default terminal command (use %s for arguments placeholder)", NULL); + g_key_file_set_string (kf, "General", "open_command", settings.open_cmd); + g_key_file_set_comment (kf, "General", "open_command", " Default open command (use %s for arguments placeholder)", NULL); + g_key_file_set_string (kf, "General", "date_format", settings.date_format); + g_key_file_set_comment (kf, "General", "date_format", " Default date format (see strftime(3) for details)", NULL); + g_key_file_set_boolean (kf, "General", "ignore_unknown_options", settings.ignore_unknown); + g_key_file_set_comment (kf, "General", "ignore_unknown_options", " Ignore unknown command-line options", NULL); + g_key_file_set_integer (kf, "General", "max_tab", settings.max_tab); + g_key_file_set_comment (kf, "General", "max_tab", " Maximum number of tabs in notebook", NULL); + + if (settings.print_settings) + gtk_print_settings_to_key_file (settings.print_settings, kf, NULL); + if (settings.page_setup) + gtk_page_setup_to_key_file (settings.page_setup, kf, NULL); context = g_key_file_to_data (kf, NULL, NULL); g_key_file_free (kf); - if (g_mkdir_with_parents (g_get_user_config_dir (), 0644) != -1) + if (g_mkdir_with_parents (g_get_user_config_dir (), 0755) != -1) { - gchar *filename = g_build_filename (g_get_user_config_dir (), SETTINGS_FILE, NULL); + gchar *filename = g_build_filename (g_get_user_config_dir (), YAD_SETTINGS_FILE, NULL); g_file_set_contents (filename, context, -1, NULL); g_free (filename); } @@ -145,7 +150,7 @@ } GdkPixbuf * -get_pixbuf (gchar *name, YadIconSize size) +get_pixbuf (gchar * name, YadIconSize size) { gint w, h; GdkPixbuf *pb = NULL; @@ -155,51 +160,153 @@ { pb = gdk_pixbuf_new_from_file (name, &err); if (!pb) - { - g_printerr ("yad_get_pixbuf(): %s\n", err->message); - g_error_free (err); - } + { + g_printerr ("yad_get_pixbuf(): %s\n", err->message); + g_error_free (err); + }
View file
yad-0.16.3.tar.bz2/src/yad.h -> yad-0.36.2.tar.xz/src/yad.h
Changed
@@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with YAD. If not, see <http://www.gnu.org/licenses/>. * - * Copyright (C) 2008-2011, Victor Ananjevsky <ananasik@gmail.com> + * Copyright (C) 2008-2016, Victor Ananjevsky <ananasik@gmail.com> */ #ifndef _YAD_H_ @@ -22,15 +22,37 @@ #include <config.h> +#include <sys/types.h> +#include <sys/ipc.h> + +#include <gdk/gdkx.h> + #include <gtk/gtk.h> #include <glib/gi18n.h> +#if GTK_CHECK_VERSION(3,0,0) +#include <gtk/gtkx.h> +#endif + +#ifdef HAVE_SPELL +#include <gtkspell/gtkspell.h> +#endif + +#ifdef HAVE_SOURCEVIEW +#include <gtksourceview/gtksourceview.h> +#include <gtksourceview/gtksourcebuffer.h> +#include <gtksourceview/gtksourcelanguage.h> +#include <gtksourceview/gtksourcelanguagemanager.h> +#endif + G_BEGIN_DECLS +#define YAD_SETTINGS_FILE "yad.conf" + #define YAD_RESPONSE_OK 0 #define YAD_RESPONSE_CANCEL 1 #define YAD_RESPONSE_TIMEOUT 70 -#define YAD_RESPONSE_ESC -4 /* 252 */ +#define YAD_RESPONSE_ESC -4 /* 252 */ #define YAD_URL_REGEX "(http|https|ftp)://a-zA-Z0-9./_%#&-+" @@ -43,22 +65,34 @@ YAD_MODE_FILE, YAD_MODE_FONT, YAD_MODE_FORM, +#ifdef HAVE_HTML + YAD_MODE_HTML, +#endif YAD_MODE_ICONS, YAD_MODE_LIST, YAD_MODE_MULTI_PROGRESS, + YAD_MODE_NOTEBOOK, YAD_MODE_NOTIFICATION, + YAD_MODE_PANED, + YAD_MODE_PICTURE, YAD_MODE_PRINT, YAD_MODE_PROGRESS, YAD_MODE_SCALE, YAD_MODE_TEXTINFO, YAD_MODE_ABOUT, - YAD_MODE_VERSION, + YAD_MODE_VERSION } YadDialogMode; typedef enum { + YAD_COLOR_HEX, + YAD_COLOR_RGB +} YadColorMode; + +typedef enum { YAD_FIELD_SIMPLE = 0, YAD_FIELD_HIDDEN, YAD_FIELD_READ_ONLY, + YAD_FIELD_COMPLETE, YAD_FIELD_NUM, YAD_FIELD_CHECK, YAD_FIELD_COMBO, @@ -68,42 +102,61 @@ YAD_FIELD_MFILE, YAD_FIELD_DIR, YAD_FIELD_DIR_CREATE, + YAD_FIELD_MDIR, YAD_FIELD_FONT, YAD_FIELD_COLOR, YAD_FIELD_DATE, + YAD_FIELD_SCALE, YAD_FIELD_BUTTON, + YAD_FIELD_FULL_BUTTON, YAD_FIELD_LABEL, + YAD_FIELD_TEXT } YadFieldType; typedef enum { YAD_COLUMN_TEXT = 0, YAD_COLUMN_NUM, + YAD_COLUMN_SIZE, YAD_COLUMN_FLOAT, YAD_COLUMN_CHECK, + YAD_COLUMN_RADIO, + YAD_COLUMN_BAR, YAD_COLUMN_IMAGE, - YAD_COLUMN_TOOLTIP, + YAD_COLUMN_HIDDEN, YAD_COLUMN_ATTR_FORE, YAD_COLUMN_ATTR_BACK, - YAD_COLUMN_ATTR_FONT, + YAD_COLUMN_ATTR_FONT } YadColumnType; typedef enum { + YAD_PICTURE_FIT, + YAD_PICTURE_ORIG +} YadPictureType; + +typedef enum { YAD_PRINT_TEXT = 0, YAD_PRINT_IMAGE, - YAD_PRINT_RAW, + YAD_PRINT_RAW } YadPrintType; typedef enum { YAD_PROGRESS_NORMAL = 0, YAD_PROGRESS_RTL, - YAD_PROGRESS_PULSE, + YAD_PROGRESS_PULSE } YadProgressType; typedef enum { YAD_BIG_ICON = 0, - YAD_SMALL_ICON, + YAD_SMALL_ICON } YadIconSize; +typedef enum { + YAD_COMPLETE_SIMPLE = 0, + YAD_COMPLETE_ANY, + YAD_COMPLETE_ALL, + YAD_COMPLETE_REGEX +} YadCompletionType; + typedef struct { gchar *name; gchar *cmd; @@ -139,20 +192,19 @@ guint timeout; gchar *to_indicator; gchar *dialog_text; - gdouble text_align; + GtkJustification text_align; gchar *dialog_image; gboolean image_on_top; gchar *icon_theme; -#if !GTK_CHECK_VERSION(3,0,0) - gboolean dialog_sep; -#endif gchar *expander; gint borders; GSList *buttons; gboolean no_buttons; gboolean no_markup; + gboolean no_escape; gboolean always_print; gboolean selectable_labels; + GtkButtonBoxStyle buttons_layout; /* window settings */ gboolean sticky; gboolean fixed; @@ -161,6 +213,10 @@ gboolean mouse; gboolean undecorated; gboolean skip_taskbar; + gboolean maximized; + gboolean fullscreen; + gboolean splash; + gboolean focus; } YadData; typedef struct { @@ -172,9 +228,13 @@ typedef struct { gchar *init_color; + gboolean gtk_palette; gboolean use_palette; + gboolean expand_palette; gchar *palette; gboolean extra; + gboolean alpha; + YadColorMode mode; } YadColorData; typedef struct {
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
.