diff --git a/flameshot.pro b/flameshot.pro index 0edb06fc..607becd1 100644 --- a/flameshot.pro +++ b/flameshot.pro @@ -83,7 +83,7 @@ DEFINES += QAPPLICATION_CLASS=QApplication SOURCES += src/main.cpp \ src/config/filepathconfiguration.cpp \ - src/tools/historywidget.cpp \ + src/widgets/historywidget.cpp \ src/utils/configenterprise.cpp \ src/utils/history.cpp \ src/widgets/capture/buttonhandler.cpp \ @@ -162,7 +162,7 @@ SOURCES += src/main.cpp \ HEADERS += src/widgets/capture/buttonhandler.h \ src/config/filepathconfiguration.h \ - src/tools/historywidget.h \ + src/widgets/historywidget.h \ src/utils/configenterprise.h \ src/utils/history.h \ src/widgets/infowindow.h \ diff --git a/src/core/controller.cpp b/src/core/controller.cpp index 0953417f..ffee6268 100644 --- a/src/core/controller.cpp +++ b/src/core/controller.cpp @@ -27,7 +27,7 @@ #include "src/utils/screengrabber.h" #include "src/utils/history.h" #include "src/utils/configenterprise.h" -#include "src/tools/historywidget.h" +#include "src/widgets/historywidget.h" #include #include #include @@ -255,7 +255,7 @@ void Controller::updateConfigComponents() { void Controller::showRecentScreenshots() { HistoryWidget *pHistory = new HistoryWidget(); - pHistory->show(); + pHistory->exec(); } void Controller::startFullscreenCapture(const uint id) { diff --git a/src/core/controller.h b/src/core/controller.h index 2ef40f16..8bacb7b9 100644 --- a/src/core/controller.h +++ b/src/core/controller.h @@ -24,17 +24,10 @@ #include #include #include -#include - -#include -#include -#include -#include class CaptureWidget; class ConfigWindow; class InfoWindow; -class QMenu; class QSystemTrayIcon; using lambda = std::function; diff --git a/src/core/globalshortcutfilter.cpp b/src/core/globalshortcutfilter.cpp index 313da9b4..609b9c1b 100644 --- a/src/core/globalshortcutfilter.cpp +++ b/src/core/globalshortcutfilter.cpp @@ -17,14 +17,20 @@ #include "globalshortcutfilter.h" #include "src/core/controller.h" +#include "src/widgets/historywidget.h" #include +#include GlobalShortcutFilter::GlobalShortcutFilter(QObject *parent) : QObject(parent) { // Forced Print Screen if (RegisterHotKey(NULL, 1, 0, VK_SNAPSHOT)) { - // ok + // ok - capture screen + } + + if (RegisterHotKey(NULL, 2, MOD_SHIFT, VK_SNAPSHOT)) { + // ok - show screenshots history } } @@ -38,13 +44,24 @@ bool GlobalShortcutFilter::nativeEventFilter( MSG* msg = static_cast(message); if (msg->message == WM_HOTKEY) { - //const quint32 keycode = HIWORD(msg->lParam); - //const quint32 modifiers = LOWORD(msg->lParam); - // TODO: this is just a temporal workwrround, proper global // support would need custom shortcuts defined by the user. - Controller::getInstance()->requestCapture( - CaptureRequest(CaptureRequest::GRAPHICAL_MODE)); + const quint32 keycode = HIWORD(msg->lParam); + const quint32 modifiers = LOWORD(msg->lParam); + + // Show screenshots history + if(VK_SNAPSHOT == keycode && MOD_SHIFT == modifiers) { + qDebug() << "Show screenshots history"; + HistoryWidget *pHistory = new HistoryWidget(); + pHistory->show(); + } + + // Capture screen + if(VK_SNAPSHOT == keycode && 0 == modifiers) { + Controller::getInstance()->requestCapture( + CaptureRequest(CaptureRequest::GRAPHICAL_MODE)); + } + return true; } return false; diff --git a/src/tools/historywidget.cpp b/src/tools/historywidget.cpp deleted file mode 100644 index 8ee155d0..00000000 --- a/src/tools/historywidget.cpp +++ /dev/null @@ -1,78 +0,0 @@ -#include "historywidget.h" -#include "src/utils/history.h" -#include "src/utils/configenterprise.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - - -HistoryWidget::HistoryWidget(QWidget *parent) : QWidget(parent) -{ - setWindowTitle(tr("Screenshots history")); - setFixedSize(this->size()); - - m_pVBox = new QVBoxLayout(this); - - QScrollArea *scrollArea = new QScrollArea( this ); - scrollArea->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOn ); - scrollArea->setWidgetResizable( true ); - scrollArea->setGeometry( this->frameGeometry() ); - - QWidget *widget = new QWidget(); - scrollArea->setWidget( widget ); - widget->setLayout( m_pVBox ); - - loadHistory(); -} - -void HistoryWidget::loadHistory() { - History history = History(); - QList historyFiles = history.history(); - - foreach(QString fileName, historyFiles) { - QString fullFileName = history.path() + fileName; - - QPixmap pixmap; - pixmap.load( fullFileName, "png" ); - pixmap = pixmap.scaledToWidth(120); - - QPushButton *button = new QPushButton; - button->setStyleSheet("Text-align:left"); - QIcon buttonIcon(fullFileName); - button->setIcon(buttonIcon); - button->setIconSize(pixmap.rect().size()); - - QFileInfo *pFileInfo = new QFileInfo(fullFileName); - QString lastModified = pFileInfo->lastModified().toString("yyyy-MM-dd hh:mm:ss"); - button->setText(lastModified); - - connect(button, &QPushButton::clicked, this, [=](){ - // TODO - optimize it - this->close(); - ConfigEnterprise configEnterprise; - QSettings *settings = configEnterprise.settings(); - settings->beginGroup("S3"); - QString url = settings->value("S3_URL").toString() + fileName; - settings->endGroup(); - QApplication::clipboard()->setText(url); -// qDebug() << "URL copied to clipboard:" << url; - -// NotificationWidget *notification = new NotificationWidget(); -// notification->showMessage(tr("URL copied to clipboard.")); - }); - - - m_pVBox->addWidget(button); - } -} diff --git a/src/widgets/historywidget.cpp b/src/widgets/historywidget.cpp new file mode 100644 index 00000000..e97bee8d --- /dev/null +++ b/src/widgets/historywidget.cpp @@ -0,0 +1,103 @@ +#include "historywidget.h" +#include "src/utils/history.h" +#include "src/utils/configenterprise.h" +#include "src/widgets/notificationwidget.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + + +HistoryWidget::HistoryWidget(QWidget *parent) : QDialog(parent) +{ + setWindowTitle(tr("Screenshots history")); + setFixedSize(this->size()); + m_notification = new NotificationWidget(); + + m_pVBox = new QVBoxLayout(this); + + QScrollArea *scrollArea = new QScrollArea( this ); + scrollArea->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOn ); + scrollArea->setWidgetResizable( true ); + scrollArea->setGeometry( this->frameGeometry() ); + + QWidget *widget = new QWidget(); + scrollArea->setWidget( widget ); + widget->setLayout( m_pVBox ); + + loadHistory(); +} + +void HistoryWidget::loadHistory() { + History history = History(); + QList historyFiles = history.history(); + + ConfigEnterprise configEnterprise; + QSettings *settings = configEnterprise.settings(); + settings->beginGroup("S3"); + QString s3BaseUrl = settings->value("S3_URL").toString(); + settings->endGroup(); + + foreach(QString fileName, historyFiles) { + // generate url + QString fullFileName = history.path() + fileName; + QString url = s3BaseUrl + fileName; + + // load pixmap + QPixmap pixmap; + pixmap.load( fullFileName, "png" ); + pixmap = pixmap.scaledToWidth(HISTORYWIDGET_MAX_PREVIEW_HEIGHT); + + // get file info + QFileInfo *pFileInfo = new QFileInfo(fullFileName); + QString lastModified = pFileInfo->lastModified().toString(" yyyy-MM-dd hh:mm:ss"); + + // copy url + QPushButton *buttonCopyUrl = new QPushButton; + buttonCopyUrl->setStyleSheet("text-align:left"); + QIcon buttonIcon(fullFileName); + buttonCopyUrl->setIcon(buttonIcon); + buttonCopyUrl->setStyleSheet("padding: 5px;"); + buttonCopyUrl->setIconSize(pixmap.rect().size()); + buttonCopyUrl->setText(lastModified); + connect(buttonCopyUrl, &QPushButton::clicked, this, [=](){ + QApplication::clipboard()->setText(url); + m_notification->showMessage(tr("URL copied to clipboard.")); + this->close(); + }); + + // open in browser + QPushButton *buttonOpen = new QPushButton; + buttonOpen->setText(tr("Open in browser")); + connect(buttonOpen, &QPushButton::clicked, this, [=](){ + QDesktopServices::openUrl(QUrl(url)); + this->close(); + }); + + // layout + QHBoxLayout *phbl = new QHBoxLayout(); + phbl->addWidget(buttonCopyUrl); + phbl->addWidget(buttonOpen); + + int nHeight = pixmap.rect().size().height() >= HISTORYWIDGET_MAX_PREVIEW_HEIGHT + ? HISTORYWIDGET_MAX_PREVIEW_HEIGHT + : pixmap.rect().size().height(); + buttonOpen->setMinimumSize(1, nHeight + 5 * 2 + 2); // padding 5px*2 + border + phbl->setStretchFactor(buttonCopyUrl, 7); + phbl->setStretchFactor(buttonOpen, 3); + + // add to scroll + m_pVBox->addLayout(phbl); + } +} diff --git a/src/tools/historywidget.h b/src/widgets/historywidget.h similarity index 63% rename from src/tools/historywidget.h rename to src/widgets/historywidget.h index 6fec3cdf..a89db0b4 100644 --- a/src/tools/historywidget.h +++ b/src/widgets/historywidget.h @@ -1,12 +1,16 @@ #ifndef HISTORYWIDGET_H #define HISTORYWIDGET_H +#define HISTORYWIDGET_MAX_PREVIEW_HEIGHT 120 + #include #include +#include class QVBoxLayout; +class NotificationWidget; -class HistoryWidget : public QWidget +class HistoryWidget : public QDialog { Q_OBJECT public: @@ -19,6 +23,7 @@ private: private: QVBoxLayout *m_pVBox; + NotificationWidget *m_notification; }; #endif // HISTORYWIDGET_H diff --git a/src/widgets/infowindow.cpp b/src/widgets/infowindow.cpp index fe3517d0..c903b161 100644 --- a/src/widgets/infowindow.cpp +++ b/src/widgets/infowindow.cpp @@ -61,7 +61,9 @@ QVector InfoWindow::m_keys = { "CTRL + Z", QT_TR_NOOP("SPACEBAR"), QT_TR_NOOP("Right Click"), - QT_TR_NOOP("Mouse Wheel") + QT_TR_NOOP("Mouse Wheel"), + "Print Screen", + "SHIFT + Print Screen" }; QVector InfoWindow::m_description = { @@ -73,7 +75,9 @@ QVector InfoWindow::m_description = { QT_TR_NOOP("Undo the last modification"), QT_TR_NOOP("Toggle visibility of sidebar with options of the selected tool"), QT_TR_NOOP("Show color picker"), - QT_TR_NOOP("Change the tool's thickness") + QT_TR_NOOP("Change the tool's thickness"), + QT_TR_NOOP("Capture screen"), + QT_TR_NOOP("Screenshot history") }; void InfoWindow::initInfoTable() { diff --git a/translations/Internationalization_ca.ts b/translations/Internationalization_ca.ts index 310200b3..077e394b 100644 --- a/translations/Internationalization_ca.ts +++ b/translations/Internationalization_ca.ts @@ -184,27 +184,32 @@ Press Space to open the side panel. Controller - + &Open Launcher - + &Configuration &Configuració - + &Information &Informació - + &Quit &Ix - + + &Recent Screenshot + + + + &Take Screenshot @@ -432,45 +437,58 @@ Press Space to open the side panel. + + HistoryWidget + + + Screenshots history + + + + + URL copied to clipboard. + L'URL s'ha copiat al porta-retalls. + + ImgS3Uploader - + Upload to ImgS3 - + Uploading Image S'està pujant la imatge - + Copy URL Copia l'URL - + Open URL Obri l'URL - + Image to Clipboard. Imatge al porta-retalls. - + Unable to open the URL. No es pot obrir l'URL. - + URL copied to clipboard. L'URL s'ha copiat al porta-retalls. - + Screenshot copied to clipboard. La captura s'ha copiat al porta-retalls. @@ -757,7 +775,7 @@ Press Space to open the side panel. - + URL copied to clipboard. L'URL s'ha copiat al porta-retalls. diff --git a/translations/Internationalization_de_DE.ts b/translations/Internationalization_de_DE.ts index b84693d0..82ac52a2 100644 --- a/translations/Internationalization_de_DE.ts +++ b/translations/Internationalization_de_DE.ts @@ -187,30 +187,35 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. Controller - + &Take Screenshot &Bildschirmaufnahme anfertigen - + &Open Launcher - + &Configuration &Einstellungen - + &Information &Informationen - + &Quit &Beenden + + + &Recent Screenshot + + CopyTool @@ -435,45 +440,58 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. + + HistoryWidget + + + Screenshots history + + + + + URL copied to clipboard. + URL kopiert. + + ImgS3Uploader - + Upload to ImgS3 - + Uploading Image Bild hochladen - + Copy URL URL kopieren - + Open URL URL öffnen - + Image to Clipboard. Bild in Zwischenablage. - + Unable to open the URL. Kann URL nicht öffnen. - + URL copied to clipboard. URL kopiert. - + Screenshot copied to clipboard. Bildschirmaufnahme in Zwischenablage kopiert. @@ -760,7 +778,7 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. Kein Schreibzugriff auf - + URL copied to clipboard. URL kopiert. diff --git a/translations/Internationalization_es.ts b/translations/Internationalization_es.ts index dbc5ab14..757fb5bb 100644 --- a/translations/Internationalization_es.ts +++ b/translations/Internationalization_es.ts @@ -187,30 +187,35 @@ Presiona Espacio para abrir el panel lateral. Controller - + &Take Screenshot &Tomar captura de pantalla - + &Open Launcher - + &Configuration &Configuración - + &Information &Información - + &Quit &Salir + + + &Recent Screenshot + + CopyTool @@ -435,45 +440,58 @@ Presiona Espacio para abrir el panel lateral. + + HistoryWidget + + + Screenshots history + + + + + URL copied to clipboard. + URL copiada al portapapeles. + + ImgS3Uploader - + Upload to ImgS3 - + Uploading Image Subiendo Imagen - + Copy URL Copiar URL - + Open URL Abrir URL - + Image to Clipboard. Imagen al Portapapeles. - + Unable to open the URL. No puede abrir la URL. - + URL copied to clipboard. URL copiada al portapapeles. - + Screenshot copied to clipboard. Captura copiada al portapapeles. @@ -760,7 +778,7 @@ Presiona Espacio para abrir el panel lateral. Imposible escribir en - + URL copied to clipboard. URL copiada al portapapeles. diff --git a/translations/Internationalization_fr.ts b/translations/Internationalization_fr.ts index 35718e62..1fd529da 100644 --- a/translations/Internationalization_fr.ts +++ b/translations/Internationalization_fr.ts @@ -187,30 +187,35 @@ Appuyer sur Espace pour ouvrir le panneau latéral. Controller - + &Take Screenshot &Capturer l'écran - + &Open Launcher - + &Configuration &Configuration - + &Information &Informations - + &Quit &Quitter + + + &Recent Screenshot + + CopyTool @@ -435,45 +440,58 @@ Appuyer sur Espace pour ouvrir le panneau latéral. + + HistoryWidget + + + Screenshots history + + + + + URL copied to clipboard. + URL copiée dans le Presse-papier. + + ImgS3Uploader - + Upload to ImgS3 - + Uploading Image Mise en ligne de l'image - + Copy URL Copier l'URL - + Open URL Ouvrir l'URL - + Image to Clipboard. Image dans le Presse-papier. - + Unable to open the URL. Impossible d'ouvrir l'URL. - + URL copied to clipboard. URL copiée dans le Presse-papier. - + Screenshot copied to clipboard. Capture d'écran copiée dans le Presse-papier. @@ -760,7 +778,7 @@ Appuyer sur Espace pour ouvrir le panneau latéral. Imposible d'écrire par dessus - + URL copied to clipboard. URL copiée dans le Presse-papier. diff --git a/translations/Internationalization_hu.ts b/translations/Internationalization_hu.ts index d2973c84..ad292fe1 100644 --- a/translations/Internationalization_hu.ts +++ b/translations/Internationalization_hu.ts @@ -181,6 +181,10 @@ Press Space to open the side panel. &Open Launcher + + &Recent Screenshot + + CopyTool @@ -378,6 +382,17 @@ Press Space to open the side panel. + + HistoryWidget + + Screenshots history + + + + URL copied to clipboard. + URL másolva a vágólapra. + + ImgS3Uploader diff --git a/translations/Internationalization_ja.ts b/translations/Internationalization_ja.ts index 7e8f651e..d6fd191c 100644 --- a/translations/Internationalization_ja.ts +++ b/translations/Internationalization_ja.ts @@ -187,30 +187,35 @@ Enter を押すと画面をキャプチャー。 Controller - + &Take Screenshot スクリーンショットを撮る(&T) - + &Open Launcher - + &Configuration 設定(&C) - + &Information 情報(&I) - + &Quit 終了(&Q) + + + &Recent Screenshot + + CopyTool @@ -435,45 +440,58 @@ Enter を押すと画面をキャプチャー。 + + HistoryWidget + + + Screenshots history + + + + + URL copied to clipboard. + URL をクリップボードにコピーしました。 + + ImgS3Uploader - + Upload to ImgS3 - + Uploading Image 画像をアップロード中 - + Copy URL URL をコピー - + Open URL URL を開く - + Image to Clipboard. 画像をクリップボードへ。 - + Unable to open the URL. URL を開けません。 - + URL copied to clipboard. URL をクリップボードにコピーしました。 - + Screenshot copied to clipboard. スクリーンショットをクリップボードにコピーしました。 @@ -760,7 +778,7 @@ Enter を押すと画面をキャプチャー。 書き込めません: - + URL copied to clipboard. URL をクリップボードにコピーしました。 diff --git a/translations/Internationalization_ka.ts b/translations/Internationalization_ka.ts index fcdd73ed..f2c7f093 100644 --- a/translations/Internationalization_ka.ts +++ b/translations/Internationalization_ka.ts @@ -183,30 +183,35 @@ Press Space to open the side panel. Controller - + &Take Screenshot - + &Open Launcher - + &Configuration &პარამეტრები - + &Information &ინფორმაცია - + &Quit &გამოსვლა + + + &Recent Screenshot + + CopyTool @@ -431,45 +436,58 @@ Press Space to open the side panel. + + HistoryWidget + + + Screenshots history + + + + + URL copied to clipboard. + URL დაკოპირდა გაცვლის ბუფერში. + + ImgS3Uploader - + Upload to ImgS3 - + Uploading Image სურათის ატვირთვა - + Copy URL URL-ის კოპირება - + Open URL URL-ის გახსნა - + Image to Clipboard. სურათის გაცვლის ბუფერში გაგზავნა - + Unable to open the URL. URL-ის გახსნა ვერ მოხერხდა. - + URL copied to clipboard. URL დაკოპირდა გაცვლის ბუფერში. - + Screenshot copied to clipboard. სურათი დაკოპირდა გაცვლის ბუფერში. @@ -756,7 +774,7 @@ Press Space to open the side panel. შემდეგ მისამართზე ჩაწერა ვერ მოხერხდა: - + URL copied to clipboard. URL დაკოპირდა გაცვლის ბუფერში. diff --git a/translations/Internationalization_nl.ts b/translations/Internationalization_nl.ts index c9d09797..73610b16 100644 --- a/translations/Internationalization_nl.ts +++ b/translations/Internationalization_nl.ts @@ -187,30 +187,35 @@ Druk op spatie om het zijpaneel te openen. Controller - + &Take Screenshot Schermafdruk &maken - + &Open Launcher - + &Configuration &Configuratie - + &Information &Informatie - + &Quit &Afsluiten + + + &Recent Screenshot + + CopyTool @@ -435,45 +440,58 @@ Druk op spatie om het zijpaneel te openen. + + HistoryWidget + + + Screenshots history + + + + + URL copied to clipboard. + URL gekopieerd naar klembord. + + ImgS3Uploader - + Upload to ImgS3 - + Uploading Image Bezig met uploaden van afbeelding... - + Copy URL URL kopiëren - + Open URL URL openen - + Image to Clipboard. Afbeelding naar klembord. - + Unable to open the URL. Kan URL niet openen. - + URL copied to clipboard. URL gekopieerd naar klembord. - + Screenshot copied to clipboard. Schermafdruk gekopieerd naar klembord. @@ -760,7 +778,7 @@ Druk op spatie om het zijpaneel te openen. Kan niet wegschrijven naar - + URL copied to clipboard. URL gekopieerd naar klembord. diff --git a/translations/Internationalization_pl.ts b/translations/Internationalization_pl.ts index c7bea720..a1661741 100644 --- a/translations/Internationalization_pl.ts +++ b/translations/Internationalization_pl.ts @@ -186,30 +186,35 @@ Spacja, aby pokazać panel boczny. Controller - + &Take Screenshot &Zrzut ekranu - + &Open Launcher - + &Configuration &Konfiguracja - + &Information &Informacje - + &Quit &Wyjdź + + + &Recent Screenshot + + CopyTool @@ -434,45 +439,58 @@ Spacja, aby pokazać panel boczny. + + HistoryWidget + + + Screenshots history + + + + + URL copied to clipboard. + URL skopiowany do schowka. + + ImgS3Uploader - + Upload to ImgS3 - + Uploading Image Wysyłanie obrazka - + Copy URL Kopiuj URL - + Open URL Otwórz URL - + Image to Clipboard. Obrazek do schowka. - + Unable to open the URL. Nie można otworzyć adresu URL. - + URL copied to clipboard. URL skopiowany do schowka. - + Screenshot copied to clipboard. Zrzut ekranu skopiowany do schowka. @@ -759,7 +777,7 @@ Spacja, aby pokazać panel boczny. Nie można zapisać w - + URL copied to clipboard. URL skopiowany do schowka. diff --git a/translations/Internationalization_pt_br.ts b/translations/Internationalization_pt_br.ts index fad4e75c..7cb01125 100644 --- a/translations/Internationalization_pt_br.ts +++ b/translations/Internationalization_pt_br.ts @@ -187,30 +187,35 @@ Pressione espaço abrir o painel lateral. Controller - + &Take Screenshot &Tirar Screenshot - + &Open Launcher - + &Configuration &Configuração - + &Information &Informações - + &Quit &Sair + + + &Recent Screenshot + + CopyTool @@ -435,45 +440,58 @@ Pressione espaço abrir o painel lateral. + + HistoryWidget + + + Screenshots history + + + + + URL copied to clipboard. + URL copiada para o clipboard. + + ImgS3Uploader - + Upload to ImgS3 - + Uploading Image Upando Imagem - + Copy URL Copiar URL - + Open URL Abrir URL - + Image to Clipboard. Imagem no Clipboard. - + Unable to open the URL. Nã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. @@ -760,7 +778,7 @@ Pressione espaço abrir o painel lateral. Não foi possível escrever em - + URL copied to clipboard. URL copiada para o clipboard. diff --git a/translations/Internationalization_ru.ts b/translations/Internationalization_ru.ts index e9d67f60..8aa028e0 100644 --- a/translations/Internationalization_ru.ts +++ b/translations/Internationalization_ru.ts @@ -187,30 +187,35 @@ Press Space to open the side panel. Controller - + &Take Screenshot &Сделать снимок - + &Open Launcher &Открыть - + &Configuration &Настройка - + &Information &Информация - + &Quit &Выход + + + &Recent Screenshot + &Недавние скриншоты + CopyTool @@ -435,25 +440,38 @@ Press Space to open the side panel. Скопировать URL после загрузки и закрыть окно + + HistoryWidget + + + Screenshots history + История скриншотов + + + + URL copied to clipboard. + URL скопирован в буфер обмена. + + ImgS3Uploader - + Upload to ImgS3 Загрузить на S3 - + Uploading Image Загрузка изображения - + Copy URL Скопировать URL - + Open URL Открыть URL @@ -462,22 +480,22 @@ Press Space to open the side panel. Удалить изображение - + Image to Clipboard. Изображение в буфер обмена. - + Unable to open the URL. Не удалось открыть URL. - + URL copied to clipboard. URL скопирован в буфер обмена. - + Screenshot copied to clipboard. Снимок скопирован в буфер обмена. @@ -768,7 +786,7 @@ Press Space to open the side panel. Не удалось сохранить - + URL copied to clipboard. URL скопирован в буфер обмена. diff --git a/translations/Internationalization_sk.ts b/translations/Internationalization_sk.ts index c7b74642..b9c89324 100644 --- a/translations/Internationalization_sk.ts +++ b/translations/Internationalization_sk.ts @@ -187,30 +187,35 @@ Stlačte medzerník pre otvorenie postranného panelu. Controller - + &Take Screenshot &Vytvoriť snímku - + &Open Launcher - + &Configuration &Konfigurácia - + &Information &Informácie - + &Quit &Ukončiť + + + &Recent Screenshot + + CopyTool @@ -435,45 +440,58 @@ Stlačte medzerník pre otvorenie postranného panelu. + + HistoryWidget + + + Screenshots history + + + + + URL copied to clipboard. + URL skopírovaná do schránky. + + ImgS3Uploader - + Upload to ImgS3 - + Uploading Image Nahrávam obrázok - + Copy URL Kopírovať URL - + Open URL Otvoriť URL - + 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. @@ -760,7 +778,7 @@ Stlačte medzerník pre otvorenie postranného panelu. Chyba pri ukladaní - + URL copied to clipboard. URL skopírovaná do schránky. diff --git a/translations/Internationalization_sr.ts b/translations/Internationalization_sr.ts index aebc19c1..490d21f1 100644 --- a/translations/Internationalization_sr.ts +++ b/translations/Internationalization_sr.ts @@ -187,30 +187,35 @@ Press Space to open the side panel. Controller - + &Take Screenshot &Направи снимак екрана - + &Open Launcher - + &Configuration &Подешавања - + &Information Ин&формације - + &Quit &Излаз + + + &Recent Screenshot + + CopyTool @@ -435,45 +440,58 @@ Press Space to open the side panel. + + HistoryWidget + + + Screenshots history + + + + + URL copied to clipboard. + Интернет адреса је сачувана у привременој меморији. + + ImgS3Uploader - + Upload to ImgS3 - + Uploading Image Објављујем слику - + Copy URL Запамти интернет адресу - + Open URL Посети интернет адресу - + Image to Clipboard. Сачувај у привремену меморију. - + Unable to open the URL. Нисам успео да посетим интернет адресу. - + URL copied to clipboard. Интернет адреса је сачувана у привременој меморији. - + Screenshot copied to clipboard. Слика је сачувана у привременој меморији. @@ -760,7 +778,7 @@ Press Space to open the side panel. Нисам успео са сачувам - + URL copied to clipboard. Интернет адреса је сачувана у привременој меморији. diff --git a/translations/Internationalization_tr.ts b/translations/Internationalization_tr.ts index 2c383089..5e2ee277 100644 --- a/translations/Internationalization_tr.ts +++ b/translations/Internationalization_tr.ts @@ -187,30 +187,35 @@ Yan paneli açmak için Boşluk tuşuna basın. Controller - + &Take Screenshot &Ekran Resmi Al - + &Open Launcher - + &Configuration &Ayarlar - + &Information &Bilgi - + &Quit &Çıkış + + + &Recent Screenshot + + CopyTool @@ -435,45 +440,58 @@ Yan paneli açmak için Boşluk tuşuna basın. + + HistoryWidget + + + Screenshots history + + + + + URL copied to clipboard. + URL panoya kopyalandı. + + ImgS3Uploader - + Upload to ImgS3 - + Uploading Image Resim Yükleniyor - + Copy URL URL Kopyala - + Open URL URL Aç - + Image to Clipboard. Resim Pano'ya. - + Unable to open the URL. URL açılamıyor. - + URL copied to clipboard. URL panoya kopyalandı. - + Screenshot copied to clipboard. Ekran görüntüsü panoya kopyalandı. @@ -760,7 +778,7 @@ Yan paneli açmak için Boşluk tuşuna basın. Yazma mümkün değil - + URL copied to clipboard. URL panoya kopyalandı. diff --git a/translations/Internationalization_uk.ts b/translations/Internationalization_uk.ts index 224a45aa..e7e60a35 100644 --- a/translations/Internationalization_uk.ts +++ b/translations/Internationalization_uk.ts @@ -187,30 +187,35 @@ Press Space to open the side panel. Controller - + &Take Screenshot &Зробити знімок - + &Open Launcher &Відчинити - + &Configuration &Налаштування - + &Information &Інформація - + &Quit Ви&йти + + + &Recent Screenshot + Нещодавні скріншоти + CopyTool @@ -435,25 +440,38 @@ Press Space to open the side panel. Копіювати URL та закрити вікно після завантаження + + HistoryWidget + + + Screenshots history + Історія скріншотів + + + + URL copied to clipboard. + URL скопійовано до буферу обміну. + + ImgS3Uploader - + Upload to ImgS3 Вивантажити на S3 - + Uploading Image Вивантаження зображення - + Copy URL Скопіювати URL - + Open URL Відкрити URL @@ -462,22 +480,22 @@ Press Space to open the side panel. Видалити зображення - + Image to Clipboard. Зображення до буферу обміну. - + Unable to open the URL. Не вдалось відкрити URL. - + URL copied to clipboard. URL скопійовано до буферу обміну. - + Screenshot copied to clipboard. Знімок скопійовано до буферу обміну. @@ -768,7 +786,7 @@ Press Space to open the side panel. Не вдалось зберегти - + URL copied to clipboard. URL скопійовано до буферу обміну. diff --git a/translations/Internationalization_zh_CN.ts b/translations/Internationalization_zh_CN.ts index 404d38e8..eff90b2f 100644 --- a/translations/Internationalization_zh_CN.ts +++ b/translations/Internationalization_zh_CN.ts @@ -188,30 +188,35 @@ Press Space to open the side panel. Controller - + &Take Screenshot 进行截图(&T) - + &Open Launcher 打开启动器(&O) - + &Configuration 配置(&C) - + &Information 信息(&I) - + &Quit 退出(&Q) + + + &Recent Screenshot + + CopyTool @@ -436,45 +441,58 @@ Press Space to open the side panel. + + HistoryWidget + + + Screenshots history + + + + + URL copied to clipboard. + 复制链接到剪贴板。 + + ImgS3Uploader - + Upload to ImgS3 - + Uploading Image 正在上传 - + Copy URL 复制链接 - + Open URL 打开链接 - + Image to Clipboard. 保存文件到剪贴板。 - + Unable to open the URL. 无法打开此链接。 - + URL copied to clipboard. 复制链接到剪贴板。 - + Screenshot copied to clipboard. 截图复制到剪贴板。 @@ -761,7 +779,7 @@ Press Space to open the side panel. 无法写入 - + URL copied to clipboard. 复制链接到剪贴板。 diff --git a/translations/Internationalization_zh_TW.ts b/translations/Internationalization_zh_TW.ts index 14e822a0..51644cb0 100644 --- a/translations/Internationalization_zh_TW.ts +++ b/translations/Internationalization_zh_TW.ts @@ -183,30 +183,35 @@ Press Space to open the side panel. Controller - + &Take Screenshot - + &Open Launcher - + &Configuration &設定 - + &Information &資訊 - + &Quit &結束 + + + &Recent Screenshot + + CopyTool @@ -431,45 +436,58 @@ Press Space to open the side panel. + + HistoryWidget + + + Screenshots history + + + + + URL copied to clipboard. + 連結已複製到剪貼簿 + + ImgS3Uploader - + Upload to ImgS3 - + Uploading Image 正在上傳 - + Copy URL 複製連結 - + Open URL 打開連結 - + Image to Clipboard. 將檔案複製到剪貼簿 - + Unable to open the URL. 無法打開此連結 - + URL copied to clipboard. 連結已複製到剪貼簿 - + Screenshot copied to clipboard. 截圖已複製到剪貼簿 @@ -756,7 +774,7 @@ Press Space to open the side panel. 無法寫入 - + URL copied to clipboard. 連結已複製到剪貼簿 diff --git a/update_release_version.sh b/update_release_version.sh index 0ed345c8..2817bf3b 100755 --- a/update_release_version.sh +++ b/update_release_version.sh @@ -41,14 +41,16 @@ qmake # update qt translations, ignore if no `lupdate` utils is installed lupdate -recursive ./ -ts ./translations/* || true +lrelease flameshot.pro # push current release git add flameshot.pro ./win_setup/flameshot.iss appveyor.yml .travis.yml update_release_version.sh translations/ git commit -m "Update version to ${BASE_VERSION_NEW}" -git push ${GIT_REMOTE} -u release/${BASE_VERSION_NEW} +#git push ${GIT_REMOTE} -u release/${BASE_VERSION_NEW} # add new release tag git tag "v${BASE_VERSION_NEW}" -git push ${GIT_REMOTE} --tags +git push ${GIT_REMOTE} -u release/${BASE_VERSION_NEW} --tags +#git push ${GIT_REMOTE} --tags echo "New Flameshot version is: ${BASE_VERSION_NEW}"