diff -Nru flameshot-0.6.0/debian/changelog flameshot-0.6.0/debian/changelog --- flameshot-0.6.0/debian/changelog 2018-09-29 15:00:00.000000000 +0000 +++ flameshot-0.6.0/debian/changelog 2018-11-20 15:00:00.000000000 +0000 @@ -1,8 +1,29 @@ -flameshot (0.6.0-4+sicklylife~ppa1) bionic; urgency=medium +flameshot (0.6.0-7+bionic) bionic; urgency=medium - * Added Internationalization_ja.ts + * Backport - -- Sickly Life Sun, 30 Sep 2018 00:00:00 +0900 + -- Sickly Life Wed, 21 Nov 2018 00:00:00 +0900 + +flameshot (0.6.0-7) unstable; urgency=medium + + * debian/flameshot.1: Fix typo in man page. (Closes: #911872) + * debian/patches: Backport upstream patch till 2018-11-05. + + -- Boyuan Yang Thu, 08 Nov 2018 19:59:31 -0500 + +flameshot (0.6.0-6) unstable; urgency=medium + + * Rebuild against Qt 5.11.2. + * debian/patches: Backport upstream patch till 2018-10-23. + + -- Boyuan Yang Thu, 25 Oct 2018 12:58:12 -0400 + +flameshot (0.6.0-5) unstable; urgency=medium + + * debian/patches: Backport upstream patch till 2018-10-05. + * debian/flameshot.1: Refresh man page. + + -- Boyuan Yang Mon, 08 Oct 2018 10:26:01 -0400 flameshot (0.6.0-4) unstable; urgency=medium diff -Nru flameshot-0.6.0/debian/flameshot.1 flameshot-0.6.0/debian/flameshot.1 --- flameshot-0.6.0/debian/flameshot.1 2018-08-27 01:50:20.000000000 +0000 +++ flameshot-0.6.0/debian/flameshot.1 2018-11-09 00:57:14.000000000 +0000 @@ -1,7 +1,7 @@ .\" Hey, EMACS: -*- nroff -*- .\" (C) Copyright 2018 Boyuan Yang <073plan@gmail.com>, .\" -.TH "FLAMESHOT" "1" "2018-07-30" +.TH "FLAMESHOT" "1" "2018-10-25" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -40,13 +40,13 @@ .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. +D-Bus interface, tray icon support, 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. +\fI/usr/share/doc/flameshot/\fR directory. . .SH GUI USAGE .PP @@ -105,6 +105,10 @@ .IR /usr/share/doc/flameshot/ directory. . +.PP +Upstream project homepage: +<\fBhttps://github.com/lupoDharkael/flameshot\fR>. +. .SH AUTHOR .PP .B flameshot @@ -115,7 +119,7 @@ . .PP This manual page is written by -.MT 073plan@\:gmail.com +.MT byang@\:debian.org Boyuan Yang .ME for the Debian Project (but may be used by others). 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-09-27 22:56:53.000000000 +0000 +++ flameshot-0.6.0/debian/patches/0001-pro-Explicitly-enable-packaging-instruction-in-qmake.patch 2018-11-09 00:59:11.000000000 +0000 @@ -1,7 +1,6 @@ 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. --- @@ -9,7 +8,7 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flameshot.pro b/flameshot.pro -index 7cf9b64..43ed093 100644 +index 7485ab8..d77fb12 100644 --- a/flameshot.pro +++ b/flameshot.pro @@ -20,7 +20,7 @@ unix:!macx { 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-09-27 22:56:53.000000000 +0000 +++ flameshot-0.6.0/debian/patches/0002-Explicitly-set-app-version.patch 2018-11-09 00:59:31.000000000 +0000 @@ -1,14 +1,13 @@ 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 +index d77fb12..01a8783 100644 --- a/flameshot.pro +++ b/flameshot.pro @@ -6,7 +6,7 @@ @@ -16,7 +15,7 @@ win32:LIBS += -luser32 -lshell32 -TAG_VERSION = $$system(git --git-dir $$PWD/.git --work-tree $$PWD describe --always --tags) -+TAG_VERSION = "0.6.0-2\\\(Debian\\\)" ++TAG_VERSION = "0.6.0-7\\\(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-09-27 22:56:53.000000000 +0000 +++ flameshot-0.6.0/debian/patches/0003-infowindow-Pop-up-infowindow-at-screen-center-318.patch 2018-11-09 00:59:11.000000000 +0000 @@ -1,7 +1,6 @@ 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 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-09-27 22:56:53.000000000 +0000 +++ flameshot-0.6.0/debian/patches/0004-flameshot.svg-Use-more-strict-grammar-to-fix-preview.patch 2018-11-09 00:59:11.000000000 +0000 @@ -2,7 +2,6 @@ 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 +++- 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-09-27 22:56:53.000000000 +0000 +++ flameshot-0.6.0/debian/patches/0005-Fix-311.patch 2018-11-09 00:59:11.000000000 +0000 @@ -1,7 +1,6 @@ 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. 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-09-27 22:56:24.000000000 +0000 +++ flameshot-0.6.0/debian/patches/0006-Pin-Tool-Improve-adjustment-352.patch 2018-11-09 00:59:11.000000000 +0000 @@ -1,7 +1,6 @@ From: Ahmed Zetao Yang Date: Fri, 21 Sep 2018 19:55:16 +0800 -Subject: Pin Tool: Improve adjustment (#352) -Applied-Upstream: commit:503de1be04d6c5e2521b15eacbbc87d7a317e246 +Subject: Pin Tool: Improve adjustment (#352) Fix pin widget adjustment position --- 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 1970-01-01 00:00:00.000000000 +0000 +++ flameshot-0.6.0/debian/patches/0007-Remove-Wayland-duplicated-screenshots-after-dbus-cal.patch 2018-11-09 00:59:11.000000000 +0000 @@ -0,0 +1,32 @@ +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 1970-01-01 00:00:00.000000000 +0000 +++ flameshot-0.6.0/debian/patches/0008-Add-japanese-translation-361.patch 2018-11-09 00:59:31.000000000 +0000 @@ -0,0 +1,932 @@ +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 01a8783..e0ccc38 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 1970-01-01 00:00:00.000000000 +0000 +++ flameshot-0.6.0/debian/patches/0009-Fixes-362-363.patch 2018-11-09 00:59:11.000000000 +0000 @@ -0,0 +1,21 @@ +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 1970-01-01 00:00:00.000000000 +0000 +++ flameshot-0.6.0/debian/patches/0010-Adds-Brazilian-Portuguese-translations-364.patch 2018-11-09 00:59:31.000000000 +0000 @@ -0,0 +1,932 @@ +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 e0ccc38..282ac87 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 1970-01-01 00:00:00.000000000 +0000 +++ flameshot-0.6.0/debian/patches/0011-Small-corrections-in-Brazilian-Portuguese-translatio.patch 2018-11-09 00:59:11.000000000 +0000 @@ -0,0 +1,30 @@ +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 1970-01-01 00:00:00.000000000 +0000 +++ flameshot-0.6.0/debian/patches/0012-Add-Japanese-Translation-in-.desktop-file-and-fix-ty.patch 2018-11-09 00:59:11.000000000 +0000 @@ -0,0 +1,76 @@ +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/0013-WIP-Add-line-thickness-to-side-panel-374.patch flameshot-0.6.0/debian/patches/0013-WIP-Add-line-thickness-to-side-panel-374.patch --- flameshot-0.6.0/debian/patches/0013-WIP-Add-line-thickness-to-side-panel-374.patch 1970-01-01 00:00:00.000000000 +0000 +++ flameshot-0.6.0/debian/patches/0013-WIP-Add-line-thickness-to-side-panel-374.patch 2018-11-09 00:59:31.000000000 +0000 @@ -0,0 +1,991 @@ +From: Alfredo Ramos +Date: Wed, 10 Oct 2018 16:34:42 -0500 +Subject: [WIP] Add line thickness to side panel (#374) + +* Add thickness slider + +* Fix enums compatibility + +* Rename ColorPickerWidget to SidePanelWidget +--- + flameshot.pro | 4 +- + src/widgets/capture/capturebutton.h | 7 +- + src/widgets/capture/capturewidget.cpp | 28 +++-- + src/widgets/capture/capturewidget.h | 5 +- + src/widgets/panel/colorpickerwidget.cpp | 168 -------------------------- + src/widgets/panel/colorpickerwidget.h | 67 ---------- + src/widgets/panel/sidepanelwidget.cpp | 188 +++++++++++++++++++++++++++++ + src/widgets/panel/sidepanelwidget.h | 73 +++++++++++ + translations/Internationalization_ca.ts | 8 +- + translations/Internationalization_es.ts | 8 +- + translations/Internationalization_fr.ts | 8 +- + translations/Internationalization_ja.ts | 8 +- + translations/Internationalization_ka.ts | 8 +- + translations/Internationalization_pl.ts | 8 +- + translations/Internationalization_pt_br.ts | 8 +- + translations/Internationalization_ru.ts | 8 +- + translations/Internationalization_tr.ts | 8 +- + translations/Internationalization_zh_CN.ts | 8 +- + translations/Internationalization_zh_TW.ts | 8 +- + 19 files changed, 336 insertions(+), 292 deletions(-) + delete mode 100644 src/widgets/panel/colorpickerwidget.cpp + delete mode 100644 src/widgets/panel/colorpickerwidget.h + create mode 100644 src/widgets/panel/sidepanelwidget.cpp + create mode 100644 src/widgets/panel/sidepanelwidget.h + +diff --git a/flameshot.pro b/flameshot.pro +index 282ac87..45f6237 100644 +--- a/flameshot.pro ++++ b/flameshot.pro +@@ -140,7 +140,7 @@ SOURCES += src/main.cpp \ + src/tools/text/textwidget.cpp \ + src/core/capturerequest.cpp \ + src/tools/text/textconfig.cpp \ +- src/widgets/panel/colorpickerwidget.cpp ++ src/widgets/panel/sidepanelwidget.cpp + + HEADERS += src/widgets/capture/buttonhandler.h \ + src/widgets/infowindow.h \ +@@ -212,7 +212,7 @@ HEADERS += src/widgets/capture/buttonhandler.h \ + src/tools/text/textwidget.h \ + src/core/capturerequest.h \ + src/tools/text/textconfig.h \ +- src/widgets/panel/colorpickerwidget.h ++ src/widgets/panel/sidepanelwidget.h + + unix:!macx { + SOURCES += src/core/flameshotdbusadapter.cpp \ +diff --git a/src/widgets/capture/capturebutton.h b/src/widgets/capture/capturebutton.h +index a3a2396..8c97fcc 100644 +--- a/src/widgets/capture/capturebutton.h ++++ b/src/widgets/capture/capturebutton.h +@@ -27,7 +27,6 @@ class CaptureTool; + + class CaptureButton : public QPushButton { + Q_OBJECT +- Q_ENUMS(ButtonType) + + public: + // Don't forget to add the new types to CaptureButton::iterableButtonTypes +@@ -54,6 +53,12 @@ public: + TYPE_TEXT = 18, + }; + ++#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0) ++ Q_ENUMS(ButtonType) ++#else ++ Q_ENUM(ButtonType) ++#endif ++ + CaptureButton() = delete; + explicit CaptureButton(const ButtonType, QWidget *parent = nullptr); + +diff --git a/src/widgets/capture/capturewidget.cpp b/src/widgets/capture/capturewidget.cpp +index b988a2c..9bc4f62 100644 +--- a/src/widgets/capture/capturewidget.cpp ++++ b/src/widgets/capture/capturewidget.cpp +@@ -23,7 +23,7 @@ + + #include "capturewidget.h" + #include "src/widgets/capture/hovereventfilter.h" +-#include "src/widgets/panel/colorpickerwidget.h" ++#include "src/widgets/panel/sidepanelwidget.h" + #include "src/utils/colorutils.h" + #include "src/utils/globalvalues.h" + #include "src/widgets/capture/notifierbox.h" +@@ -541,16 +541,21 @@ void CaptureWidget::initPanel() { + panelRect.setWidth(m_colorPicker->width() * 3); + m_panel->setGeometry(panelRect); + +- ColorPickerWidget *colorPicker = +- new ColorPickerWidget(&m_context.screenshot); +- connect(colorPicker, &ColorPickerWidget::colorChanged, ++ SidePanelWidget *sidePanel = ++ new SidePanelWidget(&m_context.screenshot); ++ connect(sidePanel, &SidePanelWidget::colorChanged, + this, &CaptureWidget::setDrawColor); ++ connect(sidePanel, &SidePanelWidget::thicknessChanged, ++ this, &CaptureWidget::setDrawThickness); + connect(this, &CaptureWidget::colorChanged, +- colorPicker, &ColorPickerWidget::updateColor); +- connect(colorPicker, &ColorPickerWidget::togglePanel, ++ sidePanel, &SidePanelWidget::updateColor); ++ connect(this, &CaptureWidget::thicknessChanged, ++ sidePanel, &SidePanelWidget::updateThickness); ++ connect(sidePanel, &SidePanelWidget::togglePanel, + m_panel, &UtilityPanel::toggle); +- colorPicker->colorChanged(m_context.color); +- m_panel->pushWidget(colorPicker); ++ sidePanel->colorChanged(m_context.color); ++ sidePanel->thicknessChanged(m_context.thickness); ++ m_panel->pushWidget(sidePanel); + m_panel->pushWidget(new QUndoView(&m_undoStack, this)); + } + +@@ -692,6 +697,13 @@ void CaptureWidget::setDrawColor(const QColor &c) { + emit colorChanged(c); + } + ++void CaptureWidget::setDrawThickness(const int &t) ++{ ++ m_context.thickness = qBound(0, t, 100); ++ ConfigHandler().setdrawThickness(m_context.thickness); ++ emit thicknessChanged(m_context.thickness); ++} ++ + void CaptureWidget::leftResize() { + if (m_selection->isVisible() && m_selection->geometry().right() > m_selection->geometry().left()) { + m_selection->setGeometry(m_selection->geometry() + QMargins(0, 0, -1, 0)); +diff --git a/src/widgets/capture/capturewidget.h b/src/widgets/capture/capturewidget.h +index eb63870..2e8c803 100644 +--- a/src/widgets/capture/capturewidget.h ++++ b/src/widgets/capture/capturewidget.h +@@ -14,10 +14,10 @@ + // + // You should have received a copy of the GNU General Public License + // along with Flameshot. If not, see . +- ++ + // Based on Lightscreen areadialog.h, Copyright 2017 Christian Kaiser + // released under the GNU GPL2 +- ++ + // Based on KDE's KSnapshot regiongrabber.cpp, revision 796531, Copyright 2007 Luca Gugelmann + // released under the GNU LGPL + +@@ -89,6 +89,7 @@ private slots: + void processTool(CaptureTool *t); + void handleButtonSignal(CaptureTool::Request r); + void setDrawColor(const QColor &c); ++ void setDrawThickness(const int &t); + + protected: + void paintEvent(QPaintEvent *); +diff --git a/src/widgets/panel/colorpickerwidget.cpp b/src/widgets/panel/colorpickerwidget.cpp +deleted file mode 100644 +index 30fe48f..0000000 +--- a/src/widgets/panel/colorpickerwidget.cpp ++++ /dev/null +@@ -1,168 +0,0 @@ +-// Copyright(c) 2017-2018 Alejandro Sirgo Rica & Contributors +-// +-// This file is part of Flameshot. +-// +-// Flameshot is free software: you can redistribute it and/or modify +-// it under the terms of the GNU General Public License as published by +-// the Free Software Foundation, either version 3 of the License, or +-// (at your option) any later version. +-// +-// Flameshot is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without even the implied warranty of +-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-// GNU General Public License for more details. +-// +-// You should have received a copy of the GNU General Public License +-// along with Flameshot. If not, see . +- +-#include "colorpickerwidget.h" +-#include "src/utils/pathinfo.h" +-#include "src/utils/colorutils.h" +-#include +-#include +-#include +-#include +-#include +- +-class QColorPickingEventFilter : public QObject { +-public: +- +- explicit QColorPickingEventFilter( +- ColorPickerWidget *pw, QObject *parent = 0) : +- QObject(parent), m_pw(pw) {} +- +- bool eventFilter(QObject *, QEvent *event) override { +- event->accept(); +- switch (event->type()) { +- case QEvent::MouseMove: +- return m_pw->handleMouseMove(static_cast(event)); +- case QEvent::MouseButtonPress: +- return m_pw->handleMouseButtonPressed( +- static_cast(event)); +- case QEvent::KeyPress: +- return m_pw->handleKeyPress(static_cast(event)); +- default: +- break; +- } +- return false; +- } +- +-private: +- ColorPickerWidget *m_pw; +-}; +- +-//////////////////////// +- +-ColorPickerWidget::ColorPickerWidget(QPixmap *p, QWidget *parent) : +- QWidget(parent), m_pixmap(p), m_eventFilter(nullptr) +-{ +- m_layout = new QVBoxLayout(this); +- +- QFormLayout *colorForm = new QFormLayout(); +- m_colorLabel = new QLabel(); +- m_colorLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); +- colorForm->addRow(tr("Active color:"), m_colorLabel); +- m_layout->addLayout(colorForm); +- +- QColor background = this->palette().background().color(); +- bool isDark = ColorUtils::colorIsDark(background); +- QString modifier = isDark ? PathInfo::whiteIconPath() : +- PathInfo::blackIconPath(); +- QIcon grabIcon(modifier + "colorize.svg"); +- m_colorGrabButton = new QPushButton(grabIcon, ""); +- updateGrabButton(false); +- connect(m_colorGrabButton, &QPushButton::pressed, +- this, &ColorPickerWidget::colorGrabberActivated); +- m_layout->addWidget(m_colorGrabButton); +- +- m_colorWheel = new color_widgets::ColorWheel(this); +- m_colorWheel->setColor(m_color); +- connect(m_colorWheel, &color_widgets::ColorWheel::mouseReleaseOnColor, this, +- &ColorPickerWidget::colorChanged); +- connect(m_colorWheel, &color_widgets::ColorWheel::colorChanged, this, +- &ColorPickerWidget::updateColorNoWheel); +- m_layout->addWidget(m_colorWheel); +-} +- +-void ColorPickerWidget::updateColor(const QColor &c) { +- m_color = c; +- m_colorLabel->setStyleSheet( +- QString("QLabel { background-color : %1; }").arg(c.name())); +- m_colorWheel->setColor(m_color); +-} +- +-void ColorPickerWidget::updateColorNoWheel(const QColor &c) { +- m_color = c; +- m_colorLabel->setStyleSheet( +- QString("QLabel { background-color : %1; }").arg(c.name())); +-} +- +-void ColorPickerWidget::colorGrabberActivated() { +- grabKeyboard(); +- grabMouse(Qt::CrossCursor); +- setMouseTracking(true); +- m_colorBackup = m_color; +- if (!m_eventFilter) { +- m_eventFilter = new QColorPickingEventFilter(this, this); +- } +- installEventFilter(m_eventFilter); +- updateGrabButton(true); +-} +- +-void ColorPickerWidget::releaseColorGrab() { +- setMouseTracking(false); +- removeEventFilter(m_eventFilter); +- releaseMouse(); +- releaseKeyboard(); +- setFocus(); +- updateGrabButton(false); +-} +- +-QColor ColorPickerWidget::grabPixmapColor(const QPoint &p) { +- QColor c; +- if (m_pixmap) { +- QPixmap pixel = m_pixmap->copy(QRect(p, p)); +- c = pixel.toImage().pixel(0,0); +- } +- return c; +-} +- +-bool ColorPickerWidget::handleKeyPress(QKeyEvent *e) { +- if (e->key() == Qt::Key_Space) { +- emit togglePanel(); +- } else if (e->key() == Qt::Key_Escape) { +- releaseColorGrab(); +- updateColor(m_colorBackup); +- } else if (e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter) { +- updateColor(grabPixmapColor(QCursor::pos())); +- releaseColorGrab(); +- emit colorChanged(m_color); +- } +- return true; +-} +- +-bool ColorPickerWidget::handleMouseButtonPressed(QMouseEvent *e) { +- if (m_colorGrabButton->geometry().contains(e->pos()) || +- e->button() == Qt::RightButton) +- { +- updateColorNoWheel(m_colorBackup); +- } else if (e->button() == Qt::LeftButton) { +- updateColor(grabPixmapColor(QCursor::pos())); +- } +- releaseColorGrab(); +- emit colorChanged(m_color); +- return true; +-} +- +-bool ColorPickerWidget::handleMouseMove(QMouseEvent *e) { +- updateColorNoWheel(grabPixmapColor(e->globalPos())); +- return true; +-} +- +-void ColorPickerWidget::updateGrabButton(const bool activated) { +- if (activated) { +- m_colorGrabButton->setText(tr("Press ESC to cancel")); +- } else { +- m_colorGrabButton->setText(tr("Grab Color")); +- } +-} +diff --git a/src/widgets/panel/colorpickerwidget.h b/src/widgets/panel/colorpickerwidget.h +deleted file mode 100644 +index 6cd5544..0000000 +--- a/src/widgets/panel/colorpickerwidget.h ++++ /dev/null +@@ -1,67 +0,0 @@ +-// Copyright(c) 2017-2018 Alejandro Sirgo Rica & Contributors +-// +-// This file is part of Flameshot. +-// +-// Flameshot is free software: you can redistribute it and/or modify +-// it under the terms of the GNU General Public License as published by +-// the Free Software Foundation, either version 3 of the License, or +-// (at your option) any later version. +-// +-// Flameshot is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without even the implied warranty of +-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-// GNU General Public License for more details. +-// +-// You should have received a copy of the GNU General Public License +-// along with Flameshot. If not, see . +- +-#pragma once +- +-#include +-#include "color_wheel.hpp" +- +-class QVBoxLayout; +-class QPushButton; +-class QLabel; +-class QColorPickingEventFilter; +- +-class ColorPickerWidget : public QWidget { +- Q_OBJECT +- +- friend class QColorPickingEventFilter; +-public: +- explicit ColorPickerWidget(QPixmap *p, QWidget *parent = nullptr); +- +-signals: +- void colorChanged(const QColor &c); +- void togglePanel(); +- +-public slots: +- void updateColor(const QColor &c); +- +-private slots: +- void updateColorNoWheel(const QColor &c); +- +-private slots: +- void colorGrabberActivated(); +- void releaseColorGrab(); +- +-private: +- QColor grabPixmapColor(const QPoint &p); +- +- bool handleKeyPress(QKeyEvent *e); +- bool handleMouseButtonPressed(QMouseEvent *e); +- bool handleMouseMove(QMouseEvent *e); +- +- void updateGrabButton(const bool activated); +- +- QVBoxLayout *m_layout; +- QPushButton *m_colorGrabButton; +- color_widgets::ColorWheel *m_colorWheel; +- QLabel *m_colorLabel; +- QPixmap *m_pixmap; +- QColor m_colorBackup; +- QColor m_color; +- QColorPickingEventFilter *m_eventFilter; +- +-}; +diff --git a/src/widgets/panel/sidepanelwidget.cpp b/src/widgets/panel/sidepanelwidget.cpp +new file mode 100644 +index 0000000..47cbc88 +--- /dev/null ++++ b/src/widgets/panel/sidepanelwidget.cpp +@@ -0,0 +1,188 @@ ++// Copyright(c) 2017-2018 Alejandro Sirgo Rica & Contributors ++// ++// This file is part of Flameshot. ++// ++// Flameshot is free software: you can redistribute it and/or modify ++// it under the terms of the GNU General Public License as published by ++// the Free Software Foundation, either version 3 of the License, or ++// (at your option) any later version. ++// ++// Flameshot is distributed in the hope that it will be useful, ++// but WITHOUT ANY WARRANTY; without even the implied warranty of ++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++// GNU General Public License for more details. ++// ++// You should have received a copy of the GNU General Public License ++// along with Flameshot. If not, see . ++ ++#include "sidepanelwidget.h" ++#include "src/utils/pathinfo.h" ++#include "src/utils/colorutils.h" ++#include ++#include ++#include ++#include ++#include ++#include ++ ++class QColorPickingEventFilter : public QObject { ++public: ++ ++ explicit QColorPickingEventFilter( ++ SidePanelWidget *pw, QObject *parent = nullptr) : ++ QObject(parent), m_pw(pw) {} ++ ++ bool eventFilter(QObject *, QEvent *event) override { ++ event->accept(); ++ switch (event->type()) { ++ case QEvent::MouseMove: ++ return m_pw->handleMouseMove(static_cast(event)); ++ case QEvent::MouseButtonPress: ++ return m_pw->handleMouseButtonPressed( ++ static_cast(event)); ++ case QEvent::KeyPress: ++ return m_pw->handleKeyPress(static_cast(event)); ++ default: ++ break; ++ } ++ return false; ++ } ++ ++private: ++ SidePanelWidget *m_pw; ++}; ++ ++//////////////////////// ++ ++SidePanelWidget::SidePanelWidget(QPixmap *p, QWidget *parent) : ++ QWidget(parent), m_pixmap(p), m_eventFilter(nullptr) ++{ ++ m_layout = new QVBoxLayout(this); ++ ++ QFormLayout *colorForm = new QFormLayout(); ++ m_thicknessSlider = new QSlider(Qt::Horizontal); ++ m_thicknessSlider->setValue(m_thickness); ++ m_colorLabel = new QLabel(); ++ m_colorLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); ++ colorForm->addRow(tr("Active thickness:"), m_thicknessSlider); ++ colorForm->addRow(tr("Active color:"), m_colorLabel); ++ m_layout->addLayout(colorForm); ++ ++ connect(m_thicknessSlider, &QSlider::sliderReleased, ++ this, &SidePanelWidget::updateCurrentThickness); ++ connect(this, &SidePanelWidget::thicknessChanged, ++ this, &SidePanelWidget::updateThickness); ++ ++ QColor background = this->palette().background().color(); ++ bool isDark = ColorUtils::colorIsDark(background); ++ QString modifier = isDark ? PathInfo::whiteIconPath() : ++ PathInfo::blackIconPath(); ++ QIcon grabIcon(modifier + "colorize.svg"); ++ m_colorGrabButton = new QPushButton(grabIcon, ""); ++ updateGrabButton(false); ++ connect(m_colorGrabButton, &QPushButton::pressed, ++ this, &SidePanelWidget::colorGrabberActivated); ++ m_layout->addWidget(m_colorGrabButton); ++ ++ m_colorWheel = new color_widgets::ColorWheel(this); ++ m_colorWheel->setColor(m_color); ++ connect(m_colorWheel, &color_widgets::ColorWheel::mouseReleaseOnColor, this, ++ &SidePanelWidget::colorChanged); ++ connect(m_colorWheel, &color_widgets::ColorWheel::colorChanged, this, ++ &SidePanelWidget::updateColorNoWheel); ++ m_layout->addWidget(m_colorWheel); ++} ++ ++void SidePanelWidget::updateColor(const QColor &c) { ++ m_color = c; ++ m_colorLabel->setStyleSheet( ++ QString("QLabel { background-color : %1; }").arg(c.name())); ++ m_colorWheel->setColor(m_color); ++} ++ ++void SidePanelWidget::updateThickness(const int &t) ++{ ++ m_thickness = qBound(0, t, 100); ++ m_thicknessSlider->setValue(m_thickness); ++} ++ ++void SidePanelWidget::updateColorNoWheel(const QColor &c) { ++ m_color = c; ++ m_colorLabel->setStyleSheet( ++ QString("QLabel { background-color : %1; }").arg(c.name())); ++} ++ ++void SidePanelWidget::updateCurrentThickness() ++{ ++ emit thicknessChanged(m_thicknessSlider->value()); ++} ++ ++void SidePanelWidget::colorGrabberActivated() { ++ grabKeyboard(); ++ grabMouse(Qt::CrossCursor); ++ setMouseTracking(true); ++ m_colorBackup = m_color; ++ if (!m_eventFilter) { ++ m_eventFilter = new QColorPickingEventFilter(this, this); ++ } ++ installEventFilter(m_eventFilter); ++ updateGrabButton(true); ++} ++ ++void SidePanelWidget::releaseColorGrab() { ++ setMouseTracking(false); ++ removeEventFilter(m_eventFilter); ++ releaseMouse(); ++ releaseKeyboard(); ++ setFocus(); ++ updateGrabButton(false); ++} ++ ++QColor SidePanelWidget::grabPixmapColor(const QPoint &p) { ++ QColor c; ++ if (m_pixmap) { ++ QPixmap pixel = m_pixmap->copy(QRect(p, p)); ++ c = pixel.toImage().pixel(0,0); ++ } ++ return c; ++} ++ ++bool SidePanelWidget::handleKeyPress(QKeyEvent *e) { ++ if (e->key() == Qt::Key_Space) { ++ emit togglePanel(); ++ } else if (e->key() == Qt::Key_Escape) { ++ releaseColorGrab(); ++ updateColor(m_colorBackup); ++ } else if (e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter) { ++ updateColor(grabPixmapColor(QCursor::pos())); ++ releaseColorGrab(); ++ emit colorChanged(m_color); ++ } ++ return true; ++} ++ ++bool SidePanelWidget::handleMouseButtonPressed(QMouseEvent *e) { ++ if (m_colorGrabButton->geometry().contains(e->pos()) || ++ e->button() == Qt::RightButton) ++ { ++ updateColorNoWheel(m_colorBackup); ++ } else if (e->button() == Qt::LeftButton) { ++ updateColor(grabPixmapColor(QCursor::pos())); ++ } ++ releaseColorGrab(); ++ emit colorChanged(m_color); ++ return true; ++} ++ ++bool SidePanelWidget::handleMouseMove(QMouseEvent *e) { ++ updateColorNoWheel(grabPixmapColor(e->globalPos())); ++ return true; ++} ++ ++void SidePanelWidget::updateGrabButton(const bool activated) { ++ if (activated) { ++ m_colorGrabButton->setText(tr("Press ESC to cancel")); ++ } else { ++ m_colorGrabButton->setText(tr("Grab Color")); ++ } ++} +diff --git a/src/widgets/panel/sidepanelwidget.h b/src/widgets/panel/sidepanelwidget.h +new file mode 100644 +index 0000000..34c2d03 +--- /dev/null ++++ b/src/widgets/panel/sidepanelwidget.h +@@ -0,0 +1,73 @@ ++// Copyright(c) 2017-2018 Alejandro Sirgo Rica & Contributors ++// ++// This file is part of Flameshot. ++// ++// Flameshot is free software: you can redistribute it and/or modify ++// it under the terms of the GNU General Public License as published by ++// the Free Software Foundation, either version 3 of the License, or ++// (at your option) any later version. ++// ++// Flameshot is distributed in the hope that it will be useful, ++// but WITHOUT ANY WARRANTY; without even the implied warranty of ++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++// GNU General Public License for more details. ++// ++// You should have received a copy of the GNU General Public License ++// along with Flameshot. If not, see . ++ ++#pragma once ++ ++#include ++#include "color_wheel.hpp" ++ ++class QVBoxLayout; ++class QPushButton; ++class QLabel; ++class QColorPickingEventFilter; ++class QSlider; ++ ++class SidePanelWidget : public QWidget { ++ Q_OBJECT ++ ++ friend class QColorPickingEventFilter; ++public: ++ explicit SidePanelWidget(QPixmap *p, QWidget *parent = nullptr); ++ ++signals: ++ void colorChanged(const QColor &c); ++ void thicknessChanged(const int &t); ++ void togglePanel(); ++ ++public slots: ++ void updateColor(const QColor &c); ++ void updateThickness(const int &t); ++ ++private slots: ++ void updateColorNoWheel(const QColor &c); ++ void updateCurrentThickness(); ++ ++private slots: ++ void colorGrabberActivated(); ++ void releaseColorGrab(); ++ ++private: ++ QColor grabPixmapColor(const QPoint &p); ++ ++ bool handleKeyPress(QKeyEvent *e); ++ bool handleMouseButtonPressed(QMouseEvent *e); ++ bool handleMouseMove(QMouseEvent *e); ++ ++ void updateGrabButton(const bool activated); ++ ++ QVBoxLayout *m_layout; ++ QPushButton *m_colorGrabButton; ++ color_widgets::ColorWheel *m_colorWheel; ++ QLabel *m_colorLabel; ++ QPixmap *m_pixmap; ++ QColor m_colorBackup; ++ QColor m_color; ++ QSlider *m_thicknessSlider; ++ int m_thickness; ++ QColorPickingEventFilter *m_eventFilter; ++ ++}; +diff --git a/translations/Internationalization_ca.ts b/translations/Internationalization_ca.ts +index 81b2738..0f97317 100644 +--- a/translations/Internationalization_ca.ts ++++ b/translations/Internationalization_ca.ts +@@ -106,19 +106,19 @@ Press Space to open the side panel. + + + +- ColorPickerWidget ++ SidePanelWidget + +- ++ + Active color: + + + +- ++ + Press ESC to cancel + + + +- ++ + Grab Color + + +diff --git a/translations/Internationalization_es.ts b/translations/Internationalization_es.ts +index 06ddf62..c28962c 100644 +--- a/translations/Internationalization_es.ts ++++ b/translations/Internationalization_es.ts +@@ -109,19 +109,19 @@ Presiona Espacion para abrir el panel lateral. + + + +- ColorPickerWidget ++ SidePanelWidget + +- ++ + Active color: + Color activo: + + +- ++ + Press ESC to cancel + Presiona Esc para cancelar + + +- ++ + Grab Color + Tomar Color + +diff --git a/translations/Internationalization_fr.ts b/translations/Internationalization_fr.ts +index 7edac78..950963d 100644 +--- a/translations/Internationalization_fr.ts ++++ b/translations/Internationalization_fr.ts +@@ -105,19 +105,19 @@ Press Space to open the side panel. + + + +- ColorPickerWidget ++ SidePanelWidget + +- ++ + Active color: + + + +- ++ + Press ESC to cancel + + + +- ++ + Grab Color + + +diff --git a/translations/Internationalization_ja.ts b/translations/Internationalization_ja.ts +index 5dda0ec..68e4819 100644 +--- a/translations/Internationalization_ja.ts ++++ b/translations/Internationalization_ja.ts +@@ -109,19 +109,19 @@ Enter を押すと画面をキャプチャー。 + + + +- ColorPickerWidget ++ SidePanelWidget + +- ++ + Active color: + アクティブな色: + + +- ++ + Press ESC to cancel + ESC でキャンセル + + +- ++ + Grab Color + 色の取得 + +diff --git a/translations/Internationalization_ka.ts b/translations/Internationalization_ka.ts +index e6f4435..8a115be 100644 +--- a/translations/Internationalization_ka.ts ++++ b/translations/Internationalization_ka.ts +@@ -105,19 +105,19 @@ Press Space to open the side panel. + + + +- ColorPickerWidget ++ SidePanelWidget + +- ++ + Active color: + + + +- ++ + Press ESC to cancel + + + +- ++ + Grab Color + + +diff --git a/translations/Internationalization_pl.ts b/translations/Internationalization_pl.ts +index 56e027d..852ca0a 100644 +--- a/translations/Internationalization_pl.ts ++++ b/translations/Internationalization_pl.ts +@@ -108,19 +108,19 @@ Spacja, aby pokazać panel boczny. + + + +- ColorPickerWidget ++ SidePanelWidget + +- ++ + Active color: + Aktywny kolor: + + +- ++ + Press ESC to cancel + Wciśnij ESC, aby anulować + + +- ++ + Grab Color + Pobierz kolor + +diff --git a/translations/Internationalization_pt_br.ts b/translations/Internationalization_pt_br.ts +index 39afd7d..1acba13 100644 +--- a/translations/Internationalization_pt_br.ts ++++ b/translations/Internationalization_pt_br.ts +@@ -109,19 +109,19 @@ Pressione espaço abrir o painel lateral. + + + +- ColorPickerWidget ++ SidePanelWidget + +- ++ + Active color: + Cor ativa: + + +- ++ + Press ESC to cancel + Presione Esc para cancelar + + +- ++ + Grab Color + Usar Cor + +diff --git a/translations/Internationalization_ru.ts b/translations/Internationalization_ru.ts +index 7a21b38..e6a7c9f 100644 +--- a/translations/Internationalization_ru.ts ++++ b/translations/Internationalization_ru.ts +@@ -105,19 +105,19 @@ Press Space to open the side panel. + + + +- ColorPickerWidget ++ SidePanelWidget + +- ++ + Active color: + + + +- ++ + Press ESC to cancel + + + +- ++ + Grab Color + + +diff --git a/translations/Internationalization_tr.ts b/translations/Internationalization_tr.ts +index a676c66..9296234 100644 +--- a/translations/Internationalization_tr.ts ++++ b/translations/Internationalization_tr.ts +@@ -109,19 +109,19 @@ Yan paneli açmak için Boşluk tuşuna basın. + + + +- ColorPickerWidget ++ SidePanelWidget + +- ++ + Active color: + Aktif Renk: + + +- ++ + Press ESC to cancel + Çıkmak için ESC'ye tıklayın + + +- ++ + Grab Color + + +diff --git a/translations/Internationalization_zh_CN.ts b/translations/Internationalization_zh_CN.ts +index a822dfb..d9801f5 100644 +--- a/translations/Internationalization_zh_CN.ts ++++ b/translations/Internationalization_zh_CN.ts +@@ -110,19 +110,19 @@ Press Space to open the side panel. + + + +- ColorPickerWidget ++ SidePanelWidget + +- ++ + Active color: + 活动颜色： + + +- ++ + Press ESC to cancel + 按下 ESC 键以取消 + + +- ++ + Grab Color + 获取颜色 + +diff --git a/translations/Internationalization_zh_TW.ts b/translations/Internationalization_zh_TW.ts +index e7d997e..916a0a6 100644 +--- a/translations/Internationalization_zh_TW.ts ++++ b/translations/Internationalization_zh_TW.ts +@@ -105,19 +105,19 @@ Press Space to open the side panel. + + + +- ColorPickerWidget ++ SidePanelWidget + +- ++ + Active color: + + + +- ++ + Press ESC to cancel + + + +- ++ + Grab Color + + diff -Nru flameshot-0.6.0/debian/patches/0014-Add-Serbian-translation-376.patch flameshot-0.6.0/debian/patches/0014-Add-Serbian-translation-376.patch --- flameshot-0.6.0/debian/patches/0014-Add-Serbian-translation-376.patch 1970-01-01 00:00:00.000000000 +0000 +++ flameshot-0.6.0/debian/patches/0014-Add-Serbian-translation-376.patch 2018-11-09 00:59:31.000000000 +0000 @@ -0,0 +1,980 @@ +From: =?utf-8?b?ItCd0LjQutC+0LvQsCDQoNCw0LTQvtCy0LDQvdC+0LLQuNGbIChOaWtv?= + =?utf-8?b?bGEgUmFkb3Zhbm92acSHKSI=?= +Date: Thu, 11 Oct 2018 23:59:40 +0200 +Subject: Add Serbian translation (#376) + +--- + CONTRIBUTING.md | 1 + + docs/desktopEntry/package/flameshot.desktop | 4 + + flameshot.pro | 3 +- + translations/Internationalization_sr.ts | 903 ++++++++++++++++++++++++++++ + 4 files changed, 910 insertions(+), 1 deletion(-) + create mode 100644 translations/Internationalization_sr.ts + +diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md +index 8a3367f..223dfcc 100644 +--- a/CONTRIBUTING.md ++++ b/CONTRIBUTING.md +@@ -24,6 +24,7 @@ Check this nice official documentation from Qt docs as it explains how to transl + | Georgian | ge | :bookmark:v0.5.1 | [giogziro95](https://github.com/giogziro95) | + | French | fr | :bookmark:v0.5.1 | [ld892012](https://github.com/ld892012) | + | Polish | pl | :bookmark:v0.5.1 | [napcok](https://github.com/napcok) | ++| Serbian | sr | :bookmark:v0.6.0 | [cobisimo](https://github.com/cobisimo) | + + + ## Code +diff --git a/docs/desktopEntry/package/flameshot.desktop b/docs/desktopEntry/package/flameshot.desktop +index a7daac4..920fdc7 100644 +--- a/docs/desktopEntry/package/flameshot.desktop ++++ b/docs/desktopEntry/package/flameshot.desktop +@@ -6,11 +6,13 @@ GenericName[zh_CN]=屏幕截图工具 + GenericName[pl]=Zrzuty ekranu + GenericName[fr]=Outil de capture d'écran + GenericName[ja]=スクリーンショットツール ++GenericName[sr]=Снимач екрана + 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]=パワフルで使いやすいスクリーンショットソフトウェア。 ++Comment[sr]=Једноставан, а моћан алат за снимање екрана + Keywords=flameshot;screenshot;capture;shutter; + Keywords[zh_CN]=flameshot;screenshot;capture;shutter;截图;屏幕; + Keywords[fr]=flameshot;capture d'écran;capter;shutter; +@@ -29,6 +31,7 @@ Name[zh_CN]=配置 + Name[pl]=Konfiguruj + Name[fr]=Configurer + Name[ja]=設定 ++Name[sr]=Подешавања + Exec=flameshot config + + [Desktop Action Capture] +@@ -37,4 +40,5 @@ Name[zh_CN]=进行截图 + Name[pl]=Zrzut ekranu + Name[fr]=Prendre une capture d'écran + Name[ja]=スクリーンショットを撮る ++Name[sr]=Сними екран + Exec=flameshot gui --delay 500 +diff --git a/flameshot.pro b/flameshot.pro +index 45f6237..aa5458c 100644 +--- a/flameshot.pro ++++ b/flameshot.pro +@@ -45,7 +45,8 @@ TRANSLATIONS = translations/Internationalization_es.ts \ + translations/Internationalization_fr.ts \ + translations/Internationalization_pl.ts \ + translations/Internationalization_ja.ts \ +- translations/Internationalization_pt_br.ts ++ translations/Internationalization_pt_br.ts \ ++ translations/Internationalization_sr.ts + + # Generate translations in build + TRANSLATIONS_FILES = +diff --git a/translations/Internationalization_sr.ts b/translations/Internationalization_sr.ts +new file mode 100644 +index 0000000..56caec9 +--- /dev/null ++++ b/translations/Internationalization_sr.ts +@@ -0,0 +1,903 @@ ++ ++ ++ ++ ++ AppLauncher ++ ++ ++ App Launcher ++ Покретач ++ ++ ++ ++ Choose an app to open the capture ++ Изаберите програм у ком желите да отворите снимак ++ ++ ++ ++ AppLauncherWidget ++ ++ ++ Open With ++ Отвори помоћу ++ ++ ++ ++ Launch in terminal ++ Покрени у терминалу ++ ++ ++ ++ Keep open after selection ++ Остави отворено након избора ++ ++ ++ ++ ++ Error ++ Грешка ++ ++ ++ ++ Unable to write in ++ Нисам успео да сачувам ++ ++ ++ ++ Unable to launch in terminal. ++ Нисам успео да покренем у терминалу. ++ ++ ++ ++ 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 ++ Избор цртања круга ++ ++ ++ ++ SidePanelWidget ++ ++ ++ Active color: ++ Активна боја: ++ ++ ++ ++ Press ESC to cancel ++ Притисните ESC за прекид ++ ++ ++ ++ Grab Color ++ Преузмите боју ++ ++ ++ ++ ConfigWindow ++ ++ ++ Configuration ++ Подешавања ++ ++ ++ ++ Interface ++ Изглед ++ ++ ++ ++ Filename Editor ++ Избор имена датотеке ++ ++ ++ ++ General ++ Опште ++ ++ ++ ++ Controller ++ ++ ++ &Take Screenshot ++ &Направи снимак екрана ++ ++ ++ ++ &Configuration ++ &Подешавања ++ ++ ++ ++ &Information ++ Ин&формације ++ ++ ++ ++ &Quit ++ &Излаз ++ ++ ++ ++ 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 ++ ++ ++ ++ Import ++ Увоз ++ ++ ++ ++ ++ ++ Error ++ Грешка ++ ++ ++ ++ Unable to read file. ++ Нисам успео да прочитам датотеку. ++ ++ ++ ++ ++ Unable to write file. ++ Нисам успео да сачувам датотеку. ++ ++ ++ ++ Save File ++ Сачувај датотеку ++ ++ ++ ++ Confirm Reset ++ Потврда поништавања ++ ++ ++ ++ Are you sure you want to reset the configuration? ++ Да ли сте сигурни да желите да поништите сва прилагођена подешавања? ++ ++ ++ ++ Show help message ++ Приказуј поруку са упутством ++ ++ ++ ++ Show the help message at the beginning in the capture mode. ++ Приказуј поруку са кратким упутством на почетку снимања екрана. ++ ++ ++ ++ ++ Show desktop notifications ++ Користи системска обавештења ++ ++ ++ ++ Show tray icon ++ Иконица на системској полици ++ ++ ++ ++ Show the systemtray icon ++ Приказуј иконицу на системској полици ++ ++ ++ ++ Configuration File ++ Датотека са подешавањима ++ ++ ++ ++ Export ++ Извоз ++ ++ ++ ++ Reset ++ Поништи ++ ++ ++ ++ Launch at startup ++ Покрени на почетку ++ ++ ++ ++ Launch Flameshot ++ Покрени Flameshot ++ ++ ++ ++ ImgurUploader ++ ++ ++ Upload to Imgur ++ Објави на Imgur ++ ++ ++ ++ Uploading Image ++ Објављујем слику ++ ++ ++ ++ Copy URL ++ Запамти интернет адресу ++ ++ ++ ++ Open URL ++ Посети интернет адресу ++ ++ ++ ++ Delete image ++ Избриши слику ++ ++ ++ ++ Image to Clipboard. ++ Сачувај у привремену меморију. ++ ++ ++ ++ ++ Unable to open the URL. ++ Нисам успео да посетим интернет адресу. ++ ++ ++ ++ URL copied to clipboard. ++ Интернет адреса је сачувана у привременој меморији. ++ ++ ++ ++ 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 ++ Измени дебљину линије алата ++ ++ ++ ++ Available shortcuts in the screen capture mode. ++ Доступне пречице у моду снимка екрана. ++ ++ ++ ++ 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> ++ ++ ++ ++ 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) ++ Име месеца (јан) ++ ++ ++ ++ Month Name (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 ++ Уређивање боје сучеља ++ ++ ++ ++ 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/0015-Update-translation-files-to-match-375-380.patch flameshot-0.6.0/debian/patches/0015-Update-translation-files-to-match-375-380.patch --- flameshot-0.6.0/debian/patches/0015-Update-translation-files-to-match-375-380.patch 1970-01-01 00:00:00.000000000 +0000 +++ flameshot-0.6.0/debian/patches/0015-Update-translation-files-to-match-375-380.patch 2018-11-09 00:59:11.000000000 +0000 @@ -0,0 +1,1352 @@ +From: dgw +Date: Fri, 19 Oct 2018 08:48:45 -0500 +Subject: Update translation files to match #375 (#380) + +Opened all 13 translation files and did a global find-and-replace for +each string I changed in #375. +--- + translations/Internationalization_ca.ts | 22 +++++++++++----------- + translations/Internationalization_es.ts | 22 +++++++++++----------- + translations/Internationalization_fr.ts | 22 +++++++++++----------- + translations/Internationalization_hu.ts | 20 ++++++++++---------- + translations/Internationalization_ja.ts | 22 +++++++++++----------- + translations/Internationalization_ka.ts | 22 +++++++++++----------- + translations/Internationalization_pl.ts | 22 +++++++++++----------- + translations/Internationalization_pt_br.ts | 22 +++++++++++----------- + translations/Internationalization_ru.ts | 22 +++++++++++----------- + translations/Internationalization_sr.ts | 22 +++++++++++----------- + translations/Internationalization_tr.ts | 22 +++++++++++----------- + translations/Internationalization_zh_CN.ts | 22 +++++++++++----------- + translations/Internationalization_zh_TW.ts | 22 +++++++++++----------- + 13 files changed, 142 insertions(+), 142 deletions(-) + +diff --git a/translations/Internationalization_ca.ts b/translations/Internationalization_ca.ts +index 0f97317..91bd702 100644 +--- a/translations/Internationalization_ca.ts ++++ b/translations/Internationalization_ca.ts +@@ -57,7 +57,7 @@ + + + +- Sets the Arrow as the paint tool ++ Set the Arrow as the paint tool + Estableix la fletxa com a eina de dibuix + + +@@ -70,7 +70,7 @@ + + + +- Sets the Blur as the paint tool ++ Set Blur as the paint tool + Estableix el desenfocament com a eina de dibuix + + +@@ -101,7 +101,7 @@ Press Space to open the side panel. + + + +- Sets the Circle as the paint tool ++ Set the Circle as the paint tool + Estableix el cercle com a eina de dibuix + + +@@ -178,7 +178,7 @@ Press Space to open the side panel. + + + +- Copies the selection into the clipboard ++ Copy the selection into the clipboard + + + +@@ -402,7 +402,7 @@ Press Space to open the side panel. + + + +- Uploads the selection to Imgur ++ Upload the selection to Imgur + Puja la selecció a Imgur + + +@@ -503,7 +503,7 @@ Press Space to open the side panel. + + + +- Sets the Line as the paint tool ++ Set the Line as the paint tool + Estableix la línia com a eina de dibuix + + +@@ -516,7 +516,7 @@ Press Space to open the side panel. + + + +- Sets the Marker as the paint tool ++ Set the Marker as the paint tool + Estableix el marcador com a eina de dibuix + + +@@ -542,7 +542,7 @@ Press Space to open the side panel. + + + +- Sets the Pencil as the paint tool ++ Set the Pencil as the paint tool + Estableix el llapis com a eina de dibuix + + +@@ -611,7 +611,7 @@ Press Space to open the side panel. + + + +- Sets the Rectangle as the paint tool ++ Set the Rectangle as the paint tool + Estableix el rectangle com a eina de dibuix + + +@@ -658,7 +658,7 @@ Press Space to open the side panel. + + + +- Sets the Selection as the paint tool ++ Set Selection as the paint tool + Estableix la selecció com a eina de dibuix + + +@@ -671,7 +671,7 @@ Press Space to open the side panel. + + + +- Shows the dimensions of the selection (X Y) ++ Show the dimensions of the selection (X Y) + Mostra les mides de la selecció (X Y) + + +diff --git a/translations/Internationalization_es.ts b/translations/Internationalization_es.ts +index c28962c..847ba27 100644 +--- a/translations/Internationalization_es.ts ++++ b/translations/Internationalization_es.ts +@@ -57,7 +57,7 @@ + + + +- Sets the Arrow as the paint tool ++ Set the Arrow as the paint tool + Establece la Flecha como herramienta de dibujo + + +@@ -70,7 +70,7 @@ + + + +- Sets the Blur as the paint tool ++ Set Blur as the paint tool + Establece el Desenfoque como herramienta de dibujo + + +@@ -104,7 +104,7 @@ Presiona Espacion para abrir el panel lateral. + + + +- Sets the Circle as the paint tool ++ Set the Circle as the paint tool + Establece el Círculo como herramienta de dibujo + + +@@ -181,7 +181,7 @@ Presiona Espacion para abrir el panel lateral. + + + +- Copies the selection into the clipboard ++ Copy the selection into the clipboard + Copia la selección al portapapeles + + +@@ -405,7 +405,7 @@ Presiona Espacion para abrir el panel lateral. + + + +- Uploads the selection to Imgur ++ Upload the selection to Imgur + Sube la selección a Imgur + + +@@ -506,7 +506,7 @@ Presiona Espacion para abrir el panel lateral. + + + +- Sets the Line as the paint tool ++ Set the Line as the paint tool + Establece la Línea como herramienta de dibujo + + +@@ -519,7 +519,7 @@ Presiona Espacion para abrir el panel lateral. + + + +- Sets the Marker as the paint tool ++ Set the Marker as the paint tool + Establece el Marcador como herramienta de dibujo + + +@@ -545,7 +545,7 @@ Presiona Espacion para abrir el panel lateral. + + + +- Sets the Pencil as the paint tool ++ Set the Pencil as the paint tool + Establece el Lápiz como herramienta de dibujo + + +@@ -614,7 +614,7 @@ Presiona Espacion para abrir el panel lateral. + + + +- Sets the Rectangle as the paint tool ++ Set the Rectangle as the paint tool + Establece el Rectángulo como herramienta de dibujo + + +@@ -661,7 +661,7 @@ Presiona Espacion para abrir el panel lateral. + + + +- Sets the Selection as the paint tool ++ Set Selection as the paint tool + Establece la Selección como herramienta de dibujo + + +@@ -674,7 +674,7 @@ Presiona Espacion para abrir el panel lateral. + + + +- Shows the dimensions of the selection (X Y) ++ Show the dimensions of the selection (X Y) + Muestra la dimensión de la selección (X Y) + + +diff --git a/translations/Internationalization_fr.ts b/translations/Internationalization_fr.ts +index 950963d..70ccf64 100644 +--- a/translations/Internationalization_fr.ts ++++ b/translations/Internationalization_fr.ts +@@ -57,7 +57,7 @@ + + + +- Sets the Arrow as the paint tool ++ Set the Arrow as the paint tool + Sélectionner l'outil Flèche + + +@@ -70,7 +70,7 @@ + + + +- Sets the Blur as the paint tool ++ Set Blur as the paint tool + Sélectionner l'outil Flou + + +@@ -100,7 +100,7 @@ Press Space to open the side panel. + + + +- Sets the Circle as the paint tool ++ Set the Circle as the paint tool + Sélectionner l'outil Ellipse + + +@@ -177,7 +177,7 @@ Press Space to open the side panel. + + + +- Copies the selection into the clipboard ++ Copy the selection into the clipboard + + + +@@ -401,7 +401,7 @@ Press Space to open the side panel. + + + +- Uploads the selection to Imgur ++ Upload the selection to Imgur + Mettre en ligne la sélection vers Imgur + + +@@ -502,7 +502,7 @@ Press Space to open the side panel. + + + +- Sets the Line as the paint tool ++ Set the Line as the paint tool + Sélectionner l'outil Ligne + + +@@ -515,7 +515,7 @@ Press Space to open the side panel. + + + +- Sets the Marker as the paint tool ++ Set the Marker as the paint tool + Sélectionner l'outil Surligneur + + +@@ -541,7 +541,7 @@ Press Space to open the side panel. + + + +- Sets the Pencil as the paint tool ++ Set the Pencil as the paint tool + Sélectionner l'outil Crayon + + +@@ -610,7 +610,7 @@ Press Space to open the side panel. + + + +- Sets the Rectangle as the paint tool ++ Set the Rectangle as the paint tool + Sélectionner l'outil Rectangle plein + + +@@ -657,7 +657,7 @@ Press Space to open the side panel. + + + +- Sets the Selection as the paint tool ++ Set Selection as the paint tool + Sélectionner l'outil Rectangle + + +@@ -670,7 +670,7 @@ Press Space to open the side panel. + + + +- Shows the dimensions of the selection (X Y) ++ Show the dimensions of the selection (X Y) + Montre les dimmensions de la sélection (X Y) + + +diff --git a/translations/Internationalization_hu.ts b/translations/Internationalization_hu.ts +index f040e7b..e779ce3 100644 +--- a/translations/Internationalization_hu.ts ++++ b/translations/Internationalization_hu.ts +@@ -46,7 +46,7 @@ + Nyíl + + +- Sets the Arrow as the paint tool ++ Set the Arrow as the paint tool + Beállítja a nyíl eszközt festő eszközként + + +@@ -57,7 +57,7 @@ + Homályosítás + + +- Sets the Blur as the paint tool ++ Set Blur as the paint tool + Beállítja a Homályosítás eszközt festő eszközként + + +@@ -85,7 +85,7 @@ Használd a görgőt az eszköz vastagságának állítására. + Kör + + +- Sets the Circle as the paint tool ++ Set the Circle as the paint tool + Beálítja a Kör eszközt festő eszközként + + +@@ -318,7 +318,7 @@ Használd a görgőt az eszköz vastagságának állítására. + Kép feltöltő + + +- Uploads the selection to Imgur ++ Upload the selection to Imgur + Feltölti a kiválasztott képet az Imgur -ra + + +@@ -400,7 +400,7 @@ Használd a görgőt az eszköz vastagságának állítására. + Vonal + + +- Sets the Line as the paint tool ++ Set the Line as the paint tool + Beállítja a Vonal eszközt festő eszközként + + +@@ -411,7 +411,7 @@ Használd a görgőt az eszköz vastagságának állítására. + Jelölő + + +- Sets the Marker as the paint tool ++ Set the Marker as the paint tool + Beállítja a Jelölő eszközt festő eszközként + + +@@ -433,7 +433,7 @@ Használd a görgőt az eszköz vastagságának állítására. + Ceruza + + +- Sets the Pencil as the paint tool ++ Set the Pencil as the paint tool + Beállítja a Ceruza eszközt festő eszközként + + +@@ -476,7 +476,7 @@ Használd a görgőt az eszköz vastagságának állítására. + Téglalap + + +- Sets the Rectangle as the paint tool ++ Set the Rectangle as the paint tool + Beállítja a Téglalap eszközt festő eszközként + + +@@ -505,7 +505,7 @@ Használd a görgőt az eszköz vastagságának állítására. + Téglalapos kijelölő + + +- Sets the Selection as the paint tool ++ Set Selection as the paint tool + Beállítja a Téglalapos kijelölő eszközt Festő eszközként + + +@@ -516,7 +516,7 @@ Használd a görgőt az eszköz vastagságának állítására. + Kiválasztott terület méretének indikátora + + +- Shows the dimensions of the selection (X Y) ++ Show the dimensions of the selection (X Y) + Mutatja a dimenzióját a kijelölésnek (X Y) + + +diff --git a/translations/Internationalization_ja.ts b/translations/Internationalization_ja.ts +index 68e4819..2b909bc 100644 +--- a/translations/Internationalization_ja.ts ++++ b/translations/Internationalization_ja.ts +@@ -57,7 +57,7 @@ + + + +- Sets the Arrow as the paint tool ++ Set the Arrow as the paint tool + ペイントツールとして「矢印」をセットする + + +@@ -70,7 +70,7 @@ + + + +- Sets the Blur as the paint tool ++ Set Blur as the paint tool + ペイントツールとして「ぼかし」をセットする + + +@@ -104,7 +104,7 @@ Enter を押すと画面をキャプチャー。 + + + +- Sets the Circle as the paint tool ++ Set the Circle as the paint tool + ペイントツールとして「円形」をセットする + + +@@ -181,7 +181,7 @@ Enter を押すと画面をキャプチャー。 + + + +- Copies the selection into the clipboard ++ Copy the selection into the clipboard + 選択範囲をクリップボードにコピーする + + +@@ -405,7 +405,7 @@ Enter を押すと画面をキャプチャー。 + + + +- Uploads the selection to Imgur ++ Upload the selection to Imgur + Imgur に選択範囲をアップロードする + + +@@ -506,7 +506,7 @@ Enter を押すと画面をキャプチャー。 + + + +- Sets the Line as the paint tool ++ Set the Line as the paint tool + ペイントツールとして「直線」をセットする + + +@@ -519,7 +519,7 @@ Enter を押すと画面をキャプチャー。 + + + +- Sets the Marker as the paint tool ++ Set the Marker as the paint tool + ペイントツールとして「マーカー」をセットする + + +@@ -545,7 +545,7 @@ Enter を押すと画面をキャプチャー。 + + + +- Sets the Pencil as the paint tool ++ Set the Pencil as the paint tool + ペイントツールとして「鉛筆」をセットする + + +@@ -614,7 +614,7 @@ Enter を押すと画面をキャプチャー。 + + + +- Sets the Rectangle as the paint tool ++ Set the Rectangle as the paint tool + ペイントツールとして「矩形」をセットする + + +@@ -661,7 +661,7 @@ Enter を押すと画面をキャプチャー。 + + + +- Sets the Selection as the paint tool ++ Set Selection as the paint tool + ペイントツールとして「矩形選択」をセットする + + +@@ -674,7 +674,7 @@ Enter を押すと画面をキャプチャー。 + + + +- Shows the dimensions of the selection (X Y) ++ Show the dimensions of the selection (X Y) + 選択範囲の寸法 (X Y) を表示する + + +diff --git a/translations/Internationalization_ka.ts b/translations/Internationalization_ka.ts +index 8a115be..da90772 100644 +--- a/translations/Internationalization_ka.ts ++++ b/translations/Internationalization_ka.ts +@@ -57,7 +57,7 @@ + + + +- Sets the Arrow as the paint tool ++ Set the Arrow as the paint tool + ისრის ხელსაწყოს არჩევა სახატავად + + +@@ -70,7 +70,7 @@ + + + +- Sets the Blur as the paint tool ++ Set Blur as the paint tool + გაბუნდოვნების ხელსაწყოს არჩევა სახატავად + + +@@ -100,7 +100,7 @@ Press Space to open the side panel. + + + +- Sets the Circle as the paint tool ++ Set the Circle as the paint tool + წრის ხელსაწყოს არჩევა სახატავად + + +@@ -177,7 +177,7 @@ Press Space to open the side panel. + + + +- Copies the selection into the clipboard ++ Copy the selection into the clipboard + + + +@@ -401,7 +401,7 @@ Press Space to open the side panel. + + + +- Uploads the selection to Imgur ++ Upload the selection to Imgur + შერჩეულის Imgur-ზე ატვირთვა + + +@@ -502,7 +502,7 @@ Press Space to open the side panel. + + + +- Sets the Line as the paint tool ++ Set the Line as the paint tool + ხაზის ხელსაწყოს არჩევა სახატავად + + +@@ -515,7 +515,7 @@ Press Space to open the side panel. + + + +- Sets the Marker as the paint tool ++ Set the Marker as the paint tool + მარკერის ხელსაწყოს არჩევა სახატავად + + +@@ -541,7 +541,7 @@ Press Space to open the side panel. + + + +- Sets the Pencil as the paint tool ++ Set the Pencil as the paint tool + ფანქრის ხელსაწყოს არჩევა სახატავად + + +@@ -610,7 +610,7 @@ Press Space to open the side panel. + + + +- Sets the Rectangle as the paint tool ++ Set the Rectangle as the paint tool + მართკუთხედის ხელსაწყოს არჩევა სახატავად + + +@@ -657,7 +657,7 @@ Press Space to open the side panel. + + + +- Sets the Selection as the paint tool ++ Set Selection as the paint tool + შერჩევის ხელსაწყოს არჩევა სახატავად + + +@@ -670,7 +670,7 @@ Press Space to open the side panel. + + + +- Shows the dimensions of the selection (X Y) ++ Show the dimensions of the selection (X Y) + აჩვენებს შერჩეული არის განზომილებებს (X Y) + + +diff --git a/translations/Internationalization_pl.ts b/translations/Internationalization_pl.ts +index 852ca0a..67d54b5 100644 +--- a/translations/Internationalization_pl.ts ++++ b/translations/Internationalization_pl.ts +@@ -57,7 +57,7 @@ + + + +- Sets the Arrow as the paint tool ++ Set the Arrow as the paint tool + Rysowanie strzałek + + +@@ -70,7 +70,7 @@ + + + +- Sets the Blur as the paint tool ++ Set Blur as the paint tool + Rozmywanie obszarów + + +@@ -103,7 +103,7 @@ Spacja, aby pokazać panel boczny. + + + +- Sets the Circle as the paint tool ++ Set the Circle as the paint tool + Rysowanie okręgów i elips + + +@@ -180,7 +180,7 @@ Spacja, aby pokazać panel boczny. + + + +- Copies the selection into the clipboard ++ Copy the selection into the clipboard + + + +@@ -404,7 +404,7 @@ Spacja, aby pokazać panel boczny. + + + +- Uploads the selection to Imgur ++ Upload the selection to Imgur + Wyślij zaznaczenie do Imgur + + +@@ -505,7 +505,7 @@ Spacja, aby pokazać panel boczny. + + + +- Sets the Line as the paint tool ++ Set the Line as the paint tool + Ustawia linię jako narzędzie do rysowania + + +@@ -518,7 +518,7 @@ Spacja, aby pokazać panel boczny. + + + +- Sets the Marker as the paint tool ++ Set the Marker as the paint tool + Ustawia Marker jako narzędzie rysowania + + +@@ -544,7 +544,7 @@ Spacja, aby pokazać panel boczny. + + + +- Sets the Pencil as the paint tool ++ Set the Pencil as the paint tool + Ustawia ołówek jako narzędzie do rysowania + + +@@ -613,7 +613,7 @@ Spacja, aby pokazać panel boczny. + + + +- Sets the Rectangle as the paint tool ++ Set the Rectangle as the paint tool + Ustawia prostokąt jako narzędzie do rysowania + + +@@ -660,7 +660,7 @@ Spacja, aby pokazać panel boczny. + + + +- Sets the Selection as the paint tool ++ Set Selection as the paint tool + Ustawia zaznaczenie prostokątne jako narzędzie do rysowania + + +@@ -673,7 +673,7 @@ Spacja, aby pokazać panel boczny. + + + +- Shows the dimensions of the selection (X Y) ++ Show the dimensions of the selection (X Y) + Pokazuje wymiary zaznaczenia (X Y) + + +diff --git a/translations/Internationalization_pt_br.ts b/translations/Internationalization_pt_br.ts +index 1acba13..3cf5a85 100644 +--- a/translations/Internationalization_pt_br.ts ++++ b/translations/Internationalization_pt_br.ts +@@ -57,7 +57,7 @@ + + + +- Sets the Arrow as the paint tool ++ Set the Arrow as the paint tool + Usa a Flecha como ferramenta de desenho + + +@@ -70,7 +70,7 @@ + + + +- Sets the Blur as the paint tool ++ Set Blur as the paint tool + Usa o Desfoque como ferramenta de desenho + + +@@ -104,7 +104,7 @@ Pressione espaço abrir o painel lateral. + + + +- Sets the Circle as the paint tool ++ Set the Circle as the paint tool + Usa o Círculo como ferramenta de desenho + + +@@ -181,7 +181,7 @@ Pressione espaço abrir o painel lateral. + + + +- Copies the selection into the clipboard ++ Copy the selection into the clipboard + Copia a seleção para o clipboard + + +@@ -405,7 +405,7 @@ Pressione espaço abrir o painel lateral. + + + +- Uploads the selection to Imgur ++ Upload the selection to Imgur + Upa a seleção no Imgur + + +@@ -506,7 +506,7 @@ Pressione espaço abrir o painel lateral. + + + +- Sets the Line as the paint tool ++ Set the Line as the paint tool + Usa a Linha como ferramenta de desenho + + +@@ -519,7 +519,7 @@ Pressione espaço abrir o painel lateral. + + + +- Sets the Marker as the paint tool ++ Set the Marker as the paint tool + Usa o marcador como ferramenta de desenho + + +@@ -545,7 +545,7 @@ Pressione espaço abrir o painel lateral. + + + +- Sets the Pencil as the paint tool ++ Set the Pencil as the paint tool + Usa o Lápis como ferramenta de desenho + + +@@ -614,7 +614,7 @@ Pressione espaço abrir o painel lateral. + + + +- Sets the Rectangle as the paint tool ++ Set the Rectangle as the paint tool + Seta o Retângulo como ferramenta de desenho + + +@@ -661,7 +661,7 @@ Pressione espaço abrir o painel lateral. + + + +- Sets the Selection as the paint tool ++ Set Selection as the paint tool + Estabelece o Selecionador como ferramenta de desenho + + +@@ -674,7 +674,7 @@ Pressione espaço abrir o painel lateral. + + + +- Shows the dimensions of the selection (X Y) ++ Show the dimensions of the selection (X Y) + Mostra a dimensão da seleção (X Y) + + +diff --git a/translations/Internationalization_ru.ts b/translations/Internationalization_ru.ts +index e6a7c9f..325a56b 100644 +--- a/translations/Internationalization_ru.ts ++++ b/translations/Internationalization_ru.ts +@@ -57,7 +57,7 @@ + + + +- Sets the Arrow as the paint tool ++ Set the Arrow as the paint tool + Выбрать Стрелку инструментом для рисования + + +@@ -70,7 +70,7 @@ + + + +- Sets the Blur as the paint tool ++ Set Blur as the paint tool + Выбрать Размытие инструментом для рисования + + +@@ -100,7 +100,7 @@ Press Space to open the side panel. + + + +- Sets the Circle as the paint tool ++ Set the Circle as the paint tool + Выбрать Окружность инструментом для рисования + + +@@ -177,7 +177,7 @@ Press Space to open the side panel. + + + +- Copies the selection into the clipboard ++ Copy the selection into the clipboard + + + +@@ -401,7 +401,7 @@ Press Space to open the side panel. + + + +- Uploads the selection to Imgur ++ Upload the selection to Imgur + Загрузить выделение на Imgur + + +@@ -502,7 +502,7 @@ Press Space to open the side panel. + + + +- Sets the Line as the paint tool ++ Set the Line as the paint tool + Выбрать Линию инструментом для рисования + + +@@ -515,7 +515,7 @@ Press Space to open the side panel. + + + +- Sets the Marker as the paint tool ++ Set the Marker as the paint tool + Выбрать Маркер инструментом для рисования + + +@@ -541,7 +541,7 @@ Press Space to open the side panel. + + + +- Sets the Pencil as the paint tool ++ Set the Pencil as the paint tool + Выбрать Карандаш инструментом для рисования + + +@@ -610,7 +610,7 @@ Press Space to open the side panel. + + + +- Sets the Rectangle as the paint tool ++ Set the Rectangle as the paint tool + Выбрать Прямоугольник инструментом для рисования + + +@@ -657,7 +657,7 @@ Press Space to open the side panel. + + + +- Sets the Selection as the paint tool ++ Set Selection as the paint tool + Выбрать Прямоугольное выделение инструментом для рисования + + +@@ -670,7 +670,7 @@ Press Space to open the side panel. + + + +- Shows the dimensions of the selection (X Y) ++ Show the dimensions of the selection (X Y) + Показывает размер выделения (X Y) + + +diff --git a/translations/Internationalization_sr.ts b/translations/Internationalization_sr.ts +index 56caec9..97097fd 100644 +--- a/translations/Internationalization_sr.ts ++++ b/translations/Internationalization_sr.ts +@@ -57,7 +57,7 @@ + + + +- Sets the Arrow as the paint tool ++ Set the Arrow as the paint tool + Избор цртања стрелице + + +@@ -70,7 +70,7 @@ + + + +- Sets the Blur as the paint tool ++ Set Blur as the paint tool + Избор цртања замућене области + + +@@ -104,7 +104,7 @@ Press Space to open the side panel. + + + +- Sets the Circle as the paint tool ++ Set the Circle as the paint tool + Избор цртања круга + + +@@ -181,7 +181,7 @@ Press Space to open the side panel. + + + +- Copies the selection into the clipboard ++ Copy the selection into the clipboard + Копира избор у привремену оставу + + +@@ -405,7 +405,7 @@ Press Space to open the side panel. + + + +- Uploads the selection to Imgur ++ Upload the selection to Imgur + Објави избор на Imgur сајту + + +@@ -506,7 +506,7 @@ Press Space to open the side panel. + + + +- Sets the Line as the paint tool ++ Set the Line as the paint tool + Избор цртања линије + + +@@ -519,7 +519,7 @@ Press Space to open the side panel. + + + +- Sets the Marker as the paint tool ++ Set the Marker as the paint tool + Избор цртања маркером + + +@@ -545,7 +545,7 @@ Press Space to open the side panel. + + + +- Sets the Pencil as the paint tool ++ Set the Pencil as the paint tool + Избор цртања оловком + + +@@ -614,7 +614,7 @@ Press Space to open the side panel. + + + +- Sets the Rectangle as the paint tool ++ Set the Rectangle as the paint tool + Избор цртања обојеног правоугаоника + + +@@ -662,7 +662,7 @@ Press Space to open the side panel. + + + +- Sets the Selection as the paint tool ++ Set Selection as the paint tool + Избор цртања правоугаоног оквира + + +@@ -675,7 +675,7 @@ Press Space to open the side panel. + + + +- Shows the dimensions of the selection (X Y) ++ Show the dimensions of the selection (X Y) + Приказује величину избора (X Y) + + +diff --git a/translations/Internationalization_tr.ts b/translations/Internationalization_tr.ts +index 9296234..c6df0c2 100644 +--- a/translations/Internationalization_tr.ts ++++ b/translations/Internationalization_tr.ts +@@ -57,7 +57,7 @@ + + + +- Sets the Arrow as the paint tool ++ Set the Arrow as the paint tool + Oku çizim aracı olarak ayarlar + + +@@ -70,7 +70,7 @@ + + + +- Sets the Blur as the paint tool ++ Set Blur as the paint tool + Bulnıklığı boyama aracı olarak ayarlar + + +@@ -104,7 +104,7 @@ Yan paneli açmak için Boşluk tuşuna basın. + + + +- Sets the Circle as the paint tool ++ Set the Circle as the paint tool + Çemberi boyama aracı olarak ayarlar + + +@@ -181,7 +181,7 @@ Yan paneli açmak için Boşluk tuşuna basın. + + + +- Copies the selection into the clipboard ++ Copy the selection into the clipboard + Seçimi panoya kopyalar + + +@@ -405,7 +405,7 @@ Yan paneli açmak için Boşluk tuşuna basın. + + + +- Uploads the selection to Imgur ++ Upload the selection to Imgur + Seçimi Imgur'a yükler + + +@@ -506,7 +506,7 @@ Yan paneli açmak için Boşluk tuşuna basın. + + + +- Sets the Line as the paint tool ++ Set the Line as the paint tool + Çizgiyi boyama aracı olarak ayarlar + + +@@ -519,7 +519,7 @@ Yan paneli açmak için Boşluk tuşuna basın. + + + +- Sets the Marker as the paint tool ++ Set the Marker as the paint tool + İşaretleyiciyi boyama aracı olarak ayarlar + + +@@ -545,7 +545,7 @@ Yan paneli açmak için Boşluk tuşuna basın. + + + +- Sets the Pencil as the paint tool ++ Set the Pencil as the paint tool + Kurşun Kalemi çizim aracı olarak ayarlar + + +@@ -614,7 +614,7 @@ Yan paneli açmak için Boşluk tuşuna basın. + + + +- Sets the Rectangle as the paint tool ++ Set the Rectangle as the paint tool + Dikdörtgeni boyama aracı olarak ayarlar + + +@@ -661,7 +661,7 @@ Yan paneli açmak için Boşluk tuşuna basın. + + + +- Sets the Selection as the paint tool ++ Set Selection as the paint tool + Seçimi boyama aracı olarak ayarlar + + +@@ -674,7 +674,7 @@ Yan paneli açmak için Boşluk tuşuna basın. + + + +- Shows the dimensions of the selection (X Y) ++ Show the dimensions of the selection (X Y) + Seçimin boyutlarını gösterir (X Y) + + +diff --git a/translations/Internationalization_zh_CN.ts b/translations/Internationalization_zh_CN.ts +index d9801f5..587cfe7 100644 +--- a/translations/Internationalization_zh_CN.ts ++++ b/translations/Internationalization_zh_CN.ts +@@ -57,7 +57,7 @@ + + + +- Sets the Arrow as the paint tool ++ Set the Arrow as the paint tool + 选择箭头作为绘画工具 + + +@@ -70,7 +70,7 @@ + + + +- Sets the Blur as the paint tool ++ Set Blur as the paint tool + 选择模糊作为绘画工具 + + +@@ -105,7 +105,7 @@ Press Space to open the side panel. + + + +- Sets the Circle as the paint tool ++ Set the Circle as the paint tool + 选择圆环作为绘画工具 + + +@@ -182,7 +182,7 @@ Press Space to open the side panel. + + + +- Copies the selection into the clipboard ++ Copy the selection into the clipboard + 复制选择到剪贴板 + + +@@ -406,7 +406,7 @@ Press Space to open the side panel. + + + +- Uploads the selection to Imgur ++ Upload the selection to Imgur + 上传选择到 Imgur + + +@@ -507,7 +507,7 @@ Press Space to open the side panel. + + + +- Sets the Line as the paint tool ++ Set the Line as the paint tool + 将直线线设置为绘画工具 + + +@@ -520,7 +520,7 @@ Press Space to open the side panel. + + + +- Sets the Marker as the paint tool ++ Set the Marker as the paint tool + 将标记设置为绘画工具 + + +@@ -546,7 +546,7 @@ Press Space to open the side panel. + + + +- Sets the Pencil as the paint tool ++ Set the Pencil as the paint tool + 将铅笔设置为绘画工具 + + +@@ -615,7 +615,7 @@ Press Space to open the side panel. + + + +- Sets the Rectangle as the paint tool ++ Set the Rectangle as the paint tool + 将实心矩形设置为绘画工具 + + +@@ -662,7 +662,7 @@ Press Space to open the side panel. + + + +- Sets the Selection as the paint tool ++ Set Selection as the paint tool + 将矩形选择设置为绘画工具 + + +@@ -675,7 +675,7 @@ Press Space to open the side panel. + + + +- Shows the dimensions of the selection (X Y) ++ Show the dimensions of the selection (X Y) + 显示选择的尺寸 (X Y) + + +diff --git a/translations/Internationalization_zh_TW.ts b/translations/Internationalization_zh_TW.ts +index 916a0a6..e4dace8 100644 +--- a/translations/Internationalization_zh_TW.ts ++++ b/translations/Internationalization_zh_TW.ts +@@ -57,7 +57,7 @@ + + + +- Sets the Arrow as the paint tool ++ Set the Arrow as the paint tool + 選擇箭頭作為繪製工具 + + +@@ -70,7 +70,7 @@ + + + +- Sets the Blur as the paint tool ++ Set Blur as the paint tool + 選擇模糊作為繪製工具 + + +@@ -100,7 +100,7 @@ Press Space to open the side panel. + + + +- Sets the Circle as the paint tool ++ Set the Circle as the paint tool + 選擇圈型作為繪畫工具 + + +@@ -177,7 +177,7 @@ Press Space to open the side panel. + + + +- Copies the selection into the clipboard ++ Copy the selection into the clipboard + + + +@@ -401,7 +401,7 @@ Press Space to open the side panel. + + + +- Uploads the selection to Imgur ++ Upload the selection to Imgur + 上傳到 Imgur + + +@@ -502,7 +502,7 @@ Press Space to open the side panel. + + + +- Sets the Line as the paint tool ++ Set the Line as the paint tool + 將直線線設定為繪畫工具 + + +@@ -515,7 +515,7 @@ Press Space to open the side panel. + + + +- Sets the Marker as the paint tool ++ Set the Marker as the paint tool + 將標記設定為繪畫工具 + + +@@ -541,7 +541,7 @@ Press Space to open the side panel. + + + +- Sets the Pencil as the paint tool ++ Set the Pencil as the paint tool + 將鉛筆設定為繪畫工具 + + +@@ -610,7 +610,7 @@ Press Space to open the side panel. + + + +- Sets the Rectangle as the paint tool ++ Set the Rectangle as the paint tool + 將實心矩形設定為繪畫工具 + + +@@ -657,7 +657,7 @@ Press Space to open the side panel. + + + +- Sets the Selection as the paint tool ++ Set Selection as the paint tool + 將矩形選擇設定為繪畫工具 + + +@@ -670,7 +670,7 @@ Press Space to open the side panel. + + + +- Shows the dimensions of the selection (X Y) ++ Show the dimensions of the selection (X Y) + 顯示選擇的尺寸 (X Y) + + diff -Nru flameshot-0.6.0/debian/patches/0016-Make-tools-English-tooltip-phrasing-consistent-375.patch flameshot-0.6.0/debian/patches/0016-Make-tools-English-tooltip-phrasing-consistent-375.patch --- flameshot-0.6.0/debian/patches/0016-Make-tools-English-tooltip-phrasing-consistent-375.patch 1970-01-01 00:00:00.000000000 +0000 +++ flameshot-0.6.0/debian/patches/0016-Make-tools-English-tooltip-phrasing-consistent-375.patch 2018-11-09 00:59:11.000000000 +0000 @@ -0,0 +1,167 @@ +From: dgw +Date: Sun, 21 Oct 2018 03:22:21 -0500 +Subject: Make tools' (English) tooltip phrasing consistent (#375) +MIME-Version: 1.0 +Content-Type: text/plain; charset="utf-8" +Content-Transfer-Encoding: 8bit + +Some tooltips were written as imperatives ("Set foo to bar"), others +were written as simple present ("Performs foo action"). All should now +be consistently written in imperative form (unless I missed any…). +--- + src/tools/arrow/arrowtool.cpp | 2 +- + src/tools/blur/blurtool.cpp | 2 +- + src/tools/circle/circletool.cpp | 2 +- + src/tools/copy/copytool.cpp | 2 +- + src/tools/imgur/imguruploadertool.cpp | 2 +- + src/tools/line/linetool.cpp | 2 +- + src/tools/marker/markertool.cpp | 2 +- + src/tools/pencil/penciltool.cpp | 2 +- + src/tools/rectangle/rectangletool.cpp | 2 +- + src/tools/selection/selectiontool.cpp | 2 +- + src/tools/sizeindicator/sizeindicatortool.cpp | 2 +- + 11 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/src/tools/arrow/arrowtool.cpp b/src/tools/arrow/arrowtool.cpp +index 5cc26f6..cdec49d 100644 +--- a/src/tools/arrow/arrowtool.cpp ++++ b/src/tools/arrow/arrowtool.cpp +@@ -85,7 +85,7 @@ QString ArrowTool::nameID() { + } + + QString ArrowTool::description() const { +- return tr("Sets the Arrow as the paint tool"); ++ return tr("Set the Arrow as the paint tool"); + } + + CaptureTool* ArrowTool::copy(QObject *parent) { +diff --git a/src/tools/blur/blurtool.cpp b/src/tools/blur/blurtool.cpp +index e845d47..0ea63f5 100644 +--- a/src/tools/blur/blurtool.cpp ++++ b/src/tools/blur/blurtool.cpp +@@ -39,7 +39,7 @@ QString BlurTool::nameID() { + } + + QString BlurTool::description() const { +- return tr("Sets the Blur as the paint tool"); ++ return tr("Set Blur as the paint tool"); + } + + CaptureTool* BlurTool::copy(QObject *parent) { +diff --git a/src/tools/circle/circletool.cpp b/src/tools/circle/circletool.cpp +index 4ce2f5d..387c6ef 100644 +--- a/src/tools/circle/circletool.cpp ++++ b/src/tools/circle/circletool.cpp +@@ -39,7 +39,7 @@ QString CircleTool::nameID() { + } + + QString CircleTool::description() const { +- return tr("Sets the Circle as the paint tool"); ++ return tr("Set the Circle as the paint tool"); + } + + CaptureTool* CircleTool::copy(QObject *parent) { +diff --git a/src/tools/copy/copytool.cpp b/src/tools/copy/copytool.cpp +index 3914dd1..268d0b7 100644 +--- a/src/tools/copy/copytool.cpp ++++ b/src/tools/copy/copytool.cpp +@@ -40,7 +40,7 @@ QString CopyTool::nameID() { + } + + QString CopyTool::description() const { +- return tr("Copies the selection into the clipboard"); ++ return tr("Copy the selection into the clipboard"); + } + + CaptureTool* CopyTool::copy(QObject *parent) { +diff --git a/src/tools/imgur/imguruploadertool.cpp b/src/tools/imgur/imguruploadertool.cpp +index 92d4e86..428e3db 100644 +--- a/src/tools/imgur/imguruploadertool.cpp ++++ b/src/tools/imgur/imguruploadertool.cpp +@@ -40,7 +40,7 @@ QString ImgurUploaderTool::nameID() { + } + + QString ImgurUploaderTool::description() const { +- return tr("Uploads the selection to Imgur"); ++ return tr("Upload the selection to Imgur"); + } + + QWidget* ImgurUploaderTool::widget() { +diff --git a/src/tools/line/linetool.cpp b/src/tools/line/linetool.cpp +index c6daeb8..e1a1755 100644 +--- a/src/tools/line/linetool.cpp ++++ b/src/tools/line/linetool.cpp +@@ -47,7 +47,7 @@ QString LineTool::nameID() { + } + + QString LineTool::description() const { +- return tr("Sets the Line as the paint tool"); ++ return tr("Set the Line as the paint tool"); + } + + CaptureTool* LineTool::copy(QObject *parent) { +diff --git a/src/tools/marker/markertool.cpp b/src/tools/marker/markertool.cpp +index 85a11dd..42800b0 100644 +--- a/src/tools/marker/markertool.cpp ++++ b/src/tools/marker/markertool.cpp +@@ -47,7 +47,7 @@ QString MarkerTool::nameID() { + } + + QString MarkerTool::description() const { +- return tr("Sets the Marker as the paint tool"); ++ return tr("Set the Marker as the paint tool"); + } + + CaptureTool* MarkerTool::copy(QObject *parent) { +diff --git a/src/tools/pencil/penciltool.cpp b/src/tools/pencil/penciltool.cpp +index 509c825..7b01c5b 100644 +--- a/src/tools/pencil/penciltool.cpp ++++ b/src/tools/pencil/penciltool.cpp +@@ -35,7 +35,7 @@ QString PencilTool::nameID() { + } + + QString PencilTool::description() const { +- return tr("Sets the Pencil as the paint tool"); ++ return tr("Set the Pencil as the paint tool"); + } + + CaptureTool* PencilTool::copy(QObject *parent) { +diff --git a/src/tools/rectangle/rectangletool.cpp b/src/tools/rectangle/rectangletool.cpp +index 368199c..fa9c483 100644 +--- a/src/tools/rectangle/rectangletool.cpp ++++ b/src/tools/rectangle/rectangletool.cpp +@@ -39,7 +39,7 @@ QString RectangleTool::nameID() { + } + + QString RectangleTool::description() const { +- return tr("Sets the Rectangle as the paint tool"); ++ return tr("Set the Rectangle as the paint tool"); + } + + CaptureTool* RectangleTool::copy(QObject *parent) { +diff --git a/src/tools/selection/selectiontool.cpp b/src/tools/selection/selectiontool.cpp +index fb3b312..c1c4222 100644 +--- a/src/tools/selection/selectiontool.cpp ++++ b/src/tools/selection/selectiontool.cpp +@@ -43,7 +43,7 @@ QString SelectionTool::nameID() { + } + + QString SelectionTool::description() const { +- return tr("Sets the Selection as the paint tool"); ++ return tr("Set Selection as the paint tool"); + } + + CaptureTool* SelectionTool::copy(QObject *parent) { +diff --git a/src/tools/sizeindicator/sizeindicatortool.cpp b/src/tools/sizeindicator/sizeindicatortool.cpp +index 1e88304..047f755 100644 +--- a/src/tools/sizeindicator/sizeindicatortool.cpp ++++ b/src/tools/sizeindicator/sizeindicatortool.cpp +@@ -39,7 +39,7 @@ QString SizeIndicatorTool::nameID() { + } + + QString SizeIndicatorTool::description() const { +- return tr("Shows the dimensions of the selection (X Y)"); ++ return tr("Show the dimensions of the selection (X Y)"); + } + + CaptureTool* SizeIndicatorTool::copy(QObject *parent) { diff -Nru flameshot-0.6.0/debian/patches/0017-Fix-some-issues-detected-by-Clazy-384.patch flameshot-0.6.0/debian/patches/0017-Fix-some-issues-detected-by-Clazy-384.patch --- flameshot-0.6.0/debian/patches/0017-Fix-some-issues-detected-by-Clazy-384.patch 1970-01-01 00:00:00.000000000 +0000 +++ flameshot-0.6.0/debian/patches/0017-Fix-some-issues-detected-by-Clazy-384.patch 2018-11-09 00:59:11.000000000 +0000 @@ -0,0 +1,1578 @@ +From: Alfredo Ramos +Date: Tue, 23 Oct 2018 18:04:42 -0500 +Subject: Fix some issues detected by Clazy (#384) + +* Fix old style connect + +* Fix unneeded QString memory allocations +--- + src/cli/commandlineparser.cpp | 28 ++--- + src/cli/commandoption.cpp | 2 +- + src/config/geneneralconf.cpp | 2 +- + src/config/uicoloreditor.cpp | 4 +- + src/config/visualseditor.cpp | 4 +- + src/core/capturerequest.h | 2 +- + src/core/controller.cpp | 2 +- + src/core/controller.h | 2 +- + src/main.cpp | 138 ++++++++++----------- + .../singleapplication/singleapplication.cpp | 2 +- + src/tools/arrow/arrowtool.cpp | 2 +- + src/tools/blur/blurtool.cpp | 2 +- + src/tools/circle/circletool.cpp | 2 +- + src/tools/copy/copytool.cpp | 2 +- + src/tools/exit/exittool.cpp | 2 +- + src/tools/imgur/imguruploader.cpp | 16 +-- + src/tools/imgur/imguruploadertool.cpp | 2 +- + src/tools/launcher/applaunchertool.cpp | 2 +- + src/tools/launcher/applauncherwidget.cpp | 10 +- + src/tools/line/linetool.cpp | 2 +- + src/tools/marker/markertool.cpp | 2 +- + src/tools/move/movetool.cpp | 2 +- + src/tools/pencil/penciltool.cpp | 2 +- + src/tools/pin/pintool.cpp | 2 +- + src/tools/rectangle/rectangletool.cpp | 2 +- + src/tools/redo/redotool.cpp | 2 +- + src/tools/save/savetool.cpp | 2 +- + src/tools/selection/selectiontool.cpp | 2 +- + src/tools/sizeindicator/sizeindicatortool.cpp | 2 +- + src/tools/text/textconfig.cpp | 8 +- + src/tools/text/texttool.cpp | 2 +- + src/tools/text/textwidget.cpp | 4 +- + src/tools/undo/undotool.cpp | 2 +- + src/utils/confighandler.cpp | 76 ++++++------ + src/utils/dbusutils.cpp | 8 +- + src/utils/desktopfileparse.cpp | 44 +++---- + src/utils/desktopinfo.cpp | 20 +-- + src/utils/filenamehandler.cpp | 10 +- + src/utils/pathinfo.cpp | 10 +- + src/utils/screengrabber.cpp | 4 +- + src/utils/screenshotsaver.cpp | 8 +- + src/utils/systemnotification.cpp | 2 +- + src/widgets/capture/capturebutton.cpp | 2 +- + src/widgets/capture/notifierbox.cpp | 2 +- + src/widgets/infowindow.cpp | 4 +- + src/widgets/loadspinner.cpp | 2 +- + src/widgets/panel/sidepanelwidget.cpp | 6 +- + src/widgets/panel/utilitypanel.cpp | 2 +- + 48 files changed, 231 insertions(+), 231 deletions(-) + mode change 100755 => 100644 src/tools/pin/pintool.cpp + +diff --git a/src/cli/commandlineparser.cpp b/src/cli/commandlineparser.cpp +index 726f384..17f7e20 100644 +--- a/src/cli/commandlineparser.cpp ++++ b/src/cli/commandlineparser.cpp +@@ -31,9 +31,9 @@ QTextStream out(stdout); + QTextStream err(stderr); + + auto versionOption = CommandOption({"v", "version"}, +- "Displays version information"); ++ QStringLiteral("Displays version information")); + auto helpOption = CommandOption({"h", "help"}, +- "Displays this help"); ++ QStringLiteral("Displays this help")); + + QString optionsToString(const QList &options, + const QList &arguments) { +@@ -43,7 +43,7 @@ QString optionsToString(const QList &options, + // of every option at the same horizontal character position. + for (auto const &option: options) { + QStringList dashedOptions = option.dashedNames(); +- QString joinedDashedOptions = dashedOptions.join(", "); ++ QString joinedDashedOptions = dashedOptions.join(QStringLiteral(", ")); + if (!option.valueName().isEmpty()) { + joinedDashedOptions += QStringLiteral(" <%1>") + .arg(option.valueName()); +@@ -61,20 +61,20 @@ QString optionsToString(const QList &options, + // generate the text + QString result; + if(!dashedOptionList.isEmpty()) { +- result += "Options:\n"; +- QString linePadding = QString(" ").repeated(size + 4).prepend("\n"); ++ result += QLatin1String("Options:\n"); ++ QString linePadding = QStringLiteral(" ").repeated(size + 4).prepend("\n"); + for (int i = 0; i < options.length(); ++i) { + result += QStringLiteral(" %1 %2\n") + .arg(dashedOptionList.at(i).leftJustified(size, ' ')) + .arg(options.at(i).description() +- .replace("\n", linePadding)); ++ .replace(QLatin1String("\n"), linePadding)); + } + if (!arguments.isEmpty()) { +- result += "\n"; ++ result += QLatin1String("\n"); + } + } + if (!arguments.isEmpty()) { +- result += "Arguments:\n"; ++ result += QLatin1String("Arguments:\n"); + } + for (int i = 0; i < arguments.length(); ++i) { + result += QStringLiteral(" %1 %2\n") +@@ -121,14 +121,14 @@ bool CommandLineParser::processOptions(const QStringList &args, + QString arg = *actualIt; + bool ok = true; + // track values +- int equalsPos = arg.indexOf("="); ++ int equalsPos = arg.indexOf(QLatin1String("=")); + QString valueStr; + if (equalsPos != -1) { + valueStr = arg.mid(equalsPos +1); // right + arg = arg.mid(0, equalsPos); // left + } + // check format -x --xx... +- bool isDoubleDashed = arg.startsWith("--"); ++ bool isDoubleDashed = arg.startsWith(QLatin1String("--")); + ok = isDoubleDashed ? arg.length() > 3 : + arg.length() == 2; + if (!ok) { +@@ -182,8 +182,8 @@ bool CommandLineParser::processOptions(const QStringList &args, + ok = option.checkValue(valueStr); + if (!ok) { + QString err = option.errorMsg(); +- if (!err.endsWith(".")) +- err += "."; ++ if (!err.endsWith(QLatin1String("."))) ++ err += QLatin1String("."); + out << err; + return ok; + } +@@ -219,7 +219,7 @@ bool CommandLineParser::parse(const QStringList &args) { + // process the other args + for (; it != args.cend() && ok; ++it) { + const QString &value = *it; +- if (value.startsWith("-")) { ++ if (value.startsWith(QLatin1String("-"))) { + ok = processOptions(args, it, actualNode); + + } else { +@@ -326,7 +326,7 @@ void CommandLineParser::printHelp(QStringList args, const Node *node) { + } + QString argText = node->subNodes.isEmpty() ? "" : "[arguments]"; + helpText += QStringLiteral("Usage: %1 [%2-options] %3\n\n") +- .arg(args.join(" ")) ++ .arg(args.join(QStringLiteral(" "))) + .arg(argName).arg(argText); + // add command options and subarguments + QList subArgs; +diff --git a/src/cli/commandoption.cpp b/src/cli/commandoption.cpp +index 1fcadfe..089c466 100644 +--- a/src/cli/commandoption.cpp ++++ b/src/cli/commandoption.cpp +@@ -70,7 +70,7 @@ QString CommandOption::valueName() const { + + void CommandOption::setValue(const QString &value) { + if (m_valueName.isEmpty()) { +- m_valueName = "value"; ++ m_valueName = QLatin1String("value"); + } + m_value = value; + } +diff --git a/src/config/geneneralconf.cpp b/src/config/geneneralconf.cpp +index 23e64d6..c8b9272 100644 +--- a/src/config/geneneralconf.cpp ++++ b/src/config/geneneralconf.cpp +@@ -99,7 +99,7 @@ void GeneneralConf::importConfiguration() { + + void GeneneralConf::exportFileConfiguration() { + QString fileName = QFileDialog::getSaveFileName(this, tr("Save File"), +- "flameshot.conf"); ++ QStringLiteral("flameshot.conf")); + + // Cancel button + if (fileName.isNull()) { +diff --git a/src/config/uicoloreditor.cpp b/src/config/uicoloreditor.cpp +index 89afe1f..a8313a1 100644 +--- a/src/config/uicoloreditor.cpp ++++ b/src/config/uicoloreditor.cpp +@@ -125,7 +125,7 @@ void UIcolorEditor::initButtons() { + h2->addWidget(frame2); + frame2->setFixedSize(frameSize, frameSize); + m_labelContrast = new ClickableLabel(tr("Contrast Color"), this); +- m_labelContrast->setStyleSheet("color : gray"); ++ m_labelContrast->setStyleSheet(QStringLiteral("color : gray")); + h2->addWidget(m_labelContrast); + m_vLayout->addLayout(h2); + +@@ -149,7 +149,7 @@ void UIcolorEditor::changeLastButton(CaptureButton *b) { + if (m_lastButtonPressed != b) { + m_lastButtonPressed = b; + +- QString offStyle("QLabel { color : gray; }"); ++ QString offStyle(QStringLiteral("QLabel { color : gray; }")); + + if (b == m_buttonMainColor) { + m_colorWheel->setColor(m_uiColor); +diff --git a/src/config/visualseditor.cpp b/src/config/visualseditor.cpp +index f32aef4..bc8468f 100644 +--- a/src/config/visualseditor.cpp ++++ b/src/config/visualseditor.cpp +@@ -45,9 +45,9 @@ void VisualsEditor::initOpacitySlider() { + connect(m_opacitySlider, &ExtendedSlider::modificationsEnded, + this, &VisualsEditor::saveOpacity); + QHBoxLayout *localLayout = new QHBoxLayout(); +- localLayout->addWidget(new QLabel("0%")); ++ localLayout->addWidget(new QLabel(QStringLiteral("0%"))); + localLayout->addWidget(m_opacitySlider); +- localLayout->addWidget(new QLabel("100%")); ++ localLayout->addWidget(new QLabel(QStringLiteral("100%"))); + + QLabel *label = new QLabel(); + QString labelMsg = tr("Opacity of area outside selection:") + " %1%"; +diff --git a/src/core/capturerequest.h b/src/core/capturerequest.h +index fc65c8b..a84b437 100644 +--- a/src/core/capturerequest.h ++++ b/src/core/capturerequest.h +@@ -37,7 +37,7 @@ public: + + CaptureRequest(CaptureMode mode, + const uint delay = 0, +- const QString &path = "", ++ const QString &path = QLatin1String(""), + const QVariant &data = QVariant(), + ExportTask tasks = NO_TASK); + +diff --git a/src/core/controller.cpp b/src/core/controller.cpp +index 459ec35..3d0e39a 100644 +--- a/src/core/controller.cpp ++++ b/src/core/controller.cpp +@@ -189,7 +189,7 @@ void Controller::enableTrayIcon() { + trayIconMenu->addAction(quitAction); + + m_trayIcon = new QSystemTrayIcon(); +- m_trayIcon->setToolTip("Flameshot"); ++ m_trayIcon->setToolTip(QStringLiteral("Flameshot")); + m_trayIcon->setContextMenu(trayIconMenu); + QIcon trayicon = QIcon::fromTheme("flameshot-tray", QIcon(":img/app/flameshot.png")); + m_trayIcon->setIcon(trayicon); +diff --git a/src/core/controller.h b/src/core/controller.h +index 6d80a4b..60e08b0 100644 +--- a/src/core/controller.h ++++ b/src/core/controller.h +@@ -55,7 +55,7 @@ public slots: + void enableTrayIcon(); + void disableTrayIcon(); + void sendTrayNotification(const QString &text, +- const QString &title = "Flameshot Info", ++ const QString &title = QStringLiteral("Flameshot Info"), + const int timeout = 5000); + + void updateConfigComponents(); +diff --git a/src/main.cpp b/src/main.cpp +index 83fa1c1..504dd45 100644 +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -51,7 +51,7 @@ int main(int argc, char *argv[]) { + + for (const QString &path: trPaths) { + bool match = translator.load(QLocale(), +- "Internationalization", "_", ++ QStringLiteral("Internationalization"), QStringLiteral("_"), + path); + if (match) { + break; +@@ -60,8 +60,8 @@ int main(int argc, char *argv[]) { + + app.installTranslator(&translator); + app.setAttribute(Qt::AA_DontCreateNativeWidgetSiblings, true); +- app.setApplicationName("flameshot"); +- app.setOrganizationName("Dharkael"); ++ app.setApplicationName(QStringLiteral("flameshot")); ++ app.setOrganizationName(QStringLiteral("Dharkael")); + + auto c = Controller::getInstance(); + #if defined(Q_OS_LINUX) || defined(Q_OS_UNIX) +@@ -71,8 +71,8 @@ int main(int argc, char *argv[]) { + SystemNotification().sendMessage( + QObject::tr("Unable to connect via DBus")); + } +- dbus.registerObject("/", c); +- dbus.registerService("org.dharkael.Flameshot"); ++ dbus.registerObject(QStringLiteral("/"), c); ++ dbus.registerService(QStringLiteral("org.dharkael.Flameshot")); + #endif + // Exporting captures must be connected after the dbus interface + // or the dbus signal gets blocked until we end the exports. +@@ -85,66 +85,66 @@ int main(int argc, char *argv[]) { + * CLI parsing | + * ------------*/ + QCoreApplication app(argc, argv); +- app.setApplicationName("flameshot"); +- app.setOrganizationName("Dharkael"); ++ app.setApplicationName(QStringLiteral("flameshot")); ++ app.setOrganizationName(QStringLiteral("Dharkael")); + app.setApplicationVersion(qApp->applicationVersion()); + CommandLineParser parser; + // Add description + parser.setDescription( +- "Powerful yet simple to use screenshot software."); +- parser.setGeneralErrorMessage("See 'flameshot --help'."); ++ QStringLiteral("Powerful yet simple to use screenshot software.")); ++ parser.setGeneralErrorMessage(QStringLiteral("See 'flameshot --help'.")); + // Arguments +- CommandArgument fullArgument("full", "Capture the entire desktop."); +- CommandArgument guiArgument("gui", "Start a manual capture in GUI mode."); +- CommandArgument configArgument("config", "Configure flameshot."); +- CommandArgument screenArgument("screen", "Capture a single screen."); ++ CommandArgument fullArgument(QStringLiteral("full"), QStringLiteral("Capture the entire desktop.")); ++ CommandArgument guiArgument(QStringLiteral("gui"), QStringLiteral("Start a manual capture in GUI mode.")); ++ CommandArgument configArgument(QStringLiteral("config"), QStringLiteral("Configure flameshot.")); ++ CommandArgument screenArgument(QStringLiteral("screen"), QStringLiteral("Capture a single screen.")); + + // Options + CommandOption pathOption( + {"p", "path"}, +- "Path where the capture will be saved", +- "path"); ++ QStringLiteral("Path where the capture will be saved"), ++ QStringLiteral("path")); + CommandOption clipboardOption( + {"c", "clipboard"}, +- "Save the capture to the clipboard"); ++ QStringLiteral("Save the capture to the clipboard")); + CommandOption delayOption( + {"d", "delay"}, +- "Delay time in milliseconds", +- "milliseconds"); ++ QStringLiteral("Delay time in milliseconds"), ++ QStringLiteral("milliseconds")); + CommandOption filenameOption( + {"f", "filename"}, +- "Set the filename pattern", +- "pattern"); ++ QStringLiteral("Set the filename pattern"), ++ QStringLiteral("pattern")); + CommandOption trayOption( + {"t", "trayicon"}, +- "Enable or disable the trayicon", +- "bool"); ++ QStringLiteral("Enable or disable the trayicon"), ++ QStringLiteral("bool")); + CommandOption autostartOption( + {"a", "autostart"}, +- "Enable or disable run at startup", +- "bool"); ++ QStringLiteral("Enable or disable run at startup"), ++ QStringLiteral("bool")); + CommandOption showHelpOption( + {"s", "showhelp"}, +- "Show the help message in the capture mode", +- "bool"); ++ QStringLiteral("Show the help message in the capture mode"), ++ QStringLiteral("bool")); + CommandOption mainColorOption( + {"m", "maincolor"}, +- "Define the main UI color", +- "color-code"); ++ QStringLiteral("Define the main UI color"), ++ QStringLiteral("color-code")); + CommandOption contrastColorOption( + {"k", "contrastcolor"}, +- "Define the contrast UI color", +- "color-code"); ++ QStringLiteral("Define the contrast UI color"), ++ QStringLiteral("color-code")); + CommandOption rawImageOption( + {"r", "raw"}, +- "Print raw PNG capture"); ++ QStringLiteral("Print raw PNG capture")); + CommandOption screenNumberOption( + {"n", "number"}, +- "Define the screen to capture,\ndefault: screen containing the cursor", +- "Screen number", "-1"); ++ QStringLiteral("Define the screen to capture,\ndefault: screen containing the cursor"), ++ QStringLiteral("Screen number"), QStringLiteral("-1")); + + // Add checkers +- auto colorChecker = [&parser](const QString &colorCode) -> bool { ++ auto colorChecker = [](const QString &colorCode) -> bool { + QColor parsedColor(colorCode); + return parsedColor.isValid() && parsedColor.alphaF() == 1.0; + }; +@@ -156,15 +156,15 @@ int main(int argc, char *argv[]) { + "- Named colors like 'blue' or 'red'\n" + "You may need to escape the '#' sign as in '\\#FFF'"; + +- const QString delayErr = "Invalid delay, it must be higher than 0"; +- const QString numberErr = "Invalid screen number, it must be non negative"; +- auto numericChecker = [&parser](const QString &delayValue) -> bool { ++ const QString delayErr = QStringLiteral("Invalid delay, it must be higher than 0"); ++ const QString numberErr = QStringLiteral("Invalid screen number, it must be non negative"); ++ auto numericChecker = [](const QString &delayValue) -> bool { + int value = delayValue.toInt(); + return value >= 0; + }; + +- const QString pathErr = "Invalid path, it must be a real path in the system"; +- auto pathChecker = [&parser, pathErr](const QString &pathValue) -> bool { ++ const QString pathErr = QStringLiteral("Invalid path, it must be a real path in the system"); ++ auto pathChecker = [pathErr](const QString &pathValue) -> bool { + bool res = QDir(pathValue).exists(); + if (!res) { + SystemNotification().sendMessage(QObject::tr(pathErr.toLatin1().data())); +@@ -172,9 +172,9 @@ int main(int argc, char *argv[]) { + return res; + }; + +- const QString booleanErr = "Invalid value, it must be defined as 'true' or 'false'"; +- auto booleanChecker = [&parser](const QString &value) -> bool { +- return value == "true" || value == "false"; ++ const QString booleanErr = QStringLiteral("Invalid value, it must be defined as 'true' or 'false'"); ++ auto booleanChecker = [](const QString &value) -> bool { ++ return value == QLatin1String("true") || value == QLatin1String("false"); + }; + + contrastColorOption.addChecker(colorChecker, colorErr); +@@ -220,8 +220,8 @@ int main(int argc, char *argv[]) { + uint id = req.id(); + + // Send message +- QDBusMessage m = QDBusMessage::createMethodCall("org.dharkael.Flameshot", +- "/", "", "graphicCapture"); ++ QDBusMessage m = QDBusMessage::createMethodCall(QStringLiteral("org.dharkael.Flameshot"), ++ QStringLiteral("/"), QLatin1String(""), QStringLiteral("graphicCapture")); + m << pathValue << delay << id; + QDBusConnection sessionBus = QDBusConnection::sessionBus(); + dbusUtils.checkDBusConnection(sessionBus); +@@ -248,10 +248,10 @@ int main(int argc, char *argv[]) { + QTextStream out(stdout); + out << "Invalid format, set where to save the content with one of " + << "the following flags:\n " +- << pathOption.dashedNames().join(", ") << "\n " +- << rawImageOption.dashedNames().join(", ") << "\n " +- << clipboardOption.dashedNames().join(", ") << "\n\n"; +- parser.parse(QStringList() << argv[0] << "full" << "-h"); ++ << pathOption.dashedNames().join(QStringLiteral(", ")) << "\n " ++ << rawImageOption.dashedNames().join(QStringLiteral(", ")) << "\n " ++ << clipboardOption.dashedNames().join(QStringLiteral(", ")) << "\n\n"; ++ parser.parse(QStringList() << argv[0] << QStringLiteral("full") << QStringLiteral("-h")); + goto finish; + } + +@@ -266,8 +266,8 @@ int main(int argc, char *argv[]) { + DBusUtils dbusUtils; + + // Send message +- QDBusMessage m = QDBusMessage::createMethodCall("org.dharkael.Flameshot", +- "/", "", "fullScreen"); ++ QDBusMessage m = QDBusMessage::createMethodCall(QStringLiteral("org.dharkael.Flameshot"), ++ QStringLiteral("/"), QLatin1String(""), QStringLiteral("fullScreen")); + m << pathValue << toClipboard << delay << id; + QDBusConnection sessionBus = QDBusConnection::sessionBus(); + dbusUtils.checkDBusConnection(sessionBus); +@@ -287,7 +287,7 @@ int main(int argc, char *argv[]) { + } + else if (parser.isSet(screenArgument)) { // SCREEN + QString numberStr = parser.value(screenNumberOption); +- int number = numberStr.startsWith("-") ? -1 : numberStr.toInt(); ++ int number = numberStr.startsWith(QLatin1String("-")) ? -1 : numberStr.toInt(); + QString pathValue = parser.value(pathOption); + int delay = parser.value(delayOption).toInt(); + bool toClipboard = parser.isSet(clipboardOption); +@@ -297,10 +297,10 @@ int main(int argc, char *argv[]) { + QTextStream out(stdout); + out << "Invalid format, set where to save the content with one of " + << "the following flags:\n " +- << pathOption.dashedNames().join(", ") << "\n " +- << rawImageOption.dashedNames().join(", ") << "\n " +- << clipboardOption.dashedNames().join(", ") << "\n\n"; +- parser.parse(QStringList() << argv[0] << "screen" << "-h"); ++ << pathOption.dashedNames().join(QStringLiteral(", ")) << "\n " ++ << rawImageOption.dashedNames().join(QStringLiteral(", ")) << "\n " ++ << clipboardOption.dashedNames().join(QStringLiteral(", ")) << "\n\n"; ++ parser.parse(QStringList() << argv[0] << QStringLiteral("screen") << QStringLiteral("-h")); + goto finish; + } + +@@ -316,8 +316,8 @@ int main(int argc, char *argv[]) { + DBusUtils dbusUtils; + + // Send message +- QDBusMessage m = QDBusMessage::createMethodCall("org.dharkael.Flameshot", +- "/", "", "captureScreen"); ++ QDBusMessage m = QDBusMessage::createMethodCall(QStringLiteral("org.dharkael.Flameshot"), ++ QStringLiteral("/"), QLatin1String(""), QStringLiteral("captureScreen")); + m << number << pathValue << toClipboard << delay << id; + QDBusConnection sessionBus = QDBusConnection::sessionBus(); + dbusUtils.checkDBusConnection(sessionBus); +@@ -346,11 +346,11 @@ int main(int argc, char *argv[]) { + mainColor || contrastColor); + ConfigHandler config; + if (autostart) { +- QDBusMessage m = QDBusMessage::createMethodCall("org.dharkael.Flameshot", +- "/", "", "autostartEnabled"); +- if (parser.value(autostartOption) == "false") { ++ QDBusMessage m = QDBusMessage::createMethodCall(QStringLiteral("org.dharkael.Flameshot"), ++ QStringLiteral("/"), QLatin1String(""), QStringLiteral("autostartEnabled")); ++ if (parser.value(autostartOption) == QLatin1String("false")) { + m << false; +- } else if (parser.value(autostartOption) == "true") { ++ } else if (parser.value(autostartOption) == QLatin1String("true")) { + m << true; + } + QDBusConnection sessionBus = QDBusConnection::sessionBus(); +@@ -370,11 +370,11 @@ int main(int argc, char *argv[]) { + .arg(fh.parsedPattern()); + } + if (tray) { +- QDBusMessage m = QDBusMessage::createMethodCall("org.dharkael.Flameshot", +- "/", "", "trayIconEnabled"); +- if (parser.value(trayOption) == "false") { ++ QDBusMessage m = QDBusMessage::createMethodCall(QStringLiteral("org.dharkael.Flameshot"), ++ QStringLiteral("/"), QLatin1String(""), QStringLiteral("trayIconEnabled")); ++ if (parser.value(trayOption) == QLatin1String("false")) { + m << false; +- } else if (parser.value(trayOption) == "true") { ++ } else if (parser.value(trayOption) == QLatin1String("true")) { + m << true; + } + QDBusConnection sessionBus = QDBusConnection::sessionBus(); +@@ -385,9 +385,9 @@ int main(int argc, char *argv[]) { + sessionBus.call(m); + } + if (help) { +- if (parser.value(showHelpOption) == "false") { ++ if (parser.value(showHelpOption) == QLatin1String("false")) { + config.setShowHelp(false); +- } else if (parser.value(showHelpOption) == "true") { ++ } else if (parser.value(showHelpOption) == QLatin1String("true")) { + config.setShowHelp(true); + } + } +@@ -404,8 +404,8 @@ int main(int argc, char *argv[]) { + + // Open gui when no options + if (!someFlagSet) { +- QDBusMessage m = QDBusMessage::createMethodCall("org.dharkael.Flameshot", +- "/", "", "openConfig"); ++ QDBusMessage m = QDBusMessage::createMethodCall(QStringLiteral("org.dharkael.Flameshot"), ++ QStringLiteral("/"), QLatin1String(""), QStringLiteral("openConfig")); + QDBusConnection sessionBus = QDBusConnection::sessionBus(); + if (!sessionBus.isConnected()) { + SystemNotification().sendMessage( +diff --git a/src/third-party/singleapplication/singleapplication.cpp b/src/third-party/singleapplication/singleapplication.cpp +index 8ddb48c..f452e70 100644 +--- a/src/third-party/singleapplication/singleapplication.cpp ++++ b/src/third-party/singleapplication/singleapplication.cpp +@@ -107,7 +107,7 @@ void SingleApplicationPrivate::genBlockServerName( int timeout ) + #endif + #ifdef Q_OS_UNIX + QProcess process; +- process.start( "whoami" ); ++ process.start( QStringLiteral("whoami") ); + if( process.waitForFinished( timeout ) && + process.exitCode() == QProcess::NormalExit) { + appData.addData( process.readLine() ); +diff --git a/src/tools/arrow/arrowtool.cpp b/src/tools/arrow/arrowtool.cpp +index cdec49d..fd6e88b 100644 +--- a/src/tools/arrow/arrowtool.cpp ++++ b/src/tools/arrow/arrowtool.cpp +@@ -81,7 +81,7 @@ QString ArrowTool::name() const { + } + + QString ArrowTool::nameID() { +- return ""; ++ return QLatin1String(""); + } + + QString ArrowTool::description() const { +diff --git a/src/tools/blur/blurtool.cpp b/src/tools/blur/blurtool.cpp +index 0ea63f5..934ce48 100644 +--- a/src/tools/blur/blurtool.cpp ++++ b/src/tools/blur/blurtool.cpp +@@ -35,7 +35,7 @@ QString BlurTool::name() const { + } + + QString BlurTool::nameID() { +- return ""; ++ return QLatin1String(""); + } + + QString BlurTool::description() const { +diff --git a/src/tools/circle/circletool.cpp b/src/tools/circle/circletool.cpp +index 387c6ef..f7bd498 100644 +--- a/src/tools/circle/circletool.cpp ++++ b/src/tools/circle/circletool.cpp +@@ -35,7 +35,7 @@ QString CircleTool::name() const { + } + + QString CircleTool::nameID() { +- return ""; ++ return QLatin1String(""); + } + + QString CircleTool::description() const { +diff --git a/src/tools/copy/copytool.cpp b/src/tools/copy/copytool.cpp +index 268d0b7..a998679 100644 +--- a/src/tools/copy/copytool.cpp ++++ b/src/tools/copy/copytool.cpp +@@ -36,7 +36,7 @@ QString CopyTool::name() const { + } + + QString CopyTool::nameID() { +- return ""; ++ return QLatin1String(""); + } + + QString CopyTool::description() const { +diff --git a/src/tools/exit/exittool.cpp b/src/tools/exit/exittool.cpp +index e4661c3..9bcf0a4 100644 +--- a/src/tools/exit/exittool.cpp ++++ b/src/tools/exit/exittool.cpp +@@ -35,7 +35,7 @@ QString ExitTool::name() const { + } + + QString ExitTool::nameID() { +- return ""; ++ return QLatin1String(""); + } + + QString ExitTool::description() const { +diff --git a/src/tools/imgur/imguruploader.cpp b/src/tools/imgur/imguruploader.cpp +index c6bece9..d0cbe57 100644 +--- a/src/tools/imgur/imguruploader.cpp ++++ b/src/tools/imgur/imguruploader.cpp +@@ -72,10 +72,10 @@ void ImgurUploader::handleReply(QNetworkReply *reply) { + if (reply->error() == QNetworkReply::NoError) { + QJsonDocument response = QJsonDocument::fromJson(reply->readAll()); + QJsonObject json = response.object(); +- QJsonObject data = json["data"].toObject(); +- m_imageURL.setUrl(data["link"].toString()); +- m_deleteImageURL.setUrl(QString("https://imgur.com/delete/%1").arg( +- data["deletehash"].toString())); ++ QJsonObject data = json[QStringLiteral("data")].toObject(); ++ m_imageURL.setUrl(data[QStringLiteral("link")].toString()); ++ m_deleteImageURL.setUrl(QStringLiteral("https://imgur.com/delete/%1").arg( ++ data[QStringLiteral("deletehash")].toString())); + onUploadOk(); + } else { + m_infoLabel->setText(reply->errorString()); +@@ -101,16 +101,16 @@ void ImgurUploader::upload() { + m_pixmap.save(&buffer, "PNG"); + + QUrlQuery urlQuery; +- urlQuery.addQueryItem("title", "flameshot_screenshot"); ++ urlQuery.addQueryItem(QStringLiteral("title"), QStringLiteral("flameshot_screenshot")); + QString description = FileNameHandler().parsedPattern(); +- urlQuery.addQueryItem("description", description); ++ urlQuery.addQueryItem(QStringLiteral("description"), description); + +- QUrl url("https://api.imgur.com/3/image"); ++ QUrl url(QStringLiteral("https://api.imgur.com/3/image")); + url.setQuery(urlQuery); + QNetworkRequest request(url); + request.setHeader(QNetworkRequest::ContentTypeHeader, + "application/application/x-www-form-urlencoded"); +- request.setRawHeader("Authorization", QString("Client-ID %1").arg(IMGUR_CLIENT_ID).toUtf8()); ++ request.setRawHeader("Authorization", QStringLiteral("Client-ID %1").arg(IMGUR_CLIENT_ID).toUtf8()); + + m_NetworkAM->post(request, byteArray); + } +diff --git a/src/tools/imgur/imguruploadertool.cpp b/src/tools/imgur/imguruploadertool.cpp +index 428e3db..86e0cc2 100644 +--- a/src/tools/imgur/imguruploadertool.cpp ++++ b/src/tools/imgur/imguruploadertool.cpp +@@ -36,7 +36,7 @@ QString ImgurUploaderTool::name() const { + } + + QString ImgurUploaderTool::nameID() { +- return ""; ++ return QLatin1String(""); + } + + QString ImgurUploaderTool::description() const { +diff --git a/src/tools/launcher/applaunchertool.cpp b/src/tools/launcher/applaunchertool.cpp +index 15c4b99..b47bb72 100644 +--- a/src/tools/launcher/applaunchertool.cpp ++++ b/src/tools/launcher/applaunchertool.cpp +@@ -35,7 +35,7 @@ QString AppLauncher::name() const { + } + + QString AppLauncher::nameID() { +- return ""; ++ return QLatin1String(""); + } + + QString AppLauncher::description() const { +diff --git a/src/tools/launcher/applauncherwidget.cpp b/src/tools/launcher/applauncherwidget.cpp +index 9edccae..6902cfa 100644 +--- a/src/tools/launcher/applauncherwidget.cpp ++++ b/src/tools/launcher/applauncherwidget.cpp +@@ -61,7 +61,7 @@ AppLauncherWidget::AppLauncherWidget(const QPixmap &p, QWidget *parent): + QDir appsDirLocal(dirLocal); + m_parser.processDirectory(appsDirLocal); + +- QString dir = "/usr/share/applications/"; ++ QString dir = QStringLiteral("/usr/share/applications/"); + QDir appsDir(dir); + m_parser.processDirectory(appsDir); + +@@ -173,9 +173,9 @@ void AppLauncherWidget::initListWidget() { + const QVector &appList = m_appsMap[cat]; + addAppsToListWidget(itemsWidget, appList); + +- m_tabWidget->addTab(itemsWidget, QIcon::fromTheme(iconName), ""); ++ m_tabWidget->addTab(itemsWidget, QIcon::fromTheme(iconName), QLatin1String("")); + m_tabWidget->setTabToolTip(m_tabWidget->count(), cat); +- if (cat == "Graphics") { ++ if (cat == QLatin1String("Graphics")) { + m_tabWidget->setCurrentIndex(m_tabWidget->count() -1); + } + } +@@ -199,7 +199,7 @@ void AppLauncherWidget::initAppMap() { + // Unify multimedia. + QVector multimediaList; + QStringList multimediaNames; +- multimediaNames << "AudioVideo" << "Audio" << "Video"; ++ multimediaNames << QStringLiteral("AudioVideo") << QStringLiteral("Audio") << QStringLiteral("Video"); + for (const QString &name : multimediaNames) { + if(!m_appsMap.contains(name)) { + continue; +@@ -211,7 +211,7 @@ void AppLauncherWidget::initAppMap() { + } + m_appsMap.remove(name); + } +- m_appsMap.insert("Multimedia", multimediaList); ++ m_appsMap.insert(QStringLiteral("Multimedia"), multimediaList); + } + + void AppLauncherWidget::configureListView(QListWidget *widget) { +diff --git a/src/tools/line/linetool.cpp b/src/tools/line/linetool.cpp +index e1a1755..f69fb8c 100644 +--- a/src/tools/line/linetool.cpp ++++ b/src/tools/line/linetool.cpp +@@ -43,7 +43,7 @@ QString LineTool::name() const { + } + + QString LineTool::nameID() { +- return ""; ++ return QLatin1String(""); + } + + QString LineTool::description() const { +diff --git a/src/tools/marker/markertool.cpp b/src/tools/marker/markertool.cpp +index 42800b0..3a7e96e 100644 +--- a/src/tools/marker/markertool.cpp ++++ b/src/tools/marker/markertool.cpp +@@ -43,7 +43,7 @@ QString MarkerTool::name() const { + } + + QString MarkerTool::nameID() { +- return ""; ++ return QLatin1String(""); + } + + QString MarkerTool::description() const { +diff --git a/src/tools/move/movetool.cpp b/src/tools/move/movetool.cpp +index 08e902f..aa4fab6 100644 +--- a/src/tools/move/movetool.cpp ++++ b/src/tools/move/movetool.cpp +@@ -35,7 +35,7 @@ QString MoveTool::name() const { + } + + QString MoveTool::nameID() { +- return ""; ++ return QLatin1String(""); + } + + QString MoveTool::description() const { +diff --git a/src/tools/pencil/penciltool.cpp b/src/tools/pencil/penciltool.cpp +index 7b01c5b..0810a3b 100644 +--- a/src/tools/pencil/penciltool.cpp ++++ b/src/tools/pencil/penciltool.cpp +@@ -31,7 +31,7 @@ QString PencilTool::name() const { + } + + QString PencilTool::nameID() { +- return ""; ++ return QLatin1String(""); + } + + QString PencilTool::description() const { +diff --git a/src/tools/pin/pintool.cpp b/src/tools/pin/pintool.cpp +old mode 100755 +new mode 100644 +index f56c4ea..e5a5256 +--- a/src/tools/pin/pintool.cpp ++++ b/src/tools/pin/pintool.cpp +@@ -35,7 +35,7 @@ QString PinTool::name() const { + } + + QString PinTool::nameID() { +- return ""; ++ return QLatin1String(""); + } + + QString PinTool::description() const { +diff --git a/src/tools/rectangle/rectangletool.cpp b/src/tools/rectangle/rectangletool.cpp +index fa9c483..e36f43d 100644 +--- a/src/tools/rectangle/rectangletool.cpp ++++ b/src/tools/rectangle/rectangletool.cpp +@@ -35,7 +35,7 @@ QString RectangleTool::name() const { + } + + QString RectangleTool::nameID() { +- return ""; ++ return QLatin1String(""); + } + + QString RectangleTool::description() const { +diff --git a/src/tools/redo/redotool.cpp b/src/tools/redo/redotool.cpp +index ee8a8c0..8446f7b 100644 +--- a/src/tools/redo/redotool.cpp ++++ b/src/tools/redo/redotool.cpp +@@ -35,7 +35,7 @@ QString RedoTool::name() const { + } + + QString RedoTool::nameID() { +- return ""; ++ return QLatin1String(""); + } + + QString RedoTool::description() const { +diff --git a/src/tools/save/savetool.cpp b/src/tools/save/savetool.cpp +index ec7027f..3b7a83b 100644 +--- a/src/tools/save/savetool.cpp ++++ b/src/tools/save/savetool.cpp +@@ -36,7 +36,7 @@ QString SaveTool::name() const { + } + + QString SaveTool::nameID() { +- return ""; ++ return QLatin1String(""); + } + + QString SaveTool::description() const { +diff --git a/src/tools/selection/selectiontool.cpp b/src/tools/selection/selectiontool.cpp +index c1c4222..cc9cdfe 100644 +--- a/src/tools/selection/selectiontool.cpp ++++ b/src/tools/selection/selectiontool.cpp +@@ -39,7 +39,7 @@ QString SelectionTool::name() const { + } + + QString SelectionTool::nameID() { +- return ""; ++ return QLatin1String(""); + } + + QString SelectionTool::description() const { +diff --git a/src/tools/sizeindicator/sizeindicatortool.cpp b/src/tools/sizeindicator/sizeindicatortool.cpp +index 047f755..bae7661 100644 +--- a/src/tools/sizeindicator/sizeindicatortool.cpp ++++ b/src/tools/sizeindicator/sizeindicatortool.cpp +@@ -35,7 +35,7 @@ QString SizeIndicatorTool::name() const { + } + + QString SizeIndicatorTool::nameID() { +- return ""; ++ return QLatin1String(""); + } + + QString SizeIndicatorTool::description() const { +diff --git a/src/tools/text/textconfig.cpp b/src/tools/text/textconfig.cpp +index 357fa04..d7f455e 100644 +--- a/src/tools/text/textconfig.cpp ++++ b/src/tools/text/textconfig.cpp +@@ -42,28 +42,28 @@ TextConfig::TextConfig(QWidget *parent) : QWidget(parent) { + PathInfo::blackIconPath(); + + m_strikeOutButton = new QPushButton( +- QIcon(iconPrefix + "format_strikethrough.svg"), ""); ++ QIcon(iconPrefix + "format_strikethrough.svg"), QLatin1String("")); + m_strikeOutButton->setCheckable(true); + connect(m_strikeOutButton, &QPushButton::clicked, + this, &TextConfig::fontStrikeOutChanged); + m_strikeOutButton->setToolTip(tr("StrikeOut")); + + m_underlineButton = new QPushButton( +- QIcon(iconPrefix + "format_underlined.svg"), ""); ++ QIcon(iconPrefix + "format_underlined.svg"), QLatin1String("")); + m_underlineButton->setCheckable(true); + connect(m_underlineButton, &QPushButton::clicked, + this, &TextConfig::fontUnderlineChanged); + m_underlineButton->setToolTip(tr("Underline")); + + m_weightButton = new QPushButton( +- QIcon(iconPrefix + "format_bold.svg"), ""); ++ QIcon(iconPrefix + "format_bold.svg"), QLatin1String("")); + m_weightButton->setCheckable(true); + connect(m_weightButton, &QPushButton::clicked, + this, &TextConfig::weightButtonPressed); + m_weightButton->setToolTip(tr("Bold")); + + m_italicButton = new QPushButton( +- QIcon(iconPrefix + "format_italic.svg"), ""); ++ QIcon(iconPrefix + "format_italic.svg"), QLatin1String("")); + m_italicButton->setCheckable(true); + connect(m_italicButton, &QPushButton::clicked, + this, &TextConfig::fontItalicChanged); +diff --git a/src/tools/text/texttool.cpp b/src/tools/text/texttool.cpp +index 6688dc9..db4a541 100644 +--- a/src/tools/text/texttool.cpp ++++ b/src/tools/text/texttool.cpp +@@ -51,7 +51,7 @@ QString TextTool::name() const { + } + + QString TextTool::nameID() { +- return ""; ++ return QLatin1String(""); + } + + QString TextTool::description() const { +diff --git a/src/tools/text/textwidget.cpp b/src/tools/text/textwidget.cpp +index 100b4c7..a25085f 100644 +--- a/src/tools/text/textwidget.cpp ++++ b/src/tools/text/textwidget.cpp +@@ -18,7 +18,7 @@ + #include "textwidget.h" + + TextWidget::TextWidget(QWidget *parent) : QTextEdit(parent) { +- setStyleSheet("TextWidget { background: transparent; }"); ++ setStyleSheet(QStringLiteral("TextWidget { background: transparent; }")); + connect(this, &TextWidget::textChanged, + this, &TextWidget::adjustSize); + connect(this, &TextWidget::textChanged, +@@ -61,7 +61,7 @@ void TextWidget::setFontPointSize(qreal s) { + } + + void TextWidget::setTextColor(const QColor &c) { +- QString s("TextWidget { background: transparent; color: %1; }"); ++ QString s(QStringLiteral("TextWidget { background: transparent; color: %1; }")); + setStyleSheet(s.arg(c.name())); + } + +diff --git a/src/tools/undo/undotool.cpp b/src/tools/undo/undotool.cpp +index 1d1d791..71e6224 100644 +--- a/src/tools/undo/undotool.cpp ++++ b/src/tools/undo/undotool.cpp +@@ -35,7 +35,7 @@ QString UndoTool::name() const { + } + + QString UndoTool::nameID() { +- return ""; ++ return QLatin1String(""); + } + + QString UndoTool::description() const { +diff --git a/src/utils/confighandler.cpp b/src/utils/confighandler.cpp +index 6eef22a..a30c412 100644 +--- a/src/utils/confighandler.cpp ++++ b/src/utils/confighandler.cpp +@@ -27,13 +27,13 @@ ConfigHandler::ConfigHandler(){ + + QVector ConfigHandler::getButtons() { + QVector buttons; +- if (m_settings.contains("buttons")) { ++ if (m_settings.contains(QStringLiteral("buttons"))) { + // TODO: remove toList in v1.0 + QVector buttonsInt = +- m_settings.value("buttons").value >().toVector(); ++ m_settings.value(QStringLiteral("buttons")).value >().toVector(); + bool modified = normalizeButtons(buttonsInt); + if (modified) { +- m_settings.setValue("buttons", QVariant::fromValue(buttonsInt.toList())); ++ m_settings.setValue(QStringLiteral("buttons"), QVariant::fromValue(buttonsInt.toList())); + } + buttons = fromIntToButton(buttonsInt); + } else { +@@ -69,7 +69,7 @@ void ConfigHandler::setButtons(const QVector &buttons + QVector l = fromButtonToInt(buttons); + normalizeButtons(l); + // TODO: remove toList in v1.0 +- m_settings.setValue("buttons", QVariant::fromValue(l.toList())); ++ m_settings.setValue(QStringLiteral("buttons"), QVariant::fromValue(l.toList())); + } + + QVector ConfigHandler::getUserColors() { +@@ -86,8 +86,8 @@ QVector ConfigHandler::getUserColors() { + Qt::darkMagenta + }; + +- if (m_settings.contains("userColors")) { +- for (const QString &hex : m_settings.value("userColors").toStringList()) { ++ if (m_settings.contains(QStringLiteral("userColors"))) { ++ for (const QString &hex : m_settings.value(QStringLiteral("userColors")).toStringList()) { + if (QColor::isValidColor(hex)) { + colors.append(QColor(hex)); + } +@@ -110,22 +110,22 @@ void ConfigHandler::setUserColors(const QVector &l) { + hexColors.append(color.name()); + } + +- m_settings.setValue("userColors", QVariant::fromValue(hexColors)); ++ m_settings.setValue(QStringLiteral("userColors"), QVariant::fromValue(hexColors)); + } + + QString ConfigHandler::savePathValue() { +- return m_settings.value("savePath").toString(); ++ return m_settings.value(QStringLiteral("savePath")).toString(); + } + + void ConfigHandler::setSavePath(const QString &savePath) { +- m_settings.setValue("savePath", savePath); ++ m_settings.setValue(QStringLiteral("savePath"), savePath); + } + + QColor ConfigHandler::uiMainColorValue() { + QColor res = QColor(116, 0, 150); + +- if (m_settings.contains("uiColor")) { +- QString hex = m_settings.value("uiColor").toString(); ++ if (m_settings.contains(QStringLiteral("uiColor"))) { ++ QString hex = m_settings.value(QStringLiteral("uiColor")).toString(); + + if (QColor::isValidColor(hex)) { + res = QColor(hex); +@@ -135,14 +135,14 @@ QColor ConfigHandler::uiMainColorValue() { + } + + void ConfigHandler::setUIMainColor(const QColor &c) { +- m_settings.setValue("uiColor", c.name()); ++ m_settings.setValue(QStringLiteral("uiColor"), c.name()); + } + + QColor ConfigHandler::uiContrastColorValue() { + QColor res = QColor(86, 0, 120); + +- if (m_settings.contains("contastUiColor")) { +- QString hex = m_settings.value("contastUiColor").toString(); ++ if (m_settings.contains(QStringLiteral("contastUiColor"))) { ++ QString hex = m_settings.value(QStringLiteral("contastUiColor")).toString(); + + if (QColor::isValidColor(hex)) { + res = QColor(hex); +@@ -153,14 +153,14 @@ QColor ConfigHandler::uiContrastColorValue() { + } + + void ConfigHandler::setUIContrastColor(const QColor &c) { +- m_settings.setValue("contastUiColor", c.name()); ++ m_settings.setValue(QStringLiteral("contastUiColor"), c.name()); + } + + QColor ConfigHandler::drawColorValue() { + QColor res(Qt::red); + +- if (m_settings.contains("drawColor")) { +- QString hex = m_settings.value("drawColor").toString(); ++ if (m_settings.contains(QStringLiteral("drawColor"))) { ++ QString hex = m_settings.value(QStringLiteral("drawColor")).toString(); + + if (QColor::isValidColor(hex)) { + res = QColor(hex); +@@ -171,71 +171,71 @@ QColor ConfigHandler::drawColorValue() { + } + + void ConfigHandler::setDrawColor(const QColor &c) { +- m_settings.setValue("drawColor", c.name()); ++ m_settings.setValue(QStringLiteral("drawColor"), c.name()); + } + + bool ConfigHandler::showHelpValue() { + bool res = true; +- if (m_settings.contains("showHelp")) { +- res = m_settings.value("showHelp").toBool(); ++ if (m_settings.contains(QStringLiteral("showHelp"))) { ++ res = m_settings.value(QStringLiteral("showHelp")).toBool(); + } + return res; + } + + void ConfigHandler::setShowHelp(const bool showHelp) { +- m_settings.setValue("showHelp", showHelp); ++ m_settings.setValue(QStringLiteral("showHelp"), showHelp); + } + + bool ConfigHandler::desktopNotificationValue() { + bool res = true; +- if (m_settings.contains("showDesktopNotification")) { +- res = m_settings.value("showDesktopNotification").toBool(); ++ if (m_settings.contains(QStringLiteral("showDesktopNotification"))) { ++ res = m_settings.value(QStringLiteral("showDesktopNotification")).toBool(); + } + return res; + } + + void ConfigHandler::setDesktopNotification(const bool showDesktopNotification) { +- m_settings.setValue("showDesktopNotification", showDesktopNotification); ++ m_settings.setValue(QStringLiteral("showDesktopNotification"), showDesktopNotification); + } + + QString ConfigHandler::filenamePatternValue() { +- return m_settings.value("filenamePattern").toString(); ++ return m_settings.value(QStringLiteral("filenamePattern")).toString(); + } + + void ConfigHandler::setFilenamePattern(const QString &pattern) { +- return m_settings.setValue("filenamePattern", pattern); ++ return m_settings.setValue(QStringLiteral("filenamePattern"), pattern); + } + + bool ConfigHandler::disabledTrayIconValue() { + bool res = false; +- if (m_settings.contains("disabledTrayIcon")) { +- res = m_settings.value("disabledTrayIcon").toBool(); ++ if (m_settings.contains(QStringLiteral("disabledTrayIcon"))) { ++ res = m_settings.value(QStringLiteral("disabledTrayIcon")).toBool(); + } + return res; + } + + void ConfigHandler::setDisabledTrayIcon(const bool disabledTrayIcon) { +- m_settings.setValue("disabledTrayIcon", disabledTrayIcon); ++ m_settings.setValue(QStringLiteral("disabledTrayIcon"), disabledTrayIcon); + } + + int ConfigHandler::drawThicknessValue() { + int res = 0; +- if (m_settings.contains("drawThickness")) { +- res = m_settings.value("drawThickness").toInt(); ++ if (m_settings.contains(QStringLiteral("drawThickness"))) { ++ res = m_settings.value(QStringLiteral("drawThickness")).toInt(); + } + return res; + } + + void ConfigHandler::setdrawThickness(const int thickness) { +- m_settings.setValue("drawThickness", thickness); ++ m_settings.setValue(QStringLiteral("drawThickness"), thickness); + } + + bool ConfigHandler::keepOpenAppLauncherValue() { +- return m_settings.value("keepOpenAppLauncher").toBool(); ++ return m_settings.value(QStringLiteral("keepOpenAppLauncher")).toBool(); + } + + void ConfigHandler::setKeepOpenAppLauncher(const bool keepOpen) { +- m_settings.setValue("keepOpenAppLauncher", keepOpen); ++ m_settings.setValue(QStringLiteral("keepOpenAppLauncher"), keepOpen); + } + + bool ConfigHandler::startupLaunchValue() { +@@ -283,15 +283,15 @@ void ConfigHandler::setStartupLaunch(const bool start) { + + int ConfigHandler::contrastOpacityValue() { + int opacity = 190; +- if (m_settings.contains("contrastOpacity")) { +- opacity = m_settings.value("contrastOpacity").toInt(); ++ if (m_settings.contains(QStringLiteral("contrastOpacity"))) { ++ opacity = m_settings.value(QStringLiteral("contrastOpacity")).toInt(); + opacity = qBound(0, opacity, 255); + } + return opacity; + } + + void ConfigHandler::setContrastOpacity(const int transparency) { +- m_settings.setValue("contrastOpacity", transparency); ++ m_settings.setValue(QStringLiteral("contrastOpacity"), transparency); + } + + void ConfigHandler::setDefaults() { +@@ -305,7 +305,7 @@ void ConfigHandler::setAllTheButtons() { + buttons << static_cast(t); + } + // TODO: remove toList in v1.0 +- m_settings.setValue("buttons", QVariant::fromValue(buttons.toList())); ++ m_settings.setValue(QStringLiteral("buttons"), QVariant::fromValue(buttons.toList())); + } + + QString ConfigHandler::configFilePath() const { +diff --git a/src/utils/dbusutils.cpp b/src/utils/dbusutils.cpp +index d9bb640..87b3c65 100644 +--- a/src/utils/dbusutils.cpp ++++ b/src/utils/dbusutils.cpp +@@ -27,13 +27,13 @@ DBusUtils::DBusUtils(QObject *parent) : QObject(parent) { + void DBusUtils::connectPrintCapture(QDBusConnection &session, uint id) { + m_id = id; + // captureTaken +- session.connect("org.dharkael.Flameshot", +- "/", "", "captureTaken", ++ session.connect(QStringLiteral("org.dharkael.Flameshot"), ++ QStringLiteral("/"), QLatin1String(""), QStringLiteral("captureTaken"), + this, + SLOT(captureTaken(uint, QByteArray))); + // captureFailed +- session.connect("org.dharkael.Flameshot", +- "/", "", "captureFailed", ++ session.connect(QStringLiteral("org.dharkael.Flameshot"), ++ QStringLiteral("/"), QLatin1String(""), QStringLiteral("captureFailed"), + this, + SLOT(captureFailed(uint))); + } +diff --git a/src/utils/desktopfileparse.cpp b/src/utils/desktopfileparse.cpp +index 8a5e986..e939753 100644 +--- a/src/utils/desktopfileparse.cpp ++++ b/src/utils/desktopfileparse.cpp +@@ -30,7 +30,7 @@ DesktopFileParser::DesktopFileParser() { + m_localeNameShort = QStringLiteral("Name[%1]").arg(localeShort); + m_localeDescriptionShort = QStringLiteral("Comment[%1]") + .arg(localeShort); +- m_defaultIcon = QIcon::fromTheme("application-x-executable"); ++ m_defaultIcon = QIcon::fromTheme(QStringLiteral("application-x-executable")); + } + + DesktopAppData DesktopFileParser::parseDesktopFile( +@@ -48,62 +48,62 @@ DesktopAppData DesktopFileParser::parseDesktopFile( + bool isApplication = false; + QTextStream in(&file); + // enter the desktop entry definition +- while (!in.atEnd() && in.readLine() != "[Desktop Entry]") { ++ while (!in.atEnd() && in.readLine() != QLatin1String("[Desktop Entry]")) { + } + // start parsing + while (!in.atEnd()) { + QString line = in.readLine(); +- if (line.startsWith("Icon")) { ++ if (line.startsWith(QLatin1String("Icon"))) { + res.icon = QIcon::fromTheme( +- line.mid(line.indexOf("=")+1).trimmed(), ++ line.mid(line.indexOf(QLatin1String("="))+1).trimmed(), + m_defaultIcon); + } +- else if (!nameLocaleSet && line.startsWith("Name")) { ++ else if (!nameLocaleSet && line.startsWith(QLatin1String("Name"))) { + if (line.startsWith(m_localeName) || + line.startsWith(m_localeNameShort)) + { +- res.name = line.mid(line.indexOf("=")+1).trimmed(); ++ res.name = line.mid(line.indexOf(QLatin1String("="))+1).trimmed(); + nameLocaleSet = true; +- } else if (line.startsWith("Name=")) { +- res.name = line.mid(line.indexOf("=")+1).trimmed(); ++ } else if (line.startsWith(QLatin1String("Name="))) { ++ res.name = line.mid(line.indexOf(QLatin1String("="))+1).trimmed(); + } + } +- else if (!descriptionLocaleSet && line.startsWith("Comment")) { ++ else if (!descriptionLocaleSet && line.startsWith(QLatin1String("Comment"))) { + if (line.startsWith(m_localeDescription) || + line.startsWith(m_localeDescriptionShort)) + { +- res.description = line.mid(line.indexOf("=")+1).trimmed(); ++ res.description = line.mid(line.indexOf(QLatin1String("="))+1).trimmed(); + descriptionLocaleSet = true; +- } else if (line.startsWith("Comment=")) { +- res.description = line.mid(line.indexOf("=")+1).trimmed(); ++ } else if (line.startsWith(QLatin1String("Comment="))) { ++ res.description = line.mid(line.indexOf(QLatin1String("="))+1).trimmed(); + } + } +- else if (line.startsWith("Exec")) { +- if (line.contains("%")) { +- res.exec = line.mid(line.indexOf("=")+1) ++ else if (line.startsWith(QLatin1String("Exec"))) { ++ if (line.contains(QLatin1String("%"))) { ++ res.exec = line.mid(line.indexOf(QLatin1String("="))+1) + .trimmed(); + } else { + ok = false; + break; + } + } +- else if (line.startsWith("Type")) { +- if (line.contains("Application")) { ++ else if (line.startsWith(QLatin1String("Type"))) { ++ if (line.contains(QLatin1String("Application"))) { + isApplication = true; + } + } +- else if (line.startsWith("Categories")) { +- res.categories = line.mid(line.indexOf("=")+1).split(";"); ++ else if (line.startsWith(QLatin1String("Categories"))) { ++ res.categories = line.mid(line.indexOf(QLatin1String("="))+1).split(QStringLiteral(";")); + } +- else if (line == "NoDisplay=true") { ++ else if (line == QLatin1String("NoDisplay=true")) { + ok = false; + break; + } +- else if (line == "Terminal=true") { ++ else if (line == QLatin1String("Terminal=true")) { + res.showInTerminal = true; + } + // ignore the other entries +- else if (line.startsWith("[")) { ++ else if (line.startsWith(QLatin1String("["))) { + break; + } + } +diff --git a/src/utils/desktopinfo.cpp b/src/utils/desktopinfo.cpp +index 4751164..f306bc5 100644 +--- a/src/utils/desktopinfo.cpp ++++ b/src/utils/desktopinfo.cpp +@@ -20,26 +20,26 @@ + + DesktopInfo::DesktopInfo() { + auto e = QProcessEnvironment::systemEnvironment(); +- XDG_CURRENT_DESKTOP = e.value("XDG_CURRENT_DESKTOP"); +- XDG_SESSION_TYPE = e.value("XDG_SESSION_TYPE"); +- WAYLAND_DISPLAY = e.value("WAYLAND_DISPLAY"); +- KDE_FULL_SESSION = e.value("KDE_FULL_SESSION"); +- GNOME_DESKTOP_SESSION_ID = e.value("GNOME_DESKTOP_SESSION_ID"); +- DESKTOP_SESSION = e.value("DESKTOP_SESSION"); ++ XDG_CURRENT_DESKTOP = e.value(QStringLiteral("XDG_CURRENT_DESKTOP")); ++ XDG_SESSION_TYPE = e.value(QStringLiteral("XDG_SESSION_TYPE")); ++ WAYLAND_DISPLAY = e.value(QStringLiteral("WAYLAND_DISPLAY")); ++ KDE_FULL_SESSION = e.value(QStringLiteral("KDE_FULL_SESSION")); ++ GNOME_DESKTOP_SESSION_ID = e.value(QStringLiteral("GNOME_DESKTOP_SESSION_ID")); ++ DESKTOP_SESSION = e.value(QStringLiteral("DESKTOP_SESSION")); + } + + bool DesktopInfo::waylandDectected() { +- return XDG_SESSION_TYPE == "wayland" || +- WAYLAND_DISPLAY.contains("wayland", Qt::CaseInsensitive); ++ return XDG_SESSION_TYPE == QLatin1String("wayland") || ++ WAYLAND_DISPLAY.contains(QLatin1String("wayland"), Qt::CaseInsensitive); + } + + DesktopInfo::WM DesktopInfo::windowManager() { + DesktopInfo::WM res = DesktopInfo::OTHER; +- if (XDG_CURRENT_DESKTOP.contains("GNOME", Qt::CaseInsensitive) || ++ if (XDG_CURRENT_DESKTOP.contains(QLatin1String("GNOME"), Qt::CaseInsensitive) || + !GNOME_DESKTOP_SESSION_ID.isEmpty()) + { + res = DesktopInfo::GNOME; +- } else if (!KDE_FULL_SESSION.isEmpty() || DESKTOP_SESSION == "kde-plasma") { ++ } else if (!KDE_FULL_SESSION.isEmpty() || DESKTOP_SESSION == QLatin1String("kde-plasma")) { + res = DesktopInfo::KDE; + } + return res; +diff --git a/src/utils/filenamehandler.cpp b/src/utils/filenamehandler.cpp +index d31bcfd..f2f5259 100644 +--- a/src/utils/filenamehandler.cpp ++++ b/src/utils/filenamehandler.cpp +@@ -33,7 +33,7 @@ QString FileNameHandler::parsedPattern() { + QString FileNameHandler::parseFilename(const QString &name) { + QString res = name; + if (name.isEmpty()) { +- res = "%F_%H-%M"; ++ res = QLatin1String("%F_%H-%M"); + } + std::time_t t = std::time(NULL); + +@@ -45,7 +45,7 @@ QString FileNameHandler::parseFilename(const QString &name) { + free(tempData); + + // add the parsed pattern in a correct format for the filesystem +- res = res.replace("/", "⁄").replace(":", "-"); ++ res = res.replace(QLatin1String("/"), QStringLiteral("⁄")).replace(QLatin1String(":"), QLatin1String("-")); + return res; + } + +@@ -87,14 +87,14 @@ char * FileNameHandler::QStringTocharArr(const QString &s) { + + void FileNameHandler::fixPath(QString &directory, QString &filename) { + // add '/' at the end of the directory +- if (!directory.endsWith("/")) { +- directory += "/"; ++ if (!directory.endsWith(QLatin1String("/"))) { ++ directory += QLatin1String("/"); + } + // add numeration in case of repeated filename in the directory + // find unused name adding _n where n is a number + QFileInfo checkFile(directory + filename + ".png"); + if (checkFile.exists()) { +- filename += "_"; ++ filename += QLatin1String("_"); + int i = 1; + while (true) { + checkFile.setFile( +diff --git a/src/utils/pathinfo.cpp b/src/utils/pathinfo.cpp +index a8bbaa5..5d2cb2a 100644 +--- a/src/utils/pathinfo.cpp ++++ b/src/utils/pathinfo.cpp +@@ -21,11 +21,11 @@ + #include + + const QString PathInfo::whiteIconPath() { +- return ":/img/material/white/"; ++ return QStringLiteral(":/img/material/white/"); + } + + const QString PathInfo::blackIconPath() { +- return ":/img/material/black/"; ++ return QStringLiteral(":/img/material/black/"); + } + + QStringList PathInfo::translationsPaths() { +@@ -34,10 +34,10 @@ QStringList PathInfo::translationsPaths() { + QString trPath = QDir::toNativeSeparators(binaryPath + "/translations") ; + #if defined(Q_OS_LINUX) || defined(Q_OS_UNIX) + return QStringList() +- << QString(APP_PREFIX) + "/share/flameshot/translations" ++ << QStringLiteral(APP_PREFIX) + "/share/flameshot/translations" + << trPath +- << "/usr/share/flameshot/translations" +- << "/usr/local/share/flameshot/translations"; ++ << QStringLiteral("/usr/share/flameshot/translations") ++ << QStringLiteral("/usr/local/share/flameshot/translations"); + #elif defined(Q_OS_WIN) + return QStringList() + << trPath; +diff --git a/src/utils/screengrabber.cpp b/src/utils/screengrabber.cpp +index 4480195..90a83f3 100644 +--- a/src/utils/screengrabber.cpp ++++ b/src/utils/screengrabber.cpp +@@ -47,7 +47,7 @@ QPixmap ScreenGrabber::grabEntireDesktop(bool &ok) { + QDBusInterface gnomeInterface(QStringLiteral("org.gnome.Shell"), + QStringLiteral("/org/gnome/Shell/Screenshot"), + QStringLiteral("org.gnome.Shell.Screenshot")); +- QDBusReply reply = gnomeInterface.call("Screenshot", false, false, path); ++ QDBusReply reply = gnomeInterface.call(QStringLiteral("Screenshot"), false, false, path); + if (reply.value()) { + res = QPixmap(path); + QFile dbusResult(path); +@@ -61,7 +61,7 @@ QPixmap ScreenGrabber::grabEntireDesktop(bool &ok) { + QDBusInterface kwinInterface(QStringLiteral("org.kde.KWin"), + QStringLiteral("/Screenshot"), + QStringLiteral("org.kde.kwin.Screenshot")); +- QDBusReply reply = kwinInterface.call("screenshotFullscreen"); ++ QDBusReply reply = kwinInterface.call(QStringLiteral("screenshotFullscreen")); + res = QPixmap(reply.value()); + if (!res.isNull()) { + QFile dbusResult(reply.value()); +diff --git a/src/utils/screenshotsaver.cpp b/src/utils/screenshotsaver.cpp +index 3c5cb6e..5ac5bad 100644 +--- a/src/utils/screenshotsaver.cpp ++++ b/src/utils/screenshotsaver.cpp +@@ -38,7 +38,7 @@ bool ScreenshotSaver::saveToFilesystem(const QPixmap &capture, + const QString &path) + { + QString completePath = FileNameHandler().generateAbsolutePath(path); +- completePath += ".png"; ++ completePath += QLatin1String(".png"); + bool ok = capture.save(completePath); + QString saveMessage; + +@@ -66,14 +66,14 @@ bool ScreenshotSaver::saveToFilesystemGUI(const QPixmap &capture) { + break; + } + +- if (!savePath.endsWith(".png")) { +- savePath += ".png"; ++ if (!savePath.endsWith(QLatin1String(".png"))) { ++ savePath += QLatin1String(".png"); + } + + ok = capture.save(savePath); + + if (ok) { +- QString pathNoFile = savePath.left(savePath.lastIndexOf("/")); ++ QString pathNoFile = savePath.left(savePath.lastIndexOf(QLatin1String("/"))); + ConfigHandler().setSavePath(pathNoFile); + QString msg = QObject::tr("Capture saved as ") + savePath; + SystemNotification().sendMessage(msg); +diff --git a/src/utils/systemnotification.cpp b/src/utils/systemnotification.cpp +index ac92f6f..c35a457 100644 +--- a/src/utils/systemnotification.cpp ++++ b/src/utils/systemnotification.cpp +@@ -47,7 +47,7 @@ void SystemNotification::sendMessage( + << QStringList() //actions + << QVariantMap() //hints + << timeout; //timeout +- m_interface->callWithArgumentList(QDBus::AutoDetect, "Notify", args); ++ m_interface->callWithArgumentList(QDBus::AutoDetect, QStringLiteral("Notify"), args); + #else + auto c = Controller::getInstance(); + c->sendTrayNotification(text, title, timeout); +diff --git a/src/widgets/capture/capturebutton.cpp b/src/widgets/capture/capturebutton.cpp +index 6d2af48..71022dd 100644 +--- a/src/widgets/capture/capturebutton.cpp ++++ b/src/widgets/capture/capturebutton.cpp +@@ -129,7 +129,7 @@ void CaptureButton::animatedShow() { + if(!isVisible()) { + show(); + m_emergeAnimation->start(); +- connect(m_emergeAnimation, &QPropertyAnimation::finished, this, [this](){ ++ connect(m_emergeAnimation, &QPropertyAnimation::finished, this, [](){ + }); + } + } +diff --git a/src/widgets/capture/notifierbox.cpp b/src/widgets/capture/notifierbox.cpp +index a060267..fbd43c9 100644 +--- a/src/widgets/capture/notifierbox.cpp ++++ b/src/widgets/capture/notifierbox.cpp +@@ -63,5 +63,5 @@ void NotifierBox::showMessage(const QString &msg) { + + void NotifierBox::showColor(const QColor &color) { + Q_UNUSED(color); +- m_message = ""; ++ m_message = QLatin1String(""); + } +diff --git a/src/widgets/infowindow.cpp b/src/widgets/infowindow.cpp +index 2860047..b39fe29 100644 +--- a/src/widgets/infowindow.cpp ++++ b/src/widgets/infowindow.cpp +@@ -121,7 +121,7 @@ void InfoWindow::initLabels() { + QLabel *licenseTitleLabel = new QLabel(tr("License"), this); + licenseTitleLabel->setAlignment(Qt::AlignHCenter); + m_layout->addWidget(licenseTitleLabel); +- QLabel *licenseLabel = new QLabel("GPLv3+", this); ++ QLabel *licenseLabel = new QLabel(QStringLiteral("GPLv3+"), this); + licenseLabel->setAlignment(Qt::AlignHCenter); + m_layout->addWidget(licenseLabel); + m_layout->addStretch(); +@@ -129,7 +129,7 @@ void InfoWindow::initLabels() { + QLabel *versionTitleLabel = new QLabel(tr("Version"), this); + versionTitleLabel->setAlignment(Qt::AlignHCenter); + m_layout->addWidget(versionTitleLabel); +- QString versionMsg = "Flameshot " + QString(APP_VERSION) + "\nCompiled with Qt " ++ QString versionMsg = "Flameshot " + QStringLiteral(APP_VERSION) + "\nCompiled with Qt " + + QT_VERSION_STR; + QLabel *versionLabel = new QLabel(versionMsg, this); + versionLabel->setAlignment(Qt::AlignHCenter); +diff --git a/src/widgets/loadspinner.cpp b/src/widgets/loadspinner.cpp +index 44478ad..470d813 100644 +--- a/src/widgets/loadspinner.cpp ++++ b/src/widgets/loadspinner.cpp +@@ -32,7 +32,7 @@ LoadSpinner::LoadSpinner(QWidget *parent) : + updateFrame(); + // init timer + m_timer = new QTimer(this); +- connect(m_timer, SIGNAL(timeout()), this, SLOT(rotate())); ++ connect(m_timer, &QTimer::timeout, this, &LoadSpinner::rotate); + m_timer->setInterval(30); + } + +diff --git a/src/widgets/panel/sidepanelwidget.cpp b/src/widgets/panel/sidepanelwidget.cpp +index 47cbc88..f807296 100644 +--- a/src/widgets/panel/sidepanelwidget.cpp ++++ b/src/widgets/panel/sidepanelwidget.cpp +@@ -78,7 +78,7 @@ SidePanelWidget::SidePanelWidget(QPixmap *p, QWidget *parent) : + QString modifier = isDark ? PathInfo::whiteIconPath() : + PathInfo::blackIconPath(); + QIcon grabIcon(modifier + "colorize.svg"); +- m_colorGrabButton = new QPushButton(grabIcon, ""); ++ m_colorGrabButton = new QPushButton(grabIcon, QLatin1String("")); + updateGrabButton(false); + connect(m_colorGrabButton, &QPushButton::pressed, + this, &SidePanelWidget::colorGrabberActivated); +@@ -96,7 +96,7 @@ SidePanelWidget::SidePanelWidget(QPixmap *p, QWidget *parent) : + void SidePanelWidget::updateColor(const QColor &c) { + m_color = c; + m_colorLabel->setStyleSheet( +- QString("QLabel { background-color : %1; }").arg(c.name())); ++ QStringLiteral("QLabel { background-color : %1; }").arg(c.name())); + m_colorWheel->setColor(m_color); + } + +@@ -109,7 +109,7 @@ void SidePanelWidget::updateThickness(const int &t) + void SidePanelWidget::updateColorNoWheel(const QColor &c) { + m_color = c; + m_colorLabel->setStyleSheet( +- QString("QLabel { background-color : %1; }").arg(c.name())); ++ QStringLiteral("QLabel { background-color : %1; }").arg(c.name())); + } + + void SidePanelWidget::updateCurrentThickness() +diff --git a/src/widgets/panel/utilitypanel.cpp b/src/widgets/panel/utilitypanel.cpp +index 48b4a7a..a17fe9d 100644 +--- a/src/widgets/panel/utilitypanel.cpp ++++ b/src/widgets/panel/utilitypanel.cpp +@@ -98,7 +98,7 @@ void UtilityPanel::initInternalPanel() { + + QColor bgColor = palette().background().color(); + bgColor.setAlphaF(0.0); +- m_internalPanel->setStyleSheet(QString("QScrollArea {background-color: %1}") ++ m_internalPanel->setStyleSheet(QStringLiteral("QScrollArea {background-color: %1}") + .arg(bgColor.name())); + m_internalPanel->hide(); + } diff -Nru flameshot-0.6.0/debian/patches/0018-fix-broken-link-392.patch flameshot-0.6.0/debian/patches/0018-fix-broken-link-392.patch --- flameshot-0.6.0/debian/patches/0018-fix-broken-link-392.patch 1970-01-01 00:00:00.000000000 +0000 +++ flameshot-0.6.0/debian/patches/0018-fix-broken-link-392.patch 2018-11-09 00:59:11.000000000 +0000 @@ -0,0 +1,23 @@ +From: in-in +Date: Mon, 5 Nov 2018 18:27:32 +0300 +Subject: fix broken link (#392) + +They moved Github organisation +https://github.com/voidlinux/void-packages +--- + README.md | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/README.md b/README.md +index 6afac6a..a7b63f3 100644 +--- a/README.md ++++ b/README.md +@@ -162,7 +162,7 @@ There are packages available for a few distros: + + Package for Debian 9 ("Stretch") also [available via stretch-backports](https://backports.debian.org/). + - [Ubuntu 18.04+](https://launchpad.net/ubuntu/+source/flameshot): `apt install flameshot` + - [openSUSE](https://software.opensuse.org/package/flameshot) +-- [Void Linux](https://github.com/voidlinux/void-packages/tree/master/srcpkgs/flameshot) (`xbps-install flameshot`) ++- [Void Linux](https://github.com/void-linux/void-packages/tree/master/srcpkgs/flameshot) (`xbps-install flameshot`) + - [Docker](https://github.com/ManuelLR/docker-flameshot) + - Fedora: `dnf install flameshot` + diff -Nru flameshot-0.6.0/debian/patches/flameshot.pro.patch flameshot-0.6.0/debian/patches/flameshot.pro.patch --- flameshot-0.6.0/debian/patches/flameshot.pro.patch 2018-08-26 15:00:00.000000000 +0000 +++ flameshot-0.6.0/debian/patches/flameshot.pro.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ ---- a/flameshot.pro -+++ b/flameshot_new.pro -@@ -43,7 +43,8 @@ - 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 -Nru flameshot-0.6.0/debian/patches/Internationalization_ja.ts.patch flameshot-0.6.0/debian/patches/Internationalization_ja.ts.patch --- flameshot-0.6.0/debian/patches/Internationalization_ja.ts.patch 2018-08-26 15:00:00.000000000 +0000 +++ flameshot-0.6.0/debian/patches/Internationalization_ja.ts.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,905 +0,0 @@ ---- /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) -+ 曜日 (mon) -+ -+ -+ -+ Day Name (monday) -+ 曜日 (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/series flameshot-0.6.0/debian/patches/series --- flameshot-0.6.0/debian/patches/series 2018-09-29 15:00:00.000000000 +0000 +++ flameshot-0.6.0/debian/patches/series 2018-11-09 00:59:11.000000000 +0000 @@ -4,5 +4,15 @@ 0004-flameshot.svg-Use-more-strict-grammar-to-fix-preview.patch 0005-Fix-311.patch 0006-Pin-Tool-Improve-adjustment-352.patch -Internationalization_ja.ts.patch -flameshot.pro.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 +0013-WIP-Add-line-thickness-to-side-panel-374.patch +0014-Add-Serbian-translation-376.patch +0015-Update-translation-files-to-match-375-380.patch +0016-Make-tools-English-tooltip-phrasing-consistent-375.patch +0017-Fix-some-issues-detected-by-Clazy-384.patch +0018-fix-broken-link-392.patch