Commit eb6e627c authored by Unit 193's avatar Unit 193

New upstream version 1.9.6

parent 76428989
This diff is collapsed.
......@@ -195,7 +195,7 @@ panel_desktop_DATA = $(panel_desktop_in_files:.desktop.in=.desktop)
# appdata file for the application
@INTLTOOL_XML_RULE@
appdatadir = $(datadir)/appdata
appdatadir = $(datadir)/metainfo
appdata_DATA = $(appdata_in_files:.xml.in=.xml)
appdata_in_files = src/xfce4-screenshooter.appdata.xml.in
......
......@@ -681,7 +681,7 @@ panel_plugin_libscreenshooterplugin_la_SOURCES = \
panel_desktopdir = $(datadir)/xfce4/panel/plugins
panel_desktop_in_files = panel-plugin/screenshooter.desktop.in
panel_desktop_DATA = $(panel_desktop_in_files:.desktop.in=.desktop)
appdatadir = $(datadir)/appdata
appdatadir = $(datadir)/metainfo
appdata_DATA = $(appdata_in_files:.xml.in=.xml)
appdata_in_files = src/xfce4-screenshooter.appdata.xml.in
......
1.9.6
======
- Do not show translation info on --help output (Bug #15883)
- Avoid destroying size window twice (Bug #15792)
- Replace GtkStock buttons
- Add missing NULL as last parameter of
xfce_titled_dialog_new_with_buttons() (Bug #14973)
- Do not use root coordinates for region capture (Bug #15406)
- Install AppData into metainfo
- Update AppData file
- Try to grab seat more than once (Bug #15320)
- Use new xfce_gdk_screen_get_geometry if available
- Make screenshooter-imgur-dialog.ui translatable (Bug #15254)
- Translation Updates: Albanian, Arabic, Asturian, Basque, Belarusian,
Bulgarian, Catalan, Chinese (China), Chinese (Taiwan), Croatian, Czech,
Danish, Dutch, English (Australia), English (United Kingdom), Finnish, French,
Galician, German, Greek, Hebrew, Hungarian, Icelandic, Indonesian, Italian,
Japanese, Kazakh, Korean, Latvian, Lithuanian, Malay, Norwegian Bokmål,
Norwegian Nynorsk, Occitan (post 1500), Polish, Portuguese,
Portuguese (Brazil), Romanian, Russian, Serbian, Slovak, Slovenian, Spanish,
Swedish, Thai, Turkish, Uighur, Ukrainian, Urdu, Urdu (Pakistan), Vietnamese
=== Version 1.9.5 ===
* Bugs fixed:
- Panel plugin: allow it to save files (bug #15187)
......
......@@ -508,7 +508,7 @@ fi])
# nls.m4 serial 5 (gettext-0.18)
dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016 Free Software
dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016, 2019 Free Software
dnl Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
......@@ -11330,7 +11330,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
......@@ -11343,7 +11343,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
])
......@@ -11690,7 +11690,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"
......@@ -11711,7 +11711,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
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for xfce4-screenshooter 1.9.5.
# Generated by GNU Autoconf 2.69 for xfce4-screenshooter 1.9.6.
#
# 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.5'
PACKAGE_STRING='xfce4-screenshooter 1.9.5'
PACKAGE_VERSION='1.9.6'
PACKAGE_STRING='xfce4-screenshooter 1.9.6'
PACKAGE_BUGREPORT='http://bugzilla.xfce.org/'
PACKAGE_URL=''
......@@ -1443,7 +1443,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.5 to adapt to many kinds of systems.
\`configure' configures xfce4-screenshooter 1.9.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1518,7 +1518,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of xfce4-screenshooter 1.9.5:";;
short | recursive ) echo "Configuration of xfce4-screenshooter 1.9.6:";;
esac
cat <<\_ACEOF
......@@ -1648,7 +1648,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
xfce4-screenshooter configure 1.9.5
xfce4-screenshooter configure 1.9.6
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -2017,7 +2017,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.5, which was
It was created by xfce4-screenshooter $as_me 1.9.6, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
......@@ -2881,7 +2881,7 @@ fi
# Define the identity of the package.
PACKAGE='xfce4-screenshooter'
VERSION='1.9.5'
VERSION='1.9.6'
cat >>confdefs.h <<_ACEOF
......@@ -13190,7 +13190,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
......@@ -13385,7 +13385,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
......@@ -13580,7 +13580,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
......@@ -13775,7 +13775,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
......@@ -13970,7 +13970,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
......@@ -14165,7 +14165,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
......@@ -14360,7 +14360,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
......@@ -14555,7 +14555,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
......@@ -14750,7 +14750,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
......@@ -14945,7 +14945,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
......@@ -15140,7 +15140,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
......@@ -15335,7 +15335,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
......@@ -15543,7 +15543,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
......@@ -16390,7 +16390,7 @@ _ACEOF
ALL_LINGUAS="ar ast be bg ca cs da de el en_AU en_GB es et eu fi fr gl he hr hu id 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 vi zh_CN zh_TW "
ALL_LINGUAS="ar ast be bg ca cs da de el en_AU en_GB es et 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 vi zh_CN zh_TW "
for ac_header in locale.h
do :
......@@ -17298,7 +17298,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"
......@@ -17321,7 +17321,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
......@@ -17924,7 +17924,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.5, which was
This file was extended by xfce4-screenshooter $as_me 1.9.6, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -17990,7 +17990,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.5
xfce4-screenshooter config.status 1.9.6
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], [5])
m4_define([xfce4_screenshooter_version_micro], [6])
m4_define([xfce4_screenshooter_version_nano], []) dnl leave this empty to have no nano version
m4_define([xfce4_screenshooter_version_build], [37a344f])
m4_define([xfce4_screenshooter_version_build], [1dca07d])
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()])])
......@@ -68,7 +68,7 @@ XDT_CHECK_LIBX11()
dnl ******************************
dnl *** Check for i18n support ***
dnl ******************************
XDT_I18N([ar ast be bg ca cs da de el en_AU en_GB es et eu fi fr gl he hr hu id 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 vi zh_CN zh_TW ])
XDT_I18N([ar ast be bg ca cs da de el en_AU en_GB es et 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 vi zh_CN zh_TW ])
dnl **************************
dnl *** Check for help2man ***
......
......@@ -42,7 +42,6 @@ typedef struct
gint x_root;
gint y_root;
cairo_rectangle_int_t rectangle;
cairo_rectangle_int_t rectangle_root;
GtkWidget *size_window;
GtkWidget *size_label;
} RubberBandData;
......@@ -593,6 +592,7 @@ static gboolean cb_button_released (GtkWidget *widget,
{
gtk_dialog_response (GTK_DIALOG (widget), GTK_RESPONSE_NONE);
gtk_widget_destroy (rbdata->size_window);
rbdata->size_window = NULL;
return TRUE;
}
else
......@@ -699,14 +699,13 @@ static gboolean cb_motion_notify (GtkWidget *widget,
if (rbdata->left_pressed)
{
cairo_rectangle_int_t *new_rect, *new_rect_root;
cairo_rectangle_int_t *new_rect;
cairo_rectangle_int_t old_rect, intersect;
cairo_region_t *region;
TRACE ("Mouse is moving with left button pressed");
new_rect = &rbdata->rectangle;
new_rect_root = &rbdata->rectangle_root;
if (!rbdata->rubber_banding)
{
......@@ -734,12 +733,12 @@ static gboolean cb_motion_notify (GtkWidget *widget,
coords = g_strdup_printf ("%d x %d", rect_width, rect_height);
size_window_get_offset (rbdata->size_window, strlen (coords),
event->x_root, event->y_root,
event->x, event->y,
&x_offset, &y_offset);
gtk_window_move (GTK_WINDOW (rbdata->size_window),
event->x_root + x_offset,
event->y_root + y_offset);
event->x + x_offset,
event->y + y_offset);
gtk_label_set_text (GTK_LABEL (rbdata->size_label), coords);
g_free (coords);
......@@ -757,26 +756,14 @@ static gboolean cb_motion_notify (GtkWidget *widget,
/* Do not resize, instead move the rubber banding rectangle around */
if (rbdata->anchor & ANCHOR_LEFT)
{
rbdata->x = (new_rect->x = event->x) + new_rect->width;
rbdata->x_root = (new_rect_root->x = event->x_root) + new_rect->width;
}
rbdata->x = (new_rect->x = event->x) + new_rect->width;
else
{
rbdata->x = new_rect->x = event->x - new_rect->width;
rbdata->x_root = new_rect_root->x = event->x_root - new_rect->width;
}
rbdata->x = new_rect->x = event->x - new_rect->width;
if (rbdata->anchor & ANCHOR_TOP)
{
rbdata->y = (new_rect->y = event->y) + new_rect->height;
rbdata->y_root = (new_rect_root->y = event->y_root) + new_rect->height;
}
rbdata->y = (new_rect->y = event->y) + new_rect->height;
else
{
rbdata->y = new_rect->y = event->y - new_rect->height;
rbdata->x_root = new_rect_root->y = event->y_root - new_rect->height;
}
rbdata->y = new_rect->y = event->y - new_rect->height;
}
else
{
......@@ -785,11 +772,6 @@ static gboolean cb_motion_notify (GtkWidget *widget,
new_rect->y = MIN (rbdata->y, event->y);
new_rect->width = ABS (rbdata->x - event->x) + 1;
new_rect->height = ABS (rbdata->y - event->y) + 1;
new_rect_root->x = MIN (rbdata->x_root, event->x_root);
new_rect_root->y = MIN (rbdata->y_root, event->y_root);
new_rect_root->width = ABS (rbdata->x_root - event->x_root) + 1;
new_rect_root->height = ABS (rbdata->y_root - event->y_root) + 1;
}
region = cairo_region_create_rectangle (&old_rect);
......@@ -858,6 +840,29 @@ static GdkPixbuf
static GdkGrabStatus
try_grab (GdkSeat *seat, GdkWindow *window, GdkCursor *cursor)
{
GdkGrabStatus status;
gint attempts = 0;
while (TRUE) {
status = gdk_seat_grab (seat, window, GDK_SEAT_CAPABILITY_ALL, FALSE,
cursor, NULL, NULL, NULL);
if (++attempts > 5 || status == GDK_GRAB_SUCCESS)
break;
/* Wait 100ms before trying again, useful when invoked by global hotkey
* because xfsettings will grab the key for a moment */
g_usleep(100000);
}
return status;
}
static GdkPixbuf
*get_rectangle_screenshot_composited (gint delay)
{
......@@ -923,17 +928,11 @@ static GdkPixbuf
gtk_widget_grab_focus (window);
gdk_display_flush (display);
/* Wait 100ms before grabbing devices, useful when invoked by global hotkey
* because xfsettings will grab the key for a moment */
g_usleep(100000);
/* Grab the mouse and the keyboard to prevent any interaction with other
* applications */
seat = gdk_display_get_default_seat (display);
res = gdk_seat_grab (seat, gtk_widget_get_window (window),
GDK_SEAT_CAPABILITY_ALL, FALSE, xhair_cursor,
NULL, NULL, NULL);
res = try_grab (seat, gtk_widget_get_window (window), xhair_cursor);
if (res != GDK_GRAB_SUCCESS)
{
......@@ -955,14 +954,15 @@ static GdkPixbuf
goto cleanup;
/* Grab the screenshot on the main window */
screenshot = capture_rectangle_screenshot (rbdata.rectangle_root.x,
rbdata.rectangle_root.y,
screenshot = capture_rectangle_screenshot (rbdata.rectangle.x,
rbdata.rectangle.y,
rbdata.rectangle.width,
rbdata.rectangle.height,
delay);
cleanup:
gtk_widget_destroy (rbdata.size_window);
if (rbdata.size_window)
gtk_widget_destroy (rbdata.size_window);
gdk_seat_ungrab (seat);
gdk_display_flush (display);
......@@ -1235,18 +1235,13 @@ static GdkPixbuf
xhair_cursor = gdk_cursor_new_for_display (gdk_display_get_default (),
GDK_CROSSHAIR);
/* Wait 100ms before grabbing devices, useful when invoked by global hotkey
* because xfsettings will grab the key for a moment */
g_usleep(100000);
gdk_window_show_unraised (root_window);
/* Grab the mouse and the keyboard to prevent any interaction with other
* applications */
seat = gdk_display_get_default_seat (gdk_display_get_default ());
res = gdk_seat_grab (seat, root_window, GDK_SEAT_CAPABILITY_ALL, FALSE,
xhair_cursor, NULL, NULL, NULL);
res = try_grab (seat, root_window, xhair_cursor);
if (res != GDK_GRAB_SUCCESS)
{
......
......@@ -655,36 +655,26 @@ GtkWidget *screenshooter_region_dialog_new (ScreenshotData *sd, gboolean plugin)
GtkWidget *delay_spinner_box, *delay_spinner, *seconds_label;
/* Create the dialog */
if (!plugin)
if (plugin)
{
dlg =
xfce_titled_dialog_new_with_buttons (_("Screenshot"),
NULL,
GTK_DIALOG_DESTROY_WITH_PARENT,
"gtk-help",
GTK_RESPONSE_HELP,
"gtk-cancel",
GTK_RESPONSE_CANCEL,
"gtk-ok",
GTK_RESPONSE_OK,
NULL);
dlg = xfce_titled_dialog_new_with_mixed_buttons (_("Screenshot"),
NULL, GTK_DIALOG_DESTROY_WITH_PARENT,
"help-browser", _("_Help"), GTK_RESPONSE_HELP,
"window-close", _("_Close"), GTK_RESPONSE_OK,
NULL);
xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (dlg), _("Take a screenshot"));
xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (dlg), _("Preferences"));
}
else
{
dlg =
xfce_titled_dialog_new_with_buttons (_("Screenshot"),
NULL,
GTK_DIALOG_DESTROY_WITH_PARENT,
"gtk-help",
GTK_RESPONSE_HELP,
"gtk-close",
GTK_RESPONSE_OK,
NULL);
xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (dlg),
_("Preferences"));
dlg = xfce_titled_dialog_new_with_mixed_buttons (_("Screenshot"),
NULL, GTK_DIALOG_DESTROY_WITH_PARENT,
"help-browser", _("_Help"), GTK_RESPONSE_HELP,
"", _("_Cancel"), GTK_RESPONSE_CANCEL,
"", _("_OK"), GTK_RESPONSE_OK,
NULL);
xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (dlg), _("Take a screenshot"));
}
gtk_window_set_position (GTK_WINDOW (dlg), GTK_WIN_POS_CENTER);
......@@ -894,16 +884,12 @@ GtkWidget *screenshooter_actions_dialog_new (ScreenshotData *sd)
GtkWidget *preview, *preview_ebox, *preview_box, *preview_label;
GdkPixbuf *thumbnail;
dlg = xfce_titled_dialog_new_with_buttons (_("Screenshot"),
NULL,
GTK_DIALOG_DESTROY_WITH_PARENT,
"gtk-help",
GTK_RESPONSE_HELP,
"gtk-cancel",
GTK_RESPONSE_CANCEL,
"gtk-ok",
GTK_RESPONSE_OK,
NULL);
dlg = xfce_titled_dialog_new_with_mixed_buttons (_("Screenshot"),
NULL, GTK_DIALOG_DESTROY_WITH_PARENT,
"help-browser", _("_Help"), GTK_RESPONSE_HELP,
"", _("_Cancel"), GTK_RESPONSE_CANCEL,
"", _("_OK"), GTK_RESPONSE_OK,
NULL);
xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (dlg), _("Action"));
gtk_window_set_position (GTK_WINDOW (dlg), GTK_WIN_POS_CENTER);
......
......@@ -129,7 +129,8 @@ screenshooter_imgur_dialog_new (const gchar *upload_name,
NULL,
GTK_DIALOG_DESTROY_WITH_PARENT,
"gtk-close",
GTK_RESPONSE_CLOSE);
GTK_RESPONSE_CLOSE,
NULL);
xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (self->window), _("Your uploaded image"));
gtk_window_set_icon_name (GTK_WINDOW (self->window), "applets-screenshooter");
gtk_window_set_default_size (GTK_WINDOW (self->window), 500, 330);
......
......@@ -5,7 +5,7 @@
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-copy</property>
<property name="icon_name">edit-copy</property>
</object>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
......@@ -15,12 +15,12 @@
<object class="GtkImage" id="image3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-copy</property>
<property name="icon_name">edit-copy</property>
</object>
<object class="GtkImage" id="image4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-copy</property>
<property name="icon_name">edit-copy</property>
</object>
<object class="GtkImage" id="image6">
<property name="visible">True</property>
......
This diff is collapsed.
......@@ -398,6 +398,12 @@ screenshooter_f1_key (GtkWidget *widget, GdkEventKey *event, gpointer user_data)
void
screenshooter_get_screen_geometry (GdkRectangle *geometry)
{
#if LIBXFCE4UI_CHECK_VERSION (4,14,0)
GdkRectangle *geometry2 = xfce_gdk_screen_get_geometry ();
geometry->width = geometry2->width;
geometry->height = geometry2->height;
g_free (geometry2);
#else
GdkDisplay *display = gdk_display_get_default ();
int num_monitors = gdk_display_get_n_monitors (display);
......@@ -420,6 +426,7 @@ screenshooter_get_screen_geometry (GdkRectangle *geometry)
geometry->width = w - x;
geometry->height = h - y;
#endif
}
......
......@@ -2,7 +2,7 @@ lib/screenshooter-dialogs.c
lib/screenshooter-utils.c
lib/screenshooter-imgur.c
lib/screenshooter-imgur-dialog.c
lib/screenshooter-imgur-dialog.ui
[type: gettext/glade]lib/screenshooter-imgur-dialog.ui
lib/screenshooter-job-callbacks.c
src/main.c
src/xfce4-screenshooter.desktop.in.in
......
This diff is collapsed.
This diff is collapsed.
......@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Xfce Apps\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-01-10 06:31+0100\n"
"PO-Revision-Date: 2019-01-13 16:12+0000\n"
"POT-Creation-Date: 2019-04-07 00:31+0200\n"
"PO-Revision-Date: 2019-05-07 19:06+0000\n"
"Last-Translator: Zmicer Turok <zmicerturok@gmail.com>\n"
"Language-Team: Belarusian (http://www.transifex.com/xfce/xfce-apps/language/be/)\n"
"MIME-Version: 1.0\n"
......@@ -36,8 +36,8 @@ msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Здымак экрана
#. Setup window
#: ../lib/screenshooter-dialogs.c:661 ../lib/screenshooter-dialogs.c:677
#: ../lib/screenshooter-dialogs.c:897 ../lib/screenshooter-utils.c:64
#: ../lib/screenshooter-utils.c:96 ../lib/screenshooter-imgur-dialog.c:128
#: ../lib/screenshooter-dialogs.c:897 ../lib/screenshooter-utils.c:124
#: ../lib/screenshooter-utils.c:156 ../lib/screenshooter-imgur-dialog.c:128
#: ../src/xfce4-screenshooter.desktop.in.in.h:1
#: ../panel-plugin/screenshooter.desktop.in.h:1
msgid "Screenshot"
......@@ -158,7 +158,7 @@ msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Папярэдні пра
msgid "Save screenshot as..."
msgstr "Захаваць здымак у..."
#: ../lib/screenshooter-utils.c:209
#: ../lib/screenshooter-utils.c:269
#, c-format
msgid ""
"<b>The application could not be launched.</b>\n"
......@@ -182,6 +182,89 @@ msgstr "Imgur"
msgid "Your uploaded image"
msgstr "Запампаваная вамі выява"
#: ../lib/screenshooter-imgur-dialog.ui.h:1
msgid "Size"
msgstr "Памер"
#: ../lib/screenshooter-imgur-dialog.ui.h:2
msgid "Link"
msgstr "Спасылка"
#: ../lib/screenshooter-imgur-dialog.ui.h:3
msgid "Tiny"
msgstr "Дробная"
#: ../lib/screenshooter-imgur-dialog.ui.h:4
msgid "Medium"
msgstr "Сярэдняя"
#: ../lib/screenshooter-imgur-dialog.ui.h:5
msgid "Full"
msgstr "Поўная"
#: ../lib/screenshooter-imgur-dialog.ui.h:6
msgid "Copy"
msgstr "Капіяваць"
#: ../lib/screenshooter-imgur-dialog.ui.h:7
msgid "View in browser"
msgstr "Праглядзець у браўзеры"
#: ../lib/screenshooter-imgur-dialog.ui.h:8
msgid "Image"
msgstr "Выявы"
#: ../lib/screenshooter-imgur-dialog.ui.h:9
msgid "Syntax"
msgstr "Сінтаксіс"
#: ../lib/screenshooter-imgur-dialog.ui.h:10
msgid "HTML"
msgstr "HTML"
#: ../lib/screenshooter-imgur-dialog.ui.h:11
msgid "Markdown"
msgstr "Markdown"
#: ../lib/screenshooter-imgur-dialog.ui.h:12
msgid "BBCODE"
msgstr "BBCODE"
#: ../lib/screenshooter-imgur-dialog.ui.h:13
msgid "Code"
msgstr "Код"
#: ../lib/screenshooter-imgur-dialog.ui.h:14