Skip to content
Commits on Source (4)
commit d708d5dfad6a1c551437fa33444ca9333d5d67d5
Author: Yannick Le Guen <leguen.yannick@gmail.com>
Date: Wed Aug 21 12:31:24 2019 +0200
I18n: Update translation fr (100%).
453 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 16ad603484be4da4add3038b096770ff006080aa
Author: Steve Harris <steve@cultureofweb.com>
Date: Wed Aug 21 06:30:56 2019 +0200
I18n: Add new translation en_CA (78%).
354 translated messages, 99 untranslated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 5ebfae2131a65e86d966180b67dac09af07ce523
Author: 玉堂白鹤 <yjwork@qq.com>
Date: Wed Aug 21 06:30:55 2019 +0200
I18n: Update translation zh_CN (100%).
453 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 392cf6b43b702fbbbb80422e68e4176053f1719c
Author: Igor <f2404@yandex.ru>
Date: Wed Aug 21 00:31:08 2019 +0200
I18n: Update translation ru (100%).
453 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit c73dcaec6b7800c63287868bdc1fc14903997fe4
Author: Michael Martins <michaelfm21@gmail.com>
Date: Wed Aug 21 00:31:08 2019 +0200
I18n: Update translation pt_BR (100%).
453 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 1bc26f45c2e00401d98767773fda2319be43bd2b
Author: Pjotr <pjotrvertaalt@gmail.com>
Date: Wed Aug 21 00:31:08 2019 +0200
I18n: Update translation nl (100%).
453 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 6d1245766de22475b6646fc1d715e3ca3788492a
Author: Vinzenz Vietzke <vinz@vinzv.de>
Date: Wed Aug 21 00:31:08 2019 +0200
I18n: Update translation de (100%).
453 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 2770268db213b48a530fdf662e58142290121471
Author: Kiril Kirilov <cybercop_montana@abv.bg>
Date: Wed Aug 21 00:31:08 2019 +0200
I18n: Update translation bg (100%).
453 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 4dd3a94d06b0139b227f85b6419000a76b34895b
Author: Daniel Muñiz Fontoira <dani@damufo.com>
Date: Tue Aug 20 18:31:57 2019 +0200
I18n: Update translation gl (100%).
453 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 449e9d9a6f4a341d63ff542b6f9cf0af5d43951f
Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
Date: Tue Aug 20 01:01:40 2019 +0200
color: Conditionally hide info button in add-profile dialog
The button is shown/hidden based on the availability of gcm-viewer.
commit e777649343213af373b25719d096e7b7493e2675
Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
Date: Tue Aug 20 01:01:09 2019 +0200
color: Add tooltip to profile info buttons
commit 41dec5a0e2ac07676dffa1e3d5fc6f215a0c074d
Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
Date: Mon Aug 19 18:11:31 2019 +0200
display: Fix profile matching in xfsettingsd
Previously the code (erroneously) checked the CRTCs instead of the
Outputs, which meant that sometimes no EDID would be found (which is to
be expected) or the amount of CRTCs would differ from the amount of
Outputs, so the for loop would be messed up.
commit ae8221b23f72f62276bd0a0ffe129329b217a612
Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
Date: Mon Aug 19 18:09:48 2019 +0200
display: Assure correct gchar** (Bug #15816)
commit 5701809b52e76d6be31c5d90e51d722bb1cb2ea8
Author: Elishai Eliyahu <e1907@mm.st>
Date: Sun Aug 18 00:31:14 2019 +0200
I18n: Update translation he (100%).
452 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit a7120d7e46c904f65ed0edc2df2319a1cce4bc49
Author: Daniel Muñiz Fontoira <dani@damufo.com>
Date: Sun Aug 18 00:31:14 2019 +0200
I18n: Update translation gl (100%).
452 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 2822f0644fc1670263b81d0c84d9c205bc580a2e
Author: Emanuele Petriglia <transifex@emanuelepetriglia.com>
Date: Sat Aug 17 18:31:51 2019 +0200
I18n: Update translation it (100%).
452 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 4a821cf1f9067e1fe8abb834e17b164b014a7f77
Author: Daniel Muñiz Fontoira <dani@damufo.com>
Date: Sat Aug 17 18:31:51 2019 +0200
I18n: Update translation gl (100%).
452 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 4b5018de753408433b2db9e93a7293967b838a36
Author: clmmbs <msreywel@hotmail.com>
Date: Sat Aug 17 18:31:51 2019 +0200
I18n: Update translation ar (89%).
405 translated messages, 47 untranslated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 230404bce88b663e192d6722b38a01c410b37898
Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
Date: Sat Aug 17 00:58:00 2019 +0200
keyboard: Improve layout of add-command dialog
commit d1b799be09bc64457c26bb79b4a3c0bfcd2d0823
Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
Date: Sat Aug 17 00:46:14 2019 +0200
keyboard: Add mnemonics to add-command dialog (Bug #10495)
The icon-button for the command is used to be consistent with
xfce4-session's add autostart entry dialog.
commit 8d75b768b203323fd0402bd6247ac04c98ef00b4
Author: Саша Петровић <salepetronije@gmail.com>
Date: Thu Aug 15 00:30:56 2019 +0200
I18n: Update translation sr (100%).
452 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 143b9e6d860f669332180aee9dd9ea780deef99d
Author: Sean Davis <smd.seandavis@gmail.com>
Date: Sun Aug 11 16:26:38 2019 -0400
Back to development
commit a60f610f9b8aac1fa45bcb52ebb647011341a03c
Author: Sean Davis <smd.seandavis@gmail.com>
Date: Sun Aug 11 16:23:37 2019 -0400
Updates for release
commit 682c5d83a24ccc450d6efc07058f4747a5c01181
Author: Kjell Cato Heskjestad <cato@heskjestad.xyz>
Date: Sun Aug 11 12:31:19 2019 +0200
......
4.14.1
======
- display: Fix profile matching in xfsettingsd
- display: Assure correct gchar** (Bug #15816)
- color: Conditionally hide info button in add-profile dialog
- color: Add tooltip to profile info buttons
- keyboard: Add mnemonics to add-command dialog (Bug #10495)
- keyboard: Improve layout of add-command dialog
- Translation Updates:
Arabic, Bulgarian, Chinese (China), Dutch, French, Galician, German,
Hebrew, Italian, Portuguese (Brazil), Russian, Serbian
4.14.0
======
- a11y: Replace GtkStock buttons
......
This diff is collapsed.
......@@ -162,11 +162,6 @@ display_settings_get_profiles (gchar **display_infos, XfconfChannel *channel)
g_free (profile_name);
}
for (m = 0; m < noutput; ++m)
{
g_free (display_infos[m]);
}
g_free (display_infos);
g_list_free (channel_contents);
g_hash_table_destroy (properties);
......
#! /bin/sh
# From configure.ac 682c5d83.
# From configure.ac d708d5df.
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for xfce4-settings 4.14.0.
# Generated by GNU Autoconf 2.69 for xfce4-settings 4.14.1.
#
# Report bugs to <https://bugzilla.xfce.org/>.
#
......@@ -594,8 +594,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='xfce4-settings'
PACKAGE_TARNAME='xfce4-settings'
PACKAGE_VERSION='4.14.0'
PACKAGE_STRING='xfce4-settings 4.14.0'
PACKAGE_VERSION='4.14.1'
PACKAGE_STRING='xfce4-settings 4.14.1'
PACKAGE_BUGREPORT='https://bugzilla.xfce.org/'
PACKAGE_URL=''
 
......@@ -1530,7 +1530,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures xfce4-settings 4.14.0 to adapt to many kinds of systems.
\`configure' configures xfce4-settings 4.14.1 to adapt to many kinds of systems.
 
Usage: $0 [OPTION]... [VAR=VALUE]...
 
......@@ -1605,7 +1605,7 @@ fi
 
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of xfce4-settings 4.14.0:";;
short | recursive ) echo "Configuration of xfce4-settings 4.14.1:";;
esac
cat <<\_ACEOF
 
......@@ -1768,7 +1768,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
xfce4-settings configure 4.14.0
xfce4-settings configure 4.14.1
generated by GNU Autoconf 2.69
 
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -2140,7 +2140,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
 
It was created by xfce4-settings $as_me 4.14.0, which was
It was created by xfce4-settings $as_me 4.14.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
 
$ $0 $@
......@@ -3007,7 +3007,7 @@ fi
 
# Define the identity of the package.
PACKAGE='xfce4-settings'
VERSION='4.14.0'
VERSION='4.14.1'
 
 
cat >>confdefs.h <<_ACEOF
......@@ -8151,8 +8151,11 @@ _LT_EOF
test $ac_status = 0; }; then
# Now try to grab the symbols.
nlist=conftest.nm
$ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&5
if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&5 && test -s "$nlist"; then
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
(eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; } && test -s "$nlist"; then
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
......@@ -10229,12 +10232,6 @@ lt_prog_compiler_static=
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-static'
;;
# flang / f18. f95 an alias for gfortran or flang on Debian
flang* | f18* | f95*)
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-fPIC'
lt_prog_compiler_static='-static'
;;
# icc used to be incompatible with GCC.
# ICC 10 doesn't accept -KPIC any more.
icc* | ifort*)
......@@ -13830,7 +13827,7 @@ _ACEOF
 
 
 
ALL_LINGUAS="am ar ast be bg bn ca cs da de el en_AU en_GB es eu fi fr gl he hr hu hy_AM id ie is it ja kk ko lt lv ms nb nl nn oc pa pl pt_BR pt ro ru si sk sl sq sr sv te th tr ug uk ur_PK ur zh_CN zh_HK zh_TW "
ALL_LINGUAS="am ar ast be bg bn ca cs da de el en_AU en_CA en_GB es eu fi fr gl he hr hu hy_AM id ie is it ja kk ko lt lv ms nb nl nn oc pa pl pt_BR pt ro ru si sk sl sq sr sv te th tr ug uk ur_PK ur zh_CN zh_HK zh_TW "
 
for ac_header in locale.h
do :
......@@ -14791,7 +14788,7 @@ fi
echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config"
echo "*** from the freedesktop.org software repository at"
echo "***"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "*** http://www.freedesktop.org/software/pkgconfig"
echo "***"
exit 1;
fi
......@@ -14986,7 +14983,7 @@ fi
echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config"
echo "*** from the freedesktop.org software repository at"
echo "***"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "*** http://www.freedesktop.org/software/pkgconfig"
echo "***"
exit 1;
fi
......@@ -15181,7 +15178,7 @@ fi
echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config"
echo "*** from the freedesktop.org software repository at"
echo "***"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "*** http://www.freedesktop.org/software/pkgconfig"
echo "***"
exit 1;
fi
......@@ -15376,7 +15373,7 @@ fi
echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config"
echo "*** from the freedesktop.org software repository at"
echo "***"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "*** http://www.freedesktop.org/software/pkgconfig"
echo "***"
exit 1;
fi
......@@ -15571,7 +15568,7 @@ fi
echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config"
echo "*** from the freedesktop.org software repository at"
echo "***"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "*** http://www.freedesktop.org/software/pkgconfig"
echo "***"
exit 1;
fi
......@@ -15766,7 +15763,7 @@ fi
echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config"
echo "*** from the freedesktop.org software repository at"
echo "***"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "*** http://www.freedesktop.org/software/pkgconfig"
echo "***"
exit 1;
fi
......@@ -15961,7 +15958,7 @@ fi
echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config"
echo "*** from the freedesktop.org software repository at"
echo "***"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "*** http://www.freedesktop.org/software/pkgconfig"
echo "***"
exit 1;
fi
......@@ -16156,7 +16153,7 @@ fi
echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config"
echo "*** from the freedesktop.org software repository at"
echo "***"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "*** http://www.freedesktop.org/software/pkgconfig"
echo "***"
exit 1;
fi
......@@ -16351,7 +16348,7 @@ fi
echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config"
echo "*** from the freedesktop.org software repository at"
echo "***"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "*** http://www.freedesktop.org/software/pkgconfig"
echo "***"
exit 1;
fi
......@@ -16546,7 +16543,7 @@ fi
echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config"
echo "*** from the freedesktop.org software repository at"
echo "***"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "*** http://www.freedesktop.org/software/pkgconfig"
echo "***"
exit 1;
fi
......@@ -16742,7 +16739,7 @@ fi
echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config"
echo "*** from the freedesktop.org software repository at"
echo "***"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "*** http://www.freedesktop.org/software/pkgconfig"
echo "***"
exit 1;
fi
......@@ -17795,7 +17792,7 @@ fi
echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config"
echo "*** from the freedesktop.org software repository at"
echo "***"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "*** http://www.freedesktop.org/software/pkgconfig"
echo "***"
exit 1;
fi
......@@ -17987,7 +17984,7 @@ fi
echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config"
echo "*** from the freedesktop.org software repository at"
echo "***"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "*** http://www.freedesktop.org/software/pkgconfig"
echo "***"
exit 1;
fi
......@@ -18196,7 +18193,7 @@ fi
echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config"
echo "*** from the freedesktop.org software repository at"
echo "***"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "*** http://www.freedesktop.org/software/pkgconfig"
echo "***"
exit 1;
fi
......@@ -18443,7 +18440,7 @@ fi
echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config"
echo "*** from the freedesktop.org software repository at"
echo "***"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "*** http://www.freedesktop.org/software/pkgconfig"
echo "***"
exit 1;
fi
......@@ -18679,7 +18676,7 @@ fi
echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config"
echo "*** from the freedesktop.org software repository at"
echo "***"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "*** http://www.freedesktop.org/software/pkgconfig"
echo "***"
exit 1;
fi
......@@ -18915,7 +18912,7 @@ fi
echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config"
echo "*** from the freedesktop.org software repository at"
echo "***"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "*** http://www.freedesktop.org/software/pkgconfig"
echo "***"
exit 1;
fi
......@@ -19152,7 +19149,7 @@ fi
echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config"
echo "*** from the freedesktop.org software repository at"
echo "***"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "*** http://www.freedesktop.org/software/pkgconfig"
echo "***"
exit 1;
fi
......@@ -19388,7 +19385,7 @@ fi
echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config"
echo "*** from the freedesktop.org software repository at"
echo "***"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "*** http://www.freedesktop.org/software/pkgconfig"
echo "***"
exit 1;
fi
......@@ -19624,7 +19621,7 @@ fi
echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config"
echo "*** from the freedesktop.org software repository at"
echo "***"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "*** http://www.freedesktop.org/software/pkgconfig"
echo "***"
exit 1;
fi
......@@ -19860,7 +19857,7 @@ fi
echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config"
echo "*** from the freedesktop.org software repository at"
echo "***"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "*** http://www.freedesktop.org/software/pkgconfig"
echo "***"
exit 1;
fi
......@@ -20095,7 +20092,7 @@ fi
echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config"
echo "*** from the freedesktop.org software repository at"
echo "***"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "*** http://www.freedesktop.org/software/pkgconfig"
echo "***"
exit 1;
fi
......@@ -20330,7 +20327,7 @@ fi
echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config"
echo "*** from the freedesktop.org software repository at"
echo "***"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "*** http://www.freedesktop.org/software/pkgconfig"
echo "***"
exit 1;
fi
......@@ -20483,7 +20480,7 @@ $as_echo "#define DEBUG 1" >>confdefs.h
-Wno-unused-parameter -Wold-style-definition \
-Wdeclaration-after-statement \
-Wmissing-declarations \
-Wmissing-noreturn -Wpointer-arith \
-Wmissing-noreturn -Wshadow -Wpointer-arith \
-Wcast-align -Wformat -Wformat-security -Wformat-y2k \
-Winit-self -Wmissing-include-dirs -Wundef \
-Wnested-externs"
......@@ -20506,7 +20503,7 @@ $as_echo "#define DEBUG_TRACE 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: full" >&5
$as_echo "full" >&6; }
else
xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -g -Wshadow"
xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -g"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
fi
......@@ -21198,7 +21195,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by xfce4-settings $as_me 4.14.0, which was
This file was extended by xfce4-settings $as_me 4.14.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
 
CONFIG_FILES = $CONFIG_FILES
......@@ -21264,7 +21261,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
xfce4-settings config.status 4.14.0
xfce4-settings config.status 4.14.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
 
......
......@@ -16,9 +16,9 @@ dnl *** Version information ***
dnl ***************************
m4_define([xfce4_settings_version_major], [4])
m4_define([xfce4_settings_version_minor], [14])
m4_define([xfce4_settings_version_micro], [0])
m4_define([xfce4_settings_version_micro], [1])
m4_define([xfce4_settings_version_nano], [])
m4_define([xfce4_settings_version_build], [682c5d83])
m4_define([xfce4_settings_version_build], [d708d5df])
m4_define([xfce4_settings_version_tag], []) # Leave empty for releases
m4_define([xfce4_settings_version], [xfce4_settings_version_major().xfce4_settings_version_minor().xfce4_settings_version_micro()ifelse(xfce4_settings_version_nano(), [], [], [.xfce4_settings_version_nano()])ifelse(xfce4_settings_version_tag(), [git], [xfce4_settings_version_tag()-xfce4_settings_version_build()], [xfce4_settings_version_tag()])])
......@@ -42,7 +42,7 @@ AC_COPYRIGHT([Copyright (c) 2008-2019
AC_INIT([xfce4-settings], [xfce4_settings_version], [https://bugzilla.xfce.org/])
AC_PREREQ([2.60])
AC_CONFIG_MACRO_DIRS([m4])
AC_REVISION([682c5d83])
AC_REVISION([d708d5df])
dnl ***************************
dnl *** Initialize automake ***
......@@ -83,7 +83,7 @@ AC_CHECK_FUNCS([daemon setsid])
dnl ******************************
dnl *** Check for i18n support ***
dnl ******************************
XDT_I18N([am ar ast be bg bn ca cs da de el en_AU en_GB es eu fi fr gl he hr hu hy_AM id ie is it ja kk ko lt lv ms nb nl nn oc pa pl pt_BR pt ro ru si sk sl sq sr sv te th tr ug uk ur_PK ur zh_CN zh_HK zh_TW ])
XDT_I18N([am ar ast be bg bn ca cs da de el en_AU en_CA en_GB es eu fi fr gl he hr hu hy_AM id ie is it ja kk ko lt lv ms nb nl nn oc pa pl pt_BR pt ro ru si sk sl sq sr sv te th tr ug uk ur_PK ur zh_CN zh_HK zh_TW ])
dnl ***********************************
dnl *** Version string for the docs ***
......
xfce4-settings (4.14.1-1) unstable; urgency=medium
* New upstream version 4.14.1
-- Yves-Alexis Perez <corsac@debian.org> Thu, 22 Aug 2019 20:25:15 +0200
xfce4-settings (4.14.0-1) unstable; urgency=medium
[ Mateusz Łukasik ]
......
......@@ -62,34 +62,34 @@
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="button1">
<property name="label" translatable="yes">_Help</property>
<object class="GtkButton" id="button2">
<property name="label" translatable="yes">_Close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="image">image6</property>
<property name="image">image7</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
<property name="secondary">True</property>
</packing>
</child>
<child>
<object class="GtkButton" id="button2">
<property name="label" translatable="yes">_Close</property>
<object class="GtkButton" id="button1">
<property name="label" translatable="yes">_Help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="image">image7</property>
<property name="image">image6</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
<property name="secondary">True</property>
</packing>
</child>
</object>
......@@ -402,6 +402,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Show detailed information about the selected profile</property>
<property name="image">image4</property>
</object>
<packing>
......@@ -485,8 +486,8 @@
</object>
</child>
<action-widgets>
<action-widget response="-11">button1</action-widget>
<action-widget response="0">button2</action-widget>
<action-widget response="-11">button1</action-widget>
</action-widgets>
</object>
<object class="GtkListStore" id="liststore-assign">
......@@ -610,6 +611,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Show detailed information about the selected profile</property>
<property name="image">image5</property>
</object>
<packing>
......
......@@ -46,6 +46,13 @@ static const char color_dialog_ui[] =
"ss=\"GtkButtonBox\" id=\"dialog-action_area1\"><property name=\"visible"
"\">True</property><property name=\"can_focus\">False</property><propert"
"y name=\"layout_style\">end</property><child><object class=\"GtkButton\""
" id=\"button2\"><property name=\"label\" translatable=\"yes\">_Close</p"
"roperty><property name=\"visible\">True</property><property name=\"can_"
"focus\">True</property><property name=\"receives_default\">True</proper"
"ty><property name=\"image\">image7</property><property name=\"use_under"
"line\">True</property></object><packing><property name=\"expand\">False"
"</property><property name=\"fill\">False</property><property name=\"pos"
"ition\">0</property></packing></child><child><object class=\"GtkButton\""
" id=\"button1\"><property name=\"label\" translatable=\"yes\">_Help</pr"
"operty><property name=\"visible\">True</property><property name=\"can_f"
"ocus\">True</property><property name=\"receives_default\">True</propert"
......@@ -53,13 +60,6 @@ static const char color_dialog_ui[] =
"ine\">True</property></object><packing><property name=\"expand\">False<"
"/property><property name=\"fill\">False</property><property name=\"posi"
"tion\">0</property><property name=\"secondary\">True</property></packin"
"g></child><child><object class=\"GtkButton\" id=\"button2\"><property n"
"ame=\"label\" translatable=\"yes\">_Close</property><property name=\"vi"
"sible\">True</property><property name=\"can_focus\">True</property><pro"
"perty name=\"receives_default\">True</property><property name=\"image\""
">image7</property><property name=\"use_underline\">True</property></obj"
"ect><packing><property name=\"expand\">False</property><property name=\""
"fill\">False</property><property name=\"position\">0</property></packin"
"g></child></object><packing><property name=\"expand\">False</property><"
"property name=\"fill\">True</property><property name=\"pack_type\">end<"
"/property><property name=\"position\">0</property></packing></child><ch"
......@@ -194,103 +194,107 @@ static const char color_dialog_ui[] =
"operty><property name=\"position\">1</property></packing></child><child"
"><object class=\"GtkButton\" id=\"profiles-info\"><property name=\"visi"
"ble\">True</property><property name=\"can_focus\">True</property><prope"
"rty name=\"receives_default\">True</property><property name=\"image\">i"
"mage4</property></object><packing><property name=\"expand\">False</prop"
"erty><property name=\"fill\">True</property><property name=\"position\""
">2</property></packing></child></object><packing><property name=\"expan"
"d\">False</property><property name=\"fill\">True</property><property na"
"me=\"position\">0</property></packing></child><child><object class=\"Gt"
"kBox\"><property name=\"visible\">True</property><property name=\"can_f"
"ocus\">False</property><property name=\"orientation\">vertical</propert"
"y><child><object class=\"GtkButton\" id=\"profiles-enable\"><property n"
"ame=\"label\" translatable=\"yes\">Enable</property><property name=\"vi"
"sible\">True</property><property name=\"can_focus\">True</property><pro"
"perty name=\"receives_default\">True</property><property name=\"tooltip"
"_text\" translatable=\"yes\">Enable the selected profile</property></ob"
"ject><packing><property name=\"expand\">False</property><property name="
"\"fill\">True</property><property name=\"position\">0</property></packi"
"ng></child></object><packing><property name=\"expand\">False</property>"
"<property name=\"fill\">True</property><property name=\"pack_type\">end"
"</property><property name=\"position\">2</property></packing></child></"
"object></child><child type=\"label_item\"><placeholder/></child><style>"
"<class name=\"inline-toolbar\"/></style></object><packing><property nam"
"e=\"expand\">False</property><property name=\"fill\">True</property><pr"
"operty name=\"position\">3</property></packing></child></object><packin"
"g><property name=\"resize\">True</property><property name=\"shrink\">Fa"
"lse</property></packing></child><style><class name=\"frame\"/></style><"
"/object><packing><property name=\"expand\">True</property><property nam"
"e=\"fill\">True</property><property name=\"position\">0</property></pac"
"king></child></object><packing><property name=\"expand\">True</property"
"><property name=\"fill\">True</property><property name=\"position\">1</"
"property></packing></child></object></child><action-widgets><action-wid"
"get response=\"-11\">button1</action-widget><action-widget response=\"0"
"\">button2</action-widget></action-widgets></object><object class=\"Gtk"
"ListStore\" id=\"liststore-assign\"><columns><column type=\"gchararray\""
"/><column type=\"GObject\"/><column type=\"guint\"/><column type=\"gcha"
"rarray\"/></columns></object><object class=\"XfceTitledDialog\" id=\"di"
"alog-assign\"><property name=\"can_focus\">False</property><property na"
"me=\"title\" translatable=\"yes\">Add Profile to Device</property><prop"
"erty name=\"modal\">True</property><property name=\"default_width\">350"
"</property><property name=\"default_height\">500</property><property na"
"me=\"icon_name\">xfce4-color-settings</property><property name=\"type_h"
"int\">dialog</property><property name=\"transient_for\">dialog</propert"
"y><property name=\"subtitle\" translatable=\"yes\">Add a Color Profile "
"to your Device</property><child internal-child=\"vbox\"><object class=\""
"GtkBox\"><property name=\"can_focus\">False</property><property name=\""
"orientation\">vertical</property><property name=\"spacing\">2</property"
"><child internal-child=\"action_area\"><object class=\"GtkButtonBox\"><"
"property name=\"can_focus\">False</property><property name=\"layout_sty"
"le\">end</property><child><object class=\"GtkButton\" id=\"assign-cance"
"l\"><property name=\"label\" translatable=\"yes\">_Cancel</property><pr"
"operty name=\"visible\">True</property><property name=\"can_focus\">Tru"
"e</property><property name=\"receives_default\">True</property><propert"
"y name=\"use_underline\">True</property></object><packing><property nam"
"e=\"expand\">True</property><property name=\"fill\">True</property><pro"
"perty name=\"position\">0</property></packing></child><child><object cl"
"ass=\"GtkButton\" id=\"assign-ok\"><property name=\"label\" translatabl"
"e=\"yes\">_OK</property><property name=\"visible\">True</property><prop"
"erty name=\"can_focus\">True</property><property name=\"receives_defaul"
"t\">True</property><property name=\"use_underline\">True</property></ob"
"ject><packing><property name=\"expand\">True</property><property name=\""
"fill\">True</property><property name=\"position\">1</property></packing"
"></child></object><packing><property name=\"expand\">False</property><p"
"roperty name=\"fill\">False</property><property name=\"position\">0</pr"
"operty></packing></child><child><object class=\"GtkBox\"><property name"
"=\"visible\">True</property><property name=\"can_focus\">False</propert"
"y><property name=\"margin_left\">12</property><property name=\"margin_r"
"ight\">12</property><property name=\"margin_top\">12</property><propert"
"y name=\"orientation\">vertical</property><child><object class=\"GtkScr"
"olledWindow\"><property name=\"visible\">True</property><property name="
"\"can_focus\">True</property><property name=\"shadow_type\">in</propert"
"y><child><object class=\"GtkTreeView\" id=\"treeview-assign\"><property"
" name=\"visible\">True</property><property name=\"can_focus\">True</pro"
"perty><property name=\"model\">liststore-assign</property><child intern"
"al-child=\"selection\"><object class=\"GtkTreeSelection\"/></child></ob"
"ject></child></object><packing><property name=\"expand\">True</property"
"><property name=\"fill\">True</property><property name=\"position\">0</"
"property></packing></child><child><object class=\"GtkBox\"><property na"
"me=\"visible\">True</property><property name=\"can_focus\">False</prope"
"rty><property name=\"margin_bottom\">12</property><child><object class="
"\"GtkButton\" id=\"assign-import\"><property name=\"visible\">True</pro"
"perty><property name=\"can_focus\">True</property><property name=\"rece"
"ives_default\">True</property><property name=\"tooltip_text\" translata"
"ble=\"yes\">Import color profile files (*.icc)</property><property name"
"=\"halign\">start</property><property name=\"image\">image3</property><"
"/object><packing><property name=\"expand\">False</property><property na"
"me=\"fill\">False</property><property name=\"position\">0</property></p"
"acking></child><child><object class=\"GtkButton\" id=\"assign-info\"><p"
"roperty name=\"visible\">True</property><property name=\"can_focus\">Tr"
"ue</property><property name=\"receives_default\">True</property><proper"
"ty name=\"image\">image5</property></object><packing><property name=\"e"
"xpand\">False</property><property name=\"fill\">True</property><propert"
"y name=\"position\">1</property></packing></child><style><class name=\""
"inline-toolbar\"/></style></object><packing><property name=\"expand\">F"
"alse</property><property name=\"fill\">True</property><property name=\""
"position\">1</property></packing></child></object><packing><property na"
"me=\"expand\">True</property><property name=\"fill\">True</property><pr"
"operty name=\"position\">1</property></packing></child></object></child"
"></object><object class=\"GtkListStore\" id=\"profiles\"/></interface>"
"rty name=\"receives_default\">True</property><property name=\"tooltip_t"
"ext\" translatable=\"yes\">Show detailed information about the selected"
" profile</property><property name=\"image\">image4</property></object><"
"packing><property name=\"expand\">False</property><property name=\"fill"
"\">True</property><property name=\"position\">2</property></packing></c"
"hild></object><packing><property name=\"expand\">False</property><prope"
"rty name=\"fill\">True</property><property name=\"position\">0</propert"
"y></packing></child><child><object class=\"GtkBox\"><property name=\"vi"
"sible\">True</property><property name=\"can_focus\">False</property><pr"
"operty name=\"orientation\">vertical</property><child><object class=\"G"
"tkButton\" id=\"profiles-enable\"><property name=\"label\" translatable"
"=\"yes\">Enable</property><property name=\"visible\">True</property><pr"
"operty name=\"can_focus\">True</property><property name=\"receives_defa"
"ult\">True</property><property name=\"tooltip_text\" translatable=\"yes"
"\">Enable the selected profile</property></object><packing><property na"
"me=\"expand\">False</property><property name=\"fill\">True</property><p"
"roperty name=\"position\">0</property></packing></child></object><packi"
"ng><property name=\"expand\">False</property><property name=\"fill\">Tr"
"ue</property><property name=\"pack_type\">end</property><property name="
"\"position\">2</property></packing></child></object></child><child type"
"=\"label_item\"><placeholder/></child><style><class name=\"inline-toolb"
"ar\"/></style></object><packing><property name=\"expand\">False</proper"
"ty><property name=\"fill\">True</property><property name=\"position\">3"
"</property></packing></child></object><packing><property name=\"resize\""
">True</property><property name=\"shrink\">False</property></packing></c"
"hild><style><class name=\"frame\"/></style></object><packing><property "
"name=\"expand\">True</property><property name=\"fill\">True</property><"
"property name=\"position\">0</property></packing></child></object><pack"
"ing><property name=\"expand\">True</property><property name=\"fill\">Tr"
"ue</property><property name=\"position\">1</property></packing></child>"
"</object></child><action-widgets><action-widget response=\"0\">button2<"
"/action-widget><action-widget response=\"-11\">button1</action-widget><"
"/action-widgets></object><object class=\"GtkListStore\" id=\"liststore-"
"assign\"><columns><column type=\"gchararray\"/><column type=\"GObject\""
"/><column type=\"guint\"/><column type=\"gchararray\"/></columns></obje"
"ct><object class=\"XfceTitledDialog\" id=\"dialog-assign\"><property na"
"me=\"can_focus\">False</property><property name=\"title\" translatable="
"\"yes\">Add Profile to Device</property><property name=\"modal\">True</"
"property><property name=\"default_width\">350</property><property name="
"\"default_height\">500</property><property name=\"icon_name\">xfce4-col"
"or-settings</property><property name=\"type_hint\">dialog</property><pr"
"operty name=\"transient_for\">dialog</property><property name=\"subtitl"
"e\" translatable=\"yes\">Add a Color Profile to your Device</property><"
"child internal-child=\"vbox\"><object class=\"GtkBox\"><property name=\""
"can_focus\">False</property><property name=\"orientation\">vertical</pr"
"operty><property name=\"spacing\">2</property><child internal-child=\"a"
"ction_area\"><object class=\"GtkButtonBox\"><property name=\"can_focus\""
">False</property><property name=\"layout_style\">end</property><child><"
"object class=\"GtkButton\" id=\"assign-cancel\"><property name=\"label\""
" translatable=\"yes\">_Cancel</property><property name=\"visible\">True"
"</property><property name=\"can_focus\">True</property><property name=\""
"receives_default\">True</property><property name=\"use_underline\">True"
"</property></object><packing><property name=\"expand\">True</property><"
"property name=\"fill\">True</property><property name=\"position\">0</pr"
"operty></packing></child><child><object class=\"GtkButton\" id=\"assign"
"-ok\"><property name=\"label\" translatable=\"yes\">_OK</property><prop"
"erty name=\"visible\">True</property><property name=\"can_focus\">True<"
"/property><property name=\"receives_default\">True</property><property "
"name=\"use_underline\">True</property></object><packing><property name="
"\"expand\">True</property><property name=\"fill\">True</property><prope"
"rty name=\"position\">1</property></packing></child></object><packing><"
"property name=\"expand\">False</property><property name=\"fill\">False<"
"/property><property name=\"position\">0</property></packing></child><ch"
"ild><object class=\"GtkBox\"><property name=\"visible\">True</property>"
"<property name=\"can_focus\">False</property><property name=\"margin_le"
"ft\">12</property><property name=\"margin_right\">12</property><propert"
"y name=\"margin_top\">12</property><property name=\"orientation\">verti"
"cal</property><child><object class=\"GtkScrolledWindow\"><property name"
"=\"visible\">True</property><property name=\"can_focus\">True</property"
"><property name=\"shadow_type\">in</property><child><object class=\"Gtk"
"TreeView\" id=\"treeview-assign\"><property name=\"visible\">True</prop"
"erty><property name=\"can_focus\">True</property><property name=\"model"
"\">liststore-assign</property><child internal-child=\"selection\"><obje"
"ct class=\"GtkTreeSelection\"/></child></object></child></object><packi"
"ng><property name=\"expand\">True</property><property name=\"fill\">Tru"
"e</property><property name=\"position\">0</property></packing></child><"
"child><object class=\"GtkBox\"><property name=\"visible\">True</propert"
"y><property name=\"can_focus\">False</property><property name=\"margin_"
"bottom\">12</property><child><object class=\"GtkButton\" id=\"assign-im"
"port\"><property name=\"visible\">True</property><property name=\"can_f"
"ocus\">True</property><property name=\"receives_default\">True</propert"
"y><property name=\"tooltip_text\" translatable=\"yes\">Import color pro"
"file files (*.icc)</property><property name=\"halign\">start</property>"
"<property name=\"image\">image3</property></object><packing><property n"
"ame=\"expand\">False</property><property name=\"fill\">False</property>"
"<property name=\"position\">0</property></packing></child><child><objec"
"t class=\"GtkButton\" id=\"assign-info\"><property name=\"visible\">Tru"
"e</property><property name=\"can_focus\">True</property><property name="
"\"receives_default\">True</property><property name=\"tooltip_text\" tra"
"nslatable=\"yes\">Show detailed information about the selected profile<"
"/property><property name=\"image\">image5</property></object><packing><"
"property name=\"expand\">False</property><property name=\"fill\">True</"
"property><property name=\"position\">1</property></packing></child><sty"
"le><class name=\"inline-toolbar\"/></style></object><packing><property "
"name=\"expand\">False</property><property name=\"fill\">True</property>"
"<property name=\"position\">1</property></packing></child></object><pac"
"king><property name=\"expand\">True</property><property name=\"fill\">T"
"rue</property><property name=\"position\">1</property></packing></child"
"></object></child></object><object class=\"GtkListStore\" id=\"profiles"
"\"/></interface>"
};
static const unsigned color_dialog_ui_length = 19103u;
static const unsigned color_dialog_ui_length = 19327u;
......@@ -1299,9 +1299,6 @@ color_settings_dialog_init (GtkBuilder *builder)
g_signal_connect (settings->profiles_remove, "clicked", G_CALLBACK (color_settings_profile_remove_cb), settings);
settings->profiles_info = gtk_builder_get_object (builder, "profiles-info");
/* Conditionally show/hide the info button, based on the availability of gnome-color-manager */
if (g_find_program_in_path ("gcm-viewer") == NULL)
gtk_widget_hide (GTK_WIDGET (settings->profiles_info));
gtk_widget_set_sensitive (GTK_WIDGET (settings->profiles_info), FALSE);
g_signal_connect (settings->profiles_info, "clicked", G_CALLBACK (color_settings_profile_info_cb), settings);
......@@ -1354,6 +1351,12 @@ color_settings_dialog_init (GtkBuilder *builder)
g_signal_connect (settings->button_assign_cancel, "clicked",
G_CALLBACK (color_settings_button_assign_cancel_cb), settings);
/* Conditionally show/hide the info buttons, based on the availability of gnome-color-manager */
if (g_find_program_in_path ("gcm-viewer") == NULL) {
gtk_widget_hide (GTK_WIDGET (settings->profiles_info));
gtk_widget_hide (GTK_WIDGET (settings->button_assign_info));
}
cd_client_connect (settings->client,
settings->cancellable,
color_settings_connect_cb,
......
......@@ -1264,12 +1264,13 @@ display_settings_get_display_infos (void)
gchar **display_infos;
guint m;
display_infos = g_new0 (gchar *, xfce_randr->noutput);
display_infos = g_new0 (gchar *, xfce_randr->noutput + 1);
/* get all display edids, to only query randr once */
for (m = 0; m < xfce_randr->noutput; ++m)
{
display_infos[m] = g_strdup_printf ("%s", xfce_randr_get_edid (xfce_randr, m));
}
return display_infos;
}
......@@ -1286,6 +1287,7 @@ display_settings_minimal_profile_populate (GtkBuilder *builder)
display_infos = display_settings_get_display_infos ();
profiles = display_settings_get_profiles (display_infos, display_channel);
g_strfreev (display_infos);
current = g_list_first (profiles);
while (current)
......@@ -1386,6 +1388,7 @@ display_settings_profile_list_populate (GtkBuilder *builder)
display_infos = display_settings_get_display_infos ();
profiles = display_settings_get_profiles (display_infos, display_channel);
g_strfreev (display_infos);
/* Populate treeview */
current = g_list_first (profiles);
......
......@@ -100,6 +100,7 @@ command_dialog_create_contents (CommandDialog *dialog,
GtkWidget *content_box;
GtkWidget *hbox;
GtkWidget *label;
GtkWidget *image;
GtkWidget *table;
/* Set dialog title and icon */
......@@ -107,11 +108,11 @@ command_dialog_create_contents (CommandDialog *dialog,
gtk_window_set_icon_name (GTK_WINDOW (dialog), "application-x-executable");
/* Create cancel button */
button = gtk_button_new_with_label (_("Cancel"));
button = gtk_button_new_with_mnemonic (_("_Cancel"));
gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, GTK_RESPONSE_CANCEL);
gtk_widget_show (button);
button = gtk_button_new_with_label (_("OK"));
button = gtk_button_new_with_mnemonic (_("_OK"));
gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, GTK_RESPONSE_OK);
gtk_widget_set_can_default (GTK_WIDGET(button), TRUE);
gtk_widget_grab_default (button);
......@@ -119,9 +120,7 @@ command_dialog_create_contents (CommandDialog *dialog,
/* Set the main box layout */
content_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
gtk_widget_set_margin_bottom (GTK_WIDGET(content_box), 6);
gtk_widget_set_margin_start (GTK_WIDGET(content_box), 12);
gtk_container_set_border_width (GTK_CONTAINER (content_box), 6);
gtk_container_set_border_width (GTK_CONTAINER (content_box), 12);
gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), content_box);
gtk_widget_show (content_box);
......@@ -144,7 +143,7 @@ command_dialog_create_contents (CommandDialog *dialog,
table = gtk_grid_new ();
gtk_grid_set_row_spacing (GTK_GRID (table), 6);
gtk_grid_set_column_spacing (GTK_GRID (table), 12);
gtk_container_set_border_width (GTK_CONTAINER (table), 6);
gtk_widget_set_margin_top (GTK_WIDGET (table), 6);
gtk_container_add (GTK_CONTAINER (content_box), table);
gtk_widget_show (table);
......@@ -165,29 +164,33 @@ command_dialog_create_contents (CommandDialog *dialog,
gtk_widget_show (label);
}
label = gtk_label_new (_("Command:"));
label = gtk_label_new_with_mnemonic (_("Comm_and:"));
gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START);
gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_CENTER);
gtk_grid_attach (GTK_GRID (table), label, 0, 1, 1, 1);
gtk_widget_show (label);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
gtk_widget_set_hexpand (hbox, TRUE);
gtk_grid_attach (GTK_GRID (table), hbox, 1, 1, 1, 1);
gtk_widget_show (hbox);
dialog->entry = gtk_entry_new ();
gtk_entry_set_activates_default (GTK_ENTRY (dialog->entry), TRUE);
gtk_entry_set_text (GTK_ENTRY (dialog->entry), action != NULL ? action : "");
gtk_container_add (GTK_CONTAINER (hbox), dialog->entry);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), GTK_WIDGET (dialog->entry));
gtk_box_pack_start (GTK_BOX (hbox), dialog->entry, TRUE, TRUE, 0);
gtk_widget_show (dialog->entry);
dialog->button = gtk_button_new_with_label (_("Open"));
dialog->button = gtk_button_new ();
image = gtk_image_new_from_icon_name ("document-open", GTK_ICON_SIZE_BUTTON);
gtk_button_set_image (GTK_BUTTON (dialog->button), image);
g_signal_connect_swapped (dialog->button, "clicked", G_CALLBACK (command_dialog_button_clicked), dialog);
gtk_box_pack_start (GTK_BOX (hbox), dialog->button, FALSE, TRUE, 0);
gtk_box_pack_end (GTK_BOX (hbox), dialog->button, FALSE, TRUE, 0);
gtk_widget_show (dialog->button);
dialog->sn_option = gtk_check_button_new_with_mnemonic (_("Use _startup notification"));
gtk_grid_attach (GTK_GRID (table), dialog->sn_option, 0, 2, 1, 1);
gtk_grid_attach (GTK_GRID (table), dialog->sn_option, 0, 2, 2, 1);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->sn_option), snotify);
gtk_widget_show (dialog->sn_option);
......@@ -256,8 +259,8 @@ command_dialog_button_clicked (CommandDialog *dialog)
chooser = gtk_file_chooser_dialog_new (_("Select command"),
GTK_WINDOW (dialog),
GTK_FILE_CHOOSER_ACTION_OPEN,
_("Cancel"), GTK_RESPONSE_CANCEL,
_("Open"), GTK_RESPONSE_OK, NULL);
_("_Cancel"), GTK_RESPONSE_CANCEL,
_("_Open"), GTK_RESPONSE_OK, NULL);
/* Add file chooser filters */
filter = gtk_file_filter_new ();
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.