From afe33738967e4184d650c94628a4c2b5f4e8e997 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 17 Sep 2017 21:45:49 +0200 Subject: [PATCH] Apply tidy after updating to clang-format 5.0.0 The behavior of clang-format slightly changed in Clang 5.0.0: http://releases.llvm.org/5.0.0/tools/clang/docs/ReleaseNotes.html#clang-format --- aboutdialog/aboutdialog.cpp | 10 +- aboutdialog/aboutdialog.h | 2 +- enterpassworddialog/enterpassworddialog.cpp | 7 +- enterpassworddialog/enterpassworddialog.h | 2 +- misc/adoptlocker.h | 2 +- misc/conversion.h | 2 +- misc/dbusnotification.cpp | 2 +- misc/dbusnotification.h | 2 +- misc/desktoputils.cpp | 2 +- misc/recentmenumanager.cpp | 2 +- misc/recentmenumanager.h | 2 +- misc/trylocker.h | 2 +- models/checklistmodel.cpp | 2 +- models/checklistmodel.h | 2 +- paletteeditor/colorbutton.cpp | 2 +- paletteeditor/colorbutton.h | 2 +- paletteeditor/paletteeditor.cpp | 2 +- paletteeditor/paletteeditor.h | 2 +- resources/qtconfigarguments.cpp | 19 +- resources/qtconfigarguments.h | 2 +- resources/resources.cpp | 6 +- resources/resources.h | 4 +- settingsdialog/optioncategory.cpp | 2 +- settingsdialog/optioncategory.h | 2 +- settingsdialog/optioncategoryfiltermodel.cpp | 2 +- settingsdialog/optioncategoryfiltermodel.h | 2 +- settingsdialog/optioncategorymodel.cpp | 4 +- settingsdialog/optioncategorymodel.h | 2 +- settingsdialog/optionpage.cpp | 2 +- settingsdialog/optionpage.h | 2 +- settingsdialog/qtsettings.cpp | 2 +- settingsdialog/qtsettings.h | 2 +- settingsdialog/settingsdialog.cpp | 2 +- settingsdialog/settingsdialog.h | 2 +- translations/qtutilities_de_DE.ts | 172 +++++++++---------- translations/qtutilities_en_US.ts | 16 +- widgets/buttonoverlay.cpp | 2 +- widgets/buttonoverlay.h | 2 +- widgets/clearcombobox.cpp | 2 +- widgets/clearlineedit.cpp | 2 +- widgets/clearlineedit.h | 2 +- widgets/clearspinbox.cpp | 2 +- widgets/clearspinbox.h | 2 +- widgets/iconbutton.cpp | 2 +- widgets/iconbutton.h | 2 +- widgets/pathselection.cpp | 2 +- widgets/pathselection.h | 2 +- 47 files changed, 157 insertions(+), 159 deletions(-) diff --git a/aboutdialog/aboutdialog.cpp b/aboutdialog/aboutdialog.cpp index b2faad1..2799681 100644 --- a/aboutdialog/aboutdialog.cpp +++ b/aboutdialog/aboutdialog.cpp @@ -54,10 +54,10 @@ AboutDialog::AboutDialog(QWidget *parent, const QString &applicationName, const } m_ui->creatorLabel->setText(tr("developed by %1").arg(creator.isEmpty() ? QApplication::organizationName() : creator)); m_ui->versionLabel->setText(version.isEmpty() ? QApplication::applicationVersion() : version); - m_ui->websiteLabel->setText(tr( - "For updates and bug reports visit the project " - "website.").arg(website.isEmpty() ? QApplication::organizationDomain() : website)); + m_ui->websiteLabel->setText(tr("For updates and bug reports visit the project " + "website.") + .arg(website.isEmpty() ? QApplication::organizationDomain() : website)); m_ui->descLabel->setText(description); m_iconScene = new QGraphicsScene(this); auto *item = image.isNull() @@ -84,4 +84,4 @@ AboutDialog::AboutDialog(QWidget *parent, const QString &description, const QIma AboutDialog::~AboutDialog() { } -} +} // namespace Dialogs diff --git a/aboutdialog/aboutdialog.h b/aboutdialog/aboutdialog.h index d5bc9b9..d04406a 100644 --- a/aboutdialog/aboutdialog.h +++ b/aboutdialog/aboutdialog.h @@ -28,6 +28,6 @@ private: std::unique_ptr m_ui; QGraphicsScene *m_iconScene; }; -} +} // namespace Dialogs #endif // DIALOGS_ABOUTDIALOG_H diff --git a/enterpassworddialog/enterpassworddialog.cpp b/enterpassworddialog/enterpassworddialog.cpp index 556ce1b..3da9e48 100644 --- a/enterpassworddialog/enterpassworddialog.cpp +++ b/enterpassworddialog/enterpassworddialog.cpp @@ -290,8 +290,9 @@ void EnterPasswordDialog::confirm() } else { if (isVerificationRequired() && (password != repeatedPassword) && !m_ui->showPasswordCheckBox->isChecked()) { if (repeatedPassword.isEmpty()) { - QMessageBox::warning(this, windowTitle(), tr("You have to enter the new password twice to " - "ensure you enterd it correct.")); + QMessageBox::warning(this, windowTitle(), + tr("You have to enter the new password twice to " + "ensure you enterd it correct.")); } else { QMessageBox::warning(this, windowTitle(), tr("You mistyped the password.")); } @@ -340,4 +341,4 @@ bool EnterPasswordDialog::isCapslockPressed() return false; #endif } -} +} // namespace Dialogs diff --git a/enterpassworddialog/enterpassworddialog.h b/enterpassworddialog/enterpassworddialog.h index d439075..903576e 100644 --- a/enterpassworddialog/enterpassworddialog.h +++ b/enterpassworddialog/enterpassworddialog.h @@ -99,6 +99,6 @@ inline void EnterPasswordDialog::abort() m_password.clear(); done(QDialog::Rejected); } -} +} // namespace Dialogs #endif // DIALOGS_ENTERPASSWORDDIALOG_H diff --git a/misc/adoptlocker.h b/misc/adoptlocker.h index 37f2da0..30752b1 100644 --- a/misc/adoptlocker.h +++ b/misc/adoptlocker.h @@ -31,6 +31,6 @@ public: private: Mutex &m_mutex; }; -} +} // namespace ThreadingUtils #endif // THEADING_UTILS_ADOPTLOCKER_H diff --git a/misc/conversion.h b/misc/conversion.h index 53b74dc..4712c98 100644 --- a/misc/conversion.h +++ b/misc/conversion.h @@ -36,6 +36,6 @@ inline QString fromNativeFileName(const std::string &nativeFileName) #endif } -} // namespace Dialogs +} // namespace ConversionUtilities #endif // CONVERSION_H diff --git a/misc/dbusnotification.cpp b/misc/dbusnotification.cpp index f46013f..97e54c6 100644 --- a/misc/dbusnotification.cpp +++ b/misc/dbusnotification.cpp @@ -309,4 +309,4 @@ void DBusNotification::handleActionInvoked(uint id, const QString &action) * \fn DBusNotification::isVisible() * \brief Returns whether the notification is (still) visible. */ -} +} // namespace MiscUtils diff --git a/misc/dbusnotification.h b/misc/dbusnotification.h index 221a530..b229e2e 100644 --- a/misc/dbusnotification.h +++ b/misc/dbusnotification.h @@ -171,6 +171,6 @@ inline bool DBusNotification::isVisible() const { return m_id != 0; } -} +} // namespace MiscUtils #endif // MISC_UTILS_NOTIFICATION_H diff --git a/misc/desktoputils.cpp b/misc/desktoputils.cpp index ff138f3..886e01d 100644 --- a/misc/desktoputils.cpp +++ b/misc/desktoputils.cpp @@ -26,4 +26,4 @@ bool openLocalFileOrDir(const QString &path) return QDesktopServices::openUrl(url); #endif } -} +} // namespace DesktopUtils diff --git a/misc/recentmenumanager.cpp b/misc/recentmenumanager.cpp index 89fc0e5..c5b5118 100644 --- a/misc/recentmenumanager.cpp +++ b/misc/recentmenumanager.cpp @@ -170,4 +170,4 @@ void RecentMenuManager::handleActionTriggered() * \remarks Only emitted when the selected file still existed; otherwise the * user is ask whether to keep or delete the entry. */ -} +} // namespace MiscUtils diff --git a/misc/recentmenumanager.h b/misc/recentmenumanager.h index 0c30a78..221c724 100644 --- a/misc/recentmenumanager.h +++ b/misc/recentmenumanager.h @@ -33,6 +33,6 @@ private: QAction *m_sep; QAction *m_clearAction; }; -} +} // namespace MiscUtils #endif // MISC_UTILS_RECENTMENUMANAGER_H diff --git a/misc/trylocker.h b/misc/trylocker.h index 50e1979..7aa595b 100644 --- a/misc/trylocker.h +++ b/misc/trylocker.h @@ -50,6 +50,6 @@ public: private: Mutex *m_mutex; }; -} +} // namespace ThreadingUtils #endif // THREADING_UTILS_TRYLOCKER_H diff --git a/models/checklistmodel.cpp b/models/checklistmodel.cpp index 71611c2..1969e63 100644 --- a/models/checklistmodel.cpp +++ b/models/checklistmodel.cpp @@ -225,4 +225,4 @@ void ChecklistModel::save(QSettings &settings, const QString &name) const } settings.endArray(); } -} +} // namespace Models diff --git a/models/checklistmodel.h b/models/checklistmodel.h index 83c2287..bcca282 100644 --- a/models/checklistmodel.h +++ b/models/checklistmodel.h @@ -109,6 +109,6 @@ constexpr int ChecklistModel::idRole() { return Qt::UserRole + 1; } -} +} // namespace Models #endif // MODELS_CHECKLISTMODEL_H diff --git a/paletteeditor/colorbutton.cpp b/paletteeditor/colorbutton.cpp index 9caa8eb..457c2d9 100644 --- a/paletteeditor/colorbutton.cpp +++ b/paletteeditor/colorbutton.cpp @@ -231,6 +231,6 @@ void ColorButton::dropEvent(QDropEvent *event) emit colorChanged(color()); } #endif -} +} // namespace Widgets #include "moc_colorbutton.cpp" diff --git a/paletteeditor/colorbutton.h b/paletteeditor/colorbutton.h index 23b7cf8..2d6598c 100644 --- a/paletteeditor/colorbutton.h +++ b/paletteeditor/colorbutton.h @@ -46,6 +46,6 @@ private: Q_DISABLE_COPY(ColorButton) Q_PRIVATE_SLOT(d_func(), void slotEditColor()) }; -} +} // namespace Widgets #endif // WIDGETS_COLORBUTTON_H diff --git a/paletteeditor/paletteeditor.cpp b/paletteeditor/paletteeditor.cpp index b805508..2eb076c 100644 --- a/paletteeditor/paletteeditor.cpp +++ b/paletteeditor/paletteeditor.cpp @@ -552,4 +552,4 @@ QSize ColorDelegate::sizeHint(const QStyleOptionViewItem &opt, const QModelIndex { return QItemDelegate::sizeHint(opt, index) + QSize(4, 4); } -} +} // namespace Dialogs diff --git a/paletteeditor/paletteeditor.h b/paletteeditor/paletteeditor.h index 2a60624..12553bf 100644 --- a/paletteeditor/paletteeditor.h +++ b/paletteeditor/paletteeditor.h @@ -180,6 +180,6 @@ public: void paint(QPainter *painter, const QStyleOptionViewItem &opt, const QModelIndex &index) const; QSize sizeHint(const QStyleOptionViewItem &opt, const QModelIndex &index) const; }; -} +} // namespace Dialogs #endif // WIDGETS_PALETTEEDITOR_H diff --git a/resources/qtconfigarguments.cpp b/resources/qtconfigarguments.cpp index dd368fe..a9e9c0c 100644 --- a/resources/qtconfigarguments.cpp +++ b/resources/qtconfigarguments.cpp @@ -28,15 +28,18 @@ QtConfigArguments::QtConfigArguments() : m_qtWidgetsGuiArg("qt-widgets-gui", 'g', "shows a Qt widgets based graphical user interface") , m_qtQuickGuiArg("qt-quick-gui", 'q', "shows a Qt quick based graphical user interface") , m_lngArg("lang", 'l', "sets the language for the Qt GUI") - , m_qmlDebuggerArg("qmljsdebugger", '\0', "enables QML debugging (see " - "http://doc.qt.io/qt-5/" - "qtquick-debugging.html)") + , m_qmlDebuggerArg("qmljsdebugger", '\0', + "enables QML debugging (see " + "http://doc.qt.io/qt-5/" + "qtquick-debugging.html)") , m_styleArg("style", '\0', "sets the Qt widgets style") - , m_iconThemeArg("icon-theme", '\0', "sets the icon theme and additional " - "theme search paths for the Qt GUI") + , m_iconThemeArg("icon-theme", '\0', + "sets the icon theme and additional " + "theme search paths for the Qt GUI") , m_fontArg("font", '\0', "sets the font family and size (point) for the Qt GUI") - , m_libraryPathsArg("library-paths", '\0', "sets the list of directories to search when loading " - "libraries (all existing paths will be deleted)") + , m_libraryPathsArg("library-paths", '\0', + "sets the list of directories to search when loading " + "libraries (all existing paths will be deleted)") , m_platformThemeArg("platformtheme", '\0', "specifies the Qt platform theme to be used") { // language @@ -163,4 +166,4 @@ void QtConfigArguments::applySettings(bool preventApplyingDefaultFont) const QCoreApplication::setLibraryPaths(libraryPaths); } } -} +} // namespace ApplicationUtilities diff --git a/resources/qtconfigarguments.h b/resources/qtconfigarguments.h index cd952a4..e59138e 100644 --- a/resources/qtconfigarguments.h +++ b/resources/qtconfigarguments.h @@ -61,7 +61,7 @@ inline bool QtConfigArguments::areQtGuiArgsPresent() const { return m_qtWidgetsGuiArg.isPresent() || m_qtQuickGuiArg.isPresent(); } -} +} // namespace ApplicationUtilities #endif // APPLICATION_UTILITIES_QTCONFIGARGUMENTS_H diff --git a/resources/resources.cpp b/resources/resources.cpp index afc2ae8..e576b04 100644 --- a/resources/resources.cpp +++ b/resources/resources.cpp @@ -62,7 +62,7 @@ void cleanup() { cleanupResources(); } -} +} // namespace QtUtilitiesResources /*! * \brief Convenience functions to load translations for Qt and the application. @@ -232,7 +232,7 @@ void loadApplicationTranslationFile(const std::initializer_list &applic loadApplicationTranslationFile(applicationName, localeName); } } -} +} // namespace TranslationFiles /*! * \brief Convenience functions to check whether a @@ -328,4 +328,4 @@ QString locateConfigFile(const QString &applicationName, const QString &fileName #endif } } -} +} // namespace ConfigFile diff --git a/resources/resources.h b/resources/resources.h index f94d974..22fd396 100644 --- a/resources/resources.h +++ b/resources/resources.h @@ -32,7 +32,7 @@ namespace QtUtilitiesResources { QT_UTILITIES_EXPORT void init(); QT_UTILITIES_EXPORT void cleanup(); -} +} // namespace QtUtilitiesResources namespace TranslationFiles { @@ -43,7 +43,7 @@ QT_UTILITIES_EXPORT void loadApplicationTranslationFile(const QString &applicati QT_UTILITIES_EXPORT void loadApplicationTranslationFile(const QString &applicationName, const QString &localeName); QT_UTILITIES_EXPORT void loadApplicationTranslationFile(const std::initializer_list &applicationNames); QT_UTILITIES_EXPORT void loadApplicationTranslationFile(const std::initializer_list &applicationNames, const QString &localeName); -} +} // namespace TranslationFiles namespace ApplicationInstances { diff --git a/settingsdialog/optioncategory.cpp b/settingsdialog/optioncategory.cpp index d3d73c3..80a7b43 100644 --- a/settingsdialog/optioncategory.cpp +++ b/settingsdialog/optioncategory.cpp @@ -91,4 +91,4 @@ void OptionCategory::assignPages(const QList pages) * \fn OptionCategory::pagesChanged() * \brief Emitted when the pages changed. */ -} +} // namespace Dialogs diff --git a/settingsdialog/optioncategory.h b/settingsdialog/optioncategory.h index cf4e5f6..63ae2f1 100644 --- a/settingsdialog/optioncategory.h +++ b/settingsdialog/optioncategory.h @@ -105,6 +105,6 @@ inline void OptionCategory::setCurrentIndex(int currentIndex) { m_currentIndex = currentIndex; } -} +} // namespace Dialogs #endif // DIALOGS_OPTIONSCATEGORY_H diff --git a/settingsdialog/optioncategoryfiltermodel.cpp b/settingsdialog/optioncategoryfiltermodel.cpp index adbea2f..219463d 100644 --- a/settingsdialog/optioncategoryfiltermodel.cpp +++ b/settingsdialog/optioncategoryfiltermodel.cpp @@ -29,4 +29,4 @@ bool OptionCategoryFilterModel::filterAcceptsRow(int sourceRow, const QModelInde } return false; } -} +} // namespace Dialogs diff --git a/settingsdialog/optioncategoryfiltermodel.h b/settingsdialog/optioncategoryfiltermodel.h index 491f554..c33628d 100644 --- a/settingsdialog/optioncategoryfiltermodel.h +++ b/settingsdialog/optioncategoryfiltermodel.h @@ -13,6 +13,6 @@ public: protected: virtual bool filterAcceptsRow(int source_row, const QModelIndex &sourceParent) const; }; -} +} // namespace Dialogs #endif // DIALOGS_OPTIONCATEGORYFILTERMODEL_H diff --git a/settingsdialog/optioncategorymodel.cpp b/settingsdialog/optioncategorymodel.cpp index 1b6e9dd..feb07ab 100644 --- a/settingsdialog/optioncategorymodel.cpp +++ b/settingsdialog/optioncategorymodel.cpp @@ -80,7 +80,7 @@ QVariant OptionCategoryModel::data(const QModelIndex &index, int role) const #else QSize(32, 32) #endif - ); + ); } } } @@ -117,4 +117,4 @@ void OptionCategoryModel::categoryChangedIcon() } } } -} +} // namespace Dialogs diff --git a/settingsdialog/optioncategorymodel.h b/settingsdialog/optioncategorymodel.h index f345618..e009612 100644 --- a/settingsdialog/optioncategorymodel.h +++ b/settingsdialog/optioncategorymodel.h @@ -62,6 +62,6 @@ inline OptionCategory *OptionCategoryModel::category(int row) const { return row < m_categories.size() ? m_categories.at(row) : nullptr; } -} +} // namespace Dialogs #endif // DIALOGS_OPTIONCATEGORYMODEL_H diff --git a/settingsdialog/optionpage.cpp b/settingsdialog/optionpage.cpp index e903ade..99b5756 100644 --- a/settingsdialog/optionpage.cpp +++ b/settingsdialog/optionpage.cpp @@ -102,4 +102,4 @@ bool OptionPage::matches(const QString &searchKeyWord) * \brief Creates the widget for the page. Called in the first invocation of * widget(). */ -} +} // namespace Dialogs diff --git a/settingsdialog/optionpage.h b/settingsdialog/optionpage.h index afd8c2e..4adaea1 100644 --- a/settingsdialog/optionpage.h +++ b/settingsdialog/optionpage.h @@ -138,7 +138,7 @@ template inline UiClass *UiFileBasedOptionPage::ui() { return m_ui.get(); } -} +} // namespace Dialogs /*! * \brief Declares a class inheriting from Dialogs::OptionPage in a convenient diff --git a/settingsdialog/qtsettings.cpp b/settingsdialog/qtsettings.cpp index 5eddb32..3e789b3 100644 --- a/settingsdialog/qtsettings.cpp +++ b/settingsdialog/qtsettings.cpp @@ -407,7 +407,7 @@ void QtEnvOptionPage::reset() ui()->translationPathSelection->lineEdit()->setText(TranslationFiles::additionalTranslationFilePath()); } } -} +} // namespace Dialogs INSTANTIATE_UI_FILE_BASED_OPTION_PAGE(QtAppearanceOptionPage) INSTANTIATE_UI_FILE_BASED_OPTION_PAGE(QtLanguageOptionPage) diff --git a/settingsdialog/qtsettings.h b/settingsdialog/qtsettings.h index 387c59f..3a32758 100644 --- a/settingsdialog/qtsettings.h +++ b/settingsdialog/qtsettings.h @@ -55,7 +55,7 @@ public: private: std::unique_ptr m_d; }; -} +} // namespace Dialogs DECLARE_EXTERN_UI_FILE_BASED_OPTION_PAGE(QtAppearanceOptionPage) DECLARE_EXTERN_UI_FILE_BASED_OPTION_PAGE(QtLanguageOptionPage) diff --git a/settingsdialog/settingsdialog.cpp b/settingsdialog/settingsdialog.cpp index a21c1a8..676ffdf 100644 --- a/settingsdialog/settingsdialog.cpp +++ b/settingsdialog/settingsdialog.cpp @@ -268,4 +268,4 @@ void SettingsDialog::reset() } emit resetted(); } -} +} // namespace Dialogs diff --git a/settingsdialog/settingsdialog.h b/settingsdialog/settingsdialog.h index 06515c4..bd2faba 100644 --- a/settingsdialog/settingsdialog.h +++ b/settingsdialog/settingsdialog.h @@ -75,6 +75,6 @@ inline OptionCategoryModel *SettingsDialog::categoryModel() { return m_categoryModel; } -} +} // namespace Dialogs #endif // DIALOGS_SETTINGSDIALOG_H diff --git a/translations/qtutilities_de_DE.ts b/translations/qtutilities_de_DE.ts index 58dc127..cf86403 100644 --- a/translations/qtutilities_de_DE.ts +++ b/translations/qtutilities_de_DE.ts @@ -6,47 +6,42 @@ About - Über + application name - just a placeholder - + version - just a placeholder - + description - just a placeholder - + website link - just a placeholder - + creators - just a placeholder - + developed by %1 - entwickelt von %1 + For updates and bug reports visit the <a href="%1" style="text-decoration: underline; color: palette(link);">project website</a>. - Für Aktualisierung und Melden von Fehlern besuche die <a href="%1" style="text-decoration: underline; color: palette(link);">Webseite des Projekts</a>. + @@ -57,73 +52,73 @@ Enter the password - Passwort eingeben + user name - Benutzername + password - Passwort + repeat password - Password wiederholen + show password - Passwort zeigen + don't use a password - Kein Passwort verwenden + Capslock is active - Feststelltaste ist aktiviert + Abort - Abbrechen + Confirm - Bestätigen + Enter the new password - Neues Passwort festlegen + You didn't enter a user name. - Es wurde kein Benutzername eingegeben. + You didn't enter a password. - Es wurde kein Passwort eingegeben. + - + You have to enter the new password twice to ensure you enterd it correct. - Um sicher zu stellen, dass das neue Passwort richtig eingegeben wurde, muss es zweimal eingegeben werden. + - + You mistyped the password. - Erstes und zweites Passwort stimmen nicht überein. + @@ -131,27 +126,27 @@ Edit Palette - Palette ändern + Tune Palette - Palette + Show Detai&ls - Details einblenden + &Compute Details - Details berechnen + Quick - Einfach + @@ -159,22 +154,22 @@ Color Role - Farbrolle + Active - Aktiv + Inactive - Inaktiv + Disabled - Deaktiviert + @@ -182,54 +177,53 @@ Appearance - Erscheinungsbild + Use system default - Verwende Systemvorgabe + Font - Schriftart + More options ... - Weitere Optionen ... + Widget style - Widget-Stil + Style sheet - Stylesheet + Palette - + select ... - Bearbeiten ... + Icon theme - Symbole + These settings take effect after restarting the application. These settings might be overwritten by your Qt 5 platfrom integration plugin and hence have no effect. - Diese Einstellungen wirken sich erst nach einem Neustart der Anwendung aus. -Außerdem werden sie vielleicht vom QPA plugin überschrieben und funktionieren daher nicht. + @@ -237,27 +231,27 @@ Außerdem werden sie vielleicht vom QPA plugin überschrieben und funktionieren Environment/paths - Umgebung/Pfade + Additional plugin directory - Zusätzliches Plugin-Verzeichnis + Additional icon theme search path - Zusätzliches Verzeichnis für Symbole + Additional translation search path - Zusätzliches Verzeichnis für Übersetzungen + These settings take effect after restarting the application. - Diese Einstellungen wirken sich erst nach einem Neustart der Anwendung aus. + @@ -265,22 +259,22 @@ Außerdem werden sie vielleicht vom QPA plugin überschrieben und funktionieren Localization - Lokalisierung + Locale - Gebietsschema + Use system default - Verwende Systemvorgabe + These settings take effect after restarting the application. - Diese Einstellungen wirken sich erst nach einem Neustart der Anwendung aus. + @@ -288,43 +282,43 @@ Außerdem werden sie vielleicht vom QPA plugin überschrieben und funktionieren Settings - Einstellungen + No category selected - Keine Kategorie gewählt + Filter - + Abort - Abbrechen + Apply - Anwenden + OK - + <p><b>Errors occured when applying changes:</b></p><ul> - <p><b>Beim Anwenden der Einstellungen sind Fehler aufgetreten:</b></p><ul> + unknonw error - unbekannter Fehler + @@ -332,32 +326,32 @@ Außerdem werden sie vielleicht vom QPA plugin überschrieben und funktionieren &Recent - &Zuletzt verwendet + &Clear list - &Liste löschen + Recently opened files - - Kürzlich geöffnete Dateien - + The selected file can't be found anymore. Do you want to delete the obsolete entry from the list? - Die ausgewählte Datei kann nicht mehr gefunden werden. Soll die Datei aus der Liste gelöscht werden? + keep entry - Eintrag behalten + delete entry - Eintrag löschen + @@ -365,7 +359,7 @@ Außerdem werden sie vielleicht vom QPA plugin überschrieben und funktionieren Clear - Text löschen + @@ -373,7 +367,7 @@ Außerdem werden sie vielleicht vom QPA plugin überschrieben und funktionieren recognized by Qt as - von Qt erkannt als + @@ -381,7 +375,7 @@ Außerdem werden sie vielleicht vom QPA plugin überschrieben und funktionieren Qt - + @@ -389,47 +383,47 @@ Außerdem werden sie vielleicht vom QPA plugin überschrieben und funktionieren Unsaved - %1 - Nicht gespeichert - %1 + %1 - %2 - %3 - + *Unsaved - %1 - *Nicht gespeichert - %1 + *%1 - %2 - %3 - + Widgets::PathSelection - - + + Select ... - Wählen ... + - + Open - Öffnen + - + Explore - Im Dateibrowser öffnen + - - + + Select path - Pfad auswählen + diff --git a/translations/qtutilities_en_US.ts b/translations/qtutilities_en_US.ts index 549df72..e930a34 100644 --- a/translations/qtutilities_en_US.ts +++ b/translations/qtutilities_en_US.ts @@ -111,12 +111,12 @@ - + You have to enter the new password twice to ensure you enterd it correct. - + You mistyped the password. @@ -404,24 +404,24 @@ These settings might be overwritten by your Qt 5 platfrom integration plugin and Widgets::PathSelection - - + + Select ... - + Open - + Explore - - + + Select path diff --git a/widgets/buttonoverlay.cpp b/widgets/buttonoverlay.cpp index 8650163..2d0e416 100644 --- a/widgets/buttonoverlay.cpp +++ b/widgets/buttonoverlay.cpp @@ -196,4 +196,4 @@ void ButtonOverlay::showInfo() QToolTip::showText(QCursor::pos(), m_infoButton->toolTip(), m_infoButton); } } -} +} // namespace Widgets diff --git a/widgets/buttonoverlay.h b/widgets/buttonoverlay.h index 0bf6a69..bb88717 100644 --- a/widgets/buttonoverlay.h +++ b/widgets/buttonoverlay.h @@ -67,6 +67,6 @@ inline bool ButtonOverlay::isInfoButtonEnabled() const { return m_infoButton != nullptr; } -} +} // namespace Widgets #endif // WIDGETS_BUTTONOVERLAY_H diff --git a/widgets/clearcombobox.cpp b/widgets/clearcombobox.cpp index e65de93..a038394 100644 --- a/widgets/clearcombobox.cpp +++ b/widgets/clearcombobox.cpp @@ -54,4 +54,4 @@ bool ClearComboBox::isCleared() const { return currentText().isEmpty(); } -} +} // namespace Widgets diff --git a/widgets/clearlineedit.cpp b/widgets/clearlineedit.cpp index c0c1dbb..20a4d61 100644 --- a/widgets/clearlineedit.cpp +++ b/widgets/clearlineedit.cpp @@ -42,4 +42,4 @@ bool ClearLineEdit::isCleared() const { return text().isEmpty(); } -} +} // namespace Widgets diff --git a/widgets/clearlineedit.h b/widgets/clearlineedit.h index edc1839..1aaeb4c 100644 --- a/widgets/clearlineedit.h +++ b/widgets/clearlineedit.h @@ -22,6 +22,6 @@ private Q_SLOTS: void handleTextChanged(const QString &text); void handleClearButtonClicked(); }; -} +} // namespace Widgets #endif // WIDGETS_CLEARLINEEDIT_H diff --git a/widgets/clearspinbox.cpp b/widgets/clearspinbox.cpp index 4040f76..e16f76a 100644 --- a/widgets/clearspinbox.cpp +++ b/widgets/clearspinbox.cpp @@ -75,4 +75,4 @@ QString ClearSpinBox::textFromValue(int val) const return QSpinBox::textFromValue(val); } } -} +} // namespace Widgets diff --git a/widgets/clearspinbox.h b/widgets/clearspinbox.h index 2a4eada..f5e03ce 100644 --- a/widgets/clearspinbox.h +++ b/widgets/clearspinbox.h @@ -72,6 +72,6 @@ inline void ClearSpinBox::setPlaceholderText(const QString &placeholderText) { lineEdit()->setPlaceholderText(placeholderText); } -} +} // namespace Widgets #endif // WIDGETS_CLEARSPINBOX_H diff --git a/widgets/iconbutton.cpp b/widgets/iconbutton.cpp index 45c2362..3844a7c 100644 --- a/widgets/iconbutton.cpp +++ b/widgets/iconbutton.cpp @@ -76,4 +76,4 @@ void IconButton::keyReleaseEvent(QKeyEvent *event) QAbstractButton::keyReleaseEvent(event); event->accept(); } -} +} // namespace Widgets diff --git a/widgets/iconbutton.h b/widgets/iconbutton.h index 939bfb4..80c14d4 100644 --- a/widgets/iconbutton.h +++ b/widgets/iconbutton.h @@ -45,6 +45,6 @@ inline void IconButton::setPixmap(const QPixmap &pixmap) m_pixmap = pixmap; update(); } -} +} // namespace Widgets #endif // WIDGETS_ICONBUTTON_H diff --git a/widgets/pathselection.cpp b/widgets/pathselection.cpp index 8dd7d52..2007034 100644 --- a/widgets/pathselection.cpp +++ b/widgets/pathselection.cpp @@ -127,4 +127,4 @@ void PathSelection::showFileDialog() } } } -} +} // namespace Widgets diff --git a/widgets/pathselection.h b/widgets/pathselection.h index ae9c434..b367239 100644 --- a/widgets/pathselection.h +++ b/widgets/pathselection.h @@ -72,6 +72,6 @@ inline void PathSelection::provideCustomFileDialog(QFileDialog *customFileDialog { m_customDialog = customFileDialog; } -} +} // namespace Widgets #endif // WIDGETS_PATHSELECTION_H