Skip to content
Commits on Source (8)
Expand all Show whitespace changes
Inline Side-by-side
ChangeLog
View file @ 91ab7f71
commit 682c5d83a24ccc450d6efc07058f4747a5c01181
Author: Kjell Cato Heskjestad <cato@heskjestad.xyz>
Date: Sun Aug 11 12:31:19 2019 +0200
I18n: Update translation nb (100%).
452 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit d2ad11761ca984a0035026c1cb59e8f934f17114
Author: Emanuele Petriglia <transifex@emanuelepetriglia.com>
Date: Thu Aug 8 18:32:17 2019 +0200
I18n: Update translation it (100%).
452 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 09bdf5d1118b9ba8ce48fb8cf4528f024b218be2
Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
Date: Mon Aug 5 09:37:41 2019 +0200
display: Fix settings retention (Bug #15437)
While this is a rather big commit, at the core it's simply replacing a
misguided call to xfce_randr_new. This led to xfsettingsd asking X for
the default/preferred mode etc. of the connected displays, essentially
resetting all saved settings (i.e. the "Default" profile in xfconf).
The correct approach is to get all necessary display_infos from the xfce
display helper (aka displays.c).
Other, unrelated, changes are the replacement of the completely
unnecessary "buf" variable and correctly freeing the GList
"channel_contents".
commit 6592ab6b6b431ae2e60ee60f116cc0ddad3fabb6
Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
Date: Wed Aug 7 09:32:09 2019 +0200
display: Don't warn on deleting last profile
commit eea301d77f989c32e7e7224e5582095e1fae964d
Author: Anonymous <noreply@xfce.org>
Date: Wed Aug 7 00:30:55 2019 +0200
I18n: Update translation da (100%).
452 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 0cec2e9eafa4d0c2317740b9590e7cdcc4f51894
Author: Jiri Grönroos <jiri.gronroos@iki.fi>
Date: Mon Aug 5 18:30:43 2019 +0200
I18n: Update translation fi (100%).
452 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 71cc2840eb09c59154ca80b2ba0417d88aeeb836
Author: Anonymous <noreply@xfce.org>
Date: Sun Aug 4 18:30:54 2019 +0200
I18n: Update translation hu (100%).
452 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 36fd6baa612c0bea6becc0f5c827ffffb2d0e291
Author: Daniel Muñiz Fontoira <dani@damufo.com>
Date: Sun Aug 4 18:30:53 2019 +0200
I18n: Update translation gl (100%).
452 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit d403bc6abc9bd49b9f95d1ba647fe112519597dd
Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
Date: Sat Aug 3 23:22:18 2019 +0200
display: Remove debug statement breaking profiles (Bug #15769)
These debug statements were introduced by accident in commit
4e56723968b2f35fb45d4a8e38e8b6415aeccbd4
commit fcdbcf3250f351f16fa6218b96dd7ae75cbfc0c2
Author: Baurzhan Muftakhidinov <baurthefirst@gmail.com>
Date: Sat Aug 3 12:31:03 2019 +0200
I18n: Update translation kk (100%).
452 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 445b1b9b16f17ea76ad1887c283235d7fc042f30
Author: Daniel Muñiz Fontoira <dani@damufo.com>
Date: Sat Aug 3 12:31:01 2019 +0200
I18n: Update translation gl (100%).
452 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 3091ebafbbb6ee499f1e9179b027636274b6d54a
Author: Hugo Carvalho <hugokarvalho@hotmail.com>
Date: Fri Aug 2 12:30:52 2019 +0200
I18n: Update translation pt (100%).
452 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 03874e0dbc3219d148b61f839a520ba6a459252c
Author: Zmicer Turok <nashtlumach@gmail.com>
Date: Fri Aug 2 12:30:52 2019 +0200
I18n: Update translation be (100%).
452 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit dad52673656236569938be28f14474d22e414040
Author: Michael Martins <michaelfm21@gmail.com>
Date: Fri Aug 2 06:31:12 2019 +0200
I18n: Update translation pt_BR (100%).
452 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 281c736967d380aa5cc384b722e87d07a784df16
Author: Andre Miranda <andreldm@xfce.org>
Date: Thu Aug 1 23:12:02 2019 -0300
settings-editor: Fix buttons declaration
commit d5337a7a02d20bb9cd9e42a41eb25133002fb6b1
Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
Date: Thu Aug 1 00:28:27 2019 +0200
settings-editor: Replace GtkStock buttons
commit 43c5277a22947b1aa294272c4850a1367d2fd07e
Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
Date: Thu Aug 1 00:09:17 2019 +0200
Make strings translateable
commit 7da4dcd4a62f9fca6e497d7452ca57251accc1c3
Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
Date: Thu Aug 1 00:08:22 2019 +0200
a11y: Replace GtkStock buttons
commit d5b6b156a7c76938ce729eb550ff4706b3625c18
Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
Date: Thu Aug 1 00:00:14 2019 +0200
mouse: Replace GtkStock buttons
commit 48a2310275c0b96dbd902d530ccf3cb80bd7d2d0
Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
Date: Wed Jul 31 23:58:36 2019 +0200
keyboard: Replace GtkStock buttons
commit ad989a6f382b1ebc45d61f2506279998c66c873e
Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
Date: Wed Jul 31 23:56:05 2019 +0200
color: Replace GtkStock buttons
commit 229169c7b8f2bf249bc80b17b4d3e6d4dd2fcfd2
Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
Date: Wed Jul 31 23:51:58 2019 +0200
appearance: Replace GtkStock buttons
commit 7d488fa8721ebb1e0e8f3f2b0af2d34aaf739a8e
Author: 黃柏諺 <s8321414@gmail.com>
Date: Wed Jul 31 18:30:44 2019 +0200
I18n: Update translation zh_TW (100%).
452 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit ec29a23606e275d808900fa570add3f97804f6f3
Author: 玉堂白鹤 <yjwork@qq.com>
Date: Wed Jul 31 06:31:08 2019 +0200
I18n: Update translation zh_CN (100%).
452 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 945b4cf97a4119c4a9d36194477a4b435db44730
Author: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>
Date: Wed Jul 31 00:30:42 2019 +0200
I18n: Update translation ca (100%).
452 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 011ef66ef9ab5fa088f3b027c6e4fb26af099c68
Author: Igor <f2404@yandex.ru>
Date: Tue Jul 30 18:30:55 2019 +0200
I18n: Update translation ru (100%).
452 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 753fcb277b67ddd40ac03030107161deb26f6471
Author: Yannick Le Guen <leguen.yannick@gmail.com>
Date: Tue Jul 30 18:30:55 2019 +0200
I18n: Update translation fr (100%).
452 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 6bb6b17d82963750fcd8ad552161f89f7ac7f519
Author: Anonymous <noreply@xfce.org>
Date: Tue Jul 30 18:30:55 2019 +0200
I18n: Update translation es (100%).
452 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit e7e820c3a0a4308cb97d342ea77b28280a4bf000
Author: Michal Várady <miko.vaji@gmail.com>
Date: Tue Jul 30 18:30:54 2019 +0200
I18n: Update translation cs (100%).
452 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 7b202a1249dd4252a611d182962d43cd93df3ac9
Author: Andre Miranda <andreldm@xfce.org>
Date: Mon Jul 29 23:27:28 2019 -0300
Make strings translatable
commit ba32b0df81191cda1d9ca8ffddc6cecc5e6ad24b
Author: Andre Miranda <andreldm@xfce.org>
Date: Mon Jul 29 22:00:12 2019 -0300
display-settings: use proper icon name
commit 357bf6c0634aa30732207b558fabdd08e0df969e
Author: Daniel Muñiz Fontoira <dani@damufo.com>
Date: Mon Jul 29 18:30:57 2019 +0200
I18n: Update translation gl (100%).
451 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit eadb1d8944c71a1e13068df2d5830906873ed8b3
Author: Daniel Muñiz Fontoira <dani@damufo.com>
Date: Mon Jul 29 12:31:03 2019 +0200
I18n: Update translation gl (100%).
451 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 44b702be9505b062df096715c59c5b229c5e3969
Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
Date: Sun Jul 28 15:35:09 2019 +0200
Back to development
commit 4e56723968b2f35fb45d4a8e38e8b6415aeccbd4
Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
Date: Sun Jul 28 15:33:13 2019 +0200
Updates for release
commit ea6efed4de5bbd18e92409ba5d03d8d78e48d9df
Author: 玉堂白鹤 <yjwork@qq.com>
Date: Fri Jul 26 06:30:58 2019 +0200
I18n: Update translation zh_CN (100%).
451 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 960504d933378ad8b6f165c0063e7984a5ee0f7b
Author: Olivier Fourdan <fourdan@xfce.org>
Date: Sat Jul 20 17:30:16 2019 +0200
display: Sync display when applying config
Previously the display plugin would flush the display when applying the
configuration.
Use a sync instead to make sure the request is actually sent and
processed by the XServer.
Signed-off-by: Olivier Fourdan <fourdan@xfce.org>
commit 4cdf8a91cb8789a5104f9eb96548497deb591cd7
Author: Olivier Fourdan <fourdan@xfce.org>
Date: Sat Jul 20 15:29:12 2019 +0200
display: Use current display
Instead of getting the default display again and again.
Signed-off-by: Olivier Fourdan <fourdan@xfce.org>
commit 523abc95d66cf7aa76f76ba0a6f0363b2dd4c51c
Author: Olivier Fourdan <fourdan@xfce.org>
Date: Fri Jul 19 14:10:08 2019 +0200
xsettings: Grab and sync XServer on startup (Bug #15725)
Grab the XServer when declaring ourselves the xsettings manager and flush
it prior to ungrabbing it to make sure everything gets set for other clients.
The goal is to avoid other X11 clients from reading xsettings until we
are done initializing.
Signed-off-by: Olivier Fourdan <fourdan@xfce.org>
commit 9c4acaaf5ea233f342b20e709eed25f1be1915ac
Author: Olivier Fourdan <fourdan@xfce.org>
Date: Fri Jul 19 14:05:00 2019 +0200
xfsettingsd: Start settings prior to complete startup (Bug #15725)
On session startup, various gtk based applications are launched concurrently.
If we start the settings daemon simultaneously, those other apps fail to detect
the settings and ignore the various preferences set via xsettings (themes,
icons, etc.).
Make sure we spawn all settings helpers prior to declaring ourselves ready to the
session manager.
Signed-off-by: Olivier Fourdan <fourdan@xfce.org>
commit 86717779a48e7fb4cd37171ca4e2766672a8d8a9
Author: Olivier Fourdan <fourdan@xfce.org>
Date: Sat Jul 20 17:40:29 2019 +0200
Revert "xfsettingsd: Start with the highest priority (Bug #15697)"
This reverts commit 92ddf97f8e8b976c3aa4483e2a5d1a23078ae84f.
Signed-off-by: Olivier Fourdan <fourdan@xfce.org>
commit dc1e2ff11405d897c3060f91a825791b0487b233
Author: Kjell Cato Heskjestad <cato@heskjestad.xyz>
Date: Tue Jul 23 18:31:36 2019 +0200
I18n: Update translation nb (97%).
438 translated messages, 13 untranslated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 840fccea029bd9db5da413e2821c409acfcadc9d
Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
Date: Wed Jul 17 23:34:22 2019 +0200
Update copyright years
commit bdd47c5fce91c10ae41f38d53704f99299c573fe
Author: Jiri Grönroos <jiri.gronroos@iki.fi>
Date: Wed Jul 17 12:32:06 2019 +0200
I18n: Update translation fi (100%).
451 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 92ddf97f8e8b976c3aa4483e2a5d1a23078ae84f
Author: Olivier Fourdan <fourdan@xfce.org>
Date: Wed Jul 10 21:16:18 2019 +0200
xfsettingsd: Start with the highest priority (Bug #15697)
Start the settings daemon with the highest priority, so it gets started
first, because all other components depend on the settings applied by
xfsettingsd and applying those after the other components have started
is very expensive, clients have to reconfigure themselves, reload fonts,
themes, reload configuration, etc.
If we load the settings first, the other applications do not need all
that reconfiguration and therefore we end up starting the whole session
faster.
Signed-off-by: Olivier Fourdan <fourdan@xfce.org>
commit 5377b8c061efaef1261e869b3ccd6e0bfd666be7
Author: Yarema aka Knedlyk <yupadmin@gmail.com>
Date: Wed Jul 10 00:31:25 2019 +0200
I18n: Update translation uk (85%).
385 translated messages, 66 untranslated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 87cc09115a15a777cb4fe571f44caa340d0ee57b
Author: Real School <translator_students@realschool.am>
Date: Wed Jul 3 18:30:39 2019 +0200
I18n: Update translation hy_AM (100%).
451 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit e7a30bdde79d49857e70e442abe8c99f76f2c60e
Author: Real School <translator_students@realschool.am>
Date: Wed Jul 3 12:31:12 2019 +0200
I18n: Update translation hy_AM (82%).
372 translated messages, 79 untranslated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 01b4847f80b2e98e137bc5813486c6acd4740fdd
Author: Sean Davis <smd.seandavis@gmail.com>
Date: Sun Jun 30 17:16:54 2019 -0400
Back to development
commit e74f0edc8bb53ae8150070f5623667c2a68b86e0
Author: Sean Davis <smd.seandavis@gmail.com>
Date: Sun Jun 30 17:13:28 2019 -0400
Updates for release
commit 4b3a588cfc501ed662d67a260c8953ceaeca813b
Author: Sean Davis <smd.seandavis@gmail.com>
Date: Sun Jun 30 06:44:14 2019 -0400
......
NEWS
View file @ 91ab7f71
4.14.0
======
- a11y: Replace GtkStock buttons
- appearance: Replace GtkStock buttons
- color: Replace GtkStock buttons
- display: Don't warn on deleting last profile
- display: Fix settings retention (Bug #15437)
- display: Remove debug statement breaking profiles (Bug #15769)
- display: Use proper icon name
- keyboard: Replace GtkStock buttons
- Make strings translatable
- mouse: Replace GtkStock buttons
- settings-editor: Fix buttons declaration
- settings-editor: Replace GtkStock buttons
- Translation Updates:
Belarusian, Catalan, Chinese (China), Chinese (Taiwan), Czech, Danish,
Finnish, French, Galician, Hungarian, Italian, Kazakh, Norwegian
Bokmål, Portuguese, Portuguese (Brazil), Russian, Spanish,
4.13.8
======
- display: Sync display when applying config
- display: Use current display
- xsettings: Grab and sync XServer on startup (Bug #15725)
- xfsettingsd: Start settings prior to complete startup (Bug #15725)
- Update copyright years
- Translation Updates:
Armenian (Armenia), Finnish, Norwegian Bokmål, Ukrainian
4.13.7
======
- Bugfixes and other small changes:
......
aclocal.m4
View file @ 91ab7f71
......@@ -11262,7 +11262,7 @@ AC_DEFUN([XDT_PROG_PKG_CONFIG],
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 "*** http://www.freedesktop.org/software/pkgconfig"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "***"
exit 1;
fi
......@@ -11275,7 +11275,7 @@ AC_DEFUN([XDT_PROG_PKG_CONFIG],
echo "*** You can download pkg-config from the freedesktop.org"
echo "*** software repository at"
echo "***"
echo "*** http://www.freedesktop.org/software/pkgconfig"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "***"
exit 1
])
......@@ -11622,7 +11622,7 @@ AC_HELP_STRING([--disable-debug], [Include no debugging support]),
-Wno-unused-parameter -Wold-style-definition \
-Wdeclaration-after-statement \
-Wmissing-declarations \
-Wmissing-noreturn -Wshadow -Wpointer-arith \
-Wmissing-noreturn -Wpointer-arith \
-Wcast-align -Wformat -Wformat-security -Wformat-y2k \
-Winit-self -Wmissing-include-dirs -Wundef \
-Wnested-externs"
......@@ -11643,7 +11643,7 @@ AC_HELP_STRING([--disable-debug], [Include no debugging support]),
CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG"
AC_MSG_RESULT([full])
else
xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -g"
xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -g -Wshadow"
AC_MSG_RESULT([yes])
fi
......
common/display-profiles.c
View file @ 91ab7f71
......@@ -66,27 +66,24 @@ display_settings_profile_name_exists (XfconfChannel *channel, const gchar *new_p
current = g_list_next (current);
}
g_list_free (channel_contents);
g_hash_table_destroy (properties);
return TRUE;
}
GList*
display_settings_get_profiles (XfceRandr *xfce_randr, XfconfChannel *channel)
display_settings_get_profiles (gchar **display_infos, XfconfChannel *channel)
{
GHashTable *properties;
GList *channel_contents, *profiles = NULL, *current;
GList *channel_contents;
GList *profiles = NULL;
GList *current;
guint m;
gchar **display_infos;
guint noutput;
properties = xfconf_channel_get_properties (channel, NULL);
channel_contents = g_hash_table_get_keys (properties);
display_infos = g_new0 (gchar *, xfce_randr->noutput);
/* 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));
}
noutput = g_strv_length (display_infos);
/* get all profiles */
current = g_list_first (channel_contents);
......@@ -98,8 +95,8 @@ display_settings_get_profiles (XfceRandr *xfce_randr, XfconfChannel *channel)
gpointer key, value;
guint profile_match = 0;
guint monitors = 0;
gchar *buf;
gchar **current_elements = g_strsplit (current->data, "/", -1);
gchar *profile_name;
/* Only process the profiles and skip all other xfconf properties */
/* If xfconf ever supports just getting the first-level children of a property
......@@ -110,11 +107,12 @@ display_settings_get_profiles (XfceRandr *xfce_randr, XfconfChannel *channel)
current = g_list_next (current);
continue;
}
profile_name = g_strdup_printf ("%s", *(current_elements+1));
g_strfreev (current_elements);
buf = strtok (current->data, "/");
/* Walk through the profile and check if every EDID referenced there is also currently available */
property_profile = g_strdup_printf ("/%s", buf);
property_profile = g_strdup_printf ("/%s", profile_name);
props = xfconf_channel_get_properties (channel, property_profile);
g_hash_table_iter_init (&iter, props);
......@@ -132,7 +130,7 @@ display_settings_get_profiles (XfceRandr *xfce_randr, XfconfChannel *channel)
if (current_edid) {
for (m = 0; m < xfce_randr->noutput; ++m)
for (m = 0; m < noutput; ++m)
{
if (g_strcmp0 (display_infos[m], current_edid) == 0)
{
......@@ -150,20 +148,21 @@ display_settings_get_profiles (XfceRandr *xfce_randr, XfconfChannel *channel)
g_hash_table_destroy (props);
/* filter the content of the combobox to only matching profiles and exclude "Notify", "Default" and "Schemes" */
if (!g_list_find_custom (profiles, (char*) buf, (GCompareFunc) strcmp) &&
strcmp (buf, "Notify") &&
strcmp (buf, "Default") &&
strcmp (buf, "Schemes") &&
if (!g_list_find_custom (profiles, profile_name, (GCompareFunc) strcmp) &&
strcmp (profile_name, "Notify") &&
strcmp (profile_name, "Default") &&
strcmp (profile_name, "Schemes") &&
profile_match == monitors &&
xfce_randr->noutput == profile_match)
noutput == profile_match)
{
profiles = g_list_prepend (profiles, g_strdup (buf));
profiles = g_list_prepend (profiles, g_strdup (profile_name));
}
/* else don't add the profile to the list */
current = g_list_next (current);
g_free (profile_name);
}
for (m = 0; m < xfce_randr->noutput; ++m)
for (m = 0; m < noutput; ++m)
{
g_free (display_infos[m]);
}
......
common/display-profiles.h
View file @ 91ab7f71
......@@ -24,5 +24,5 @@
gboolean display_settings_profile_name_exists (XfconfChannel *channel,
const gchar *new_profile_name);
GList* display_settings_get_profiles (XfceRandr *xfce_randr,
GList* display_settings_get_profiles (gchar **display_infos,
XfconfChannel *channel);
common/xfce-randr.c
View file @ 91ab7f71
......@@ -515,7 +515,7 @@ xfce_randr_load (XfceRandr *randr,
static guint8 *
guint8 *
xfce_randr_read_edid_data (Display *xdisplay,
RROutput output)
{
......
common/xfce-randr.h
View file @ 91ab7f71
......@@ -128,6 +128,9 @@ void xfce_randr_load (XfceRandr *randr,
const gchar *scheme,
XfconfChannel *channel);
guint8 * xfce_randr_read_edid_data (Display *xdisplay,
RROutput output);
const XfceRRMode *xfce_randr_find_mode_by_id (XfceRandr *randr,
guint output,
RRMode id);
......
configure
View file @ 91ab7f71
#! /bin/sh
# From configure.ac 4b3a588c.
# From configure.ac 682c5d83.
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for xfce4-settings 4.13.7.
# Generated by GNU Autoconf 2.69 for xfce4-settings 4.14.0.
#
# Report bugs to <https://bugzilla.xfce.org/>.
#
# Copyright (c) 2008-2015
# Copyright (c) 2008-2019
# The Xfce development team. All rights reserved.
#
#
......@@ -594,8 +594,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='xfce4-settings'
PACKAGE_TARNAME='xfce4-settings'
PACKAGE_VERSION='4.13.7'
PACKAGE_STRING='xfce4-settings 4.13.7'
PACKAGE_VERSION='4.14.0'
PACKAGE_STRING='xfce4-settings 4.14.0'
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.13.7 to adapt to many kinds of systems.
\`configure' configures xfce4-settings 4.14.0 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.13.7:";;
short | recursive ) echo "Configuration of xfce4-settings 4.14.0:";;
esac
cat <<\_ACEOF
 
......@@ -1768,14 +1768,14 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
xfce4-settings configure 4.13.7
xfce4-settings configure 4.14.0
generated by GNU Autoconf 2.69
 
Copyright (C) 2012 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
 
Copyright (c) 2008-2015
Copyright (c) 2008-2019
The Xfce development team. All rights reserved.
_ACEOF
exit
......@@ -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.13.7, which was
It was created by xfce4-settings $as_me 4.14.0, 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.13.7'
VERSION='4.14.0'
 
 
cat >>confdefs.h <<_ACEOF
......@@ -14655,7 +14655,7 @@ $as_echo "$XGETTEXT_ARGS" >&6; }
 
 
 
$as_echo "#define XFCE4_SETTINGS_VERSION_SHORT \"4.13\"" >>confdefs.h
$as_echo "#define XFCE4_SETTINGS_VERSION_SHORT \"4.14\"" >>confdefs.h
 
 
 
......@@ -14791,7 +14791,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 "*** http://www.freedesktop.org/software/pkgconfig"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "***"
exit 1;
fi
......@@ -14986,7 +14986,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 "*** http://www.freedesktop.org/software/pkgconfig"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "***"
exit 1;
fi
......@@ -15181,7 +15181,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 "*** http://www.freedesktop.org/software/pkgconfig"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "***"
exit 1;
fi
......@@ -15376,7 +15376,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 "*** http://www.freedesktop.org/software/pkgconfig"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "***"
exit 1;
fi
......@@ -15571,7 +15571,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 "*** http://www.freedesktop.org/software/pkgconfig"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "***"
exit 1;
fi
......@@ -15766,7 +15766,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 "*** http://www.freedesktop.org/software/pkgconfig"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "***"
exit 1;
fi
......@@ -15961,7 +15961,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 "*** http://www.freedesktop.org/software/pkgconfig"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "***"
exit 1;
fi
......@@ -16156,7 +16156,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 "*** http://www.freedesktop.org/software/pkgconfig"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "***"
exit 1;
fi
......@@ -16351,7 +16351,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 "*** http://www.freedesktop.org/software/pkgconfig"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "***"
exit 1;
fi
......@@ -16546,7 +16546,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 "*** http://www.freedesktop.org/software/pkgconfig"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "***"
exit 1;
fi
......@@ -16742,7 +16742,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 "*** http://www.freedesktop.org/software/pkgconfig"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "***"
exit 1;
fi
......@@ -17795,7 +17795,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 "*** http://www.freedesktop.org/software/pkgconfig"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "***"
exit 1;
fi
......@@ -17987,7 +17987,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 "*** http://www.freedesktop.org/software/pkgconfig"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "***"
exit 1;
fi
......@@ -18196,7 +18196,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 "*** http://www.freedesktop.org/software/pkgconfig"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "***"
exit 1;
fi
......@@ -18443,7 +18443,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 "*** http://www.freedesktop.org/software/pkgconfig"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "***"
exit 1;
fi
......@@ -18679,7 +18679,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 "*** http://www.freedesktop.org/software/pkgconfig"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "***"
exit 1;
fi
......@@ -18915,7 +18915,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 "*** http://www.freedesktop.org/software/pkgconfig"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "***"
exit 1;
fi
......@@ -19152,7 +19152,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 "*** http://www.freedesktop.org/software/pkgconfig"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "***"
exit 1;
fi
......@@ -19388,7 +19388,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 "*** http://www.freedesktop.org/software/pkgconfig"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "***"
exit 1;
fi
......@@ -19624,7 +19624,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 "*** http://www.freedesktop.org/software/pkgconfig"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "***"
exit 1;
fi
......@@ -19860,7 +19860,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 "*** http://www.freedesktop.org/software/pkgconfig"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "***"
exit 1;
fi
......@@ -20095,7 +20095,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 "*** http://www.freedesktop.org/software/pkgconfig"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "***"
exit 1;
fi
......@@ -20330,7 +20330,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 "*** http://www.freedesktop.org/software/pkgconfig"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "***"
exit 1;
fi
......@@ -20483,7 +20483,7 @@ $as_echo "#define DEBUG 1" >>confdefs.h
-Wno-unused-parameter -Wold-style-definition \
-Wdeclaration-after-statement \
-Wmissing-declarations \
-Wmissing-noreturn -Wshadow -Wpointer-arith \
-Wmissing-noreturn -Wpointer-arith \
-Wcast-align -Wformat -Wformat-security -Wformat-y2k \
-Winit-self -Wmissing-include-dirs -Wundef \
-Wnested-externs"
......@@ -20506,7 +20506,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"
xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -g -Wshadow"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
fi
......@@ -21198,7 +21198,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.13.7, which was
This file was extended by xfce4-settings $as_me 4.14.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
 
CONFIG_FILES = $CONFIG_FILES
......@@ -21264,7 +21264,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.13.7
xfce4-settings config.status 4.14.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
 
......
configure.ac
View file @ 91ab7f71
......@@ -15,10 +15,10 @@ dnl ***************************
dnl *** Version information ***
dnl ***************************
m4_define([xfce4_settings_version_major], [4])
m4_define([xfce4_settings_version_minor], [13])
m4_define([xfce4_settings_version_micro], [7])
m4_define([xfce4_settings_version_minor], [14])
m4_define([xfce4_settings_version_micro], [0])
m4_define([xfce4_settings_version_nano], [])
m4_define([xfce4_settings_version_build], [4b3a588c])
m4_define([xfce4_settings_version_build], [682c5d83])
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()])])
......@@ -37,12 +37,12 @@ m4_define([xfce4_settings_debug_default], [ifelse(xfce4_settings_version_tag(),
dnl ***************************
dnl *** Initialize autoconf ***
dnl ***************************
AC_COPYRIGHT([Copyright (c) 2008-2015
AC_COPYRIGHT([Copyright (c) 2008-2019
The Xfce development team. All rights reserved.])
AC_INIT([xfce4-settings], [xfce4_settings_version], [https://bugzilla.xfce.org/])
AC_PREREQ([2.60])
AC_CONFIG_MACRO_DIRS([m4])
AC_REVISION([4b3a588c])
AC_REVISION([682c5d83])
dnl ***************************
dnl *** Initialize automake ***
......
debian/changelog
View file @ 91ab7f71
xfce4-settings (4.13.7-1) UNRELEASED; urgency=medium
xfce4-settings (4.14.0-1) unstable; urgency=medium
[ Mateusz Łukasik ]
* New upstream version 4.13.6.
* New upstream version 4.13.7.
-- Mateusz Łukasik <mati75@linuxmint.pl> Tue, 04 Jun 2019 15:30:43 +0200
[ Yves-Alexis Perez ]
* New upstream version 4.14.0
* d/control: update standards version to 4.4.0
* use debhelper-compat b-d for debhelper compat level
* d/control: recommend colord and xiccd for new color profile management
feature
* d/copyright updated for new release
-- Yves-Alexis Perez <corsac@debian.org> Thu, 15 Aug 2019 12:12:04 +0200
xfce4-settings (4.13.5-1) experimental; urgency=medium
......
debian/control
View file @ 91ab7f71
......@@ -3,8 +3,9 @@ Section: xfce
Priority: optional
Maintainer: Debian Xfce Maintainers <debian-xfce@lists.debian.org>
Uploaders: Yves-Alexis Perez <corsac@debian.org>
Build-Depends: debhelper (>= 11),
Build-Depends: debhelper-compat (= 11),
intltool (>= 0.31),
libcolord-dev,
libexo-2-dev,
libgarcon-1-0-dev (>= 0.2.0),
libgtk-3-dev,
......@@ -16,9 +17,9 @@ Build-Depends: debhelper (>= 11),
libxfconf-0-dev (>= 4.13.0),
libxklavier-dev (>= 5.0),
libxrandr-dev,
xserver-xorg-input-libinput-dev,
xfce4-dev-tools
Standards-Version: 4.3.0
xfce4-dev-tools,
xserver-xorg-input-libinput-dev
Standards-Version: 4.4.0
Homepage: https://www.xfce.org
Vcs-Git: https://salsa.debian.org/xfce-team/desktop/xfce4-settings.git
Vcs-Browser: https://salsa.debian.org/xfce-team/desktop/xfce4-settings
......@@ -29,7 +30,7 @@ Depends: libgarcon-common (>= 0.2.0),
xfconf,
${misc:Depends},
${shlibs:Depends}
Recommends: x11-utils
Recommends: colord, x11-utils, xiccd
Description: graphical application for managing Xfce settings
xfce4-settings is the Xfce settings manager front-end. It comes
with several different components for configuring application-independent
......
debian/copyright
View file @ 91ab7f71
......@@ -59,8 +59,6 @@ Copyright: 2008, Nick Schermer <nick@xfce.org>
License: GPL-2+
Files: dialogs/display-settings/main.c
dialogs/display-settings/xfce-randr.c
dialogs/display-settings/xfce-randr.h
xfsettingsd/displays.c
Copyright: 2008, Nick Schermer <nick@xfce.org>
2010-2012, Lionel Le Folgoc <lionel@lefolgoc.net>
......@@ -90,11 +88,6 @@ Files: dialogs/display-settings/scrollarea.c
Copyright: 2006-2008, Soren Sandmann <sandmann@daimi.au.dk>
License: LGPL-2+
Files: dialogs/display-settings/display-name.c
dialogs/display-settings/edid-parse.c
Copyright: 2007, Red Hat, Inc
License: MIT/X11
Files: xfce4-settings-manager/xfce-settings-manager-dialog.c
Copyright: 2008, Brian Tarricone <bjt23@cornell.edu>
2012, Nick Schermer <nick@xfce.org>
......@@ -146,10 +139,6 @@ Files: xfsettingsd/clipboard-manager.h
Copyright: 2007, William Jon McCann <mccann@jhu.edu>
License: GPL-2+
Files: dialogs/display-settings/edid.h
Copyright: 2007-2008, Red Hat, Inc.
License: LGPL-2+
Files: debian/*
Copyright: 2008, Yves-Alexis Perez <corsac@corsac.net>
License: GPL-2+
......@@ -161,22 +150,3 @@ License: GPL-2+
License: LGPL-2+
The complete text of the GNU Lesser General Public License (version 2
or later) can be found in the file `/usr/share/common-licenses/LGPL-2'.
License: MIT/X11
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
on the rights to use, copy, modify, merge, publish, distribute, sub
license, 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 (including the
next paragraph) 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 NON-INFRINGEMENT. IN NO EVENT SHALL
THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
debian/rules
View file @ 91ab7f71
......@@ -9,6 +9,7 @@ override_dh_autoreconf:
override_dh_auto_configure:
dh_auto_configure -- \
--enable-colord \
--enable-libnotify \
--enable-libxklavier \
--enable-pluggable-dialogs \
......
dialogs/accessibility-settings/accessibility-dialog.glade
View file @ 91ab7f71
......@@ -10,6 +10,16 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
<object class="GtkImage" id="image3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">help-browser</property>
</object>
<object class="GtkImage" id="image4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">window-close</property>
</object>
<object class="GtkAdjustment" id="mouse-emulation-curve">
<property name="lower">-1000</property>
<property name="upper">1000</property>
......@@ -72,32 +82,34 @@
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="button1">
<property name="label">gtk-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="use_stock">True</property>
<property name="image">image4</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">gtk-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="use_stock">True</property>
<property name="image">image3</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>
......@@ -1154,8 +1166,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>
</interface>
dialogs/accessibility-settings/find-cursor.c
View file @ 91ab7f71
/*
* Copyright (c) 2018 Simon Steinbeiß <simon@xfce.org>
* Copyright (c) 2019 Simon Steinbeiß <simon@xfce.org>
*
* 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
......
dialogs/accessibility-settings/main.c
View file @ 91ab7f71
......@@ -215,7 +215,7 @@ main (gint argc, gchar **argv)
if (G_UNLIKELY (opt_version))
{
g_print ("%s %s (Xfce %s)\n\n", G_LOG_DOMAIN, PACKAGE_VERSION, xfce_version_string ());
g_print ("%s\n", "Copyright (c) 2008-2018");
g_print ("%s\n", "Copyright (c) 2008-2019");
g_print ("\t%s\n\n", _("The Xfce development team. All rights reserved."));
g_print (_("Please report bugs to <%s>."), PACKAGE_BUGREPORT);
g_print ("\n");
......
dialogs/appearance-settings/appearance-dialog.glade
View file @ 91ab7f71
......@@ -3,6 +3,16 @@
<interface>
<requires lib="gtk+" version="3.20"/>
<requires lib="libxfce4ui-2" version="4.13"/>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">window-close</property>
</object>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">help-browser</property>
</object>
<object class="GtkListStore" id="liststore1">
<columns>
<!-- column-name title -->
......@@ -97,32 +107,34 @@
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="button1">
<property name="label">gtk-close</property>
<object class="GtkButton" id="button2">
<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="use_stock">True</property>
<property name="image">image2</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">gtk-help</property>
<object class="GtkButton" id="button1">
<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="use_stock">True</property>
<property name="image">image1</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>
......@@ -847,8 +859,8 @@
</object>
</child>
<action-widgets>
<action-widget response="0">button1</action-widget>
<action-widget response="-11">button2</action-widget>
<action-widget response="0">button1</action-widget>
</action-widgets>
</object>
</interface>