diff -Nru flameshot-0.6.0/debian/changelog flameshot-0.6.0/debian/changelog --- flameshot-0.6.0/debian/changelog 2018-10-08 14:26:01.000000000 +0000 +++ flameshot-0.6.0/debian/changelog 2018-05-07 09:34:56.000000000 +0000 @@ -1,151 +1,20 @@ -flameshot (0.6.0-5) unstable; urgency=medium +flameshot (0.6.0-1dhor~cosmic) cosmic; urgency=medium - * debian/patches: Backport upstream patch till 2018-10-05. - * debian/flameshot.1: Refresh man page. + * Allow systray customization with themes. Use "flameshot-tray" as the name of the icon. + * Unification of the desktop file with actions. + * Notification when screenshots are saved in the clipboard. + * Use datetime as default name for pics. + * Undo/Redo with Ctrl+z and Ctrl+Shift+z. + * Add "Take Screenshot" option as menu item in the systray. + * Add Side-Panel (open it with Space). + * Add autostart to config flags. + * Add Pin tool. + * Filename: replace colons with dashes. + * Add Text tool. + * Delete Imgur image button after uploading it from the preview window. + * Capture single screen: + * flameshot screen (capture the screen containing the mouse) and + * flameshot screen -n 1 (capture the first screen). + * Store settings colors in hexadecimal format. - -- Boyuan Yang Mon, 08 Oct 2018 10:26:01 -0400 - -flameshot (0.6.0-4) unstable; urgency=medium - - * debian/patches: Backport upstream patch to fix pin tool position. - - -- Boyuan Yang Thu, 27 Sep 2018 18:57:05 -0400 - -flameshot (0.6.0-3) unstable; urgency=medium - - * Rebuild against new Qt 5.11. - * debian/control: Update my maintainer email address and use the - @debian.org one. - * debian/patches: Backport upstream bugfix till 20180913. - - -- Boyuan Yang Thu, 13 Sep 2018 21:11:02 -0400 - -flameshot (0.6.0-2) unstable; urgency=medium - - * Backport upstream fixes till 2018-08-20. - * Bump Standards-Version to 4.2.1 (no changes needed). - - -- Boyuan Yang <073plan@gmail.com> Sun, 26 Aug 2018 21:53:23 -0400 - -flameshot (0.6.0-1) unstable; urgency=medium - - * New upstream stable release. - - -- Boyuan Yang <073plan@gmail.com> Fri, 17 Aug 2018 08:31:10 -0400 - -flameshot (0.5.1+git201800812-1) unstable; urgency=medium - - * New upstream snapshot. - + Fix several AppStream appdata errors and warnings. - + Fix locale detection. - + Properly install icons. - * debian/patches: Drop backported patches. - * debian/copyright: Refresh copyright information. - - -- Boyuan Yang <073plan@gmail.com> Sun, 12 Aug 2018 07:43:59 -0400 - -flameshot (0.5.1+git201800811-1) unstable; urgency=medium - - * New upstream snapshot. - + Use SVG images globally. - + More fixes to HiDPI support. - * debian/control: Bump Standards-Version to 4.2.0 (no changes needed). - * debian/patches: - + Refresh patches and drop backported patches. - + Backport a proposed fix for locale detection. - + Add a patch to canonicalize icon installation path. - - -- Boyuan Yang <073plan@gmail.com> Sat, 11 Aug 2018 21:32:48 -0400 - -flameshot (0.5.1+git20180708-2) unstable; urgency=medium - - * Rebuild against gcc 8. - * New upstream snapshot based on 20180722 upstream codebase. - + Fixes image grabbing on fractional-scaled desktop environments. - - -- Boyuan Yang <073plan@gmail.com> Sun, 22 Jul 2018 21:53:04 +0800 - -flameshot (0.5.1+git20180708-1) unstable; urgency=medium - - * New upstream snapshot. - * Bump Standards-Version to 4.1.5 (no changes needed). - - -- Boyuan Yang <073plan@gmail.com> Sun, 08 Jul 2018 08:21:39 +0800 - -flameshot (0.5.1+git20180601-1) unstable; urgency=medium - - * New upstream snapshot. - - Add text configuration function. - - Update translations. - - -- Boyuan Yang <073plan@gmail.com> Sat, 02 Jun 2018 21:39:03 +0800 - -flameshot (0.5.1+git20180506-1) unstable; urgency=medium - - * New upstream snapshot. - - Add initial support to text tool. - - Improve image pinning tool. - - -- Boyuan Yang <073plan@gmail.com> Sun, 06 May 2018 20:25:43 +0800 - -flameshot (0.5.1+git20180419-1) unstable; urgency=medium - - * New upstream snapshot. - - Add initial support for image pinning tool. - - Add ability to take screenshot from tray menu. - * d/rules: Use "dh_missing --fail-missing". - - -- Boyuan Yang <073plan@gmail.com> Fri, 20 Apr 2018 22:57:22 +0800 - -flameshot (0.5.1+git20180411-1) unstable; urgency=medium - - * New upstream snapshot. - * Remove patches merged upstream. - * Bump Standards-Version to 4.1.4 (no changes needed). - - -- Boyuan Yang <073plan@gmail.com> Wed, 11 Apr 2018 19:43:04 +0800 - -flameshot (0.5.1+git20180318-1) unstable; urgency=medium - - * New upstream snapshot. - * Remove patches merged upstream. - * Add patch to workaround upstream issue 166. - - -- Boyuan Yang <073plan@gmail.com> Tue, 20 Mar 2018 09:01:36 +0800 - -flameshot (0.5.1-3) unstable; urgency=medium - - * Backport upstream patch to allow tray icon customization. - * Backport upstream patch to use single desktop file. - Closes: #887466. - - -- Boyuan Yang <073plan@gmail.com> Mon, 05 Mar 2018 22:59:54 +0800 - -flameshot (0.5.1-2) unstable; urgency=medium - - * Backport upstream patch to fix cmdline parsing. - - -- Boyuan Yang <073plan@gmail.com> Wed, 28 Feb 2018 22:03:16 +0800 - -flameshot (0.5.1-1) unstable; urgency=medium - - * New upstream stable release. - * d/patches: Add patch to specify application version. - - -- Boyuan Yang <073plan@gmail.com> Sat, 24 Feb 2018 19:49:15 +0800 - -flameshot (0.5.0+git20180222-1) unstable; urgency=medium - - * New upstream snapshot. - * d/watch: Fix grammar error. - * d/control: Fix Vcs links. - * d/rules: Fix lintian error for debian-rules-is-dh_make-template. - * d/patches: Refresh patches. - - -- Boyuan Yang <073plan@gmail.com> Sat, 24 Feb 2018 09:45:05 +0800 - -flameshot (0.5.0+git20180114-1) unstable; urgency=medium - - * Initial release. (Closes: #886409) - - -- Boyuan Yang <073plan@gmail.com> Mon, 15 Jan 2018 19:50:38 +0800 + -- Dariusz Duma Mon, 07 May 2018 17:34:56 +0800 diff -Nru flameshot-0.6.0/debian/compat flameshot-0.6.0/debian/compat --- flameshot-0.6.0/debian/compat 2018-10-08 14:17:44.000000000 +0000 +++ flameshot-0.6.0/debian/compat 2018-05-07 09:34:56.000000000 +0000 @@ -1 +1 @@ -11 +9 diff -Nru flameshot-0.6.0/debian/control flameshot-0.6.0/debian/control --- flameshot-0.6.0/debian/control 2018-10-08 14:17:44.000000000 +0000 +++ flameshot-0.6.0/debian/control 2018-05-07 09:34:56.000000000 +0000 @@ -1,23 +1,23 @@ Source: flameshot Section: graphics Priority: optional -Maintainer: Boyuan Yang +Maintainer: Dariusz Duma Build-Depends: - debhelper (>= 11~), + debhelper (>= 9), qt5-qmake, qtbase5-dev, qttools5-dev-tools, - libqt5svg5-dev, -Standards-Version: 4.2.1 + libqt5svg5-dev +Standards-Version: 4.1.4 Homepage: https://github.com/lupoDharkael/flameshot -Vcs-Browser: https://salsa.debian.org/debian/flameshot -Vcs-Git: https://salsa.debian.org/debian/flameshot.git +Vcs-Browser: https://github.com/lupoDharkael/flameshot +Vcs-Git: https://github.com/lupoDharkael/flameshot.git Package: flameshot Architecture: any Depends: - ${misc:Depends}, ${shlibs:Depends}, + ${misc:Depends}, Suggests: ca-certificates, openssl, diff -Nru flameshot-0.6.0/debian/copyright flameshot-0.6.0/debian/copyright --- flameshot-0.6.0/debian/copyright 2018-10-08 14:17:44.000000000 +0000 +++ flameshot-0.6.0/debian/copyright 2018-05-07 09:34:56.000000000 +0000 @@ -14,15 +14,11 @@ 2018 Boyuan Yang <073plan@gmail.com> License: GPL-3+ -Files: - img/app/flameshot.* - img/hicolor/* +Files: img/flameshot.* Copyright: 2017 lupoDharkael License: Free-Art-License-1.3 -Files: - img/material/black/* - img/material/white/* +Files: img/buttonIconsBlack/* img/buttonIconsWhite/* Copyright: Google Inc. License: Apache-2.0 @@ -361,8 +357,8 @@ (without any changes). . Translation : Jonathan Clarke, Benjamin Jean, Griselda Jung, Fanny - Mourguet, Antoine Pitrou. Thanks to framalang.org - + Mourguet, Antoine Pitrou. Thanks to framalang.org + License: GPL-3+ 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 diff -Nru flameshot-0.6.0/debian/flameshot.1 flameshot-0.6.0/debian/flameshot.1 --- flameshot-0.6.0/debian/flameshot.1 2018-10-08 14:25:43.000000000 +0000 +++ flameshot-0.6.0/debian/flameshot.1 1970-01-01 00:00:00.000000000 +0000 @@ -1,125 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" (C) Copyright 2018 Boyuan Yang <073plan@gmail.com>, -.\" -.TH "FLAMESHOT" "1" "2018-10-08" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -flameshot \- Powerful yet simple-to-use screenshot software -.SH SYNOPSIS -.B flameshot -[arguments] [flameshot\-options] -.br -.B flameshot gui -[gui options] -.br -.B flameshot full -[fullscreen capture options] -.br -.B flameshot screen -[screen\-options] -.br -.B flameshot config -[config options] -.SH DESCRIPTION -This manual page documents briefly the -.B flameshot -command as provided by -.B flameshot -package. -.PP -\fBflameshot\fP is a screenshot tool that aims to be powerful yet simple-to-use. -Its notable features include customizable appearance, in-app screenshot editing, -D-Bus interface, experimental GNOME/KDE Wayland support, integration with -Imgur and support for both GUI and CLI interface. -.PP -Besides the brief information about \fBflameshot\fR here, The detailed -usage of \fBflameshot\fP is documented in the \fIREADME.md\fR file distributed -alongside this software. Typically you may find this file under -\fI/usr/share/doc/flameshot/\fR direcotry. -. -.SH GUI USAGE -.PP -This section lists some of the most common usage of \fBflameshot\fR via -command line. -. -.TP -.B flameshot gui -Capture with GUI. -. -.TP -\fBflameshot gui\fR \-p /path/to/captures -Capture with GUI and custom save path. -. -.TP -\fBflameshot gui\fR \-d 2000 -Open GUI with a delay of 2 seconds. -. -.TP -.B flameshot full \-\-help -Shows help for \fBflameshot full\fR subcommand. -. -.TP -\fB flameshot full\fR -p /path/to/captures -d 5000 -Fullscreen capture with custom save path (no GUI) and time delay. -. -.TP -\fB flameshot full\fR -c -p /path/to/captures -Fullscreen capture with custom savepath copying to clipboard. -. -.TP -\fB flameshot screen\fR \-\-number -Define the screen to capture. Will capture the screen containing the -cursor by default. -. -.TP -\fB flameshot screen\fR \-\-help -Shows help for \fBflameshot screen\fR subcommand. -.SH CLI CONFIGURATION -.PP -You may use the graphical menu to configure flameshot. -Alternatively, you can also use terminal or scripts to do so. -. -.TP -.B flameshot config -Open the configuration menu (GUI). -. -.TP -\fBflameshot config\fR \-h -Use the help flag to show more information about the available options. -.SH SEE ALSO -.PP -The program is further documented in the -.IR README.md -as typically provided under -.IR /usr/share/doc/flameshot/ -directory. -. -.PP -Upstream project homepage: -<\fBhttps://github.com/lupoDharkael/flameshot\fR>. -. -.SH AUTHOR -.PP -.B flameshot -is mainly written by -.MT izhe@\:hotmail.es -lupoDharkael -.ME . -. -.PP -This manual page is written by -.MT byang@\:debian.org -Boyuan Yang -.ME -for the Debian Project (but may be used by others). diff -Nru flameshot-0.6.0/debian/flameshot.lintian-overrides flameshot-0.6.0/debian/flameshot.lintian-overrides --- flameshot-0.6.0/debian/flameshot.lintian-overrides 2018-10-08 14:17:44.000000000 +0000 +++ flameshot-0.6.0/debian/flameshot.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -# license text, unable to make correction -flameshot: spelling-error-in-copyright allow to allow one to diff -Nru flameshot-0.6.0/debian/flameshot.manpages flameshot-0.6.0/debian/flameshot.manpages --- flameshot-0.6.0/debian/flameshot.manpages 2018-10-08 14:17:44.000000000 +0000 +++ flameshot-0.6.0/debian/flameshot.manpages 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -debian/flameshot.1 diff -Nru flameshot-0.6.0/debian/patches/0001-pro-Explicitly-enable-packaging-instruction-in-qmake.patch flameshot-0.6.0/debian/patches/0001-pro-Explicitly-enable-packaging-instruction-in-qmake.patch --- flameshot-0.6.0/debian/patches/0001-pro-Explicitly-enable-packaging-instruction-in-qmake.patch 2018-10-08 14:20:07.000000000 +0000 +++ flameshot-0.6.0/debian/patches/0001-pro-Explicitly-enable-packaging-instruction-in-qmake.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -From: Boyuan Yang <073plan@gmail.com> -Date: Sun, 6 May 2018 20:28:54 +0800 -Subject: pro: Explicitly enable packaging instruction in qmake -Forwarded: not-needed - -This would ensure correct D-Bus interface file. ---- - flameshot.pro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/flameshot.pro b/flameshot.pro -index 7cf9b64..43ed093 100644 ---- a/flameshot.pro -+++ b/flameshot.pro -@@ -20,7 +20,7 @@ unix:!macx { - - CONFIG += c++11 link_pkgconfig - --#CONFIG += packaging # Enables "make install" for packaging paths -+CONFIG += packaging # Enables "make install" for packaging paths - - TARGET = flameshot - TEMPLATE = app diff -Nru flameshot-0.6.0/debian/patches/0002-Explicitly-set-app-version.patch flameshot-0.6.0/debian/patches/0002-Explicitly-set-app-version.patch --- flameshot-0.6.0/debian/patches/0002-Explicitly-set-app-version.patch 2018-10-08 14:20:31.000000000 +0000 +++ flameshot-0.6.0/debian/patches/0002-Explicitly-set-app-version.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -From: Boyuan Yang <073plan@gmail.com> -Date: Sun, 6 May 2018 20:29:45 +0800 -Subject: Explicitly set app version -Forwarded: not-needed - ---- - flameshot.pro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/flameshot.pro b/flameshot.pro -index 43ed093..7dc5d50 100644 ---- a/flameshot.pro -+++ b/flameshot.pro -@@ -6,7 +6,7 @@ - - win32:LIBS += -luser32 -lshell32 - --TAG_VERSION = $$system(git --git-dir $$PWD/.git --work-tree $$PWD describe --always --tags) -+TAG_VERSION = "0.6.0-5\\\(Debian\\\)" - isEmpty(TAG_VERSION){ - TAG_VERSION = v0.6.0 - } diff -Nru flameshot-0.6.0/debian/patches/0003-infowindow-Pop-up-infowindow-at-screen-center-318.patch flameshot-0.6.0/debian/patches/0003-infowindow-Pop-up-infowindow-at-screen-center-318.patch --- flameshot-0.6.0/debian/patches/0003-infowindow-Pop-up-infowindow-at-screen-center-318.patch 2018-10-08 14:20:07.000000000 +0000 +++ flameshot-0.6.0/debian/patches/0003-infowindow-Pop-up-infowindow-at-screen-center-318.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,49 +0,0 @@ -From: Boyuan Yang <073plan@gmail.com> -Date: Sun, 19 Aug 2018 12:33:00 -0400 -Subject: infowindow: Pop up infowindow at screen center (#318) -Applied-Upstream: commit:36c62f6e810063ccb0f836fce91a894824f54c2a - -Currently info window will pop up at the topleft corner of the screen, -which is rather bothering. This patch will move the window to -screen center when popped up. - -Since QGuiApplication::ScreenAt() is introduced since Qt 5.10, the -code will only take effect when compiled against Qt >= 5.10. - -Signed-off-by: Boyuan Yang <073plan@gmail.com> ---- - src/widgets/infowindow.cpp | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/src/widgets/infowindow.cpp b/src/widgets/infowindow.cpp -index 6b29b2e..2860047 100644 ---- a/src/widgets/infowindow.cpp -+++ b/src/widgets/infowindow.cpp -@@ -23,6 +23,13 @@ - #include - #include - -+#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)) -+#include -+#include -+#include -+#include -+#endif -+ - // InfoWindow show basic information about the usage of Flameshot - - InfoWindow::InfoWindow(QWidget *parent) : QWidget(parent) { -@@ -30,6 +37,13 @@ InfoWindow::InfoWindow(QWidget *parent) : QWidget(parent) { - setWindowIcon(QIcon(":img/app/flameshot.svg")); - setWindowTitle(tr("About")); - -+#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)) -+ QRect position = frameGeometry(); -+ QScreen *screen = QGuiApplication::screenAt(QCursor::pos()); -+ position.moveCenter(screen->availableGeometry().center()); -+ move(position.topLeft()); -+#endif -+ - m_layout = new QVBoxLayout(this); - m_layout->setAlignment(Qt::AlignHCenter); - initLabels(); diff -Nru flameshot-0.6.0/debian/patches/0004-flameshot.svg-Use-more-strict-grammar-to-fix-preview.patch flameshot-0.6.0/debian/patches/0004-flameshot.svg-Use-more-strict-grammar-to-fix-preview.patch --- flameshot-0.6.0/debian/patches/0004-flameshot.svg-Use-more-strict-grammar-to-fix-preview.patch 2018-10-08 14:20:07.000000000 +0000 +++ flameshot-0.6.0/debian/patches/0004-flameshot.svg-Use-more-strict-grammar-to-fix-preview.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,35 +0,0 @@ -From: Boyuan Yang <073plan@gmail.com> -Date: Mon, 20 Aug 2018 10:54:40 -0400 -Subject: flameshot.svg: Use more strict grammar to fix preview on GitHub - (#319) -Applied-Upstream: commit:2c0ec850f3203d4d16ad11c0581e03d43da86df2 - ---- - img/app/flameshot.svg | 4 +++- - img/hicolor/scalable/apps/flameshot.svg | 4 +++- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/img/app/flameshot.svg b/img/app/flameshot.svg -index 8138a77..49fc043 100644 ---- a/img/app/flameshot.svg -+++ b/img/app/flameshot.svg -@@ -1,4 +1,6 @@ -- -+ -+ -+ - - - -diff --git a/img/hicolor/scalable/apps/flameshot.svg b/img/hicolor/scalable/apps/flameshot.svg -index 8138a77..49fc043 100644 ---- a/img/hicolor/scalable/apps/flameshot.svg -+++ b/img/hicolor/scalable/apps/flameshot.svg -@@ -1,4 +1,6 @@ -- -+ -+ -+ - - - diff -Nru flameshot-0.6.0/debian/patches/0005-Fix-311.patch flameshot-0.6.0/debian/patches/0005-Fix-311.patch --- flameshot-0.6.0/debian/patches/0005-Fix-311.patch 2018-10-08 14:20:07.000000000 +0000 +++ flameshot-0.6.0/debian/patches/0005-Fix-311.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,57 +0,0 @@ -From: lupoDharkael -Date: Thu, 13 Sep 2018 15:35:49 +0200 -Subject: Fix #311 -Applied-Upstream: commit:415b059fb248eec4b4ee3be85a1594ce99bfce67 - - Flameshot was unable to start new captures after saving with - Ctrl+s while having a text area active from the Text tool. - This was caused by the overloaded call to close() which - was deleting the text area instead of closing the capture - and the consequent call of the destructor. That caused an - always active capture session. ---- - src/widgets/capture/capturewidget.cpp | 6 +++--- - src/widgets/capture/capturewidget.h | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/widgets/capture/capturewidget.cpp b/src/widgets/capture/capturewidget.cpp -index a07fee7..1b1413e 100644 ---- a/src/widgets/capture/capturewidget.cpp -+++ b/src/widgets/capture/capturewidget.cpp -@@ -186,12 +186,12 @@ QPixmap CaptureWidget::pixmap() { - return m_context.selectedScreenshotArea(); - } - --void CaptureWidget::close() { -+void CaptureWidget::deleteToolwidgetOrClose() { - if (m_toolWidget) { - m_toolWidget->deleteLater(); - m_toolWidget = nullptr; - } else { -- QWidget::close(); -+ close(); - } - } - -@@ -739,7 +739,7 @@ void CaptureWidget::initShortcuts() { - new QShortcut(QKeySequence(Qt::SHIFT + Qt::Key_Up), this, SLOT(upResize())); - new QShortcut(QKeySequence(Qt::SHIFT + Qt::Key_Down), this, SLOT(downResize())); - new QShortcut(Qt::Key_Space, this, SLOT(togglePanel())); -- new QShortcut(Qt::Key_Escape, this, SLOT(close())); -+ new QShortcut(Qt::Key_Escape, this, SLOT(deleteToolwidgetOrClose())); - new QShortcut(Qt::Key_Return, this, SLOT(copyScreenshot())); - } - -diff --git a/src/widgets/capture/capturewidget.h b/src/widgets/capture/capturewidget.h -index 97601d3..eb63870 100644 ---- a/src/widgets/capture/capturewidget.h -+++ b/src/widgets/capture/capturewidget.h -@@ -61,7 +61,7 @@ public: - QPixmap pixmap(); - - public slots: -- void close(); -+ void deleteToolwidgetOrClose(); - - signals: - void captureTaken(uint id, QPixmap p); diff -Nru flameshot-0.6.0/debian/patches/0006-Pin-Tool-Improve-adjustment-352.patch flameshot-0.6.0/debian/patches/0006-Pin-Tool-Improve-adjustment-352.patch --- flameshot-0.6.0/debian/patches/0006-Pin-Tool-Improve-adjustment-352.patch 2018-10-08 14:20:07.000000000 +0000 +++ flameshot-0.6.0/debian/patches/0006-Pin-Tool-Improve-adjustment-352.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,40 +0,0 @@ -From: Ahmed Zetao Yang -Date: Fri, 21 Sep 2018 19:55:16 +0800 -Subject: Pin Tool: Improve adjustment (#352) -Applied-Upstream: commit:503de1be04d6c5e2521b15eacbbc87d7a317e246 - -Fix pin widget adjustment position ---- - src/tools/pin/pintool.cpp | 4 ---- - src/tools/pin/pinwidget.cpp | 2 +- - 2 files changed, 1 insertion(+), 5 deletions(-) - -diff --git a/src/tools/pin/pintool.cpp b/src/tools/pin/pintool.cpp -index 5017e14..f56c4ea 100755 ---- a/src/tools/pin/pintool.cpp -+++ b/src/tools/pin/pintool.cpp -@@ -45,11 +45,7 @@ QString PinTool::description() const { - QWidget* PinTool::widget() { - PinWidget *w = new PinWidget(m_pixmap); - const int &&m = w->margin(); --#if defined(Q_OS_LINUX) || defined(Q_OS_UNIX) -- QRect adjusted_pos = m_geometry + QMargins(m,-m,-m,-m); --#else - QRect adjusted_pos = m_geometry + QMargins(m, m, m, m); --#endif - w->setGeometry(adjusted_pos); - return w; - } -diff --git a/src/tools/pin/pinwidget.cpp b/src/tools/pin/pinwidget.cpp -index 330c37f..f38be3c 100644 ---- a/src/tools/pin/pinwidget.cpp -+++ b/src/tools/pin/pinwidget.cpp -@@ -58,7 +58,7 @@ int PinWidget::margin() const { - } - - void PinWidget::wheelEvent(QWheelEvent *e) { -- int val = e->delta() > 0 ? 5 : -5; -+ int val = e->delta() > 0 ? 15 : -15; - int newWidth = qBound(50, m_label->width() + val, maximumWidth()); - int newHeight = qBound(50, m_label->height() + val, maximumHeight()); - diff -Nru flameshot-0.6.0/debian/patches/0007-Remove-Wayland-duplicated-screenshots-after-dbus-cal.patch flameshot-0.6.0/debian/patches/0007-Remove-Wayland-duplicated-screenshots-after-dbus-cal.patch --- flameshot-0.6.0/debian/patches/0007-Remove-Wayland-duplicated-screenshots-after-dbus-cal.patch 2018-10-08 14:18:58.000000000 +0000 +++ flameshot-0.6.0/debian/patches/0007-Remove-Wayland-duplicated-screenshots-after-dbus-cal.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -From: lupoDharkael -Date: Fri, 28 Sep 2018 23:31:22 +0200 -Subject: Remove Wayland duplicated screenshots after dbus calls - ---- - src/utils/screengrabber.cpp | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/utils/screengrabber.cpp b/src/utils/screengrabber.cpp -index f0f2545..4480195 100644 ---- a/src/utils/screengrabber.cpp -+++ b/src/utils/screengrabber.cpp -@@ -50,6 +50,8 @@ QPixmap ScreenGrabber::grabEntireDesktop(bool &ok) { - QDBusReply reply = gnomeInterface.call("Screenshot", false, false, path); - if (reply.value()) { - res = QPixmap(path); -+ QFile dbusResult(path); -+ dbusResult.remove(); - } else { - ok = false; - } -@@ -61,6 +63,10 @@ QPixmap ScreenGrabber::grabEntireDesktop(bool &ok) { - QStringLiteral("org.kde.kwin.Screenshot")); - QDBusReply reply = kwinInterface.call("screenshotFullscreen"); - res = QPixmap(reply.value()); -+ if (!res.isNull()) { -+ QFile dbusResult(reply.value()); -+ dbusResult.remove(); -+ } - break; - } default: - ok = false; diff -Nru flameshot-0.6.0/debian/patches/0008-Add-japanese-translation-361.patch flameshot-0.6.0/debian/patches/0008-Add-japanese-translation-361.patch --- flameshot-0.6.0/debian/patches/0008-Add-japanese-translation-361.patch 2018-10-08 14:18:58.000000000 +0000 +++ flameshot-0.6.0/debian/patches/0008-Add-japanese-translation-361.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,932 +0,0 @@ -From: "sicklylife.jp" <43719368+sicklylife-jp@users.noreply.github.com> -Date: Thu, 4 Oct 2018 22:10:29 +0900 -Subject: Add japanese translation (#361) - ---- - flameshot.pro | 3 +- - translations/Internationalization_ja.ts | 902 ++++++++++++++++++++++++++++++++ - 2 files changed, 904 insertions(+), 1 deletion(-) - create mode 100644 translations/Internationalization_ja.ts - -diff --git a/flameshot.pro b/flameshot.pro -index be5f3ff..8d9a58b 100644 ---- a/flameshot.pro -+++ b/flameshot.pro -@@ -43,7 +43,8 @@ TRANSLATIONS = translations/Internationalization_es.ts \ - translations/Internationalization_tr.ts \ - translations/Internationalization_ka.ts \ - translations/Internationalization_fr.ts \ -- translations/Internationalization_pl.ts -+ translations/Internationalization_pl.ts \ -+ translations/Internationalization_ja.ts - - # Generate translations in build - TRANSLATIONS_FILES = -diff --git a/translations/Internationalization_ja.ts b/translations/Internationalization_ja.ts -new file mode 100644 -index 0000000..03c6f42 ---- /dev/null -+++ b/translations/Internationalization_ja.ts -@@ -0,0 +1,902 @@ -+ -+ -+ -+ -+ AppLauncher -+ -+ -+ App Launcher -+ アプリケーションランチャー -+ -+ -+ -+ Choose an app to open the capture -+ キャプチャーを開くアプリケーションを選択する -+ -+ -+ -+ AppLauncherWidget -+ -+ -+ Open With -+ 次で開く -+ -+ -+ -+ Launch in terminal -+ 端末内で起動する -+ -+ -+ -+ Keep open after selection -+ 選択後も開いたままにする -+ -+ -+ -+ -+ Error -+ エラー -+ -+ -+ -+ Unable to launch in terminal. -+ 端末内で起動できません。 -+ -+ -+ -+ Unable to write in -+ 書き込めません: -+ -+ -+ -+ ArrowTool -+ -+ -+ Arrow -+ 矢印 -+ -+ -+ -+ Sets the Arrow as the paint tool -+ ペイントツールとして「矢印」をセットする -+ -+ -+ -+ BlurTool -+ -+ -+ Blur -+ ぼかし -+ -+ -+ -+ Sets the Blur as the paint tool -+ ペイントツールとして「ぼかし」をセットする -+ -+ -+ -+ CaptureWidget -+ -+ -+ Unable to capture screen -+ 画面をキャプチャーできません -+ -+ -+ -+ Select an area with the mouse, or press Esc to exit. -+Press Enter to capture the screen. -+Press Right Click to show the color picker. -+Use the Mouse Wheel to change the thickness of your tool. -+Press Space to open the side panel. -+ マウスで領域を選択、Esc を押すと終了。 -+Enter を押すと画面をキャプチャー。 -+マウスの右ボタンでカラーピッカーを表示。 -+マウスホイールでツールの大きさ等を変更。 -+スペースを押すとサイドパネルを開く。 -+ -+ -+ -+ CircleTool -+ -+ -+ Circle -+ 円形 -+ -+ -+ -+ Sets the Circle as the paint tool -+ ペイントツールとして「円形」をセットする -+ -+ -+ -+ ColorPickerWidget -+ -+ -+ Active color: -+ アクティブな色: -+ -+ -+ -+ Press ESC to cancel -+ ESC でキャンセル -+ -+ -+ -+ Grab Color -+ 色の取得 -+ -+ -+ -+ ConfigWindow -+ -+ -+ Configuration -+ 設定 -+ -+ -+ -+ Interface -+ インターフェース -+ -+ -+ -+ Filename Editor -+ ファイル名エディター -+ -+ -+ -+ General -+ 全般 -+ -+ -+ -+ Controller -+ -+ -+ &Take Screenshot -+ スクリーンショットを撮る(&T) -+ -+ -+ -+ &Configuration -+ 設定(&C) -+ -+ -+ -+ &Information -+ 情報(&I) -+ -+ -+ -+ &Quit -+ 終了(&Q) -+ -+ -+ -+ CopyTool -+ -+ -+ Copy -+ コピー -+ -+ -+ -+ Copies the selection into the clipboard -+ 選択範囲をクリップボードにコピーする -+ -+ -+ -+ DBusUtils -+ -+ -+ Unable to connect via DBus -+ DBus に接続できません -+ -+ -+ -+ ExitTool -+ -+ -+ Exit -+ 終了 -+ -+ -+ -+ Leave the capture screen -+ 画面キャプチャーを終了する -+ -+ -+ -+ FileNameEditor -+ -+ -+ Edit the name of your captures: -+ キャプチャー名の編集: -+ -+ -+ -+ Edit: -+ 編集: -+ -+ -+ -+ Preview: -+ プレビュー: -+ -+ -+ -+ Save -+ 保存 -+ -+ -+ -+ Saves the pattern -+ パータンを保存する -+ -+ -+ -+ Reset -+ リセット -+ -+ -+ -+ Restores the saved pattern -+ 保存されたパターンに戻す -+ -+ -+ -+ Clear -+ 消去 -+ -+ -+ -+ Deletes the name -+ 名前を削除する -+ -+ -+ -+ GeneneralConf -+ -+ -+ Show help message -+ ヘルプメッセージを表示する -+ -+ -+ -+ Show the help message at the beginning in the capture mode. -+ キャプチャーモード開始時にヘルプメッセージを表示する。 -+ -+ -+ -+ -+ Show desktop notifications -+ デスクトップの通知を表示する -+ -+ -+ -+ Show tray icon -+ トレイアイコンを表示する -+ -+ -+ -+ Show the systemtray icon -+ システムトレイアイコンを表示する -+ -+ -+ -+ -+ Import -+ インポート -+ -+ -+ -+ -+ -+ Error -+ エラー -+ -+ -+ -+ Unable to read file. -+ ファイルを読み込めません。 -+ -+ -+ -+ -+ Unable to write file. -+ ファイルに書き込めません。 -+ -+ -+ -+ Save File -+ ファイルを保存 -+ -+ -+ -+ Confirm Reset -+ リセットの確認 -+ -+ -+ -+ Are you sure you want to reset the configuration? -+ 設定をリセットしてもよろしいですか? -+ -+ -+ -+ Configuration File -+ 設定ファイル -+ -+ -+ -+ Export -+ エクスポート -+ -+ -+ -+ Reset -+ リセット -+ -+ -+ -+ Launch at startup -+ スタートアップ時に起動する -+ -+ -+ -+ Launch Flameshot -+ Flameshot を起動する -+ -+ -+ -+ ImgurUploader -+ -+ -+ Upload to Imgur -+ Imgur にアップロード -+ -+ -+ -+ Uploading Image -+ 画像をアップロード中 -+ -+ -+ -+ Copy URL -+ URL をコピー -+ -+ -+ -+ Open URL -+ URL を開く -+ -+ -+ -+ Delete image -+ 画像を削除 -+ -+ -+ -+ Image to Clipboard. -+ 画像をクリップボードへ。 -+ -+ -+ -+ -+ Unable to open the URL. -+ URL を開けません。 -+ -+ -+ -+ URL copied to clipboard. -+ URL をクリップボードにコピーしました。 -+ -+ -+ -+ Screenshot copied to clipboard. -+ スクリーンショットをクリップボードにコピーしました。 -+ -+ -+ -+ ImgurUploaderTool -+ -+ -+ Image Uploader -+ 画像アップローダー -+ -+ -+ -+ Uploads the selection to Imgur -+ Imgur に選択範囲をアップロードする -+ -+ -+ -+ InfoWindow -+ -+ -+ About -+ このアプリケーションについて -+ -+ -+ -+ Right Click -+ 右クリック -+ -+ -+ -+ Mouse Wheel -+ マウスホイール -+ -+ -+ -+ Move selection 1px -+ 選択範囲を 1px 動かす -+ -+ -+ -+ Resize selection 1px -+ 選択範囲を 1px リサイズする -+ -+ -+ -+ Quit capture -+ キャプチャーを終了する -+ -+ -+ -+ Copy to clipboard -+ クリップボードにコピーする -+ -+ -+ -+ Save selection as a file -+ 選択範囲をファイルに保存する -+ -+ -+ -+ Undo the last modification -+ 最後の変更を元に戻す -+ -+ -+ -+ Show color picker -+ カラーピッカーを表示する -+ -+ -+ -+ Change the tool's thickness -+ ツールの値 (大きさなど) を変更する -+ -+ -+ -+ Key -+ キー -+ -+ -+ -+ Description -+ 説明 -+ -+ -+ -+ <u><b>License</b></u> -+ <u><b>ライセンス</b></u> -+ -+ -+ -+ <u><b>Version</b></u> -+ <u><b>バージョン</b></u> -+ -+ -+ -+ <u><b>Shortcuts</b></u> -+ <u><b>ショートカット</b></u> -+ -+ -+ -+ Available shortcuts in the screen capture mode. -+ スクリーンキャプチャーモードで利用可能なショートカット。 -+ -+ -+ -+ LineTool -+ -+ -+ Line -+ 直線 -+ -+ -+ -+ Sets the Line as the paint tool -+ ペイントツールとして「直線」をセットする -+ -+ -+ -+ MarkerTool -+ -+ -+ Marker -+ マーカー -+ -+ -+ -+ Sets the Marker as the paint tool -+ ペイントツールとして「マーカー」をセットする -+ -+ -+ -+ MoveTool -+ -+ -+ Move -+ 移動 -+ -+ -+ -+ Move the selection area -+ 選択範囲を移動する -+ -+ -+ -+ PencilTool -+ -+ -+ Pencil -+ 鉛筆 -+ -+ -+ -+ Sets the Pencil as the paint tool -+ ペイントツールとして「鉛筆」をセットする -+ -+ -+ -+ PinTool -+ -+ -+ Pin Tool -+ 固定ツール -+ -+ -+ -+ Pin image on the desktop -+ 選択範囲をデスクトップ上に配置する -+ -+ -+ -+ QObject -+ -+ -+ Save Error -+ 保存エラー -+ -+ -+ -+ -+ Capture saved as -+ キャプチャーを保存しました: -+ -+ -+ -+ Capture saved to clipboard -+ キャプチャーをクリップボードに保存しました -+ -+ -+ -+ -+ Error trying to save as -+ 保存時にエラーが発生しました: -+ -+ -+ -+ -+ -+ -+ Unable to connect via DBus -+ DBus に接続できません -+ -+ -+ -+ Error -+ エラー -+ -+ -+ -+ Unable to write in -+ 書き込めません: -+ -+ -+ -+ RectangleTool -+ -+ -+ Rectangle -+ 矩形 -+ -+ -+ -+ Sets the Rectangle as the paint tool -+ ペイントツールとして「矩形」をセットする -+ -+ -+ -+ RedoTool -+ -+ -+ Redo -+ やり直し -+ -+ -+ -+ Redo the next modification -+ 次の変更にやり直す -+ -+ -+ -+ SaveTool -+ -+ -+ Save -+ 保存 -+ -+ -+ -+ Save the capture -+ キャプチャーを保存する -+ -+ -+ -+ ScreenGrabber -+ -+ -+ Unable to capture screen -+ 画面をキャプチャーできません -+ -+ -+ -+ SelectionTool -+ -+ -+ Rectangular Selection -+ 矩形選択 -+ -+ -+ -+ Sets the Selection as the paint tool -+ ペイントツールとして「矩形選択」をセットする -+ -+ -+ -+ SizeIndicatorTool -+ -+ -+ Selection Size Indicator -+ 選択サイズインジケーター -+ -+ -+ -+ Shows the dimensions of the selection (X Y) -+ 選択範囲の寸法 (X Y) を表示する -+ -+ -+ -+ StrftimeChooserWidget -+ -+ -+ Century (00-99) -+ 世紀 (00-99) -+ -+ -+ -+ Year (00-99) -+ 年 (00-99) -+ -+ -+ -+ Year (2000) -+ 年 (2000) -+ -+ -+ -+ Month Name (jan) -+ 月 (jan) -+ -+ -+ -+ Month Name (january) -+ 月 (january) -+ -+ -+ -+ Month (01-12) -+ 月 (01-12) -+ -+ -+ -+ Week Day (1-7) -+ 週日 (1-7) -+ -+ -+ -+ Week (01-53) -+ 週 (01-53) -+ -+ -+ -+ Day Name (mon) -+ 曜日 (月) -+ -+ -+ -+ Day Name (monday) -+ 曜日 (月曜日) -+ -+ -+ -+ Day (01-31) -+ 日 (01-31) -+ -+ -+ -+ Day of Month (1-31) -+ 日 (1-31) -+ -+ -+ -+ Day (001-366) -+ 日 (001-366) -+ -+ -+ -+ Time (%H-%M-%S) -+ 時刻 (%H-%M-%S) -+ -+ -+ -+ Time (%H-%M) -+ 時刻 (%H-%M) -+ -+ -+ -+ Hour (00-23) -+ 時 (00-23) -+ -+ -+ -+ Hour (01-12) -+ 時 (01-12) -+ -+ -+ -+ Minute (00-59) -+ 分 (00-59) -+ -+ -+ -+ Second (00-59) -+ 秒 (00-59) -+ -+ -+ -+ Full Date (%m/%d/%y) -+ 年月日 (%m/%d/%y) -+ -+ -+ -+ Full Date (%Y-%m-%d) -+ 年月日 (%Y-%m-%d) -+ -+ -+ -+ SystemNotification -+ -+ -+ Flameshot Info -+ Flameshot の情報 -+ -+ -+ -+ TextConfig -+ -+ -+ StrikeOut -+ 取り消し線 -+ -+ -+ -+ Underline -+ 下線 -+ -+ -+ -+ Bold -+ 太字 -+ -+ -+ -+ Italic -+ 斜体 -+ -+ -+ -+ TextTool -+ -+ -+ Text -+ テキスト -+ -+ -+ -+ Add text to your capture -+ キャプチャーにテキストを追加する -+ -+ -+ -+ UIcolorEditor -+ -+ -+ UI Color Editor -+ UI カラーエディター -+ -+ -+ -+ Change the color moving the selectors and see the changes in the preview buttons. -+ セレクターを動かして色を変更し、プレビューボタンの色がどう変化するか確認してください。 -+ -+ -+ -+ Select a Button to modify it -+ 変更するボタンを選択してください -+ -+ -+ -+ Main Color -+ メインカラー -+ -+ -+ -+ Click on this button to set the edition mode of the main color. -+ このボタンをクリックすると、メインカラーの編集モードをセットします。 -+ -+ -+ -+ Contrast Color -+ コントラストカラー -+ -+ -+ -+ Click on this button to set the edition mode of the contrast color. -+ このボタンをクリックすると、コントラストカラーの編集モードをセットします。 -+ -+ -+ -+ UndoTool -+ -+ -+ Undo -+ 元に戻す -+ -+ -+ -+ Undo the last modification -+ 最後の変更を元に戻す -+ -+ -+ -+ VisualsEditor -+ -+ -+ Opacity of area outside selection: -+ 選択範囲外の不透明度: -+ -+ -+ -+ Button Selection -+ ボタンの選択 -+ -+ -+ -+ Select All -+ すべて選択 -+ -+ -+ diff -Nru flameshot-0.6.0/debian/patches/0009-Fixes-362-363.patch flameshot-0.6.0/debian/patches/0009-Fixes-362-363.patch --- flameshot-0.6.0/debian/patches/0009-Fixes-362-363.patch 2018-10-08 14:18:58.000000000 +0000 +++ flameshot-0.6.0/debian/patches/0009-Fixes-362-363.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -From: Streppel -Date: Thu, 4 Oct 2018 11:43:25 -0300 -Subject: Fixes #362 (#363) - -This fixes #362, making the enter key copy the content of the GUI selection copy the content to the clipboard ---- - src/widgets/capture/capturewidget.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/widgets/capture/capturewidget.cpp b/src/widgets/capture/capturewidget.cpp -index 1b1413e..b988a2c 100644 ---- a/src/widgets/capture/capturewidget.cpp -+++ b/src/widgets/capture/capturewidget.cpp -@@ -741,6 +741,7 @@ void CaptureWidget::initShortcuts() { - new QShortcut(Qt::Key_Space, this, SLOT(togglePanel())); - new QShortcut(Qt::Key_Escape, this, SLOT(deleteToolwidgetOrClose())); - new QShortcut(Qt::Key_Return, this, SLOT(copyScreenshot())); -+ new QShortcut(Qt::Key_Enter, this, SLOT(copyScreenshot())); - } - - void CaptureWidget::updateSizeIndicator() { diff -Nru flameshot-0.6.0/debian/patches/0010-Adds-Brazilian-Portuguese-translations-364.patch flameshot-0.6.0/debian/patches/0010-Adds-Brazilian-Portuguese-translations-364.patch --- flameshot-0.6.0/debian/patches/0010-Adds-Brazilian-Portuguese-translations-364.patch 2018-10-08 14:18:58.000000000 +0000 +++ flameshot-0.6.0/debian/patches/0010-Adds-Brazilian-Portuguese-translations-364.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,932 +0,0 @@ -From: Streppel -Date: Thu, 4 Oct 2018 13:15:29 -0300 -Subject: Adds Brazilian Portuguese translations (#364) - ---- - flameshot.pro | 3 +- - translations/Internationalization_pt_br.ts | 902 +++++++++++++++++++++++++++++ - 2 files changed, 904 insertions(+), 1 deletion(-) - create mode 100644 translations/Internationalization_pt_br.ts - -diff --git a/flameshot.pro b/flameshot.pro -index 8d9a58b..7532cb1 100644 ---- a/flameshot.pro -+++ b/flameshot.pro -@@ -44,7 +44,8 @@ TRANSLATIONS = translations/Internationalization_es.ts \ - translations/Internationalization_ka.ts \ - translations/Internationalization_fr.ts \ - translations/Internationalization_pl.ts \ -- translations/Internationalization_ja.ts -+ translations/Internationalization_ja.ts \ -+ translations/Internationalization_pt_br.ts - - # Generate translations in build - TRANSLATIONS_FILES = -diff --git a/translations/Internationalization_pt_br.ts b/translations/Internationalization_pt_br.ts -new file mode 100644 -index 0000000..35327b9 ---- /dev/null -+++ b/translations/Internationalization_pt_br.ts -@@ -0,0 +1,902 @@ -+ -+ -+ -+ -+ AppLauncher -+ -+ -+ App Launcher -+ App Launcher -+ -+ -+ -+ Choose an app to open the capture -+ Escolha uma aplicação para abrir a captura -+ -+ -+ -+ AppLauncherWidget -+ -+ -+ Open With -+ Abrir Com -+ -+ -+ -+ Launch in terminal -+ Abrir no terminal -+ -+ -+ -+ Keep open after selection -+ Manter aberto após seleção -+ -+ -+ -+ -+ Error -+ Erro -+ -+ -+ -+ Unable to write in -+ Não é possível escrever em -+ -+ -+ -+ Unable to launch in terminal. -+ Não foi possível abrir no terminal. -+ -+ -+ -+ ArrowTool -+ -+ -+ Arrow -+ Flecha -+ -+ -+ -+ Sets the Arrow as the paint tool -+ Usa a Flecha como ferramenta de desenho -+ -+ -+ -+ BlurTool -+ -+ -+ Blur -+ Desfoque -+ -+ -+ -+ Sets the Blur as the paint tool -+ Usa o Desfoque como ferramenta de desenho -+ -+ -+ -+ CaptureWidget -+ -+ -+ Unable to capture screen -+ Não foi possível capturar a tela -+ -+ -+ -+ Select an area with the mouse, or press Esc to exit. -+Press Enter to capture the screen. -+Press Right Click to show the color picker. -+Use the Mouse Wheel to change the thickness of your tool. -+Press Space to open the side panel. -+ Selecione uma área com o mouse, ou precione Esc para sair. -+Pressione Enter para capturar a tela. -+Pressione o botão direito do mouse para abrir o seletor de cores. -+Use a roda do mouse para aumentar a grossura do pincel. -+Pressione espaço abrir o painel lateral. -+ -+ -+ -+ CircleTool -+ -+ -+ Circle -+ Círculo -+ -+ -+ -+ Sets the Circle as the paint tool -+ Usa o Círculo como ferramenta de desenho -+ -+ -+ -+ ColorPickerWidget -+ -+ -+ Active color: -+ Cor ativa: -+ -+ -+ -+ Press ESC to cancel -+ Presione Esc para cancelar -+ -+ -+ -+ Grab Color -+ Usar Cor -+ -+ -+ -+ ConfigWindow -+ -+ -+ Configuration -+ Configuração -+ -+ -+ -+ Interface -+ Interface -+ -+ -+ -+ Filename Editor -+ Editor de nome de arquivo -+ -+ -+ -+ General -+ Geral -+ -+ -+ -+ Controller -+ -+ -+ &Take Screenshot -+ &Tirar Screenshot -+ -+ -+ -+ &Configuration -+ &Configuração -+ -+ -+ -+ &Information -+ &Informações -+ -+ -+ -+ &Quit -+ &Sair -+ -+ -+ -+ CopyTool -+ -+ -+ Copy -+ Copiar -+ -+ -+ -+ Copies the selection into the clipboard -+ Copia a seleção para o clipboard -+ -+ -+ -+ DBusUtils -+ -+ -+ Unable to connect via DBus -+ Não foi possível conectar via DBus -+ -+ -+ -+ ExitTool -+ -+ -+ Exit -+ Sair -+ -+ -+ -+ Leave the capture screen -+ Sair da ferramenta de captura -+ -+ -+ -+ FileNameEditor -+ -+ -+ Edit the name of your captures: -+ Edite o nome das suas capturas: -+ -+ -+ -+ Edit: -+ Editar: -+ -+ -+ -+ Preview: -+ Preview: -+ -+ -+ -+ Save -+ Salvar -+ -+ -+ -+ Saves the pattern -+ Salva o padrão -+ -+ -+ -+ Reset -+ Reiniciar -+ -+ -+ -+ Restores the saved pattern -+ Restaura o padrão salvo -+ -+ -+ -+ Clear -+ Limpar -+ -+ -+ -+ Deletes the name -+ Deleta o nome -+ -+ -+ -+ GeneneralConf -+ -+ -+ -+ Import -+ Importar -+ -+ -+ -+ -+ -+ Error -+ Erro -+ -+ -+ -+ Unable to read file. -+ Não foi possível ler o arquivo. -+ -+ -+ -+ -+ Unable to write file. -+ Não foi possível escrever no arquivo. -+ -+ -+ -+ Save File -+ Salvar Arquivo -+ -+ -+ -+ Confirm Reset -+ Confirmar Reset -+ -+ -+ -+ Are you sure you want to reset the configuration? -+ Tem certeza que deseja resetar a configuração? -+ -+ -+ -+ Show help message -+ Mostrar mensagem de ajuda -+ -+ -+ -+ Show the help message at the beginning in the capture mode. -+ Mostrar mensagem de ajuda no início do modo de captura. -+ -+ -+ -+ -+ Show desktop notifications -+ Mostrar notificações de Desktop -+ -+ -+ -+ Show tray icon -+ Mostrar ícone de tray -+ -+ -+ -+ Show the systemtray icon -+ Mosrar ícone na barra de aplicações -+ -+ -+ -+ Configuration File -+ Arquivo de Configurações -+ -+ -+ -+ Export -+ Exportar -+ -+ -+ -+ Reset -+ Reset -+ -+ -+ -+ Launch at startup -+ Iniciar junto com o sistema -+ -+ -+ -+ Launch Flameshot -+ Iniciar Flameshot -+ -+ -+ -+ ImgurUploader -+ -+ -+ Upload to Imgur -+ Upload no Imgur -+ -+ -+ -+ Uploading Image -+ Upando Imagem -+ -+ -+ -+ Copy URL -+ Copiar URL -+ -+ -+ -+ Open URL -+ Abrir URL -+ -+ -+ -+ Delete image -+ Deletar imagem -+ -+ -+ -+ Image to Clipboard. -+ Imagem no Clipboard. -+ -+ -+ -+ -+ Unable to open the URL. -+ Mão foi possível abrir a URL. -+ -+ -+ -+ URL copied to clipboard. -+ URL copiada para o clipboard. -+ -+ -+ -+ Screenshot copied to clipboard. -+ Screenshot copiada para o clipboard. -+ -+ -+ -+ ImgurUploaderTool -+ -+ -+ Image Uploader -+ Uploader de imagens -+ -+ -+ -+ Uploads the selection to Imgur -+ Upa a seleção no Imgur -+ -+ -+ -+ InfoWindow -+ -+ -+ About -+ Sobre -+ -+ -+ -+ Right Click -+ Botão Direito -+ -+ -+ -+ Mouse Wheel -+ Roda do mouse -+ -+ -+ -+ Move selection 1px -+ Move a seleção em 1px -+ -+ -+ -+ Resize selection 1px -+ Redimensiona a seleção em 1px -+ -+ -+ -+ Quit capture -+ Sair da captura -+ -+ -+ -+ Copy to clipboard -+ Copiar ao clipboard -+ -+ -+ -+ Save selection as a file -+ Salva seleção em um arquivo -+ -+ -+ -+ Undo the last modification -+ Desfazer última modificação -+ -+ -+ -+ Show color picker -+ Mostra seletor de cores -+ -+ -+ -+ Change the tool's thickness -+ Muda a grossura do pincel -+ -+ -+ -+ Available shortcuts in the screen capture mode. -+ Atalhos disponívels na tela de captura. -+ -+ -+ -+ Key -+ Tecla -+ -+ -+ -+ Description -+ Descrição -+ -+ -+ -+ <u><b>License</b></u> -+ <u><b>Licença</b></u> -+ -+ -+ -+ <u><b>Version</b></u> -+ <u><b>Versão</b></u> -+ -+ -+ -+ <u><b>Shortcuts</b></u> -+ <u><b>Atalhos</b></u> -+ -+ -+ -+ LineTool -+ -+ -+ Line -+ Linha -+ -+ -+ -+ Sets the Line as the paint tool -+ Usa a Linha como ferramenta de desenho -+ -+ -+ -+ MarkerTool -+ -+ -+ Marker -+ Marcador -+ -+ -+ -+ Sets the Marker as the paint tool -+ Usa o marcador como ferramenta de desenho -+ -+ -+ -+ MoveTool -+ -+ -+ Move -+ Mover -+ -+ -+ -+ Move the selection area -+ Move a área de seleção -+ -+ -+ -+ PencilTool -+ -+ -+ Pencil -+ Pincel -+ -+ -+ -+ Sets the Pencil as the paint tool -+ Usa o Lápis como ferramenta de desenho -+ -+ -+ -+ PinTool -+ -+ -+ Pin Tool -+ Ferramenta de Pin -+ -+ -+ -+ Pin image on the desktop -+ Pinnar imagem no desktop -+ -+ -+ -+ QObject -+ -+ -+ Save Error -+ Salvar erro -+ -+ -+ -+ -+ Capture saved as -+ Captura salva como -+ -+ -+ -+ Capture saved to clipboard -+ Captura salva no clipboard -+ -+ -+ -+ -+ Error trying to save as -+ Erro tentando salvar como -+ -+ -+ -+ -+ -+ -+ Unable to connect via DBus -+ Não foi possível conectar via DBus -+ -+ -+ -+ Error -+ Erro -+ -+ -+ -+ Unable to write in -+ Não foi possível escrever em -+ -+ -+ -+ RectangleTool -+ -+ -+ Rectangle -+ Retângulo -+ -+ -+ -+ Sets the Rectangle as the paint tool -+ Seta o Retângulo como ferramenta de desenho -+ -+ -+ -+ RedoTool -+ -+ -+ Redo -+ Refazer -+ -+ -+ -+ Redo the next modification -+ Refazer última modificação -+ -+ -+ -+ SaveTool -+ -+ -+ Save -+ Salvar -+ -+ -+ -+ Save the capture -+ Salva a captura -+ -+ -+ -+ ScreenGrabber -+ -+ -+ Unable to capture screen -+ Não foi possível capturar a tela -+ -+ -+ -+ SelectionTool -+ -+ -+ Rectangular Selection -+ Seleção Retangular -+ -+ -+ -+ Sets the Selection as the paint tool -+ Estabelece o Selecionador como ferramenta de desenho -+ -+ -+ -+ SizeIndicatorTool -+ -+ -+ Selection Size Indicator -+ Indicador do Tamanho da Seleção -+ -+ -+ -+ Shows the dimensions of the selection (X Y) -+ Mostra a dimensão da seleção (X Y) -+ -+ -+ -+ StrftimeChooserWidget -+ -+ -+ Century (00-99) -+ Século (00-99) -+ -+ -+ -+ Year (00-99) -+ Ano (00-99) -+ -+ -+ -+ Year (2000) -+ Ano (2000) -+ -+ -+ -+ Month Name (jan) -+ Nome do mês (jan) -+ -+ -+ -+ Month Name (january) -+ Nome do mês (janeiro) -+ -+ -+ -+ Month (01-12) -+ Mês (01-12) -+ -+ -+ -+ Week Day (1-7) -+ Día da semana (1-7) -+ -+ -+ -+ Week (01-53) -+ Semana (01-53) -+ -+ -+ -+ Day Name (mon) -+ Nome do dia (seg) -+ -+ -+ -+ Day Name (monday) -+ Nome do dia (segunda) -+ -+ -+ -+ Day (01-31) -+ Dia (01-31) -+ -+ -+ -+ Day of Month (1-31) -+ Dia do Mês (1-31) -+ -+ -+ -+ Day (001-366) -+ Dia (001-366) -+ -+ -+ -+ Time (%H-%M-%S) -+ Tempo (%H-%M-%S) -+ -+ -+ -+ Time (%H-%M) -+ Tempo (%H-%M) -+ -+ -+ -+ Hour (00-23) -+ Hora (00-23) -+ -+ -+ -+ Hour (01-12) -+ Hora (01-12) -+ -+ -+ -+ Minute (00-59) -+ Minuto (00-59) -+ -+ -+ -+ Second (00-59) -+ Segundo (00-59) -+ -+ -+ -+ Full Date (%m/%d/%y) -+ Data Completa (%m/%d/%y) -+ -+ -+ -+ Full Date (%Y-%m-%d) -+ Data Completa (%Y-%m-%d) -+ -+ -+ -+ SystemNotification -+ -+ -+ Flameshot Info -+ Informações do Flameshot -+ -+ -+ -+ TextConfig -+ -+ -+ StrikeOut -+ Sobrescrito -+ -+ -+ -+ Underline -+ Sublinhado -+ -+ -+ -+ Bold -+ Negrito -+ -+ -+ -+ Italic -+ Itálico -+ -+ -+ -+ TextTool -+ -+ -+ Text -+ Texto -+ -+ -+ -+ Add text to your capture -+ Adicionar texto à captura -+ -+ -+ -+ UIcolorEditor -+ -+ -+ UI Color Editor -+ Interface de Edição de Cores -+ -+ -+ -+ Change the color moving the selectors and see the changes in the preview buttons. -+ Modifique a cor movendo os seletores e veja as mudanças nos botões de preview. -+ -+ -+ -+ Select a Button to modify it -+ Selecione um botão para modificá-lo -+ -+ -+ -+ Main Color -+ Cor Principal -+ -+ -+ -+ Click on this button to set the edition mode of the main color. -+ Clique neste botão para setar o modo de edição da cor principal. -+ -+ -+ -+ Contrast Color -+ Cor de Contraste -+ -+ -+ -+ Click on this button to set the edition mode of the contrast color. -+ Clique neste botão para setar o modo de edição da cor de contraste. -+ -+ -+ -+ UndoTool -+ -+ -+ Undo -+ Desfazer -+ -+ -+ -+ Undo the last modification -+ Desfaz a última modificação -+ -+ -+ -+ VisualsEditor -+ -+ -+ Opacity of area outside selection: -+ Opacidade da área de seleção: -+ -+ -+ -+ Button Selection -+ Botão de seleção -+ -+ -+ -+ Select All -+ Selecionar Todos -+ -+ -+ diff -Nru flameshot-0.6.0/debian/patches/0011-Small-corrections-in-Brazilian-Portuguese-translatio.patch flameshot-0.6.0/debian/patches/0011-Small-corrections-in-Brazilian-Portuguese-translatio.patch --- flameshot-0.6.0/debian/patches/0011-Small-corrections-in-Brazilian-Portuguese-translatio.patch 2018-10-08 14:18:58.000000000 +0000 +++ flameshot-0.6.0/debian/patches/0011-Small-corrections-in-Brazilian-Portuguese-translatio.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -From: Welinton -Date: Thu, 4 Oct 2018 17:03:06 -0300 -Subject: Small corrections in Brazilian Portuguese translation (#365) - ---- - translations/Internationalization_pt_br.ts | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/translations/Internationalization_pt_br.ts b/translations/Internationalization_pt_br.ts -index 35327b9..39afd7d 100644 ---- a/translations/Internationalization_pt_br.ts -+++ b/translations/Internationalization_pt_br.ts -@@ -383,7 +383,7 @@ Pressione espaço abrir o painel lateral. - - - Unable to open the URL. -- Mão foi possível abrir a URL. -+ Não foi possível abrir a URL. - - - -@@ -713,7 +713,7 @@ Pressione espaço abrir o painel lateral. - - - Week Day (1-7) -- Día da semana (1-7) -+ Dia da semana (1-7) - - - diff -Nru flameshot-0.6.0/debian/patches/0012-Add-Japanese-Translation-in-.desktop-file-and-fix-ty.patch flameshot-0.6.0/debian/patches/0012-Add-Japanese-Translation-in-.desktop-file-and-fix-ty.patch --- flameshot-0.6.0/debian/patches/0012-Add-Japanese-Translation-in-.desktop-file-and-fix-ty.patch 2018-10-08 14:18:58.000000000 +0000 +++ flameshot-0.6.0/debian/patches/0012-Add-Japanese-Translation-in-.desktop-file-and-fix-ty.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,76 +0,0 @@ -From: "sicklylife.jp" <43719368+sicklylife-jp@users.noreply.github.com> -Date: Fri, 5 Oct 2018 23:36:34 +0900 -Subject: Add Japanese Translation in .desktop file, - and fix typos in ja.ts file. (#367) - ---- - docs/desktopEntry/package/flameshot.desktop | 5 +++++ - translations/Internationalization_ja.ts | 6 +++--- - 2 files changed, 8 insertions(+), 3 deletions(-) - -diff --git a/docs/desktopEntry/package/flameshot.desktop b/docs/desktopEntry/package/flameshot.desktop -index 522af47..a7daac4 100644 ---- a/docs/desktopEntry/package/flameshot.desktop -+++ b/docs/desktopEntry/package/flameshot.desktop -@@ -5,13 +5,16 @@ GenericName=Screenshot tool - GenericName[zh_CN]=屏幕截图工具 - GenericName[pl]=Zrzuty ekranu - GenericName[fr]=Outil de capture d'écran -+GenericName[ja]=スクリーンショットツール - Comment=Powerful yet simple to use screenshot software. - Comment[zh_CN]=强大又易用的屏幕截图软件 - Comment[pl]=Proste w użyciu narzędzie do zrzutów ekranu - Comment[fr]=Logiciel de capture d'écran puissant et simple d'utilisation. -+Comment[ja]=パワフルで使いやすいスクリーンショットソフトウェア。 - Keywords=flameshot;screenshot;capture;shutter; - Keywords[zh_CN]=flameshot;screenshot;capture;shutter;截图;屏幕; - Keywords[fr]=flameshot;capture d'écran;capter;shutter; -+Keywords[ja]=flameshot;screenshot;capture;shutter;スクリーンショット;キャプチャー; - Exec=flameshot - Icon=flameshot - Terminal=false -@@ -25,6 +28,7 @@ Name=Configure - Name[zh_CN]=配置 - Name[pl]=Konfiguruj - Name[fr]=Configurer -+Name[ja]=設定 - Exec=flameshot config - - [Desktop Action Capture] -@@ -32,4 +36,5 @@ Name=Take screenshot - Name[zh_CN]=进行截图 - Name[pl]=Zrzut ekranu - Name[fr]=Prendre une capture d'écran -+Name[ja]=スクリーンショットを撮る - Exec=flameshot gui --delay 500 -diff --git a/translations/Internationalization_ja.ts b/translations/Internationalization_ja.ts -index 03c6f42..5dda0ec 100644 ---- a/translations/Internationalization_ja.ts -+++ b/translations/Internationalization_ja.ts -@@ -91,7 +91,7 @@ Press Space to open the side panel. - マウスで領域を選択、Esc を押すと終了。 - Enter を押すと画面をキャプチャー。 - マウスの右ボタンでカラーピッカーを表示。 --マウスホイールでツールの大きさ等を変更。 -+マウスホイールでツールの太さ等を変更。 - スペースを押すとサイドパネルを開く。 - - -@@ -231,7 +231,7 @@ Enter を押すと画面をキャプチャー。 - - - Saves the pattern -- パータンを保存する -+ パターンを保存する - - - -@@ -464,7 +464,7 @@ Enter を押すと画面をキャプチャー。 - - - Change the tool's thickness -- ツールの値 (大きさなど) を変更する -+ ツールの値 (太さや濃さ) を変更する - - - diff -Nru flameshot-0.6.0/debian/patches/series flameshot-0.6.0/debian/patches/series --- flameshot-0.6.0/debian/patches/series 2018-10-08 14:18:58.000000000 +0000 +++ flameshot-0.6.0/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -0001-pro-Explicitly-enable-packaging-instruction-in-qmake.patch -0002-Explicitly-set-app-version.patch -0003-infowindow-Pop-up-infowindow-at-screen-center-318.patch -0004-flameshot.svg-Use-more-strict-grammar-to-fix-preview.patch -0005-Fix-311.patch -0006-Pin-Tool-Improve-adjustment-352.patch -0007-Remove-Wayland-duplicated-screenshots-after-dbus-cal.patch -0008-Add-japanese-translation-361.patch -0009-Fixes-362-363.patch -0010-Adds-Brazilian-Portuguese-translations-364.patch -0011-Small-corrections-in-Brazilian-Portuguese-translatio.patch -0012-Add-Japanese-Translation-in-.desktop-file-and-fix-ty.patch diff -Nru flameshot-0.6.0/debian/rules flameshot-0.6.0/debian/rules --- flameshot-0.6.0/debian/rules 2018-10-08 14:17:44.000000000 +0000 +++ flameshot-0.6.0/debian/rules 2018-05-07 09:34:56.000000000 +0000 @@ -1,22 +1,26 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Uncomment this to turn on verbose mode. -# export DH_VERBOSE=1 +# See debhelper(7) (uncomment to enable) +# output every command that modifies files on the build system. +#export DH_VERBOSE = 1 + # see FEATURE AREAS in dpkg-buildflags(1) -export DEB_BUILD_MAINT_OPTIONS = hardening=+all +#export DEB_BUILD_MAINT_OPTIONS = hardening=+all # see ENVIRONMENT in dpkg-buildflags(1) # package maintainers to append CFLAGS #export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic # package maintainers to append LDFLAGS -export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed +#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed export QT_SELECT := 5 - %: - dh $@ + dh $@ + + +# dh_make generated override targets +# This is example for Cmake (See https://bugs.debian.org/641051 ) +#override_dh_auto_configure: +# dh_auto_configure -- # -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) -override_dh_missing: - dh_missing --fail-missing diff -Nru flameshot-0.6.0/debian/watch flameshot-0.6.0/debian/watch --- flameshot-0.6.0/debian/watch 2018-10-08 14:17:44.000000000 +0000 +++ flameshot-0.6.0/debian/watch 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -version=4 -opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%flameshot-$1.tar.gz%" \ - https://github.com/lupoDharkael/flameshot/releases \ - (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian uupdate