Utils: Fixing codestyle issues in reloadpromptutils.

Change-Id: I225de3015425297aeaa26e349da61ccac44272cf
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This commit is contained in:
David Schulz
2013-09-06 12:37:30 +02:00
parent 78930b334b
commit eebb1dfcf4
2 changed files with 54 additions and 22 deletions

View File

@@ -36,28 +36,34 @@
using namespace Utils; using namespace Utils;
QTCREATOR_UTILS_EXPORT Utils::ReloadPromptAnswer QTCREATOR_UTILS_EXPORT Utils::ReloadPromptAnswer Utils::reloadPrompt(const QString &fileName,
Utils::reloadPrompt(const QString &fileName, bool modified, QWidget *parent) bool modified,
QWidget *parent)
{ {
const QString title = QCoreApplication::translate("Utils::reloadPrompt", "File Changed"); const QString title = QCoreApplication::translate("Utils::reloadPrompt", "File Changed");
QString msg; QString msg;
if (modified) if (modified) {
msg = QCoreApplication::translate("Utils::reloadPrompt", msg = QCoreApplication::translate("Utils::reloadPrompt",
"The unsaved file <i>%1</i> has been changed outside Qt Creator. Do you want to reload it and discard your changes?"); "The unsaved file <i>%1</i> has changed outside Qt Creator. "
else "Do you want to reload it and discard your changes?");
} else {
msg = QCoreApplication::translate("Utils::reloadPrompt", msg = QCoreApplication::translate("Utils::reloadPrompt",
"The file <i>%1</i> has changed outside Qt Creator. Do you want to reload it?"); "The file <i>%1</i> has changed outside Qt Creator. Do you want to reload it?");
}
msg = msg.arg(QFileInfo(fileName).fileName()); msg = msg.arg(QFileInfo(fileName).fileName());
return reloadPrompt(title, msg, QDir::toNativeSeparators(fileName), parent); return reloadPrompt(title, msg, QDir::toNativeSeparators(fileName), parent);
} }
QTCREATOR_UTILS_EXPORT Utils::ReloadPromptAnswer QTCREATOR_UTILS_EXPORT Utils::ReloadPromptAnswer Utils::reloadPrompt(const QString &title,
Utils::reloadPrompt(const QString &title, const QString &prompt, const QString &details, QWidget *parent) const QString &prompt,
const QString &details,
QWidget *parent)
{ {
QMessageBox msg(parent); QMessageBox msg(parent);
msg.setStandardButtons(QMessageBox::Yes|QMessageBox::YesToAll|QMessageBox::Close|QMessageBox::No|QMessageBox::NoToAll); msg.setStandardButtons(QMessageBox::Yes | QMessageBox::YesToAll | QMessageBox::Close
| QMessageBox::No | QMessageBox::NoToAll);
msg.setDefaultButton(QMessageBox::YesToAll); msg.setDefaultButton(QMessageBox::YesToAll);
msg.setWindowTitle(title); msg.setWindowTitle(title);
msg.setText(prompt); msg.setText(prompt);
@@ -81,19 +87,33 @@ QTCREATOR_UTILS_EXPORT Utils::ReloadPromptAnswer
QTCREATOR_UTILS_EXPORT Utils::FileDeletedPromptAnswer QTCREATOR_UTILS_EXPORT Utils::FileDeletedPromptAnswer
Utils::fileDeletedPrompt(const QString &fileName, bool triggerExternally, QWidget *parent) Utils::fileDeletedPrompt(const QString &fileName, bool triggerExternally, QWidget *parent)
{ {
const QString title = QCoreApplication::translate("Utils::fileDeletedPrompt", "File has been removed"); const QString title = QCoreApplication::translate("Utils::fileDeletedPrompt",
"File has been removed");
QString msg; QString msg;
if (triggerExternally) if (triggerExternally) {
msg = QCoreApplication::translate("Utils::fileDeletedPrompt", msg = QCoreApplication::translate("Utils::fileDeletedPrompt",
"The file %1 has been removed outside Qt Creator. Do you want to save it under a different name, or close the editor?").arg(QDir::toNativeSeparators(fileName)); "The file %1 has been removed outside Qt Creator. "
else "Do you want to save it under a different name, or close "
"the editor?").arg(QDir::toNativeSeparators(fileName));
} else {
msg = QCoreApplication::translate("Utils::fileDeletedPrompt", msg = QCoreApplication::translate("Utils::fileDeletedPrompt",
"The file %1 was removed. Do you want to save it under a different name, or close the editor?").arg(QDir::toNativeSeparators(fileName)); "The file %1 was removed. "
"Do you want to save it under a different name, or close "
"the editor?").arg(QDir::toNativeSeparators(fileName));
}
QMessageBox box(QMessageBox::Question, title, msg, QMessageBox::NoButton, parent); QMessageBox box(QMessageBox::Question, title, msg, QMessageBox::NoButton, parent);
QPushButton *close = box.addButton(QCoreApplication::translate("Utils::fileDeletedPrompt", "&Close"), QMessageBox::RejectRole); QPushButton *close =
QPushButton *closeAll = box.addButton(QCoreApplication::translate("Utils::fileDeletedPrompt", "C&lose All"), QMessageBox::RejectRole); box.addButton(QCoreApplication::translate("Utils::fileDeletedPrompt", "&Close"),
QPushButton *saveas = box.addButton(QCoreApplication::translate("Utils::fileDeletedPrompt", "Save &as..."), QMessageBox::ActionRole); QMessageBox::RejectRole);
QPushButton *save = box.addButton(QCoreApplication::translate("Utils::fileDeletedPrompt", "&Save"), QMessageBox::AcceptRole); QPushButton *closeAll =
box.addButton(QCoreApplication::translate("Utils::fileDeletedPrompt", "C&lose All"),
QMessageBox::RejectRole);
QPushButton *saveas =
box.addButton(QCoreApplication::translate("Utils::fileDeletedPrompt", "Save &as..."),
QMessageBox::ActionRole);
QPushButton *save =
box.addButton(QCoreApplication::translate("Utils::fileDeletedPrompt", "&Save"),
QMessageBox::AcceptRole);
box.setDefaultButton(saveas); box.setDefaultButton(saveas);
box.exec(); box.exec();
QAbstractButton *clickedbutton = box.clickedButton(); QAbstractButton *clickedbutton = box.clickedButton();

View File

@@ -39,10 +39,20 @@ QT_END_NAMESPACE
namespace Utils { namespace Utils {
enum ReloadPromptAnswer { ReloadCurrent, ReloadAll, ReloadSkipCurrent, ReloadNone, CloseCurrent }; enum ReloadPromptAnswer {
ReloadCurrent,
ReloadAll,
ReloadSkipCurrent,
ReloadNone,
CloseCurrent
};
QTCREATOR_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const QString &fileName, bool modified, QWidget *parent); QTCREATOR_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const QString &fileName,
QTCREATOR_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const QString &title, const QString &prompt, const QString &details, QWidget *parent); bool modified,
QWidget *parent);
QTCREATOR_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const QString &title,
const QString &prompt,
const QString &details, QWidget *parent);
enum FileDeletedPromptAnswer { enum FileDeletedPromptAnswer {
FileDeletedClose, FileDeletedClose,
@@ -51,7 +61,9 @@ enum FileDeletedPromptAnswer {
FileDeletedSave FileDeletedSave
}; };
QTCREATOR_UTILS_EXPORT FileDeletedPromptAnswer fileDeletedPrompt(const QString &fileName, bool triggerExternally, QWidget *parent); QTCREATOR_UTILS_EXPORT FileDeletedPromptAnswer fileDeletedPrompt(const QString &fileName,
bool triggerExternally,
QWidget *parent);
} // namespace Utils } // namespace Utils