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
This commit is contained in:
Martchus 2017-09-17 21:45:49 +02:00
parent 0e4f410e76
commit afe3373896
47 changed files with 157 additions and 159 deletions

View File

@ -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 <a href=\"%1\" "
"style=\"text-decoration: underline; color: palette(link);\">project "
"website</a>.").arg(website.isEmpty() ? QApplication::organizationDomain() : website));
m_ui->websiteLabel->setText(tr("For updates and bug reports visit the <a href=\"%1\" "
"style=\"text-decoration: underline; color: palette(link);\">project "
"website</a>.")
.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

View File

@ -28,6 +28,6 @@ private:
std::unique_ptr<Ui::AboutDialog> m_ui;
QGraphicsScene *m_iconScene;
};
}
} // namespace Dialogs
#endif // DIALOGS_ABOUTDIALOG_H

View File

@ -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

View File

@ -99,6 +99,6 @@ inline void EnterPasswordDialog::abort()
m_password.clear();
done(QDialog::Rejected);
}
}
} // namespace Dialogs
#endif // DIALOGS_ENTERPASSWORDDIALOG_H

View File

@ -31,6 +31,6 @@ public:
private:
Mutex &m_mutex;
};
}
} // namespace ThreadingUtils
#endif // THEADING_UTILS_ADOPTLOCKER_H

View File

@ -36,6 +36,6 @@ inline QString fromNativeFileName(const std::string &nativeFileName)
#endif
}
} // namespace Dialogs
} // namespace ConversionUtilities
#endif // CONVERSION_H

View File

@ -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

View File

@ -171,6 +171,6 @@ inline bool DBusNotification::isVisible() const
{
return m_id != 0;
}
}
} // namespace MiscUtils
#endif // MISC_UTILS_NOTIFICATION_H

View File

@ -26,4 +26,4 @@ bool openLocalFileOrDir(const QString &path)
return QDesktopServices::openUrl(url);
#endif
}
}
} // namespace DesktopUtils

View File

@ -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

View File

@ -33,6 +33,6 @@ private:
QAction *m_sep;
QAction *m_clearAction;
};
}
} // namespace MiscUtils
#endif // MISC_UTILS_RECENTMENUMANAGER_H

View File

@ -50,6 +50,6 @@ public:
private:
Mutex *m_mutex;
};
}
} // namespace ThreadingUtils
#endif // THREADING_UTILS_TRYLOCKER_H

View File

@ -225,4 +225,4 @@ void ChecklistModel::save(QSettings &settings, const QString &name) const
}
settings.endArray();
}
}
} // namespace Models

View File

@ -109,6 +109,6 @@ constexpr int ChecklistModel::idRole()
{
return Qt::UserRole + 1;
}
}
} // namespace Models
#endif // MODELS_CHECKLISTMODEL_H

View File

@ -231,6 +231,6 @@ void ColorButton::dropEvent(QDropEvent *event)
emit colorChanged(color());
}
#endif
}
} // namespace Widgets
#include "moc_colorbutton.cpp"

View File

@ -46,6 +46,6 @@ private:
Q_DISABLE_COPY(ColorButton)
Q_PRIVATE_SLOT(d_func(), void slotEditColor())
};
}
} // namespace Widgets
#endif // WIDGETS_COLORBUTTON_H

View File

@ -552,4 +552,4 @@ QSize ColorDelegate::sizeHint(const QStyleOptionViewItem &opt, const QModelIndex
{
return QItemDelegate::sizeHint(opt, index) + QSize(4, 4);
}
}
} // namespace Dialogs

View File

@ -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

View File

@ -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

View File

@ -61,7 +61,7 @@ inline bool QtConfigArguments::areQtGuiArgsPresent() const
{
return m_qtWidgetsGuiArg.isPresent() || m_qtQuickGuiArg.isPresent();
}
}
} // namespace ApplicationUtilities
#endif // APPLICATION_UTILITIES_QTCONFIGARGUMENTS_H

View File

@ -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<QString> &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

View File

@ -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<QString> &applicationNames);
QT_UTILITIES_EXPORT void loadApplicationTranslationFile(const std::initializer_list<QString> &applicationNames, const QString &localeName);
}
} // namespace TranslationFiles
namespace ApplicationInstances {

View File

@ -91,4 +91,4 @@ void OptionCategory::assignPages(const QList<OptionPage *> pages)
* \fn OptionCategory::pagesChanged()
* \brief Emitted when the pages changed.
*/
}
} // namespace Dialogs

View File

@ -105,6 +105,6 @@ inline void OptionCategory::setCurrentIndex(int currentIndex)
{
m_currentIndex = currentIndex;
}
}
} // namespace Dialogs
#endif // DIALOGS_OPTIONSCATEGORY_H

View File

@ -29,4 +29,4 @@ bool OptionCategoryFilterModel::filterAcceptsRow(int sourceRow, const QModelInde
}
return false;
}
}
} // namespace Dialogs

View File

@ -13,6 +13,6 @@ public:
protected:
virtual bool filterAcceptsRow(int source_row, const QModelIndex &sourceParent) const;
};
}
} // namespace Dialogs
#endif // DIALOGS_OPTIONCATEGORYFILTERMODEL_H

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -138,7 +138,7 @@ template <class UiClass> inline UiClass *UiFileBasedOptionPage<UiClass>::ui()
{
return m_ui.get();
}
}
} // namespace Dialogs
/*!
* \brief Declares a class inheriting from Dialogs::OptionPage in a convenient

View File

@ -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)

View File

@ -55,7 +55,7 @@ public:
private:
std::unique_ptr<QtSettingsData> m_d;
};
}
} // namespace Dialogs
DECLARE_EXTERN_UI_FILE_BASED_OPTION_PAGE(QtAppearanceOptionPage)
DECLARE_EXTERN_UI_FILE_BASED_OPTION_PAGE(QtLanguageOptionPage)

View File

@ -268,4 +268,4 @@ void SettingsDialog::reset()
}
emit resetted();
}
}
} // namespace Dialogs

View File

@ -75,6 +75,6 @@ inline OptionCategoryModel *SettingsDialog::categoryModel()
{
return m_categoryModel;
}
}
} // namespace Dialogs
#endif // DIALOGS_SETTINGSDIALOG_H

View File

@ -6,47 +6,42 @@
<message>
<location filename="../aboutdialog/aboutdialog.ui" line="32"/>
<source>About</source>
<translation>Über</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../aboutdialog/aboutdialog.ui" line="135"/>
<source>application name</source>
<translatorcomment>just a placeholder</translatorcomment>
<translation></translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../aboutdialog/aboutdialog.ui" line="145"/>
<source>version</source>
<translatorcomment>just a placeholder</translatorcomment>
<translation></translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../aboutdialog/aboutdialog.ui" line="171"/>
<source>description</source>
<translatorcomment>just a placeholder</translatorcomment>
<translation></translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../aboutdialog/aboutdialog.ui" line="193"/>
<source>website link</source>
<translatorcomment>just a placeholder</translatorcomment>
<translation></translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../aboutdialog/aboutdialog.ui" line="231"/>
<source>creators</source>
<translatorcomment>just a placeholder</translatorcomment>
<translation></translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../aboutdialog/aboutdialog.cpp" line="55"/>
<source>developed by %1</source>
<translation>entwickelt von %1</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../aboutdialog/aboutdialog.cpp" line="57"/>
<source>For updates and bug reports visit the &lt;a href=&quot;%1&quot; style=&quot;text-decoration: underline; color: palette(link);&quot;&gt;project website&lt;/a&gt;.</source>
<translation>Für Aktualisierung und Melden von Fehlern besuche die &lt;a href=&quot;%1&quot; style=&quot;text-decoration: underline; color: palette(link);&quot;&gt;Webseite des Projekts&lt;/a&gt;.</translation>
<translation type="unfinished"></translation>
</message>
</context>
<context>
@ -57,73 +52,73 @@
<location filename="../enterpassworddialog/enterpassworddialog.cpp" line="187"/>
<location filename="../enterpassworddialog/enterpassworddialog.cpp" line="202"/>
<source>Enter the password</source>
<translation>Passwort eingeben</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../enterpassworddialog/enterpassworddialog.ui" line="64"/>
<source>user name</source>
<translation>Benutzername</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../enterpassworddialog/enterpassworddialog.ui" line="86"/>
<source>password</source>
<translation>Passwort</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../enterpassworddialog/enterpassworddialog.ui" line="102"/>
<source>repeat password</source>
<translation>Password wiederholen</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../enterpassworddialog/enterpassworddialog.ui" line="130"/>
<source>show password</source>
<translation>Passwort zeigen</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../enterpassworddialog/enterpassworddialog.ui" line="137"/>
<source>don&apos;t use a password</source>
<translation>Kein Passwort verwenden</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../enterpassworddialog/enterpassworddialog.ui" line="213"/>
<source>Capslock is active</source>
<translation>Feststelltaste ist aktiviert</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../enterpassworddialog/enterpassworddialog.ui" line="239"/>
<source>Abort</source>
<translation>Abbrechen</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../enterpassworddialog/enterpassworddialog.ui" line="254"/>
<source>Confirm</source>
<translation>Bestätigen</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../enterpassworddialog/enterpassworddialog.cpp" line="187"/>
<location filename="../enterpassworddialog/enterpassworddialog.cpp" line="202"/>
<source>Enter the new password</source>
<translation>Neues Passwort festlegen</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../enterpassworddialog/enterpassworddialog.cpp" line="287"/>
<source>You didn&apos;t enter a user name.</source>
<translation>Es wurde kein Benutzername eingegeben.</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../enterpassworddialog/enterpassworddialog.cpp" line="289"/>
<source>You didn&apos;t enter a password.</source>
<translation>Es wurde kein Passwort eingegeben.</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../enterpassworddialog/enterpassworddialog.cpp" line="293"/>
<location filename="../enterpassworddialog/enterpassworddialog.cpp" line="294"/>
<source>You have to enter the new password twice to ensure you enterd it correct.</source>
<translation>Um sicher zu stellen, dass das neue Passwort richtig eingegeben wurde, muss es zweimal eingegeben werden.</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../enterpassworddialog/enterpassworddialog.cpp" line="296"/>
<location filename="../enterpassworddialog/enterpassworddialog.cpp" line="297"/>
<source>You mistyped the password.</source>
<translation>Erstes und zweites Passwort stimmen nicht überein.</translation>
<translation type="unfinished"></translation>
</message>
</context>
<context>
@ -131,27 +126,27 @@
<message>
<location filename="../paletteeditor/paletteeditor.ui" line="20"/>
<source>Edit Palette</source>
<translation>Palette ändern</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../paletteeditor/paletteeditor.ui" line="53"/>
<source>Tune Palette</source>
<translation>Palette</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../paletteeditor/paletteeditor.ui" line="84"/>
<source>Show Detai&amp;ls</source>
<translation>Details einblenden</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../paletteeditor/paletteeditor.ui" line="91"/>
<source>&amp;Compute Details</source>
<translation>Details berechnen</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../paletteeditor/paletteeditor.ui" line="101"/>
<source>Quick</source>
<translation>Einfach</translation>
<translation type="unfinished"></translation>
</message>
</context>
<context>
@ -159,22 +154,22 @@
<message>
<location filename="../paletteeditor/paletteeditor.cpp" line="323"/>
<source>Color Role</source>
<translation>Farbrolle</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../paletteeditor/paletteeditor.cpp" line="325"/>
<source>Active</source>
<translation>Aktiv</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../paletteeditor/paletteeditor.cpp" line="327"/>
<source>Inactive</source>
<translation>Inaktiv</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../paletteeditor/paletteeditor.cpp" line="329"/>
<source>Disabled</source>
<translation>Deaktiviert</translation>
<translation type="unfinished"></translation>
</message>
</context>
<context>
@ -182,54 +177,53 @@
<message>
<location filename="../settingsdialog/qtappearanceoptionpage.ui" line="6"/>
<source>Appearance</source>
<translation>Erscheinungsbild</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settingsdialog/qtappearanceoptionpage.ui" line="21"/>
<source>Use system default</source>
<translation>Verwende Systemvorgabe</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settingsdialog/qtappearanceoptionpage.ui" line="34"/>
<source>Font</source>
<translation>Schriftart</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settingsdialog/qtappearanceoptionpage.ui" line="71"/>
<source>More options ...</source>
<translation>Weitere Optionen ...</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settingsdialog/qtappearanceoptionpage.ui" line="93"/>
<source>Widget style</source>
<translation>Widget-Stil</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settingsdialog/qtappearanceoptionpage.ui" line="132"/>
<source>Style sheet</source>
<translation>Stylesheet</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settingsdialog/qtappearanceoptionpage.ui" line="162"/>
<source>Palette</source>
<translation></translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settingsdialog/qtappearanceoptionpage.ui" line="175"/>
<source>select ...</source>
<translation>Bearbeiten ...</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settingsdialog/qtappearanceoptionpage.ui" line="195"/>
<source>Icon theme</source>
<translation>Symbole</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settingsdialog/qtappearanceoptionpage.ui" line="249"/>
<source>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.</source>
<translation>Diese Einstellungen wirken sich erst nach einem Neustart der Anwendung aus.
Außerdem werden sie vielleicht vom QPA plugin überschrieben und funktionieren daher nicht.</translation>
<translation type="unfinished"></translation>
</message>
</context>
<context>
@ -237,27 +231,27 @@ Außerdem werden sie vielleicht vom QPA plugin überschrieben und funktionieren
<message>
<location filename="../settingsdialog/qtenvoptionpage.ui" line="14"/>
<source>Environment/paths</source>
<translation>Umgebung/Pfade</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settingsdialog/qtenvoptionpage.ui" line="28"/>
<source>Additional plugin directory</source>
<translation>Zusätzliches Plugin-Verzeichnis</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settingsdialog/qtenvoptionpage.ui" line="38"/>
<source>Additional icon theme search path</source>
<translation>Zusätzliches Verzeichnis für Symbole</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settingsdialog/qtenvoptionpage.ui" line="48"/>
<source>Additional translation search path</source>
<translation>Zusätzliches Verzeichnis für Übersetzungen</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settingsdialog/qtenvoptionpage.ui" line="79"/>
<source>These settings take effect after restarting the application.</source>
<translation>Diese Einstellungen wirken sich erst nach einem Neustart der Anwendung aus.</translation>
<translation type="unfinished"></translation>
</message>
</context>
<context>
@ -265,22 +259,22 @@ Außerdem werden sie vielleicht vom QPA plugin überschrieben und funktionieren
<message>
<location filename="../settingsdialog/qtlanguageoptionpage.ui" line="6"/>
<source>Localization</source>
<translation>Lokalisierung</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settingsdialog/qtlanguageoptionpage.ui" line="43"/>
<source>Locale</source>
<translation>Gebietsschema</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settingsdialog/qtlanguageoptionpage.ui" line="53"/>
<source>Use system default</source>
<translation>Verwende Systemvorgabe</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settingsdialog/qtlanguageoptionpage.ui" line="98"/>
<source>These settings take effect after restarting the application.</source>
<translation>Diese Einstellungen wirken sich erst nach einem Neustart der Anwendung aus.</translation>
<translation type="unfinished"></translation>
</message>
</context>
<context>
@ -288,43 +282,43 @@ Außerdem werden sie vielleicht vom QPA plugin überschrieben und funktionieren
<message>
<location filename="../settingsdialog/settingsdialog.ui" line="14"/>
<source>Settings</source>
<translation>Einstellungen</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settingsdialog/settingsdialog.ui" line="53"/>
<location filename="../settingsdialog/settingsdialog.cpp" line="148"/>
<source>No category selected</source>
<translation>Keine Kategorie gewählt</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settingsdialog/settingsdialog.ui" line="69"/>
<source>Filter</source>
<translation></translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settingsdialog/settingsdialog.ui" line="136"/>
<source>Abort</source>
<translation>Abbrechen</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settingsdialog/settingsdialog.ui" line="150"/>
<source>Apply</source>
<translation>Anwenden</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settingsdialog/settingsdialog.ui" line="161"/>
<source>OK</source>
<translation></translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settingsdialog/settingsdialog.cpp" line="236"/>
<source>&lt;p&gt;&lt;b&gt;Errors occured when applying changes:&lt;/b&gt;&lt;/p&gt;&lt;ul&gt;</source>
<translation>&lt;p&gt;&lt;b&gt;Beim Anwenden der Einstellungen sind Fehler aufgetreten:&lt;/b&gt;&lt;/p&gt;&lt;ul&gt;</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settingsdialog/settingsdialog.cpp" line="241"/>
<source>unknonw error</source>
<translation>unbekannter Fehler</translation>
<translation type="unfinished"></translation>
</message>
</context>
<context>
@ -332,32 +326,32 @@ Außerdem werden sie vielleicht vom QPA plugin überschrieben und funktionieren
<message>
<location filename="../misc/recentmenumanager.cpp" line="35"/>
<source>&amp;Recent</source>
<translation>&amp;Zuletzt verwendet</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../misc/recentmenumanager.cpp" line="38"/>
<source>&amp;Clear list</source>
<translation>&amp;Liste löschen</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../misc/recentmenumanager.cpp" line="144"/>
<source>Recently opened files - </source>
<translation>Kürzlich geöffnete Dateien - </translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../misc/recentmenumanager.cpp" line="145"/>
<source>The selected file can&apos;t be found anymore. Do you want to delete the obsolete entry from the list?</source>
<translation>Die ausgewählte Datei kann nicht mehr gefunden werden. Soll die Datei aus der Liste gelöscht werden?</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../misc/recentmenumanager.cpp" line="148"/>
<source>keep entry</source>
<translation>Eintrag behalten</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../misc/recentmenumanager.cpp" line="149"/>
<source>delete entry</source>
<translation>Eintrag löschen</translation>
<translation type="unfinished"></translation>
</message>
</context>
<context>
@ -365,7 +359,7 @@ Außerdem werden sie vielleicht vom QPA plugin überschrieben und funktionieren
<message>
<location filename="../widgets/buttonoverlay.cpp" line="84"/>
<source>Clear</source>
<translation>Text löschen</translation>
<translation type="unfinished"></translation>
</message>
</context>
<context>
@ -373,7 +367,7 @@ Außerdem werden sie vielleicht vom QPA plugin überschrieben und funktionieren
<message>
<location filename="../settingsdialog/qtsettings.cpp" line="375"/>
<source>recognized by Qt as</source>
<translation>von Qt erkannt als</translation>
<translation type="unfinished"></translation>
</message>
</context>
<context>
@ -381,7 +375,7 @@ Außerdem werden sie vielleicht vom QPA plugin überschrieben und funktionieren
<message>
<location filename="../settingsdialog/qtsettings.cpp" line="215"/>
<source>Qt</source>
<translation></translation>
<translation type="unfinished"></translation>
</message>
</context>
<context>
@ -389,47 +383,47 @@ Außerdem werden sie vielleicht vom QPA plugin überschrieben und funktionieren
<message>
<location filename="../misc/dialogutils.cpp" line="30"/>
<source>Unsaved - %1</source>
<translation>Nicht gespeichert - %1</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../misc/dialogutils.cpp" line="33"/>
<source>%1 - %2 - %3</source>
<translation></translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../misc/dialogutils.cpp" line="38"/>
<source>*Unsaved - %1</source>
<translation>*Nicht gespeichert - %1</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../misc/dialogutils.cpp" line="41"/>
<source>*%1 - %2 - %3</source>
<translation></translation>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Widgets::PathSelection</name>
<message>
<location filename="../widgets/pathselection.cpp" line="55"/>
<location filename="../widgets/pathselection.cpp" line="75"/>
<location filename="../widgets/pathselection.cpp" line="56"/>
<location filename="../widgets/pathselection.cpp" line="76"/>
<source>Select ...</source>
<translation>Wählen ...</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/pathselection.cpp" line="80"/>
<location filename="../widgets/pathselection.cpp" line="81"/>
<source>Open</source>
<translation>Öffnen</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/pathselection.cpp" line="83"/>
<location filename="../widgets/pathselection.cpp" line="84"/>
<source>Explore</source>
<translation>Im Dateibrowser öffnen</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/pathselection.cpp" line="119"/>
<location filename="../widgets/pathselection.cpp" line="121"/>
<location filename="../widgets/pathselection.cpp" line="120"/>
<location filename="../widgets/pathselection.cpp" line="122"/>
<source>Select path</source>
<translation>Pfad auswählen</translation>
<translation type="unfinished"></translation>
</message>
</context>
</TS>

View File

@ -111,12 +111,12 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../enterpassworddialog/enterpassworddialog.cpp" line="293"/>
<location filename="../enterpassworddialog/enterpassworddialog.cpp" line="294"/>
<source>You have to enter the new password twice to ensure you enterd it correct.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../enterpassworddialog/enterpassworddialog.cpp" line="296"/>
<location filename="../enterpassworddialog/enterpassworddialog.cpp" line="297"/>
<source>You mistyped the password.</source>
<translation type="unfinished"></translation>
</message>
@ -404,24 +404,24 @@ These settings might be overwritten by your Qt 5 platfrom integration plugin and
<context>
<name>Widgets::PathSelection</name>
<message>
<location filename="../widgets/pathselection.cpp" line="55"/>
<location filename="../widgets/pathselection.cpp" line="75"/>
<location filename="../widgets/pathselection.cpp" line="56"/>
<location filename="../widgets/pathselection.cpp" line="76"/>
<source>Select ...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/pathselection.cpp" line="80"/>
<location filename="../widgets/pathselection.cpp" line="81"/>
<source>Open</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/pathselection.cpp" line="83"/>
<location filename="../widgets/pathselection.cpp" line="84"/>
<source>Explore</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/pathselection.cpp" line="119"/>
<location filename="../widgets/pathselection.cpp" line="121"/>
<location filename="../widgets/pathselection.cpp" line="120"/>
<location filename="../widgets/pathselection.cpp" line="122"/>
<source>Select path</source>
<translation type="unfinished"></translation>
</message>

View File

@ -196,4 +196,4 @@ void ButtonOverlay::showInfo()
QToolTip::showText(QCursor::pos(), m_infoButton->toolTip(), m_infoButton);
}
}
}
} // namespace Widgets

View File

@ -67,6 +67,6 @@ inline bool ButtonOverlay::isInfoButtonEnabled() const
{
return m_infoButton != nullptr;
}
}
} // namespace Widgets
#endif // WIDGETS_BUTTONOVERLAY_H

View File

@ -54,4 +54,4 @@ bool ClearComboBox::isCleared() const
{
return currentText().isEmpty();
}
}
} // namespace Widgets

View File

@ -42,4 +42,4 @@ bool ClearLineEdit::isCleared() const
{
return text().isEmpty();
}
}
} // namespace Widgets

View File

@ -22,6 +22,6 @@ private Q_SLOTS:
void handleTextChanged(const QString &text);
void handleClearButtonClicked();
};
}
} // namespace Widgets
#endif // WIDGETS_CLEARLINEEDIT_H

View File

@ -75,4 +75,4 @@ QString ClearSpinBox::textFromValue(int val) const
return QSpinBox::textFromValue(val);
}
}
}
} // namespace Widgets

View File

@ -72,6 +72,6 @@ inline void ClearSpinBox::setPlaceholderText(const QString &placeholderText)
{
lineEdit()->setPlaceholderText(placeholderText);
}
}
} // namespace Widgets
#endif // WIDGETS_CLEARSPINBOX_H

View File

@ -76,4 +76,4 @@ void IconButton::keyReleaseEvent(QKeyEvent *event)
QAbstractButton::keyReleaseEvent(event);
event->accept();
}
}
} // namespace Widgets

View File

@ -45,6 +45,6 @@ inline void IconButton::setPixmap(const QPixmap &pixmap)
m_pixmap = pixmap;
update();
}
}
} // namespace Widgets
#endif // WIDGETS_ICONBUTTON_H

View File

@ -127,4 +127,4 @@ void PathSelection::showFileDialog()
}
}
}
}
} // namespace Widgets

View File

@ -72,6 +72,6 @@ inline void PathSelection::provideCustomFileDialog(QFileDialog *customFileDialog
{
m_customDialog = customFileDialog;
}
}
} // namespace Widgets
#endif // WIDGETS_PATHSELECTION_H