diff --git a/share/qtcreator/translations/qtcreator_cs.ts b/share/qtcreator/translations/qtcreator_cs.ts index 49b81ef2b52..19207cd4a52 100644 --- a/share/qtcreator/translations/qtcreator_cs.ts +++ b/share/qtcreator/translations/qtcreator_cs.ts @@ -18896,10 +18896,6 @@ Toho se dosáhne vložením této zkratky v zadávacím poli vyhledávače, nás GLSL Editor Editor GLSL - - Image Viewer - Prohlížeč obrázků - Python Editor Editor Pythonu @@ -30963,7 +30959,11 @@ Při GDB může být zadána posloupnost příkazů oddělená oddělovačem &ap - ImageViewer::Internal::ImageViewerToolbar + ImageViewer + + Image Viewer + Prohlížeč obrázků + Show background Ukázat pozadí @@ -30976,18 +30976,6 @@ Při GDB může být zadána posloupnost příkazů oddělená oddělovačem &ap Fit image in the screen Přizpůsobit obrázek velikosti obrazovky - - Original size - Původní velikost - - - Zoom In - Přiblížit - - - Zoom Out - Oddálit - Show Background Ukázat pozadí @@ -31000,10 +30988,6 @@ Při GDB může být zadána posloupnost příkazů oddělená oddělovačem &ap Fit to Screen Přizpůsobit obrazovce - - Original Size - Původní velikost - Macros::Internal::MacroOptionsWidget @@ -36694,7 +36678,7 @@ když bude zavolán mimo git bash. - ImageViewer::Internal::ImageViewer + ImageViewer Cannot open image file %1 Nelze otevřít soubor s obrázkem %1 @@ -36713,7 +36697,7 @@ když bude zavolán mimo git bash. - ImageViewer::Internal::ImageViewerActionHandler + ImageViewer Zoom In Přiblížit diff --git a/share/qtcreator/translations/qtcreator_da.ts b/share/qtcreator/translations/qtcreator_da.ts index d8d6da8f0fc..4fa072911f4 100644 --- a/share/qtcreator/translations/qtcreator_da.ts +++ b/share/qtcreator/translations/qtcreator_da.ts @@ -19944,6 +19944,10 @@ Tilføj, ændr, og fjern dokumentfiltre, som beslutter hvilke dokumentationssæt ImageViewer + + Image Viewer + Billedfremviser + Color at %1,%2: red: %3 green: %4 blue: %5 alpha: %6 Farve ved %1,%2: rød: %3 grøn: %4 blå: %5 alfa: %6 @@ -19966,7 +19970,7 @@ Tilføj, ændr, og fjern dokumentfiltre, som beslutter hvilke dokumentationssæt - ImageViewer::Internal::ExportDialog + ImageViewer File: Fil: @@ -19988,7 +19992,7 @@ Vil du overskrive den? - ImageViewer::Internal::ImageView + ImageViewer Export %1 Eksportér %1 @@ -20011,7 +20015,7 @@ Vil du overskrive den? - ImageViewer::Internal::ImageViewer + ImageViewer Pause Animation Pause animation @@ -20022,7 +20026,7 @@ Vil du overskrive den? - ImageViewer::Internal::ImageViewerFile + ImageViewer Image format not supported. Billedformat understøttes ikke. @@ -20037,7 +20041,7 @@ Vil du overskrive den? - ImageViewer::Internal::ImageViewerPlugin + ImageViewer Fit to Screen Tilpas til skærm @@ -20066,17 +20070,10 @@ Vil du overskrive den? Toggle Animation Animation til/fra - - Export Image - Eksportér billede - Export Multiple Images Eksportér flere billeder - - - ImageViewer::Internal::ImageViewerToolbar Export as Image Eksportér som billede @@ -20089,10 +20086,6 @@ Vil du overskrive den? Show Outline Vis omrids - - Fit to Screen - Tilpas til skærm - Original Size Original størrelse @@ -22377,10 +22370,6 @@ Fejl: %5 GLSL Editor GLSL-redigering - - Image Viewer - Billedfremviser - Model Editor Model-redigering @@ -44951,15 +44940,11 @@ Kopiér stien til kildefilerne til udklipsholderen? - ImageViewer::Internal::MultiExportDialog + ImageViewer Enter a file name containing place holders %1 which will be replaced by the width and height of the image, respectively. Indtast et filnavn som indeholder pladsholderne %1 som erstattes af henholdsvis bredden og højden på billedet. - - File: - Fil: - Clear Ryd diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index 070394f2e77..00baa3eed66 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -5239,10 +5239,6 @@ Add, modify, and remove document filters, which determine the documentation set Resource Editor Ressourceneditor - - Image Viewer - Bildbetrachter - GLSL Editor GLSL Editor @@ -11371,7 +11367,11 @@ IDs müssen außerdem mit einem Kleinbuchstaben beginnen. - ImageViewer::Internal::ImageViewerToolbar + ImageViewer + + Image Viewer + Bildbetrachter + Zoom In Vergrößern @@ -15270,7 +15270,7 @@ Bei vollständiger Cache-Simulation werden weitere Ereigniszähler aktiviert: - ImageViewer::Internal::ImageViewer + ImageViewer Play Animation Animation abspielen @@ -33034,7 +33034,7 @@ Das Setzen von Haltepunkten anhand von Dateinamen und Zeilennummern könnte fehl - ImageViewer::Internal::ImageViewerFile + ImageViewer Image format not supported. Bildformat nicht unterstützt. @@ -36042,11 +36042,7 @@ Sie werden erhalten. - ImageViewer::Internal::ExportDialog - - File: - Datei: - + ImageViewer x Multiplication, as in 32x32 @@ -36064,7 +36060,7 @@ Möchten Sie sie überschreiben? - ImageViewer::Internal::ImageView + ImageViewer Export %1 %1 exportieren @@ -42231,7 +42227,7 @@ Möchten Sie den Pfad zu den Quelldateien in die Zwischenablage kopieren? - ImageViewer::Internal::MultiExportDialog + ImageViewer Enter a file name containing place holders %1 which will be replaced by the width and height of the image, respectively. Geben Sie einen Dateinamen ein, der die Platzhalter %1 enthält, die durch Breite und Höhe des Bilds ersetzt werden. diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts index abe016023a2..7875b0036ae 100644 --- a/share/qtcreator/translations/qtcreator_fr.ts +++ b/share/qtcreator/translations/qtcreator_fr.ts @@ -19717,10 +19717,6 @@ p, li { white-space: pre-wrap; } Resource Editor Éditeur de ressources - - Image Viewer - Visualisateur d'image - GLSL Editor Éditeur GLSL @@ -30379,7 +30375,11 @@ Preselects Qt for Simulator and mobile targets if available - ImageViewer::Internal::ImageViewerToolbar + ImageViewer + + Image Viewer + Visualisateur d'image + Show background Afficher l'arrière plan @@ -30392,10 +30392,6 @@ Preselects Qt for Simulator and mobile targets if available Fit image in the screen Ajuster l'image à la taille de l'écran - - Original size - Taille réelle - Zoom In Zoom avant @@ -32027,27 +32023,15 @@ plutôt que dans le répertoire d'installation lors d'une exècution e - ImageViewer::Internal::ImageViewerActionHandler - - Zoom In - Zoom avant - + ImageViewer Ctrl++ Ctrl++ - - Zoom Out - Zoom arrière - Ctrl+- Ctrl+- - - Original Size - Taille réelle - Ctrl+0 Ctrl+0 @@ -43243,7 +43227,7 @@ These files are preserved. - ImageViewer::Internal::ImageViewer + ImageViewer Cannot open image file %1 Impossible d'ouvrir le fichier d'image %1 diff --git a/share/qtcreator/translations/qtcreator_hr.ts b/share/qtcreator/translations/qtcreator_hr.ts index 3e218d49288..57f8fcd29e3 100644 --- a/share/qtcreator/translations/qtcreator_hr.ts +++ b/share/qtcreator/translations/qtcreator_hr.ts @@ -4750,7 +4750,11 @@ Dodaj, izmijeni i ukloni filtre dokumenata koji određuju skup dokumentacije pri - ImageViewer::Internal::ImageViewerToolbar + ImageViewer + + Image Viewer + Prikazivač slika + Export as Image Izvezi kao sliku @@ -16920,10 +16924,6 @@ Check the test environment. GLSL Editor GLSL uređivač - - Image Viewer - Prikazivač slika - Model Editor Model uređivač @@ -27278,7 +27278,7 @@ instead of its installation directory when run outside git bash. - ImageViewer::Internal::ExportDialog + ImageViewer File: Datoteka: @@ -27300,7 +27300,7 @@ Would you like to overwrite it? - ImageViewer::Internal::ImageView + ImageViewer Exported "%1", %2x%3, %4 bytes Izvezeno "%1", %2x%3, %4 bajta @@ -27309,10 +27309,6 @@ Would you like to overwrite it? Could not write file "%1". Nije bilo moguće pisati datoteku "%1". - - Export Image - Izvezi sliku - Export %1 Izvezi %1 @@ -27321,9 +27317,6 @@ Would you like to overwrite it? Export a Series of Images from %1 (%2x%3) Izvezi seriju slika od %1 (%2x%3) - - - ImageViewer::Internal::ImageViewer Pause Animation Zaustavi animaciju @@ -27334,7 +27327,7 @@ Would you like to overwrite it? - ImageViewer::Internal::ImageViewerFile + ImageViewer Image format not supported. Slikovni format nije podržan. @@ -27347,13 +27340,6 @@ Would you like to overwrite it? Failed to read image. Neuspjelo čitanje slike. - - - ImageViewer::Internal::ImageViewerPlugin - - Fit to Screen - Prilagodi veličini ekrana - Ctrl+= Ctrl+= @@ -27386,17 +27372,10 @@ Would you like to overwrite it? Export Multiple Images Izvezi višestruke slike - - - ImageViewer::Internal::MultiExportDialog Enter a file name containing place holders %1 which will be replaced by the width and height of the image, respectively. Upiši naziv datoteke koji sadrži rezervirana mjesta %1, koja će biti zamijenjena širinom, odnosno visinom slike. - - File: - Datoteka: - Clear Ukloni diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts index e2950814d4a..2eab3c63ac1 100644 --- a/share/qtcreator/translations/qtcreator_ja.ts +++ b/share/qtcreator/translations/qtcreator_ja.ts @@ -3845,7 +3845,11 @@ Add, modify, and remove document filters, which determine the documentation set - ImageViewer::Internal::ImageViewerToolbar + ImageViewer + + Image Viewer + 画像ビューア + Show Background 背景を表示 @@ -13120,10 +13124,6 @@ in the system's browser for manual download. GLSL Editor GLSL エディタ - - Image Viewer - 画像ビューア - Python Editor Python エディタ @@ -22571,7 +22571,7 @@ instead of its installation directory when run outside git bash. - ImageViewer::Internal::ImageViewer + ImageViewer Play Animation アニメーション再生 @@ -43856,11 +43856,7 @@ Leave empty to search through the file system. - ImageViewer::Internal::ExportDialog - - File: - ファイル: - + ImageViewer x Multiplication, as in 32x32 @@ -43878,7 +43874,7 @@ Would you like to overwrite it? - ImageViewer::Internal::ImageView + ImageViewer Export %1 %1 のエクスポート @@ -43895,9 +43891,6 @@ Would you like to overwrite it? Could not write file "%1". ファイル "%1" を書き込みできませんでした。 - - - ImageViewer::Internal::ImageViewerFile Image format not supported. 未対応の画像形式です。 @@ -43910,29 +43903,14 @@ Would you like to overwrite it? Failed to read image. 画像の読込に失敗しました。 - - - ImageViewer::Internal::ImageViewerPlugin - - Zoom In - 拡大 - Ctrl++ Ctrl++ - - Zoom Out - 縮小 - Ctrl+- Ctrl+- - - Original Size - オリジナルサイズ - Meta+0 Meta+0 @@ -43941,10 +43919,6 @@ Would you like to overwrite it? Ctrl+0 Ctrl+0 - - Fit to Screen - 画面内に収める - Ctrl+= Ctrl+= @@ -43969,10 +43943,6 @@ Would you like to overwrite it? Toggle Animation アニメーションの切替 - - Export Image - 画像のエクスポート - Macros::Internal::MacroLocatorFilter @@ -53268,11 +53238,7 @@ Stepping into the module or setting breakpoints by file and line is expected to - Imageviewer::Internal::ImageViewerPlugin - - Fit to Screen - 画面内に収める - + Imageviewer Ctrl+= Ctrl+= @@ -53303,7 +53269,7 @@ Stepping into the module or setting breakpoints by file and line is expected to - ImageViewer::Internal::MultiExportDialog + ImageViewer File: ファイル: diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts index 46610e12266..1f1aac5a25e 100644 --- a/share/qtcreator/translations/qtcreator_pl.ts +++ b/share/qtcreator/translations/qtcreator_pl.ts @@ -2191,10 +2191,6 @@ Przyczyna: %3 Resource Editor Edytor zasobów - - Image Viewer - Przeglądarka plików graficznych - GLSL Editor Edytor GLSL @@ -13104,7 +13100,11 @@ Identyfikatory muszą rozpoczynać się małą literą. - ImageViewer::Internal::ImageViewerToolbar + ImageViewer + + Image Viewer + Przeglądarka plików graficznych + Zoom In Powiększ @@ -17625,7 +17625,7 @@ With cache simulation, further event counters are enabled: - ImageViewer::Internal::ImageViewer + ImageViewer Play Animation Odtwórz animację @@ -35325,7 +35325,7 @@ Ustawianie pułapek w liniach plików może się nie udać. - ImageViewer::Internal::ImageViewerFile + ImageViewer Image format not supported. Nieobsługiwany format pliku graficznego. @@ -38776,7 +38776,7 @@ Może pozostać puste w celu wyszukania w systemie plików. - ImageViewer::Internal::ExportDialog + ImageViewer File: Plik: @@ -38798,7 +38798,7 @@ Czy nadpisać go? - ImageViewer::Internal::ImageView + ImageViewer Export %1 Wyeksportuj %1 @@ -38815,29 +38815,14 @@ Czy nadpisać go? Could not write file "%1". Nie można zapisać pliku "%1". - - - ImageViewer::Internal::ImageViewerPlugin - - Zoom In - Powiększ - Ctrl++ Ctrl++ - - Zoom Out - Pomniejsz - Ctrl+- Ctrl+- - - Original Size - Oryginalny rozmiar - Meta+0 Meta+0 @@ -38846,10 +38831,6 @@ Czy nadpisać go? Ctrl+0 Ctrl+0 - - Fit to Screen - Dopasuj do ekranu - Ctrl+= Ctrl+= @@ -38874,10 +38855,6 @@ Czy nadpisać go? Toggle Animation Przełącz animację - - Export Image - Wyeksportuj plik graficzny - ModelEditor::Internal::ExtPropertiesMView diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index 219484fa0ab..22b2e7fe12a 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -24827,6 +24827,10 @@ Add, modify, and remove document filters, which determine the documentation set ImageViewer + + Image Viewer + Просмотр изображений + Color at %1,%2: red: %3 green: %4 blue: %5 alpha: %6 Цвет в %1,%2: красный: %3 зелёный: %4 синий: %5 альфа: %6 @@ -24849,7 +24853,7 @@ Add, modify, and remove document filters, which determine the documentation set - ImageViewer::Internal::ExportDialog + ImageViewer File: Файл: @@ -24871,7 +24875,7 @@ Would you like to overwrite it? - ImageViewer::Internal::ImageView + ImageViewer Export %1 Экспорт %1 @@ -24894,7 +24898,7 @@ Would you like to overwrite it? - ImageViewer::Internal::ImageViewer + ImageViewer Play Animation Воспроизвести анимацию @@ -24905,7 +24909,7 @@ Would you like to overwrite it? - ImageViewer::Internal::ImageViewerFile + ImageViewer Image format not supported. Формат изображения не поддерживается. @@ -24918,9 +24922,6 @@ Would you like to overwrite it? Failed to read image. Не удалось прочитать изображение. - - - ImageViewer::Internal::ImageViewerToolbar Zoom In Увеличить @@ -24953,17 +24954,10 @@ Would you like to overwrite it? Export Images of Multiple Sizes Экспортировать многоразмерные изображения - - - ImageViewer::Internal::MultiExportDialog Enter a file name containing place holders %1 which will be replaced by the width and height of the image, respectively. Введите имя файла, содержащее метки %1, которые будут заменены соответственно на ширину и высоту изображения. - - File: - Файл: - Clear Очистить @@ -28718,10 +28712,6 @@ If set to false, the target will be moved straight to the current mouse position Resource Editor Редактор ресурсов - - Image Viewer - Просмотр изображений - GLSL Editor Редактор GLSL diff --git a/share/qtcreator/translations/qtcreator_sl.ts b/share/qtcreator/translations/qtcreator_sl.ts index 3d9e3fadfe3..834a1412d1c 100644 --- a/share/qtcreator/translations/qtcreator_sl.ts +++ b/share/qtcreator/translations/qtcreator_sl.ts @@ -12483,10 +12483,6 @@ Za uporabo v polje Iskalnika vtipkajte to bližnjico in presledek ter nato iskan GLSL Editor Urejevalniku GLSL - - Image Viewer - Pregledovalniku slik - .qmlproject Editor Urejevalniku datotek *.qmlproject @@ -20048,7 +20044,11 @@ GDB omogoča navedbo zaporedja ukazov, ki so ločeni z »\n«. - ImageViewer::Internal::ImageViewerToolbar + ImageViewer + + Image Viewer + Pregledovalniku slik + Show background Prikaži ozadje @@ -25221,26 +25221,15 @@ ključe SSH išče na tem mestu in ne v mapi, kjer je nameščen. - ImageViewer::Internal::ImageViewer + ImageViewer Cannot open image file %1 Slikovne datoteke %1 ni moč odpreti - - - ImageViewer::Internal::ImageViewerActionHandler - - Zoom In - Približaj - Ctrl++ Ctrl++ - - Zoom Out - Oddalji - Ctrl+- Ctrl+- diff --git a/share/qtcreator/translations/qtcreator_uk.ts b/share/qtcreator/translations/qtcreator_uk.ts index faeee0c782f..97a8dfa87d2 100644 --- a/share/qtcreator/translations/qtcreator_uk.ts +++ b/share/qtcreator/translations/qtcreator_uk.ts @@ -12255,7 +12255,11 @@ Add, modify, and remove document filters, which determine the documentation set - ImageViewer::Internal::ImageViewer + ImageViewer + + Image Viewer + Переглядач зображень + Cannot open image file %1. Неможливо відкрити файл зображення %1. @@ -12270,74 +12274,7 @@ Add, modify, and remove document filters, which determine the documentation set - ImageViewer::Internal::ImageViewerActionHandler - - Zoom In - Збільшити - - - Ctrl++ - Ctrl++ - - - Zoom Out - Зменшити - - - Ctrl+- - Ctrl+- - - - Original Size - Початковий розмір - - - Ctrl+0 - Ctrl+0 - - - Meta+0 - Meta+0 - - - Fit To Screen - Вмістити на екрані - - - Ctrl+= - Ctrl+= - - - Switch Background - Увімкнути/вимкнути тло - - - Switch Outline - Увімкнути/вимкнути огляд - - - Toggle Animation - Відтворити/призупинити анімацію - - - Ctrl+[ - Ctrl+[ - - - Ctrl+] - Ctrl+] - - - - ImageViewer::Internal::ImageViewerToolbar - - Zoom In - Збільшити - - - Zoom Out - Зменшити - + ImageViewer Show Background Показувати тло @@ -12346,14 +12283,6 @@ Add, modify, and remove document filters, which determine the documentation set Show Outline Показувати огляд - - Fit to Screen - Вмістити на екрані - - - Original Size - Початковий розмір - Export as Image Експортувати як зображення @@ -14909,10 +14838,6 @@ stderr був: %1 Resource Editor Редактор ресурсів - - Image Viewer - Переглядач зображень - GLSL Editor Редактор GLSL @@ -52625,7 +52550,7 @@ Setting breakpoints by file name and line number may fail. - ImageViewer::Internal::ImageViewerFile + ImageViewer Image format not supported. Формат зображення не підтримується. @@ -55752,7 +55677,7 @@ Leave empty to search through the file system. - ImageViewer::Internal::ExportDialog + ImageViewer File: Файл: @@ -55774,7 +55699,7 @@ Would you like to overwrite it? - ImageViewer::Internal::ImageView + ImageViewer Export %1 Експортувати %1 @@ -55793,7 +55718,7 @@ Would you like to overwrite it? - ImageViewer::Internal::ImageViewerPlugin + ImageViewer Zoom In Збільшити @@ -55850,10 +55775,6 @@ Would you like to overwrite it? Toggle Animation Відтворити/призупинити анімацію - - Export Image - Експортувати зображення - ModelEditor::Internal::ExtPropertiesMView diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts index 528f6193138..220ea5b7f39 100644 --- a/share/qtcreator/translations/qtcreator_zh_CN.ts +++ b/share/qtcreator/translations/qtcreator_zh_CN.ts @@ -18095,10 +18095,6 @@ Will not be applied to whitespace in comments and strings. Resource Editor 资源编辑器 - - Image Viewer - 图像查看器 - GLSL Editor GLSL 编辑器 @@ -28228,7 +28224,11 @@ Id必须以小写字母开头。 - ImageViewer::Internal::ImageViewerToolbar + ImageViewer + + Image Viewer + 图像查看器 + Show background 显示背景 @@ -28245,14 +28245,6 @@ Id必须以小写字母开头。 Original size 原始大小 - - Zoom In - 放大 - - - Zoom Out - 缩小 - Show Background 显示背景 @@ -28265,10 +28257,6 @@ Id必须以小写字母开头。 Fit to Screen 适应屏幕 - - Original Size - 原始大小 - ComponentNameDialog @@ -29923,7 +29911,7 @@ instead of its installation directory when run outside git bash. - ImageViewer::Internal::ImageViewerActionHandler + ImageViewer Zoom In 放大 @@ -39137,7 +39125,7 @@ These files are preserved. - ImageViewer::Internal::ImageViewer + ImageViewer Cannot open image file %1 无法打开图形文件 %1 diff --git a/share/qtcreator/translations/qtcreator_zh_TW.ts b/share/qtcreator/translations/qtcreator_zh_TW.ts index e412c67e693..5a42fd7043b 100644 --- a/share/qtcreator/translations/qtcreator_zh_TW.ts +++ b/share/qtcreator/translations/qtcreator_zh_TW.ts @@ -10954,10 +10954,6 @@ Will not be applied to whitespace in comments and strings. Resource Editor 資源編輯器 - - Image Viewer - 影像檢視器 - GLSL Editor GLSL 編輯器 @@ -16196,14 +16192,10 @@ Ids must begin with a lowercase letter. - ImageViewer::Internal::ImageViewerToolbar + ImageViewer - Zoom In - 放大 - - - Zoom Out - 縮小 + Image Viewer + 影像檢視器 Show Background @@ -16217,10 +16209,6 @@ Ids must begin with a lowercase letter. Fit to Screen 適合螢幕 - - Original Size - 原始大小 - QmlJSEditor::Internal::QuickToolBarSettingsPage @@ -17383,7 +17371,7 @@ instead of its installation directory when run outside git bash. - ImageViewer::Internal::ImageViewerActionHandler + ImageViewer Zoom In 放大 @@ -23166,7 +23154,7 @@ These files are preserved. - ImageViewer::Internal::ImageViewer + ImageViewer Cannot open image file %1. 無法開啟影像檔 %1。 diff --git a/src/plugins/imageviewer/CMakeLists.txt b/src/plugins/imageviewer/CMakeLists.txt index 24619db7c74..f708c9d5186 100644 --- a/src/plugins/imageviewer/CMakeLists.txt +++ b/src/plugins/imageviewer/CMakeLists.txt @@ -11,7 +11,6 @@ add_qtc_plugin(ImageViewer imageview.cpp imageview.h imageviewer.cpp imageviewer.h imageviewerconstants.h - imageviewerfactory.cpp imageviewerfactory.h imageviewerfile.cpp imageviewerfile.h imageviewerplugin.cpp imageviewerplugin.h multiexportdialog.cpp multiexportdialog.h diff --git a/src/plugins/imageviewer/exportdialog.cpp b/src/plugins/imageviewer/exportdialog.cpp index cefe218c72e..370aae5b7b5 100644 --- a/src/plugins/imageviewer/exportdialog.cpp +++ b/src/plugins/imageviewer/exportdialog.cpp @@ -24,7 +24,9 @@ ****************************************************************************/ #include "exportdialog.h" + #include "imageview.h" // ExportData +#include "imageviewertr.h" #include @@ -54,7 +56,7 @@ QString ExportDialog::imageNameFilterString() static QString result; if (result.isEmpty()) { QMimeDatabase mimeDatabase; - const QString separator = QStringLiteral(";;"); + const QString separator = ";;"; foreach (const QByteArray &mimeType, QImageWriter::supportedMimeTypes()) { const QString filter = mimeDatabase.mimeTypeForName(QLatin1String(mimeType)).filterString(); if (!filter.isEmpty()) { @@ -85,7 +87,7 @@ ExportDialog::ExportDialog(QWidget *parent) m_pathChooser->setMinimumWidth(screen()->availableGeometry().width() / 5); m_pathChooser->setExpectedKind(Utils::PathChooser::SaveFile); m_pathChooser->setPromptDialogFilter(imageNameFilterString()); - formLayout->addRow(tr("File:"), m_pathChooser); + formLayout->addRow(Tr::tr("File:"), m_pathChooser); auto sizeLayout = new QHBoxLayout; m_widthSpinBox->setMinimum(exportMinimumSize); @@ -94,18 +96,18 @@ ExportDialog::ExportDialog(QWidget *parent) this, &ExportDialog::exportWidthChanged); sizeLayout->addWidget(m_widthSpinBox); //: Multiplication, as in 32x32 - sizeLayout->addWidget(new QLabel(tr("x"))); + sizeLayout->addWidget(new QLabel(Tr::tr("x"))); m_heightSpinBox->setMinimum(exportMinimumSize); m_heightSpinBox->setMaximum(exportMaximumSize); connect(m_heightSpinBox, QOverload::of(&QSpinBox::valueChanged), this, &ExportDialog::exportHeightChanged); sizeLayout->addWidget(m_heightSpinBox); auto resetButton = new QToolButton(this); - resetButton->setIcon(QIcon(QStringLiteral(":/qt-project.org/styles/commonstyle/images/refresh-32.png"))); + resetButton->setIcon(QIcon(":/qt-project.org/styles/commonstyle/images/refresh-32.png")); sizeLayout->addWidget(resetButton); sizeLayout->addStretch(); connect(resetButton, &QAbstractButton::clicked, this, &ExportDialog::resetExportSize); - formLayout->addRow(tr("Size:"), sizeLayout); + formLayout->addRow(Tr::tr("Size:"), sizeLayout); auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this); connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept); @@ -121,7 +123,7 @@ void ExportDialog::accept() } const QString fileName = exportFileName(); if (QFileInfo::exists(fileName)) { - const QString question = tr("%1 already exists.\nWould you like to overwrite it?") + const QString question = Tr::tr("%1 already exists.\nWould you like to overwrite it?") .arg(QDir::toNativeSeparators(fileName)); if (QMessageBox::question(this, windowTitle(), question, QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) return; diff --git a/src/plugins/imageviewer/exportdialog.h b/src/plugins/imageviewer/exportdialog.h index 2480c2dcafe..a17d0df5d9e 100644 --- a/src/plugins/imageviewer/exportdialog.h +++ b/src/plugins/imageviewer/exportdialog.h @@ -31,14 +31,12 @@ QT_FORWARD_DECLARE_CLASS(QSpinBox) namespace Utils { class PathChooser; } -namespace ImageViewer { -namespace Internal { +namespace ImageViewer::Internal { struct ExportData; class ExportDialog : public QDialog { - Q_OBJECT public: explicit ExportDialog(QWidget *parent = nullptr); @@ -69,5 +67,4 @@ private: qreal m_aspectRatio; }; -} // namespace Internal -} // namespace ImageViewer +} // ImageViewer::Internal diff --git a/src/plugins/imageviewer/imageview.cpp b/src/plugins/imageviewer/imageview.cpp index e0770eb3c17..b7aa41e9557 100644 --- a/src/plugins/imageviewer/imageview.cpp +++ b/src/plugins/imageviewer/imageview.cpp @@ -27,8 +27,9 @@ #include "imageview.h" #include "exportdialog.h" -#include "multiexportdialog.h" #include "imageviewerfile.h" +#include "imageviewertr.h" +#include "multiexportdialog.h" #include "utils/mimeutils.h" #include @@ -36,19 +37,17 @@ #include #include -#include -#include - -#include -#include -#include -#include -#include #include -#include - #include #include +#include +#include +#include +#include +#include +#include +#include +#include #include @@ -176,14 +175,14 @@ bool ImageView::exportSvg(const ExportData &ed) { const bool result = renderSvg(ed.size).save(ed.fileName); if (result) { - const QString message = tr("Exported \"%1\", %2x%3, %4 bytes") + const QString message = Tr::tr("Exported \"%1\", %2x%3, %4 bytes") .arg(QDir::toNativeSeparators(ed.fileName)) .arg(ed.size.width()).arg(ed.size.height()) .arg(QFileInfo(ed.fileName).size()); Core::MessageManager::writeDisrupting(message); } else { - const QString message = tr("Could not write file \"%1\".").arg(QDir::toNativeSeparators(ed.fileName)); - QMessageBox::critical(this, tr("Export Image"), message); + const QString message = Tr::tr("Could not write file \"%1\".").arg(QDir::toNativeSeparators(ed.fileName)); + QMessageBox::critical(this, Tr::tr("Export Image"), message); } return result; } @@ -214,7 +213,7 @@ void ImageView::exportImage() const QFileInfo origFi = m_file->filePath().toFileInfo(); ExportDialog exportDialog(this); - exportDialog.setWindowTitle(tr("Export %1").arg(origFi.fileName())); + exportDialog.setWindowTitle(Tr::tr("Export %1").arg(origFi.fileName())); exportDialog.setExportSize(svgSize()); exportDialog.setExportFileName(suggestedExportFileName(origFi)); @@ -230,7 +229,7 @@ void ImageView::exportMultiImages() const QFileInfo origFi = m_file->filePath().toFileInfo(); const QSize size = svgSize(); const QString title = - tr("Export a Series of Images from %1 (%2x%3)") + Tr::tr("Export a Series of Images from %1 (%2x%3)") .arg(origFi.fileName()).arg(size.width()).arg(size.height()); MultiExportDialog multiExportDialog; multiExportDialog.setWindowTitle(title); diff --git a/src/plugins/imageviewer/imageview.h b/src/plugins/imageviewer/imageview.h index 4f18f7620c1..c32adb8df3a 100644 --- a/src/plugins/imageviewer/imageview.h +++ b/src/plugins/imageviewer/imageview.h @@ -30,8 +30,7 @@ QT_FORWARD_DECLARE_CLASS(QImage) -namespace ImageViewer { -namespace Internal { +namespace ImageViewer::Internal { class ImageViewerFile; @@ -85,5 +84,4 @@ private: bool m_showOutline = true; }; -} // namespace Internal -} // namespace ImageViewer +} // ImageViewer::Internal diff --git a/src/plugins/imageviewer/imageviewer.cpp b/src/plugins/imageviewer/imageviewer.cpp index 7b933839380..5388b46d2c5 100644 --- a/src/plugins/imageviewer/imageviewer.cpp +++ b/src/plugins/imageviewer/imageviewer.cpp @@ -26,9 +26,10 @@ #include "imageviewer.h" -#include "imageviewerfile.h" -#include "imageviewerconstants.h" #include "imageview.h" +#include "imageviewerconstants.h" +#include "imageviewerfile.h" +#include "imageviewertr.h" #include #include @@ -42,22 +43,21 @@ #include #include -#include -#include -#include -#include #include -#include +#include +#include #include +#include #include +#include #include #include +#include using namespace Core; using namespace Utils; -namespace ImageViewer { -namespace Internal { +namespace ImageViewer::Internal{ struct ImageViewerPrivate { @@ -145,13 +145,13 @@ void ImageViewer::ctor() d->toolButtonZoomOut->setAutoRepeat(true); - d->toolButtonExportImage->setToolTipBase(tr("Export as Image")); - d->toolButtonMultiExportImages->setToolTipBase(tr("Export Images of Multiple Sizes")); - d->toolButtonOutline->setToolTipBase(tr("Show Outline")); - d->toolButtonFitToScreen->setToolTipBase(tr("Fit to Screen")); - d->toolButtonOriginalSize->setToolTipBase(tr("Original Size")); - d->toolButtonZoomIn->setToolTipBase(tr("Zoom In")); - d->toolButtonZoomOut->setToolTipBase(tr("Zoom Out")); + d->toolButtonExportImage->setToolTipBase(Tr::tr("Export as Image")); + d->toolButtonMultiExportImages->setToolTipBase(Tr::tr("Export Images of Multiple Sizes")); + d->toolButtonOutline->setToolTipBase(Tr::tr("Show Outline")); + d->toolButtonFitToScreen->setToolTipBase(Tr::tr("Fit to Screen")); + d->toolButtonOriginalSize->setToolTipBase(Tr::tr("Original Size")); + d->toolButtonZoomIn->setToolTipBase(Tr::tr("Zoom In")); + d->toolButtonZoomOut->setToolTipBase(Tr::tr("Zoom Out")); d->toolButtonExportImage->setIcon(Icons::EXPORTFILE_TOOLBAR.icon()); d->toolButtonMultiExportImages->setIcon(Icons::MULTIEXPORTFILE_TOOLBAR.icon()); @@ -359,14 +359,26 @@ void ImageViewer::updatePauseAction() { bool isMovie = d->file->type() == ImageViewerFile::TypeMovie; if (isMovie && !d->file->isPaused()) { - d->toolButtonPlayPause->setToolTipBase(tr("Pause Animation")); + d->toolButtonPlayPause->setToolTipBase(Tr::tr("Pause Animation")); d->toolButtonPlayPause->setIcon(Icons::INTERRUPT_SMALL_TOOLBAR.icon()); } else { - d->toolButtonPlayPause->setToolTipBase(tr("Play Animation")); + d->toolButtonPlayPause->setToolTipBase(Tr::tr("Play Animation")); d->toolButtonPlayPause->setIcon(Icons::RUN_SMALL_TOOLBAR.icon()); d->toolButtonPlayPause->setEnabled(isMovie); } } -} // namespace Internal -} // namespace ImageViewer +// Factory + +ImageViewerFactory::ImageViewerFactory() +{ + setId(Constants::IMAGEVIEWER_ID); + setDisplayName(Tr::tr("Image Viewer")); + setEditorCreator([] { return new ImageViewer; }); + + const QList supportedMimeTypes = QImageReader::supportedMimeTypes(); + for (const QByteArray &format : supportedMimeTypes) + addMimeType(QString::fromLatin1(format)); +} + +} // ImageViewer::Internal diff --git a/src/plugins/imageviewer/imageviewer.h b/src/plugins/imageviewer/imageviewer.h index 41cdc4119d2..29c0ab50007 100644 --- a/src/plugins/imageviewer/imageviewer.h +++ b/src/plugins/imageviewer/imageviewer.h @@ -27,16 +27,9 @@ #pragma once #include +#include #include -#include -#include - -QT_BEGIN_NAMESPACE -class QAbstractButton; -class QAction; -QT_END_NAMESPACE - namespace ImageViewer::Internal { class ImageViewerFile; @@ -78,4 +71,10 @@ private: struct ImageViewerPrivate *d; }; +class ImageViewerFactory final : public Core::IEditorFactory +{ +public: + ImageViewerFactory(); +}; + } // ImageViewer::Internal diff --git a/src/plugins/imageviewer/imageviewer.qbs b/src/plugins/imageviewer/imageviewer.qbs index d9562c27c56..c5fe2c8eb9d 100644 --- a/src/plugins/imageviewer/imageviewer.qbs +++ b/src/plugins/imageviewer/imageviewer.qbs @@ -23,8 +23,6 @@ QtcPlugin { "imageviewer.cpp", "imageviewer.h", "imageviewerconstants.h", - "imageviewerfactory.cpp", - "imageviewerfactory.h", "imageviewerfile.cpp", "imageviewerfile.h", "imageviewerplugin.cpp", diff --git a/src/plugins/imageviewer/imageviewerconstants.h b/src/plugins/imageviewer/imageviewerconstants.h index af7766abe66..f7d52bc8392 100644 --- a/src/plugins/imageviewer/imageviewerconstants.h +++ b/src/plugins/imageviewer/imageviewerconstants.h @@ -28,11 +28,9 @@ #include -namespace ImageViewer { -namespace Constants { +namespace ImageViewer::Constants { const char IMAGEVIEWER_ID[] = "Editors.ImageViewer"; -const char IMAGEVIEWER_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("OpenWith::Editors", "Image Viewer"); const char ACTION_EXPORT_IMAGE[] = "ImageViewer.ExportImage"; const char ACTION_EXPORT_MULTI_IMAGES[] = "ImageViewer.ExportMultiImages"; @@ -42,5 +40,4 @@ const char ACTION_BACKGROUND[] = "ImageViewer.Background"; const char ACTION_OUTLINE[] = "ImageViewer.Outline"; const char ACTION_TOGGLE_ANIMATION[] = "ImageViewer.ToggleAnimation"; -} // namespace Constants -} // namespace ImageViewer +} // ImageViewer::Constants diff --git a/src/plugins/imageviewer/imageviewerfactory.cpp b/src/plugins/imageviewer/imageviewerfactory.cpp deleted file mode 100644 index d0da540cfab..00000000000 --- a/src/plugins/imageviewer/imageviewerfactory.cpp +++ /dev/null @@ -1,49 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Denis Mingulov. -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - -#include "imageviewerfactory.h" -#include "imageviewerconstants.h" -#include "imageviewer.h" - -#include -#include - -namespace ImageViewer { -namespace Internal { - -ImageViewerFactory::ImageViewerFactory() -{ - setId(Constants::IMAGEVIEWER_ID); - setDisplayName(QCoreApplication::translate("OpenWith::Editors", Constants::IMAGEVIEWER_DISPLAY_NAME)); - setEditorCreator([] { return new ImageViewer; }); - - const QList supportedMimeTypes = QImageReader::supportedMimeTypes(); - for (const QByteArray &format : supportedMimeTypes) - addMimeType(QString::fromLatin1(format)); -} - -} // namespace Internal -} // namespace ImageViewer diff --git a/src/plugins/imageviewer/imageviewerfactory.h b/src/plugins/imageviewer/imageviewerfactory.h deleted file mode 100644 index 816de2ffe6b..00000000000 --- a/src/plugins/imageviewer/imageviewerfactory.h +++ /dev/null @@ -1,41 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Denis Mingulov. -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - -#pragma once - -#include - -namespace ImageViewer { -namespace Internal { - -class ImageViewerFactory final : public Core::IEditorFactory -{ -public: - ImageViewerFactory(); -}; - -} // namespace Internal -} // namespace ImageViewer diff --git a/src/plugins/imageviewer/imageviewerfile.cpp b/src/plugins/imageviewer/imageviewerfile.cpp index 0133cce05c6..6b36d9a2b54 100644 --- a/src/plugins/imageviewer/imageviewerfile.cpp +++ b/src/plugins/imageviewer/imageviewerfile.cpp @@ -25,26 +25,29 @@ ****************************************************************************/ #include "imageviewerfile.h" -#include "imageviewer.h" + #include "imageviewerconstants.h" +#include "imageviewertr.h" #include -#include +#include + +#include #include #include #include #include -#ifndef QT_NO_SVG -#include -#endif #include #include #include #include -namespace ImageViewer { -namespace Internal { +#ifndef QT_NO_SVG +#include +#endif + +namespace ImageViewer::Internal { class MovieItem : public QObject, public QGraphicsPixmapItem { @@ -103,7 +106,7 @@ Core::IDocument::OpenResult ImageViewerFile::openImpl(QString *errorString, // if it is impossible to recognize a file format - file will not be open correctly if (format.isEmpty()) { if (errorString) - *errorString = tr("Image format not supported."); + *errorString = Tr::tr("Image format not supported."); return OpenResult::CannotHandle; } @@ -115,7 +118,7 @@ Core::IDocument::OpenResult ImageViewerFile::openImpl(QString *errorString, delete m_tempSvgItem; m_tempSvgItem = nullptr; if (errorString) - *errorString = tr("Failed to read SVG image."); + *errorString = Tr::tr("Failed to read SVG image."); return OpenResult::CannotHandle; } m_type = TypeSvg; @@ -128,7 +131,7 @@ Core::IDocument::OpenResult ImageViewerFile::openImpl(QString *errorString, m_movie->jumpToNextFrame(); if (!m_movie->isValid()) { if (errorString) - *errorString = tr("Failed to read image."); + *errorString = Tr::tr("Failed to read image."); delete m_movie; m_movie = nullptr; return OpenResult::CannotHandle; @@ -152,7 +155,7 @@ Core::IDocument::OpenResult ImageViewerFile::openImpl(QString *errorString, m_pixmap = new QPixmap(fileName); if (m_pixmap->isNull()) { if (errorString) - *errorString = tr("Failed to read image."); + *errorString = Tr::tr("Failed to read image."); delete m_pixmap; m_pixmap = nullptr; return OpenResult::CannotHandle; @@ -243,7 +246,7 @@ void ImageViewerFile::updateVisibility() if (!m_movie || m_isPaused) return; bool visible = false; - foreach (Core::IEditor *editor, Core::DocumentModel::editorsForDocument(this)) { + for (Core::IEditor *editor : Core::DocumentModel::editorsForDocument(this)) { if (editor->widget()->isVisible()) { visible = true; break; @@ -265,5 +268,4 @@ void ImageViewerFile::cleanUp() m_type = TypeInvalid; } -} // namespace Internal -} // namespace ImageViewer +} // ImageViewer::Internal diff --git a/src/plugins/imageviewer/imageviewerfile.h b/src/plugins/imageviewer/imageviewerfile.h index 4cab47a45c1..ebdae989e41 100644 --- a/src/plugins/imageviewer/imageviewerfile.h +++ b/src/plugins/imageviewer/imageviewerfile.h @@ -39,8 +39,7 @@ class QGraphicsSvgItem; QT_END_NAMESPACE -namespace ImageViewer { -namespace Internal { +namespace ImageViewer::Internal { class ImageViewerFile : public Core::IDocument { @@ -89,5 +88,4 @@ private: bool m_isPaused = false; }; -} // namespace Internal -} // namespace ImageViewer +} // ImageViewer::Internal diff --git a/src/plugins/imageviewer/imageviewerplugin.cpp b/src/plugins/imageviewer/imageviewerplugin.cpp index 2c13f93ad8a..4251ee5cd5b 100644 --- a/src/plugins/imageviewer/imageviewerplugin.cpp +++ b/src/plugins/imageviewer/imageviewerplugin.cpp @@ -25,9 +25,10 @@ ****************************************************************************/ #include "imageviewerplugin.h" + #include "imageviewer.h" -#include "imageviewerfactory.h" #include "imageviewerconstants.h" +#include "imageviewertr.h" #include #include @@ -42,8 +43,7 @@ using namespace Core; using namespace Utils; -namespace ImageViewer { -namespace Internal { +namespace ImageViewer::Internal { class ImageViewerAction final : public QAction { @@ -67,8 +67,6 @@ public: class ImageViewerPluginPrivate final { - Q_DECLARE_TR_FUNCTIONS(Imageviewer::Internal::ImageViewerPlugin) - public: ImageViewerFactory imageViewerFactory; @@ -90,46 +88,46 @@ public: ImageViewerAction fitToScreenAction { Constants::ACTION_FIT_TO_SCREEN, &ImageViewer::fitToScreen, - tr("Fit to Screen"), - tr("Ctrl+=") + Tr::tr("Fit to Screen"), + Tr::tr("Ctrl+=") }; ImageViewerAction switchBackgroundAction { Constants::ACTION_BACKGROUND, &ImageViewer::switchViewBackground, - tr("Switch Background"), - tr("Ctrl+[") + Tr::tr("Switch Background"), + Tr::tr("Ctrl+[") }; ImageViewerAction switchOutlineAction { Constants::ACTION_OUTLINE, &ImageViewer::switchViewOutline, - tr("Switch Outline"), - tr("Ctrl+]") + Tr::tr("Switch Outline"), + Tr::tr("Ctrl+]") }; ImageViewerAction toggleAnimationAction { Constants::ACTION_TOGGLE_ANIMATION, &ImageViewer::togglePlay, - tr("Toggle Animation") + Tr::tr("Toggle Animation") }; ImageViewerAction exportImageAction { Constants::ACTION_EXPORT_IMAGE, &ImageViewer::exportImage, - tr("Export Image") + Tr::tr("Export Image") }; ImageViewerAction exportMulitImagesAction { Constants::ACTION_EXPORT_MULTI_IMAGES, &ImageViewer::exportMultiImages, - tr("Export Multiple Images"), + Tr::tr("Export Multiple Images"), }; ImageViewerAction copyDataUrlAction { Constants::ACTION_COPY_DATA_URL, &ImageViewer::copyDataUrl, - tr("Copy as Data URL"), + Tr::tr("Copy as Data URL"), }; }; @@ -148,5 +146,4 @@ bool ImageViewerPlugin::initialize(const QStringList &arguments, QString *errorM return true; } -} // namespace Internal -} // namespace ImageViewer +} // ImageViewer::Internal diff --git a/src/plugins/imageviewer/imageviewerplugin.h b/src/plugins/imageviewer/imageviewerplugin.h index 6c78be4c8b1..20c1feeb93e 100644 --- a/src/plugins/imageviewer/imageviewerplugin.h +++ b/src/plugins/imageviewer/imageviewerplugin.h @@ -28,8 +28,7 @@ #include -namespace ImageViewer { -namespace Internal { +namespace ImageViewer::Internal { class ImageViewerPlugin : public ExtensionSystem::IPlugin { @@ -46,5 +45,4 @@ private: class ImageViewerPluginPrivate *d = nullptr; }; -} // namespace Internal -} // namespace ImageViewer +} // ImageViewer::Internal diff --git a/src/plugins/imageviewer/multiexportdialog.cpp b/src/plugins/imageviewer/multiexportdialog.cpp index 36876e8f14f..e8d570b32a6 100644 --- a/src/plugins/imageviewer/multiexportdialog.cpp +++ b/src/plugins/imageviewer/multiexportdialog.cpp @@ -24,8 +24,10 @@ ****************************************************************************/ #include "multiexportdialog.h" + #include "exportdialog.h" #include "imageview.h" // ExportData +#include "imageviewertr.h" #include #include @@ -47,8 +49,7 @@ #include #include -namespace ImageViewer { -namespace Internal { +namespace ImageViewer::Internal { static const int standardIconSizesValues[] = {16, 24, 32, 48, 64, 128, 256}; @@ -180,11 +181,11 @@ MultiExportDialog::MultiExportDialog(QWidget *parent) m_pathChooser->setExpectedKind(Utils::PathChooser::SaveFile); m_pathChooser->setPromptDialogFilter(ExportDialog::imageNameFilterString()); const QString pathChooserToolTip = - tr("Enter a file name containing place holders %1 " + Tr::tr("Enter a file name containing place holders %1 " "which will be replaced by the width and height of the image, respectively.") .arg("%1, %2"); m_pathChooser->setToolTip(pathChooserToolTip); - QLabel *pathChooserLabel = new QLabel(tr("File:")); + QLabel *pathChooserLabel = new QLabel(Tr::tr("File:")); pathChooserLabel->setToolTip(pathChooserToolTip); formLayout->addRow(pathChooserLabel, m_pathChooser); @@ -192,18 +193,18 @@ MultiExportDialog::MultiExportDialog(QWidget *parent) sizeEditButton->setFocusPolicy(Qt::NoFocus); sizeEditButton->setIcon(Utils::Icons::ARROW_DOWN.icon()); auto sizeEditMenu = new QMenu(this); - sizeEditMenu->addAction(tr("Clear"), + sizeEditMenu->addAction(Tr::tr("Clear"), m_sizesLineEdit, &QLineEdit::clear); - sizeEditMenu->addAction(tr("Set Standard Icon Sizes"), this, + sizeEditMenu->addAction(Tr::tr("Set Standard Icon Sizes"), this, &MultiExportDialog::setStandardIconSizes); - sizeEditMenu->addAction(tr("Generate Sizes"), this, + sizeEditMenu->addAction(Tr::tr("Generate Sizes"), this, &MultiExportDialog::setGeneratedSizes); sizeEditButton->setMenu(sizeEditMenu); sizeEditButton->setPopupMode(QToolButton::InstantPopup); const QString sizesToolTip = - tr("A comma-separated list of size specifications of the form \"x\"."); - auto sizesLabel = new QLabel(tr("Sizes:")); + Tr::tr("A comma-separated list of size specifications of the form \"x\"."); + auto sizesLabel = new QLabel(Tr::tr("Sizes:")); sizesLabel->setToolTip(sizesToolTip); formLayout->addRow(sizesLabel, m_sizesLineEdit); m_sizesLineEdit->setToolTip(sizesToolTip); @@ -279,19 +280,19 @@ void MultiExportDialog::accept() const QString &sizeSpec = sizesSpecification(); if (sizeSpec.isEmpty()) { - QMessageBox::warning(this, windowTitle(), tr("Please specify some sizes.")); + QMessageBox::warning(this, windowTitle(), Tr::tr("Please specify some sizes.")); return; } const QVector &data = exportData(); if (data.isEmpty()) { QMessageBox::warning(this, windowTitle(), - tr("Invalid size specification: %1").arg(sizeSpec)); + Tr::tr("Invalid size specification: %1").arg(sizeSpec)); return; } if (data.size() > 1 && data.at(0).fileName == data.at(1).fileName) { QMessageBox::warning(this, windowTitle(), - tr("The file name must contain one of the placeholders %1, %2.") + Tr::tr("The file name must contain one of the placeholders %1, %2.") .arg(QString("%1"), QString("%2"))); return; } @@ -305,9 +306,9 @@ void MultiExportDialog::accept() } if (!existingFiles.isEmpty()) { const QString message = existingFiles.size() == 1 - ? tr("The file %1 already exists.\nWould you like to overwrite it?") + ? Tr::tr("The file %1 already exists.\nWould you like to overwrite it?") .arg(QDir::toNativeSeparators(existingFiles.constFirst())) - : tr("The files %1 already exist.\nWould you like to overwrite them?") + : Tr::tr("The files %1 already exist.\nWould you like to overwrite them?") .arg(QDir::toNativeSeparators(existingFiles.join(", "))); QMessageBox messageBox(QMessageBox::Question, windowTitle(), message, QMessageBox::Yes | QMessageBox::No, this); @@ -331,5 +332,4 @@ void MultiExportDialog::setExportFileName(QString f) m_pathChooser->setFilePath(Utils::FilePath::fromString(f)); } -} // namespace Internal -} // namespace ImageViewer +} // ImageViewer:Internal diff --git a/src/plugins/imageviewer/multiexportdialog.h b/src/plugins/imageviewer/multiexportdialog.h index cb78c3347ae..97d02f852bf 100644 --- a/src/plugins/imageviewer/multiexportdialog.h +++ b/src/plugins/imageviewer/multiexportdialog.h @@ -35,8 +35,7 @@ QT_FORWARD_DECLARE_CLASS(QLineEdit) namespace Utils { class PathChooser; } -namespace ImageViewer { -namespace Internal { +namespace ImageViewer::Internal { struct ExportData; @@ -61,12 +60,12 @@ public: QSize svgSize() const { return m_svgSize; } void setSvgSize(const QSize &svgSize) { m_svgSize = svgSize; } -public slots: - void setStandardIconSizes(); - void setGeneratedSizes(); void suggestSizes(); private: + void setStandardIconSizes(); + void setGeneratedSizes(); + QString sizesSpecification() const; Utils::PathChooser *m_pathChooser; @@ -75,5 +74,4 @@ private: }; -} // namespace Internal -} // namespace ImageViewer +} // ImageViewer::Internal