diff --git a/src/widgets/historywidget.cpp b/src/widgets/historywidget.cpp index 68b226bd..20b8140f 100644 --- a/src/widgets/historywidget.cpp +++ b/src/widgets/historywidget.cpp @@ -24,7 +24,7 @@ HistoryWidget::HistoryWidget(QWidget *parent) : QDialog(parent) { setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setWindowTitle(tr("Screenshots history")); - setFixedSize(this->size()); + setFixedSize(800, this->height()); m_notification = new NotificationWidget(); m_pVBox = new QVBoxLayout(this); @@ -55,7 +55,7 @@ void HistoryWidget::loadHistory() { if(historyFiles.isEmpty()) { QPushButton *buttonEmpty = new QPushButton; buttonEmpty->setText(tr("Screenshots history is empty")); - buttonEmpty->setMinimumSize(1, HISTORYWIDGET_MAX_PREVIEW_HEIGHT); + buttonEmpty->setMinimumSize(1, HISTORYPIXMAP_MAX_PREVIEW_HEIGHT); connect(buttonEmpty, &QPushButton::clicked, this, [=](){ this->close(); }); @@ -70,20 +70,33 @@ void HistoryWidget::loadHistory() { // load pixmap QPixmap pixmap; pixmap.load( fullFileName, "png" ); - pixmap = pixmap.scaledToWidth(HISTORYWIDGET_MAX_PREVIEW_HEIGHT); + + if (pixmap.height() / HISTORYPIXMAP_MAX_PREVIEW_HEIGHT >= pixmap.width() / HISTORYPIXMAP_MAX_PREVIEW_WIDTH) { + pixmap = pixmap.scaledToHeight(HISTORYPIXMAP_MAX_PREVIEW_HEIGHT); + } else { + pixmap = pixmap.scaledToWidth(HISTORYPIXMAP_MAX_PREVIEW_WIDTH); + } // get file info QFileInfo *pFileInfo = new QFileInfo(fullFileName); QString lastModified = pFileInfo->lastModified().toString(" yyyy-MM-dd hh:mm:ss"); + // screenshot preview + QLabel *pScreenshot = new QLabel(); + pScreenshot->setStyleSheet("padding: 5px;"); + pScreenshot->setMinimumHeight(HISTORYPIXMAP_MAX_PREVIEW_HEIGHT); + pScreenshot->setPixmap(pixmap); + + // screenshot datetime + QLabel *pScreenshotText = new QLabel(); + pScreenshotText->setStyleSheet("padding: 5px;"); + pScreenshotText->setMinimumHeight(HISTORYPIXMAP_MAX_PREVIEW_HEIGHT); + pScreenshotText->setText(lastModified); + // 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); + buttonCopyUrl->setText(tr("Copy URL")); + buttonCopyUrl->setMinimumHeight(HISTORYPIXMAP_MAX_PREVIEW_HEIGHT); connect(buttonCopyUrl, &QPushButton::clicked, this, [=](){ QApplication::clipboard()->setText(url); m_notification->showMessage(tr("URL copied to clipboard.")); @@ -93,6 +106,7 @@ void HistoryWidget::loadHistory() { // open in browser QPushButton *buttonOpen = new QPushButton; buttonOpen->setText(tr("Open in browser")); + buttonOpen->setMinimumHeight(HISTORYPIXMAP_MAX_PREVIEW_HEIGHT); connect(buttonOpen, &QPushButton::clicked, this, [=](){ QDesktopServices::openUrl(QUrl(url)); this->close(); @@ -100,15 +114,15 @@ void HistoryWidget::loadHistory() { // layout QHBoxLayout *phbl = new QHBoxLayout(); + phbl->addWidget(pScreenshot); + phbl->addWidget(pScreenshotText); 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); + phbl->setStretchFactor(pScreenshot, 3); + phbl->setStretchFactor(pScreenshotText, 2); + phbl->setStretchFactor(buttonCopyUrl, 2); + phbl->setStretchFactor(buttonOpen, 2); // add to scroll m_pVBox->addLayout(phbl); diff --git a/src/widgets/historywidget.h b/src/widgets/historywidget.h index a89db0b4..e0f1bac1 100644 --- a/src/widgets/historywidget.h +++ b/src/widgets/historywidget.h @@ -1,7 +1,8 @@ #ifndef HISTORYWIDGET_H #define HISTORYWIDGET_H -#define HISTORYWIDGET_MAX_PREVIEW_HEIGHT 120 +#define HISTORYPIXMAP_MAX_PREVIEW_WIDTH 160 +#define HISTORYPIXMAP_MAX_PREVIEW_HEIGHT 90 #include #include diff --git a/translations/Internationalization_ca.ts b/translations/Internationalization_ca.ts index 91c39256..f5dc2206 100644 --- a/translations/Internationalization_ca.ts +++ b/translations/Internationalization_ca.ts @@ -450,12 +450,17 @@ Press Space to open the side panel. - + + Copy URL + Copia l'URL + + + URL copied to clipboard. L'URL s'ha copiat al porta-retalls. - + Open in browser diff --git a/translations/Internationalization_de_DE.ts b/translations/Internationalization_de_DE.ts index 85b55640..18254720 100644 --- a/translations/Internationalization_de_DE.ts +++ b/translations/Internationalization_de_DE.ts @@ -453,12 +453,17 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. - + + Copy URL + URL kopieren + + + URL copied to clipboard. URL kopiert. - + Open in browser diff --git a/translations/Internationalization_es.ts b/translations/Internationalization_es.ts index 35697e3f..51ad0a58 100644 --- a/translations/Internationalization_es.ts +++ b/translations/Internationalization_es.ts @@ -453,12 +453,17 @@ Presiona Espacio para abrir el panel lateral. - + + Copy URL + Copiar URL + + + URL copied to clipboard. URL copiada al portapapeles. - + Open in browser diff --git a/translations/Internationalization_fr.ts b/translations/Internationalization_fr.ts index 43596788..24644a32 100644 --- a/translations/Internationalization_fr.ts +++ b/translations/Internationalization_fr.ts @@ -453,12 +453,17 @@ Appuyer sur Espace pour ouvrir le panneau latéral. - + + Copy URL + Copier l'URL + + + URL copied to clipboard. URL copiée dans le Presse-papier. - + Open in browser diff --git a/translations/Internationalization_hu.ts b/translations/Internationalization_hu.ts index b710f73e..2bc58ac8 100644 --- a/translations/Internationalization_hu.ts +++ b/translations/Internationalization_hu.ts @@ -400,6 +400,10 @@ Press Space to open the side panel. Screenshots history is empty + + Copy URL + URL másolása + ImgS3Uploader diff --git a/translations/Internationalization_ja.ts b/translations/Internationalization_ja.ts index dc7a909b..dd4e4e17 100644 --- a/translations/Internationalization_ja.ts +++ b/translations/Internationalization_ja.ts @@ -453,12 +453,17 @@ Enter を押すと画面をキャプチャー。 - + + Copy URL + URL をコピー + + + URL copied to clipboard. URL をクリップボードにコピーしました。 - + Open in browser diff --git a/translations/Internationalization_ka.ts b/translations/Internationalization_ka.ts index 1af69082..c9a573fe 100644 --- a/translations/Internationalization_ka.ts +++ b/translations/Internationalization_ka.ts @@ -449,12 +449,17 @@ Press Space to open the side panel. - + + Copy URL + URL-ის კოპირება + + + URL copied to clipboard. URL დაკოპირდა გაცვლის ბუფერში. - + Open in browser diff --git a/translations/Internationalization_nl.ts b/translations/Internationalization_nl.ts index 77f59ad1..1cbbfd2d 100644 --- a/translations/Internationalization_nl.ts +++ b/translations/Internationalization_nl.ts @@ -453,12 +453,17 @@ Druk op spatie om het zijpaneel te openen. - + + Copy URL + URL kopiëren + + + URL copied to clipboard. URL gekopieerd naar klembord. - + Open in browser diff --git a/translations/Internationalization_pl.ts b/translations/Internationalization_pl.ts index 9c40db41..e2c0ad36 100644 --- a/translations/Internationalization_pl.ts +++ b/translations/Internationalization_pl.ts @@ -452,12 +452,17 @@ Spacja, aby pokazać panel boczny. - + + Copy URL + Kopiuj URL + + + URL copied to clipboard. URL skopiowany do schowka. - + Open in browser diff --git a/translations/Internationalization_pt_br.ts b/translations/Internationalization_pt_br.ts index 58a849a9..0699934e 100644 --- a/translations/Internationalization_pt_br.ts +++ b/translations/Internationalization_pt_br.ts @@ -453,12 +453,17 @@ Pressione espaço abrir o painel lateral. - + + Copy URL + Copiar URL + + + URL copied to clipboard. URL copiada para o clipboard. - + Open in browser diff --git a/translations/Internationalization_ru.ts b/translations/Internationalization_ru.ts index 5b1400d6..55b45049 100644 --- a/translations/Internationalization_ru.ts +++ b/translations/Internationalization_ru.ts @@ -465,12 +465,17 @@ Press Space to open the side panel. История скриншотов пуста - + + Copy URL + Скопировать URL + + + URL copied to clipboard. URL скопирован в буфер обмена. - + Open in browser Открыть в браузере diff --git a/translations/Internationalization_sk.ts b/translations/Internationalization_sk.ts index f5336ad2..ca1c13ab 100644 --- a/translations/Internationalization_sk.ts +++ b/translations/Internationalization_sk.ts @@ -453,12 +453,17 @@ Stlačte medzerník pre otvorenie postranného panelu. - + + Copy URL + Kopírovať URL + + + URL copied to clipboard. URL skopírovaná do schránky. - + Open in browser diff --git a/translations/Internationalization_sr.ts b/translations/Internationalization_sr.ts index 4cdba0da..0017f9ed 100644 --- a/translations/Internationalization_sr.ts +++ b/translations/Internationalization_sr.ts @@ -453,12 +453,17 @@ Press Space to open the side panel. - + + Copy URL + Запамти интернет адресу + + + URL copied to clipboard. Интернет адреса је сачувана у привременој меморији. - + Open in browser diff --git a/translations/Internationalization_tr.ts b/translations/Internationalization_tr.ts index 7d7c86e9..4a710cf6 100644 --- a/translations/Internationalization_tr.ts +++ b/translations/Internationalization_tr.ts @@ -453,12 +453,17 @@ Yan paneli açmak için Boşluk tuşuna basın. - + + Copy URL + URL Kopyala + + + URL copied to clipboard. URL panoya kopyalandı. - + Open in browser diff --git a/translations/Internationalization_uk.ts b/translations/Internationalization_uk.ts index a1e2ddae..86721e74 100644 --- a/translations/Internationalization_uk.ts +++ b/translations/Internationalization_uk.ts @@ -465,12 +465,17 @@ Press Space to open the side panel. Історія скріншотів пуста - + + Copy URL + Скопіювати URL + + + URL copied to clipboard. URL скопійовано до буферу обміну. - + Open in browser Відкрити у браузері diff --git a/translations/Internationalization_zh_CN.ts b/translations/Internationalization_zh_CN.ts index 1ceee6ff..c72fad5c 100644 --- a/translations/Internationalization_zh_CN.ts +++ b/translations/Internationalization_zh_CN.ts @@ -454,12 +454,17 @@ Press Space to open the side panel. - + + Copy URL + 复制链接 + + + URL copied to clipboard. 复制链接到剪贴板。 - + Open in browser diff --git a/translations/Internationalization_zh_TW.ts b/translations/Internationalization_zh_TW.ts index 01477080..51b53056 100644 --- a/translations/Internationalization_zh_TW.ts +++ b/translations/Internationalization_zh_TW.ts @@ -449,12 +449,17 @@ Press Space to open the side panel. - + + Copy URL + 複製連結 + + + URL copied to clipboard. 連結已複製到剪貼簿 - + Open in browser