From 41c1707cd01c17dbb22e3f26364cc0983ba935ca Mon Sep 17 00:00:00 2001 From: Kiroc Date: Wed, 22 May 2019 17:01:46 +0200 Subject: [PATCH 01/14] Update Internationalization_es.ts (#540) Fixed a typo. --- translations/Internationalization_es.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/Internationalization_es.ts b/translations/Internationalization_es.ts index 5056b5f5..1f65cf52 100644 --- a/translations/Internationalization_es.ts +++ b/translations/Internationalization_es.ts @@ -92,7 +92,7 @@ Press Space to open the side panel. Presiona Enter para capturar la pantalla. Presion Click Derecho para mostrar el selector de color. Usa la rueda del ratón para cambiar el grosor de la herramienta. -Presiona Espacion para abrir el panel lateral. +Presiona Espacio para abrir el panel lateral. From 807e240d6c5d836ea71d6b4abb368cae890d981c Mon Sep 17 00:00:00 2001 From: Daniel Chabrowski Date: Wed, 22 May 2019 17:04:44 +0200 Subject: [PATCH 02/14] Fix pragma once in globalvalues.h (#537) --- src/utils/globalvalues.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/utils/globalvalues.h b/src/utils/globalvalues.h index 46ea2e9a..656306bd 100644 --- a/src/utils/globalvalues.h +++ b/src/utils/globalvalues.h @@ -15,10 +15,7 @@ // You should have received a copy of the GNU General Public License // along with Flameshot. If not, see . -#define pragma once - -#include -#include "src/widgets/capture/capturebutton.h" +#pragma once namespace GlobalValues { From b0de17e647b2517c9ad90d3b15a7b634f9914e6b Mon Sep 17 00:00:00 2001 From: Jose Riha Date: Wed, 22 May 2019 17:12:34 +0200 Subject: [PATCH 03/14] Add Slovak translation (#525) --- flameshot.pro | 3 +- translations/Internationalization_sk.ts | 981 ++++++++++++++++++++++++ 2 files changed, 983 insertions(+), 1 deletion(-) create mode 100644 translations/Internationalization_sk.ts diff --git a/flameshot.pro b/flameshot.pro index e0740e54..84a2e65b 100644 --- a/flameshot.pro +++ b/flameshot.pro @@ -48,7 +48,8 @@ TRANSLATIONS = translations/Internationalization_es.ts \ translations/Internationalization_pt_br.ts \ translations/Internationalization_sr.ts \ translations/Internationalization_uk.ts \ - translations/Internationalization_de_DE.ts + translations/Internationalization_de_DE.ts \ + translations/Internationalization_sk.ts \ # Generate translations in build TRANSLATIONS_FILES = diff --git a/translations/Internationalization_sk.ts b/translations/Internationalization_sk.ts new file mode 100644 index 00000000..f099e085 --- /dev/null +++ b/translations/Internationalization_sk.ts @@ -0,0 +1,981 @@ + + + + + AppLauncher + + + App Launcher + Spúšťač aplikácií + + + + Choose an app to open the capture + Vyberte aplikáciu na otvorenie snímky obrazovky + + + + AppLauncherWidget + + + Open With + Otvoriť s + + + + Launch in terminal + Otvoriť v termináli + + + + Keep open after selection + Nechať otvorené po výbere + + + + + Error + Chyba + + + + Unable to write in + Zlyhal zápis do + + + + Unable to launch in terminal. + Nepodarilo sa spustiť v termináli. + + + + ArrowTool + + + Arrow + Šípka + + + + Set the Arrow as the paint tool + Nastaviť Šípku ako nástroj pre úpravy + + + + BlurTool + + + Blur + Rozmazanie + + + + Set Blur as the paint tool + Nastaviť Rozmazanie ako nástroj pre úpravy + + + + CaptureLauncher + + + <b>Capture Mode</b> + <b>Režim zachytávania</b> + + + + Rectangular Region + Pravouhlá oblasť + + + + Full Screen (All Monitors) + Celá obrazovka (všetky monitory) + + + + No Delay + Bez oneskorenia + + + + second + sekunda + + + + seconds + sekundy + + + + Take new screenshot + Urobiť novú snímku + + + + Area: + Oblasť: + + + + Delay: + Oneskorenie: + + + + CaptureWidget + + + Unable to capture screen + Nepodarilo sa zachytiť obrazovku + + + + 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. + Vyberte oblasť snímania pomocou myši alebo stlačte Esc pre ukončenie. +Stlačte Enter pre zachytenie obrazovky. +Kliknite pravým tlačidlom pre zobrazenie nástroja pre výber farby. +Použite kolečko myši pre zmenu hrúbky vybraného nástroja. +Stlačte medzerník pre otvorenie postranného panelu. + + + + CircleTool + + + Circle + Kruh + + + + Set the Circle as the paint tool + + + + + ConfigWindow + + + Configuration + Konfigurácia + + + + Interface + Interfejs + + + + Filename Editor + Editor názvov súborov + + + + General + Všeobecné + + + + Controller + + + &Take Screenshot + &Vytvoriť snímku + + + + &Open Launcher + + + + + &Configuration + &Konfigurácia + + + + &Information + &Informácie + + + + &Quit + &Ukončiť + + + + CopyTool + + + Copy + Kopírovať + + + + Copy the selection into the clipboard + Kopírovať výber do schránky + + + + DBusUtils + + + Unable to connect via DBus + Nie je možné pripojiť sa prostredníctvom DBus + + + + ExitTool + + + Exit + Ukončiť + + + + Leave the capture screen + Opustiť obrazovku so zachytávaním obrazovky + + + + FileNameEditor + + + Edit the name of your captures: + Upraviť meno vašich snímok obrazovky: + + + + Edit: + Upraviť: + + + + Preview: + Náhľad: + + + + Save + Uložiť + + + + Saves the pattern + Uloží vzor + + + + Reset + Resetovať + + + + Restores the saved pattern + Vráti zmeny + + + + Clear + Vyčistiť + + + + Deletes the name + Vymaže meno + + + + GeneneralConf + + + + Import + Importovať + + + + + + Error + Chyba + + + + Unable to read file. + Zlyhalo čítanie súboru. + + + + + Unable to write file. + Zlyhal zápis do súboru. + + + + Save File + Uložiť súbor + + + + Confirm Reset + Potvrdiť Reset + + + + Are you sure you want to reset the configuration? + Naozaj si želáte resetovať aktuálnu konfiguráciu? + + + + Show help message + Zobraziť nápovedu + + + + Show the help message at the beginning in the capture mode. + Zobraziť nápovedu na začiatku počas režimu zachytávania obrazovky. + + + + + Show desktop notifications + Zobraziť systémové upozornenia + + + + Show tray icon + Zobraziť stavovú ikonu + + + + Show the systemtray icon + Zobraziť ikonu v stavovej oblasti + + + + Configuration File + Súbor s konfiguráciou + + + + Export + Exportovať + + + + Reset + Resetovať + + + + Launch at startup + Spúšťať pri štarte + + + + Launch Flameshot + Spustiť Flameshot + + + + Close after capture + Zavrieť po vytvorení snímky + + + + Close after taking a screenshot + Zatvoriť po vytvorení snímky obrazovky + + + + ImgurUploader + + + Upload to Imgur + Nahrať na Imgur + + + + Uploading Image + Nahrávam obrázok + + + + Copy URL + Kopírovať URL + + + + Open URL + Otvoriť URL + + + + Delete image + Vymazať obrázok + + + + Image to Clipboard. + Obrázok do schránky. + + + + + Unable to open the URL. + Nepodarilo sa otvoriť URL. + + + + URL copied to clipboard. + URL skopírovaná do schránky. + + + + Screenshot copied to clipboard. + Snímka obrazovky bola skopírovaná do schránky. + + + + ImgurUploaderTool + + + Image Uploader + Uploader obrázkov + + + + Upload the selection to Imgur + Nahrať výber na Imgur + + + + InfoWindow + + + About + O programe + + + + SPACEBAR + MEDZERNÍK + + + + Right Click + Kliknutie pravým tlačidlom + + + + Mouse Wheel + Kolečko myši + + + + Move selection 1px + Presunúť výber o 1 px + + + + Resize selection 1px + Zmeniť rozmery výberu o 1 px + + + + Quit capture + Ukončiť zachytávanie obrazovky + + + + Copy to clipboard + Kopírovať do schránky + + + + Save selection as a file + Zapísať výber do súboru + + + + Undo the last modification + Vrátiť poslednú úpravu + + + + Toggle visibility of sidebar with options of the selected tool + Prepnúť viditeľnosť bočnej lišty s možnosťami vybraného nástroja + + + + Show color picker + Zobraziť dialóg na výber farby + + + + Change the tool's thickness + Zmena hrúbky nástroja + + + + Available shortcuts in the screen capture mode. + Dostupné klávesové skratky v režime zachytávania obrazovky. + + + + Key + Kláves + + + + Description + Popis + + + + <u><b>License</b></u> + <u><b>Licencia</b></u> + + + + <u><b>Version</b></u> + <u><b>Verzia</b></u> + + + + <u><b>Shortcuts</b></u> + <u><b>Klávesové skratky</b></u> + + + + LineTool + + + Line + Čiara + + + + Set the Line as the paint tool + Nastaviť Čiaru ako nástroj pre úpravy + + + + MarkerTool + + + Marker + Fixka + + + + Set the Marker as the paint tool + Nastaviť Fixku ako nástroj pre úpravy + + + + MoveTool + + + Move + Presun + + + + Move the selection area + Presunúť oblasť výberu + + + + PencilTool + + + Pencil + Ceruzka + + + + Set the Pencil as the paint tool + Nastaviť Ceruzku ako nástroj pre úpravy + + + + PinTool + + + Pin Tool + Špendlík + + + + Pin image on the desktop + Pripnúť obrázok na plochu + + + + QObject + + + + + + + Unable to connect via DBus + Nie je možné pripojiť sa prostredníctvom DBus + + + + Error + Chyba + + + + Unable to write in + Zlyhal zápis do + + + + Capture saved to clipboard + Snímka uložená do schránky + + + + + Capture saved as + Snímka uložená ako + + + + + Error trying to save as + Chyba pri ukladaní do + + + + Save Error + Chyba pri ukladaní + + + + RectangleTool + + + Rectangle + Obdĺžnik + + + + Set the Rectangle as the paint tool + Nastaviť Obdĺžnik ako nástroj pre úpravy + + + + RedoTool + + + Redo + Znova + + + + Redo the next modification + Zopakovať úpravu + + + + SaveTool + + + Save + Uložiť + + + + Save the capture + Uložiť snímku obrazovky + + + + ScreenGrabber + + + Unable to capture screen + Nepodarilo sa zachytiť obrazovku + + + + SelectionTool + + + Rectangular Selection + Obdĺžnikový výber + + + + Set Selection as the paint tool + Nastaviť Výber ako nástroj pre úpravy + + + + SidePanelWidget + + + Active thickness: + Aktívna hrúbka: + + + + Active color: + Aktívna farba: + + + + Press ESC to cancel + Stlačte ESC pre zrušenie + + + + Grab Color + Snímať farbu + + + + SizeIndicatorTool + + + Selection Size Indicator + Ukazovateľ veľkosti výberu + + + + Show the dimensions of the selection (X Y) + Zobraziť rozmery výberu (X Y) + + + + StrftimeChooserWidget + + + Century (00-99) + Storočie (00-99) + + + + Year (00-99) + Rok (00-99) + + + + Year (2000) + Rok (2000) + + + + Month Name (jan) + Meno mesiaca (jan) + + + + Month Name (january) + Meno mesiaca (január) + + + + Month (01-12) + Mesiac (01-12) + + + + Week Day (1-7) + Deň v týždni (1-7) + + + + Week (01-53) + Týždeň (01-53) + + + + Day Name (mon) + Meno dňa (pon) + + + + Day Name (monday) + Meno dňa (pondelok) + + + + Day (01-31) + Deň (01-31) + + + + Day of Month (1-31) + Deň v mesiaci (1-31) + + + + Day (001-366) + Deň (001-366) + + + + Time (%H-%M-%S) + Čas (%H-%M-%S) + + + + Time (%H-%M) + Čas (%H-%M) + + + + Hour (00-23) + Hodina (00-23) + + + + Hour (01-12) + Hodina (01-12) + + + + Minute (00-59) + Minúta (00-59) + + + + Second (00-59) + Sekunda (00-59) + + + + Full Date (%m/%d/%y) + Celý dátum (%m/%d/%y) + + + + Full Date (%Y-%m-%d) + Celý dátum (%Y-%m-%d) + + + + SystemNotification + + + Flameshot Info + Informácie o programe Flameshot + + + + TextConfig + + + StrikeOut + Preškrtnuté + + + + Underline + Podčiarknuté + + + + Bold + Tučné + + + + Italic + Kurzíva + + + + TextTool + + + Text + Text + + + + Add text to your capture + Pridať text do snímky + + + + UIcolorEditor + + + UI Color Editor + Editor farieb interfejsu + + + + Change the color moving the selectors and see the changes in the preview buttons. + Presunom bežcov nastavte farbu a sledujte tieto zmeny v náhľade. + + + + Select a Button to modify it + Kliknite na tlačidlo pre jeho úpravu + + + + Main Color + Hlavná farba + + + + Click on this button to set the edition mode of the main color. + Pre nastavenie hlavnej farby kliknite na toto tlačidlo. + + + + Contrast Color + Kontrastná farba + + + + Click on this button to set the edition mode of the contrast color. + Pre nastavenie kontrastnej farby kliknite na toto tlačidlo. + + + + UndoTool + + + Undo + Späť + + + + Undo the last modification + Vrátiť poslednú úpravu + + + + VisualsEditor + + + Opacity of area outside selection: + Priehľadnosť oblasti mimo výberu: + + + + Button Selection + Výber tlačidiel + + + + Select All + Vybrať všetky + + + From 234a51baeab00d4c434af07f7a5a438b1d087871 Mon Sep 17 00:00:00 2001 From: Dharkael Date: Wed, 22 May 2019 18:16:43 +0200 Subject: [PATCH 04/14] Add bitcoin as donation option --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 73af3101..767dbea1 100644 --- a/README.md +++ b/README.md @@ -350,7 +350,10 @@ If you want to contribute check the [CONTRIBUTING.md](CONTRIBUTING.md) ## Donations I improve Flameshot in my free time because I want to create something good for everyone to use. -If you want you can donate some bucks [here](https://www.paypal.me/lupoDharkael). +If you want you can donate some bucks with the following options: +- [Paypal](https://www.paypal.me/lupoDharkael) +- bitcoin:1K6oiUKWVjP3x9ZuW9C7NbDfcFkMx3G8ue + ## Acknowledgment I really appreciate those who have shown interest in the early development process: From bbe14ad79bf5727f190c30bd64abb4f5ac7dd1c5 Mon Sep 17 00:00:00 2001 From: Sorin Adrian Savu Date: Tue, 25 Jun 2019 14:31:19 +0300 Subject: [PATCH 05/14] Add qt5-qtsvg to the dependencies (#560) Without qt5-qtsvg tool icons aren't rendered see #335 - I had to manually install this package on xfce to have tool icons show up --- rpm/flameshot.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/rpm/flameshot.spec b/rpm/flameshot.spec index b34fdcc1..e0607c61 100644 --- a/rpm/flameshot.spec +++ b/rpm/flameshot.spec @@ -25,6 +25,7 @@ BuildRequires: git Requires: qt5-qtbase >= 5.3.0 Requires: qt5-qttools +Requires: qt5-qtsvg %description Flameshot is a screenshot software, it's From e0cda83a742b328ac0c86c158e0c6e6044026678 Mon Sep 17 00:00:00 2001 From: Alberto Luaces Date: Mon, 12 Aug 2019 14:54:37 +0200 Subject: [PATCH 06/14] Fix a typo and finish spanish translation (#580) --- translations/Internationalization_es.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/translations/Internationalization_es.ts b/translations/Internationalization_es.ts index 1f65cf52..a5c5cda8 100644 --- a/translations/Internationalization_es.ts +++ b/translations/Internationalization_es.ts @@ -11,7 +11,7 @@ Choose an app to open the capture - Elije una aplicación con la que abrir la captura + Elige una aplicación con la que abrir la captura @@ -441,7 +441,7 @@ Presiona Espacio para abrir el panel lateral. Toggle visibility of sidebar with options of the selected tool - + Alterna la visualización de la barra lateral de opciones de la herramienta seleccionada @@ -657,7 +657,7 @@ Presiona Espacio para abrir el panel lateral. Active thickness: - + Espesor activo: From 19d7010b87d17bda597f8dcf2a442e27afcd6b6b Mon Sep 17 00:00:00 2001 From: Ahmed Zetao Yang Date: Mon, 12 Aug 2019 21:15:54 +0800 Subject: [PATCH 07/14] chore: ci add fedora 30 support (#572) --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index bc9652ee..9d4c8f5e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,6 +35,10 @@ matrix: # 29 env: OS=fedora DIST=29 EXTEN=rpm services: docker + - os: linux + # 30 + env: OS=fedora DIST=30 EXTEN=rpm + services: docker - os: linux # 16.04 LTS env: OS=ubuntu DIST=xenial EXTEN=deb From b1a64e7193fd55787c729a8f696cbc479100820c Mon Sep 17 00:00:00 2001 From: Kiroc Date: Tue, 1 Oct 2019 19:52:13 +0200 Subject: [PATCH 08/14] stylized Spanish translation (#624) --- translations/Internationalization_es.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/translations/Internationalization_es.ts b/translations/Internationalization_es.ts index a5c5cda8..9773bb5e 100644 --- a/translations/Internationalization_es.ts +++ b/translations/Internationalization_es.ts @@ -411,12 +411,12 @@ Presiona Espacio para abrir el panel lateral. Move selection 1px - Mueve la selección 1px + Mover la selección 1px Resize selection 1px - Redimensiona la selección 1px + Redimensionar la selección 1px @@ -431,7 +431,7 @@ Presiona Espacio para abrir el panel lateral. Save selection as a file - Guarda la selección como un archivo + Guardar la selección como un archivo @@ -441,12 +441,12 @@ Presiona Espacio para abrir el panel lateral. Toggle visibility of sidebar with options of the selected tool - Alterna la visualización de la barra lateral de opciones de la herramienta seleccionada + Alternar la visualización de la barra lateral de opciones de la herramienta seleccionada Show color picker - Muestra el selector de color + Mostrar el selector de color @@ -628,7 +628,7 @@ Presiona Espacio para abrir el panel lateral. Save the capture - Guarda la captura + Guardar la captura @@ -667,7 +667,7 @@ Presiona Espacio para abrir el panel lateral. Press ESC to cancel - Presiona Esc para cancelar + Presiona ESC para cancelar From 97b02a80b44e3580ee3c86a15d9af7dc168b6c44 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Tue, 1 Oct 2019 13:53:29 -0400 Subject: [PATCH 09/14] Fix misc. whitespace (#621) --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index 442924fd..b8c13f1c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -201,7 +201,7 @@ int main(int argc, char *argv[]) { auto helpOption = parser.addHelpOption(); auto versionOption = parser.addVersionOption(); parser.AddOptions({ pathOption, delayOption, rawImageOption }, guiArgument); - parser.AddOptions({ screenNumberOption, clipboardOption,pathOption, + parser.AddOptions({ screenNumberOption, clipboardOption, pathOption, delayOption, rawImageOption }, screenArgument); parser.AddOptions({ pathOption, clipboardOption, delayOption, rawImageOption }, From f648e88ccaac6642256cae666c7739f7126d9991 Mon Sep 17 00:00:00 2001 From: gm10 <13855078+gm10@users.noreply.github.com> Date: Tue, 1 Oct 2019 19:54:40 +0200 Subject: [PATCH 10/14] Add missing window icon to ImgurUploader (#618) --- src/tools/imgur/imguruploader.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/tools/imgur/imguruploader.cpp b/src/tools/imgur/imguruploader.cpp index ecf20904..db1fb5cd 100644 --- a/src/tools/imgur/imguruploader.cpp +++ b/src/tools/imgur/imguruploader.cpp @@ -45,6 +45,7 @@ ImgurUploader::ImgurUploader(const QPixmap &capture, QWidget *parent) : QWidget(parent), m_pixmap(capture) { setWindowTitle(tr("Upload to Imgur")); + setWindowIcon(QIcon(":img/app/flameshot.svg")); m_spinner = new LoadSpinner(this); m_spinner->setColor(ConfigHandler().uiMainColorValue()); From 62dbabc34163b90dccbc5ea684d14a5428d72315 Mon Sep 17 00:00:00 2001 From: teryanik Date: Tue, 1 Oct 2019 20:58:29 +0300 Subject: [PATCH 11/14] Add option to auto copy URL after upload (#553) --- src/config/geneneralconf.cpp | 15 +++++++++++++++ src/config/geneneralconf.h | 2 ++ src/tools/imgur/imguruploader.cpp | 8 +++++++- src/utils/confighandler.cpp | 8 ++++++++ src/utils/confighandler.h | 3 +++ 5 files changed, 35 insertions(+), 1 deletion(-) diff --git a/src/config/geneneralconf.cpp b/src/config/geneneralconf.cpp index 7ddce1a8..5ed73ea5 100644 --- a/src/config/geneneralconf.cpp +++ b/src/config/geneneralconf.cpp @@ -37,6 +37,7 @@ GeneneralConf::GeneneralConf(QWidget *parent) : QWidget(parent) { initShowTrayIcon(); initAutostart(); initCloseAfterCapture(); + initCopyAndCloseAfterUpload(); // this has to be at the end initConfingButtons(); @@ -49,6 +50,7 @@ void GeneneralConf::updateComponents() { m_sysNotifications->setChecked(config.desktopNotificationValue()); m_autostart->setChecked(config.startupLaunchValue()); m_closeAfterCapture->setChecked(config.closeAfterScreenshotValue()); + m_copyAndCloseAfterUpload->setChecked(config.copyAndCloseAfterUploadEnabled()); #if defined(Q_OS_LINUX) || defined(Q_OS_UNIX) m_showTray->setChecked(!config.disabledTrayIconValue()); @@ -222,3 +224,16 @@ void GeneneralConf::initCloseAfterCapture() { connect(m_closeAfterCapture, &QCheckBox::clicked, this, &GeneneralConf::closeAfterCaptureChanged); } + +void GeneneralConf::initCopyAndCloseAfterUpload() +{ + m_copyAndCloseAfterUpload = new QCheckBox(tr("Copy URL after upload"), this); + ConfigHandler config; + m_copyAndCloseAfterUpload->setChecked(config.copyAndCloseAfterUploadEnabled()); + m_copyAndCloseAfterUpload->setToolTip(tr("Copy URL and close window after upload")); + m_layout->addWidget(m_copyAndCloseAfterUpload); + + connect(m_copyAndCloseAfterUpload, &QCheckBox::clicked, [](bool checked) { + ConfigHandler().setCopyAndCloseAfterUploadEnabled(checked); + }); +} \ No newline at end of file diff --git a/src/config/geneneralconf.h b/src/config/geneneralconf.h index 96991ecd..ae40ef76 100644 --- a/src/config/geneneralconf.h +++ b/src/config/geneneralconf.h @@ -48,6 +48,7 @@ private: QCheckBox *m_helpMessage; QCheckBox *m_autostart; QCheckBox *m_closeAfterCapture; + QCheckBox *m_copyAndCloseAfterUpload; QPushButton *m_importButton; QPushButton *m_exportButton; QPushButton *m_resetButton; @@ -58,4 +59,5 @@ private: void initConfingButtons(); void initAutostart(); void initCloseAfterCapture(); + void initCopyAndCloseAfterUpload(); }; diff --git a/src/tools/imgur/imguruploader.cpp b/src/tools/imgur/imguruploader.cpp index db1fb5cd..cd0dfc63 100644 --- a/src/tools/imgur/imguruploader.cpp +++ b/src/tools/imgur/imguruploader.cpp @@ -77,7 +77,13 @@ void ImgurUploader::handleReply(QNetworkReply *reply) { m_imageURL.setUrl(data[QStringLiteral("link")].toString()); m_deleteImageURL.setUrl(QStringLiteral("https://imgur.com/delete/%1").arg( data[QStringLiteral("deletehash")].toString())); - onUploadOk(); + if (ConfigHandler().copyAndCloseAfterUploadEnabled()) { + QApplication::clipboard()->setText(m_imageURL.toString()); + SystemNotification().sendMessage(QObject::tr("URL copied to clipboard.")); + close(); + } else { + onUploadOk(); + } } else { m_infoLabel->setText(reply->errorString()); } diff --git a/src/utils/confighandler.cpp b/src/utils/confighandler.cpp index 5aed0bf6..14f3e55f 100644 --- a/src/utils/confighandler.cpp +++ b/src/utils/confighandler.cpp @@ -325,6 +325,14 @@ void ConfigHandler::setCloseAfterScreenshot(const bool close) { m_settings.setValue(QStringLiteral("closeAfterScreenshot"), close); } +bool ConfigHandler::copyAndCloseAfterUploadEnabled() { + return m_settings.value(QStringLiteral("copyAndCloseAfterUpload")).toBool(); +} + +void ConfigHandler::setCopyAndCloseAfterUploadEnabled(const bool value) { + m_settings.setValue(QStringLiteral("copyAndCloseAfterUpload"), value); +} + void ConfigHandler::setDefaults() { m_settings.clear(); } diff --git a/src/utils/confighandler.h b/src/utils/confighandler.h index 85d93612..1886882c 100644 --- a/src/utils/confighandler.h +++ b/src/utils/confighandler.h @@ -71,6 +71,9 @@ public: bool closeAfterScreenshotValue(); void setCloseAfterScreenshot(const bool); + bool copyAndCloseAfterUploadEnabled(); + void setCopyAndCloseAfterUploadEnabled(const bool); + void setDefaults(); void setAllTheButtons(); From 246cc5d7199ed75f2f433344331bb7907e6b9574 Mon Sep 17 00:00:00 2001 From: AlexP11223 Date: Tue, 1 Oct 2019 21:03:20 +0300 Subject: [PATCH 12/14] make the gui -d example more clear (#593) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 767dbea1..9960ca13 100644 --- a/README.md +++ b/README.md @@ -88,7 +88,7 @@ Example commands: flameshot gui -p ~/myStuff/captures ``` -- Open GUI with a delay of 2 seconds: +- Capture with GUI after 2 seconds delay (can be useful to take screenshots of mouse hover tooltips, etc.): ```shell flameshot gui -d 2000 From 554aaee109eb54925e3d59ebd9b018a43df815ee Mon Sep 17 00:00:00 2001 From: Damien Date: Tue, 1 Oct 2019 20:17:47 +0200 Subject: [PATCH 13/14] Add missing French translation (#597) new option "Close after capture" was not translated in French in general config tab --- translations/Internationalization_fr.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/translations/Internationalization_fr.ts b/translations/Internationalization_fr.ts index b6142bdf..71e776b9 100644 --- a/translations/Internationalization_fr.ts +++ b/translations/Internationalization_fr.ts @@ -346,6 +346,16 @@ Appuyer sur Espace pour ouvrir le panneau latéral. Launch Flameshot Démarrer Flameshot + + + Close after capture + Fermer après une capture + + + + Close after taking a screenshot + Fermer l'application après une capture d'écran + ImgurUploader From 91ba28c3ded7ca3314f02418761c982069cf8b33 Mon Sep 17 00:00:00 2001 From: Boyuan Yang Date: Tue, 1 Oct 2019 14:25:05 -0400 Subject: [PATCH 14/14] translations: Refresh Simplified Chinese (zh_CN) translation (#579) --- translations/Internationalization_zh_CN.ts | 153 +++++++++++++++------ 1 file changed, 111 insertions(+), 42 deletions(-) diff --git a/translations/Internationalization_zh_CN.ts b/translations/Internationalization_zh_CN.ts index 4fe8b462..0fceb19f 100644 --- a/translations/Internationalization_zh_CN.ts +++ b/translations/Internationalization_zh_CN.ts @@ -51,12 +51,12 @@ ArrowTool - + Arrow 箭头 - + Set the Arrow as the paint tool 选择箭头作为绘画工具 @@ -74,6 +74,54 @@ 选择模糊作为绘画工具 + + CaptureLauncher + + + <b>Capture Mode</b> + <b>捕获模式</b> + + + + Rectangular Region + 方形区域 + + + + Full Screen (All Monitors) + 全屏（所有显示器） + + + + No Delay + 无延迟 + + + + second + 秒 + + + + seconds + 秒 + + + + Take new screenshot + 获取新屏幕截图 + + + + Area: + 区域： + + + + Delay: + 延迟： + + CaptureWidget @@ -135,22 +183,27 @@ Press Space to open the side panel. Controller - + &Take Screenshot 进行截图(&T) - + + &Open Launcher + 打开启动器(&O) + + + &Configuration 配置(&C) - + &Information 信息(&I) - + &Quit 退出(&Q) @@ -240,95 +293,105 @@ Press Space to open the side panel. 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 + + + Close after capture + 捕获后关闭 + + + + Close after taking a screenshot + 获取屏幕截图后关闭 + ImgurUploader @@ -399,6 +462,11 @@ Press Space to open the side panel. About 关于 + + + SPACEBAR + 空格 + Right Click @@ -488,12 +556,12 @@ Press Space to open the side panel. LineTool - + Line 直线 - + Set the Line as the paint tool 将直线线设置为绘画工具 @@ -501,12 +569,12 @@ Press Space to open the side panel. MarkerTool - + Marker 标记 - + Set the Marker as the paint tool 将标记设置为绘画工具 @@ -553,13 +621,13 @@ Press Space to open the side panel. QObject - + Save Error 保存错误 - - + + Capture saved as 捕获已保存为 @@ -569,16 +637,17 @@ Press Space to open the side panel. 捕获已保存至剪贴板 - - + + Error trying to save as 尝试另存为时出错 - - - - + + + + + Unable to connect via DBus 无法通过DBus进行连接 @@ -800,7 +869,7 @@ Press Space to open the side panel. SystemNotification - + Flameshot Info Flameshot 消息