Commit 071b5ee6 authored by Yves-Alexis Perez's avatar Yves-Alexis Perez

New upstream version 1.9.3

parent 768f06c7
commit 00e5a5c6f3f8a991851ab6ce9b147bc295813dda
Author: Andre Miranda <andreldm@xfce.org>
Date: Fri Aug 10 23:13:10 2018 -0300
Updates for release
commit 0464a051e4048c4e1dcce0cab6ebddd63154580b
Author: Daniel Muñiz Fontoira <dani@damufo.com>
Date: Thu Aug 2 00:31:55 2018 +0200
I18n: Update translation gl (100%).
64 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 8ed1549a10c08ebf7388f0e484a4c7851327dfff
Author: José Vieira <jvieira33@sapo.pt>
Date: Wed Jul 18 18:32:08 2018 +0200
I18n: Update translation pt (100%).
64 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit c352c13e5dc23e009145637ca34c342418e174c1
Author: Anonymous <noreply@xfce.org>
Date: Mon Jul 16 18:33:24 2018 +0200
I18n: Update translation fi (93%).
60 translated messages, 4 untranslated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit d343b307ef6f51c2769a561c497689bcc58ced60
Author: Panagiotis Mantzios <pmantzios@hotmail.com>
Date: Sat Jul 14 12:32:16 2018 +0200
I18n: Update translation el (100%).
64 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 90772086958bd1be94ab4831cbb5e4a9d3ae12ec
Author: Emanuele Petriglia <inbox@emanuelepetriglia.me>
Date: Tue Jul 10 12:31:51 2018 +0200
I18n: Update translation it (100%).
64 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit ba10c6f502bd38af673e3ff72882b8807d6cc097
Author: Emanuele Petriglia <inbox@emanuelepetriglia.me>
Date: Mon Jul 9 12:31:58 2018 +0200
I18n: Update translation it (100%).
64 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 234a3db78561298a21581208852cbb29ff66cd80
Author: Andre Miranda <andreldm@xfce.org>
Date: Sun Jul 8 14:02:10 2018 -0300
Fix clipboard action handling (Bug #14513)
commit 44e50c4e4330c7b3135209951f4c14c6bdb3900f
Author: wakutiteo <wakutiteo@protonmail.com>
Date: Sun Jul 8 18:32:16 2018 +0200
I18n: Update translation es (98%).
63 translated messages, 1 untranslated message.
Transifex (https://www.transifex.com/xfce/public/).
commit 4fea9ca2d999870716e8b2c6f3dbef35104f6275
Author: Påvel Nicklasson <pavel2@frimix.se>
Date: Mon Jul 2 18:33:24 2018 +0200
I18n: Update translation sv (100%).
64 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 5548b346279c7cdfc3733d98675912889760fbd4
Author: Zmicer Turok <zmicerturok@gmail.com>
Date: Sun Jun 24 00:32:26 2018 +0200
I18n: Update translation be (100%).
64 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit a90188e65e3180df809ca11491d3d0a56a93b3e9
Author: Emanuele Petriglia <inbox@emanuelepetriglia.me>
Date: Sat Jun 16 18:33:06 2018 +0200
I18n: Update translation it (100%).
64 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 5a9e7037a676e30a1dfaf5a90e14ea4e3ccc9560
Author: Michael Martins <michaelfm21@gmail.com>
Date: Wed Jun 6 00:31:45 2018 +0200
I18n: Update translation pt_BR (100%).
64 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 22ebf283045c6467e237b3a8325b5eec7ffc8777
Author: Seong-ho Cho <darkcircle.0426@gmail.com>
Date: Sat May 26 12:31:57 2018 +0200
I18n: Update translation ko (100%).
64 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 2521bb4af69db48937a11ec719898e4e62a0c2f9
Author: Enrico B <enricobe@hotmail.com>
Date: Sat May 19 18:31:45 2018 +0200
I18n: Update translation it (100%).
64 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit fc2decae108b42458f8450c9f6b5143edc6dcdf2
Author: Саша Петровић <salepetronije@gmail.com>
Date: Fri May 18 18:32:27 2018 +0200
I18n: Update translation sr (100%).
64 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 64be75c0d43e93443f7802a324262d8b1e5bbfd9
Author: Ivica Kolić <ikoli@yahoo.com>
Date: Thu May 10 18:31:47 2018 +0200
I18n: Update translation hr (100%).
64 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit e4f23173442033044b6f94b654126fa23c777fe3
Author: Andre Miranda <andreldm@xfce.org>
Date: Mon May 7 22:44:56 2018 -0300
Fix version tag declaration
commit 1d85cffc4ddb2477c5563f2d677b8b055e209540
Author: Charles Monzat <superboa@hotmail.fr>
Date: Wed May 2 18:31:16 2018 +0200
I18n: Update translation fr (100%).
64 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit d789db863a4824567fde1fbe388e9615b7b5ecfb
Author: Andre Miranda <andreldm@xfce.org>
Date: Tue May 1 15:27:49 2018 -0300
Allow and remember 0sec delay for all regions (Bug #13763)
This changeset also permits the user to define a delay for the
"Select a region" mode via UI.
Note: if the first dialog is shown, i.e. a region was not passed
as an argument, a minimal delay of 200ms will be used to avoid
that dialog to appear on the screenshot. The same minimal delay
is also used for "Select a region" mode if no delay is defined.
commit 5983ffb03f7e30b945eac1ea6a58ae8e14fda36e
Author: Andre Miranda <andreldm@xfce.org>
Date: Tue May 1 13:14:41 2018 -0300
Allow user to move selection rectangle (Bug #14365)
commit a5267a40c61a50ba772cc1af1ee61e4dbe83a69a
Author: Andre Miranda <andreldm@xfce.org>
Date: Tue May 1 11:48:08 2018 -0300
Post release tag bump.
commit fc8d913fdf54195266b519a47bb18d484f5a5a29
Author: Andre Miranda <andreldm@xfce.org>
Date: Tue May 1 11:41:06 2018 -0300
......
=== Version 1.9.3 ===
* Enhancements:
- Allow user to move selection rectangle (bug #14365)
- Allow and remember 0sec delay for all regions (bug #13763)
* Bugs fixed:
- Fix clipboard action handling (Bug #14513)
=== Version 1.9.2 ===
* Remove zimagez support (bug #14283)
......
......@@ -541,7 +541,7 @@ AC_DEFUN([AM_NLS],
])
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
# serial 12 (pkg-config-0.29.2)
# serial 11 (pkg-config-0.29.1)
dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
......@@ -583,7 +583,7 @@ dnl
dnl See the "Since" comment for each macro you use to see what version
dnl of the macros you require.
m4_defun([PKG_PREREQ],
[m4_define([PKG_MACROS_VERSION], [0.29.2])
[m4_define([PKG_MACROS_VERSION], [0.29.1])
m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
[m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
])dnl PKG_PREREQ
......@@ -684,7 +684,7 @@ AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
pkg_failed=no
AC_MSG_CHECKING([for $2])
AC_MSG_CHECKING([for $1])
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
_PKG_CONFIG([$1][_LIBS], [libs], [$2])
......@@ -694,11 +694,11 @@ and $1[]_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.])
if test $pkg_failed = yes; then
AC_MSG_RESULT([no])
AC_MSG_RESULT([no])
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
else
else
$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
......@@ -715,7 +715,7 @@ installed software in a non-standard prefix.
_PKG_TEXT])[]dnl
])
elif test $pkg_failed = untried; then
AC_MSG_RESULT([no])
AC_MSG_RESULT([no])
m4_default([$4], [AC_MSG_FAILURE(
[The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
......@@ -816,6 +816,74 @@ AS_VAR_COPY([$1], [pkg_cv_][$1])
AS_VAR_IF([$1], [""], [$5], [$4])dnl
])dnl PKG_CHECK_VAR
dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES,
dnl [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND],
dnl [DESCRIPTION], [DEFAULT])
dnl ------------------------------------------
dnl
dnl Prepare a "--with-" configure option using the lowercase
dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and
dnl PKG_CHECK_MODULES in a single macro.
AC_DEFUN([PKG_WITH_MODULES],
[
m4_pushdef([with_arg], m4_tolower([$1]))
m4_pushdef([description],
[m4_default([$5], [build with ]with_arg[ support])])
m4_pushdef([def_arg], [m4_default([$6], [auto])])
m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes])
m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no])
m4_case(def_arg,
[yes],[m4_pushdef([with_without], [--without-]with_arg)],
[m4_pushdef([with_without],[--with-]with_arg)])
AC_ARG_WITH(with_arg,
AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),,
[AS_TR_SH([with_]with_arg)=def_arg])
AS_CASE([$AS_TR_SH([with_]with_arg)],
[yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)],
[auto],[PKG_CHECK_MODULES([$1],[$2],
[m4_n([def_action_if_found]) $3],
[m4_n([def_action_if_not_found]) $4])])
m4_popdef([with_arg])
m4_popdef([description])
m4_popdef([def_arg])
])dnl PKG_WITH_MODULES
dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
dnl [DESCRIPTION], [DEFAULT])
dnl -----------------------------------------------
dnl
dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES
dnl check._[VARIABLE-PREFIX] is exported as make variable.
AC_DEFUN([PKG_HAVE_WITH_MODULES],
[
PKG_WITH_MODULES([$1],[$2],,,[$3],[$4])
AM_CONDITIONAL([HAVE_][$1],
[test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"])
])dnl PKG_HAVE_WITH_MODULES
dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
dnl [DESCRIPTION], [DEFAULT])
dnl ------------------------------------------------------
dnl
dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after
dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make
dnl and preprocessor variable.
AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES],
[
PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4])
AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"],
[AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])])
])dnl PKG_HAVE_DEFINE_WITH_MODULES
# Copyright (C) 2002-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for xfce4-screenshooter 1.9.2.
# Generated by GNU Autoconf 2.69 for xfce4-screenshooter 1.9.3.
#
# Report bugs to <http://bugzilla.xfce.org/>.
#
......@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='xfce4-screenshooter'
PACKAGE_TARNAME='xfce4-screenshooter'
PACKAGE_VERSION='1.9.2'
PACKAGE_STRING='xfce4-screenshooter 1.9.2'
PACKAGE_VERSION='1.9.3'
PACKAGE_STRING='xfce4-screenshooter 1.9.3'
PACKAGE_BUGREPORT='http://bugzilla.xfce.org/'
PACKAGE_URL=''
......@@ -1432,7 +1432,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-screenshooter 1.9.2 to adapt to many kinds of systems.
\`configure' configures xfce4-screenshooter 1.9.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1507,7 +1507,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of xfce4-screenshooter 1.9.2:";;
short | recursive ) echo "Configuration of xfce4-screenshooter 1.9.3:";;
esac
cat <<\_ACEOF
......@@ -1637,7 +1637,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
xfce4-screenshooter configure 1.9.2
xfce4-screenshooter configure 1.9.3
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -2006,7 +2006,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-screenshooter $as_me 1.9.2, which was
It was created by xfce4-screenshooter $as_me 1.9.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
......@@ -2870,7 +2870,7 @@ fi
# Define the identity of the package.
PACKAGE='xfce4-screenshooter'
VERSION='1.9.2'
VERSION='1.9.3'
cat >>confdefs.h <<_ACEOF
......@@ -17453,7 +17453,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-screenshooter $as_me 1.9.2, which was
This file was extended by xfce4-screenshooter $as_me 1.9.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -17519,7 +17519,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-screenshooter config.status 1.9.2
xfce4-screenshooter config.status 1.9.3
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
......
......@@ -10,9 +10,9 @@ dnl
m4_define([xfce4_screenshooter_version_major], [1])
m4_define([xfce4_screenshooter_version_minor], [9])
m4_define([xfce4_screenshooter_version_micro], [2])
m4_define([xfce4_screenshooter_version_micro], [3])
m4_define([xfce4_screenshooter_version_nano], []) dnl leave this empty to have no nano version
m4_define([xfce4_screenshooter_version_build], [fc8d913])
m4_define([xfce4_screenshooter_version_build], [00e5a5c])
m4_define([xfce4_screenshooter_version_tag], [])
m4_define([xfce4_screenshooter_version], [xfce4_screenshooter_version_major().xfce4_screenshooter_version_minor().xfce4_screenshooter_version_micro()ifelse(xfce4_screenshooter_version_nano(), [], [], [.xfce4_screenshooter_version_nano()])ifelse(xfce4_screenshooter_version_tag(), [git], [xfce4_screenshooter_version_tag()-xfce4_screenshooter_version_build()], [xfce4_screenshooter_version_tag()])])
......
This diff is collapsed.
......@@ -868,7 +868,6 @@ GtkWidget *screenshooter_region_dialog_new (ScreenshotData *sd, gboolean plugin)
delay_spinner = gtk_spin_button_new_with_range(0.0, 60.0, 1.0);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (delay_spinner), sd->delay);
gtk_widget_set_sensitive (delay_spinner, (sd->region != SELECT));
gtk_widget_set_tooltip_text (delay_spinner,
_("Delay in seconds before the screenshot is taken"));
gtk_box_pack_start (GTK_BOX (delay_spinner_box), delay_spinner, FALSE, FALSE, 0);
......@@ -877,8 +876,6 @@ GtkWidget *screenshooter_region_dialog_new (ScreenshotData *sd, gboolean plugin)
gtk_box_pack_start (GTK_BOX (delay_spinner_box), seconds_label, FALSE, FALSE, 0);
g_signal_connect (G_OBJECT (delay_spinner), "value-changed",
G_CALLBACK (cb_delay_spinner_changed), sd);
g_signal_connect (G_OBJECT (rectangle_button), "toggled",
G_CALLBACK (cb_toggle_set_insensi), delay_spinner);
gtk_widget_show_all (gtk_dialog_get_content_area (GTK_DIALOG (dlg)));
......
......@@ -139,12 +139,15 @@ screenshooter_write_rc_file (const gchar *file, ScreenshotData *sd)
xfce_rc_write_int_entry (rc, "delay", sd->delay);
xfce_rc_write_int_entry (rc, "region", sd->region);
xfce_rc_write_int_entry (rc, "action", sd->action);
xfce_rc_write_int_entry (rc, "show_mouse", sd->show_mouse);
xfce_rc_write_entry (rc, "screenshot_dir", sd->screenshot_dir);
xfce_rc_write_entry (rc, "app", sd->app);
xfce_rc_write_entry (rc, "last_user", sd->last_user);
/* do not save if the action was specified from cli */
if (!sd->action_specified)
xfce_rc_write_int_entry (rc, "action", sd->action);
TRACE ("Flush and close the rc file");
xfce_rc_close (rc);
}
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -7,6 +7,7 @@
# patrick.2 <patrick.2@laposte.net>, 2009
# jc1 <jc1.quebecos@gmail.com>, 2013
# jc1 <jc1.quebecos@gmail.com>, 2013
# patrick.2 <patrick.2@laposte.net>, 2009
# Urien Desterres <urien.desterres@gmail.com>, 2014-2015
# Yannick Le Guen <leguen.yannick@gmail.com>, 2014-2015
msgid ""
......@@ -14,7 +15,7 @@ msgstr ""
"Project-Id-Version: Xfce Apps\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-04-19 00:32+0200\n"
"PO-Revision-Date: 2018-04-19 11:32+0000\n"
"PO-Revision-Date: 2018-05-02 15:18+0000\n"
"Last-Translator: Charles Monzat <superboa@hotmail.fr>\n"
"Language-Team: French (http://www.transifex.com/xfce/xfce-apps/language/fr/)\n"
"MIME-Version: 1.0\n"
......@@ -327,4 +328,4 @@ msgid ""
"and the action that will be done with the screenshot: save it to a PNG file,"
" copy it to the clipboard, open it using another application, or host it on "
"imgur, a free online image hosting service."
msgstr "Vous permet de capturer tout l’écran, la fenêtre active ou une zone sélectionnée. Vous pouvez régler le retardateur avant la prise de la capture et l’action qui en découle : l’enregistrer sous un fichier PNG, la copier dans le presse-papiers, l’ouvrir dans une autre application ou la téléverser sur Imgur, un service gratuit d’hébergement d’images en ligne. "
msgstr "Vous permet de capturer tout l’écran, la fenêtre active ou une zone sélectionnée. Vous pouvez régler le retardateur avant la prise de la capture et l’action qui en découle : l’enregistrer en tant que fichier PNG, la copier dans le presse-papiers, l’ouvrir dans une autre application ou la téléverser sur Imgur, un service gratuit d’hébergement d’images en ligne. "
This diff is collapsed.
......@@ -6,14 +6,14 @@
# Edin Veskovic <edin.lockedin@gmail.com>, 2018
# Edin Veskovic <edin.lockedin@gmail.com>, 2014-2015
# Edin Veskovic <edin.lockedin@gmail.com>, 2014
# Ivica Kolić <ikoli@yahoo.com>, 2013
# Ivica Kolić <ikoli@yahoo.com>, 2013,2018
msgid ""
msgstr ""
"Project-Id-Version: Xfce Apps\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-04-19 00:32+0200\n"
"PO-Revision-Date: 2018-04-19 12:50+0000\n"
"Last-Translator: Edin Veskovic <edin.lockedin@gmail.com>\n"
"PO-Revision-Date: 2018-05-10 14:04+0000\n"
"Last-Translator: Ivica Kolić <ikoli@yahoo.com>\n"
"Language-Team: Croatian (http://www.transifex.com/xfce/xfce-apps/language/hr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
......@@ -196,7 +196,7 @@ msgstr "Korisnik:"
msgid ""
"Your user name, if you do not have one yet please create one on the Web page"
" linked above"
msgstr "Vaše korisničko ime. Ako nemate račun možete ga stvoriti na mrežnoj stranici s gornje poveznice"
msgstr "Vaše korisničko ime. Ako ga nemate možete ga stvoriti na mrežnoj stranici s gornje poveznice"
#. Create the password label
#: ../lib/screenshooter-job-callbacks.c:228
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -17,8 +17,8 @@ msgstr ""
"Project-Id-Version: Xfce Apps\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-04-19 00:32+0200\n"
"PO-Revision-Date: 2018-04-26 23:29+0000\n"
"Last-Translator: Andre Miranda <andre42m@gmail.com>\n"
"PO-Revision-Date: 2018-06-05 19:43+0000\n"
"Last-Translator: Michael Martins <michaelfm21@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/xfce/xfce-apps/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
......
This diff is collapsed.
This diff is collapsed.
......@@ -105,6 +105,34 @@ static GOptionEntry entries[] =
static void
take_screenshot (ScreenshotData *sd, gboolean from_cli)
{
if (sd->region == SELECT)
{
/* The delay will be applied after the rectangle selection */
g_idle_add ((GSourceFunc) screenshooter_take_screenshot_idle, sd);
return;
}
if (sd->delay == 0 && from_cli)
{
/* If delay is zero and the region was passed as an argument, thus the
* first dialog was not shown, we will take the screenshot immediately
* without a minimal delay */
g_idle_add ((GSourceFunc) screenshooter_take_screenshot_idle, sd);
return;
}
/* Await the amount of the time specified by the user before capturing the
* screenshot, but not less than 200ms, otherwise the first dialog might
* appear on the screenshot. */
gint delay = sd->delay == 0 ? 200 : sd->delay * 1000;
g_timeout_add (delay, (GSourceFunc) screenshooter_take_screenshot_idle, sd);
}
static void
cb_dialog_response (GtkWidget *dialog, gint response, ScreenshotData *sd)
{
......@@ -116,7 +144,7 @@ cb_dialog_response (GtkWidget *dialog, gint response, ScreenshotData *sd)
else if (response == GTK_RESPONSE_OK)
{
gtk_widget_destroy (dialog);
g_idle_add ((GSourceFunc) screenshooter_take_screenshot_idle, sd);
take_screenshot (sd, FALSE);
}
else
{
......@@ -286,6 +314,10 @@ int main (int argc, char **argv)
if (clipboard)
{
/* if no other action was specified, reset the value loaded from prefs */
if (!sd->action_specified)
sd->action = NONE;
sd->action |= CLIPBOARD;
sd->action_specified = TRUE;
}
......@@ -313,17 +345,13 @@ int main (int argc, char **argv)
g_free (screenshot_dir);
}
g_idle_add ((GSourceFunc) screenshooter_take_screenshot_idle, sd);
take_screenshot (sd, TRUE);
}
/* Else we show a dialog which allows to set the screenshot options */
else
{
GtkWidget *dialog;
/* Use 1 as the minimal delay, 0 may show corrupted windows */
if (sd->delay == 0)
sd->delay = 1;
/* Set the dialog up */
dialog = screenshooter_region_dialog_new (sd, FALSE);
g_signal_connect (dialog, "response",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment