feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Git: Use ICore::dialogParent as dialog parent

Browse Source 
Change-Id: Idc3f2f4d27d3279f76b688fac635e8d38b2705f5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Orgad Shaneh
2018-11-29 16:19:57 +02:00
committed by Orgad Shaneh
parent d3c1086910
commit f5203796e4
4 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/git/gerrit/gerritplugin.cpp
View File

@@ -319,11 +319,11 @@ void GerritPlugin::addToLocator(CommandLocator *locator)
void GerritPlugin::push(const QString &topLevel) void GerritPlugin::push(const QString &topLevel)
{ {
// QScopedPointer is required to delete the dialog when leaving the function // QScopedPointer is required to delete the dialog when leaving the function
GerritPushDialog dialog(topLevel, m_reviewers, m_parameters, ICore::mainWindow()); GerritPushDialog dialog(topLevel, m_reviewers, m_parameters, ICore::dialogParent());
const QString initErrorMessage = dialog.initErrorMessage(); const QString initErrorMessage = dialog.initErrorMessage();
if (!initErrorMessage.isEmpty()) { if (!initErrorMessage.isEmpty()) {
QMessageBox::warning(ICore::mainWindow(), tr("Initialization Failed"), initErrorMessage); QMessageBox::warning(ICore::dialogParent(), tr("Initialization Failed"), initErrorMessage);
return; return;
} }
@@ -350,7 +350,7 @@ void GerritPlugin::openView()
if (!ICore::showOptionsDialog("Gerrit")) if (!ICore::showOptionsDialog("Gerrit"))
return; return;
} }
GerritDialog *gd = new GerritDialog(m_parameters, m_server, currentRepository(), ICore::mainWindow()); GerritDialog *gd = new GerritDialog(m_parameters, m_server, currentRepository(), ICore::dialogParent());
gd->setModal(false); gd->setModal(false);
connect(gd, &GerritDialog::fetchDisplay, this, connect(gd, &GerritDialog::fetchDisplay, this,
[this](const QSharedPointer<GerritChange> &change) { fetch(change, FetchDisplay); }); [this](const QSharedPointer<GerritChange> &change) { fetch(change, FetchDisplay); });
@@ -433,7 +433,7 @@ void GerritPlugin::fetch(const QSharedPointer<GerritChange> &change, int mode)
if (!verifiedRepository) { if (!verifiedRepository) {
QMessageBox::StandardButton answer = QMessageBox::question( QMessageBox::StandardButton answer = QMessageBox::question(
ICore::mainWindow(), tr("Remote Not Verified"), ICore::dialogParent(), tr("Remote Not Verified"),
tr("Change host %1\nand project %2\n\nwere not verified among remotes" tr("Change host %1\nand project %2\n\nwere not verified among remotes"
" in %3. Select different folder?") " in %3. Select different folder?")
.arg(m_server->host, .arg(m_server->host,

2
src/plugins/git/gerrit/gerritserver.cpp
View File

@@ -301,7 +301,7 @@ bool GerritServer::resolveRoot()
return setupAuthentication(); return setupAuthentication();
case CertificateError: case CertificateError:
if (QMessageBox::question( if (QMessageBox::question(
Core::ICore::mainWindow(), Core::ICore::dialogParent(),
QCoreApplication::translate( QCoreApplication::translate(
"Gerrit::Internal::GerritDialog", "Certificate Error"), "Gerrit::Internal::GerritDialog", "Certificate Error"),
QCoreApplication::translate( QCoreApplication::translate(

18
src/plugins/git/gitclient.cpp
View File

@@ -1144,7 +1144,7 @@ QStringList GitClient::setupCheckoutArguments(const QString &workingDirectory,
return arguments; return arguments;
if (Utils::CheckableMessageBox::doNotAskAgainQuestion( if (Utils::CheckableMessageBox::doNotAskAgainQuestion(
ICore::mainWindow() /*parent*/, ICore::dialogParent() /*parent*/,
tr("Create Local Branch") /*title*/, tr("Create Local Branch") /*title*/,
tr("Would you like to create a local branch?") /*message*/, tr("Would you like to create a local branch?") /*message*/,
ICore::settings(), "Git.CreateLocalBranchOnCheckout" /*setting*/, ICore::settings(), "Git.CreateLocalBranchOnCheckout" /*setting*/,
@@ -1181,7 +1181,7 @@ QStringList GitClient::setupCheckoutArguments(const QString &workingDirectory,
} }
} }
BranchAddDialog branchAddDialog(localBranches, true, ICore::mainWindow()); BranchAddDialog branchAddDialog(localBranches, true, ICore::dialogParent());
branchAddDialog.setTrackedBranchName(remoteBranch, true); branchAddDialog.setTrackedBranchName(remoteBranch, true);
if (branchAddDialog.exec() != QDialog::Accepted) if (branchAddDialog.exec() != QDialog::Accepted)
@@ -1207,7 +1207,7 @@ void GitClient::reset(const QString &workingDirectory, const QString &argument,
if (argument == "--hard") { if (argument == "--hard") {
if (gitStatus(workingDirectory, StatusMode(NoUntracked | NoSubmodules)) != StatusUnchanged) { if (gitStatus(workingDirectory, StatusMode(NoUntracked | NoSubmodules)) != StatusUnchanged) {
if (QMessageBox::question( if (QMessageBox::question(
Core::ICore::mainWindow(), tr("Reset"), Core::ICore::dialogParent(), tr("Reset"),
tr("All changes in working directory will be discarded. Are you sure?"), tr("All changes in working directory will be discarded. Are you sure?"),
QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes | QMessageBox::No,
QMessageBox::No) == QMessageBox::No) { QMessageBox::No) == QMessageBox::No) {
@@ -1654,7 +1654,7 @@ QString GitClient::synchronousStash(const QString &workingDirectory, const QStri
message = creatorStashMessage(messageKeyword); message = creatorStashMessage(messageKeyword);
do { do {
if ((flags & StashPromptDescription)) { if ((flags & StashPromptDescription)) {
if (!inputText(ICore::mainWindow(), if (!inputText(ICore::dialogParent(),
tr("Stash Description"), tr("Description:"), &message)) tr("Stash Description"), tr("Description:"), &message))
break; break;
} }
@@ -2052,7 +2052,7 @@ void GitClient::updateSubmodulesIfNeeded(const QString &workingDirectory, bool p
if (!updateNeeded) if (!updateNeeded)
return; return;
if (prompt && QMessageBox::question(ICore::mainWindow(), tr("Submodules Found"), if (prompt && QMessageBox::question(ICore::dialogParent(), tr("Submodules Found"),
tr("Would you like to update submodules?"), tr("Would you like to update submodules?"),
QMessageBox::Yes | QMessageBox::No) == QMessageBox::No) { QMessageBox::Yes | QMessageBox::No) == QMessageBox::No) {
return; return;
@@ -2220,7 +2220,7 @@ void GitClient::continuePreviousGitCommand(const QString &workingDirectory,
} }
QMessageBox msgBox(QMessageBox::Question, msgBoxTitle, msgBoxText, QMessageBox msgBox(QMessageBox::Question, msgBoxTitle, msgBoxText,
QMessageBox::NoButton, ICore::mainWindow()); QMessageBox::NoButton, ICore::dialogParent());
if (hasChanges || isRebase) if (hasChanges || isRebase)
msgBox.addButton(hasChanges ? buttonName : tr("Skip"), QMessageBox::AcceptRole); msgBox.addButton(hasChanges ? buttonName : tr("Skip"), QMessageBox::AcceptRole);
msgBox.addButton(QMessageBox::Abort); msgBox.addButton(QMessageBox::Abort);
@@ -2802,7 +2802,7 @@ GitClient::RevertResult GitClient::revertI(QStringList files,
// Ask to revert (to do: Handle lists with a selection dialog) // Ask to revert (to do: Handle lists with a selection dialog)
const QMessageBox::StandardButton answer const QMessageBox::StandardButton answer
= QMessageBox::question(ICore::mainWindow(), = QMessageBox::question(ICore::dialogParent(),
tr("Revert"), tr("Revert"),
tr("The file has been changed. Do you want to revert it?"), tr("The file has been changed. Do you want to revert it?"),
QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes | QMessageBox::No,
@@ -2944,7 +2944,7 @@ void GitClient::handleMergeConflicts(const QString &workingDir, const QString &c
message = tr("Conflicts detected."); message = tr("Conflicts detected.");
} }
QMessageBox mergeOrAbort(QMessageBox::Question, tr("Conflicts Detected"), message, QMessageBox mergeOrAbort(QMessageBox::Question, tr("Conflicts Detected"), message,
QMessageBox::NoButton, ICore::mainWindow()); QMessageBox::NoButton, ICore::dialogParent());
QPushButton *mergeToolButton = mergeOrAbort.addButton(tr("Run &Merge Tool"), QPushButton *mergeToolButton = mergeOrAbort.addButton(tr("Run &Merge Tool"),
QMessageBox::AcceptRole); QMessageBox::AcceptRole);
const QString mergeTool = readConfigValue(workingDir, "merge.tool"); const QString mergeTool = readConfigValue(workingDir, "merge.tool");
@@ -3292,7 +3292,7 @@ void GitClient::StashInfo::stashPrompt(const QString &command, const QString &st
QMessageBox msgBox(QMessageBox::Question, tr("Uncommitted Changes Found"), QMessageBox msgBox(QMessageBox::Question, tr("Uncommitted Changes Found"),
tr("What would you like to do with local changes in:") + "\n\n" tr("What would you like to do with local changes in:") + "\n\n"
+ QDir::toNativeSeparators(m_workingDir) + '\"', + QDir::toNativeSeparators(m_workingDir) + '\"',
QMessageBox::NoButton, ICore::mainWindow()); QMessageBox::NoButton, ICore::dialogParent());
msgBox.setDetailedText(statusOutput); msgBox.setDetailedText(statusOutput);

10
src/plugins/git/gitplugin.cpp
View File

@@ -793,7 +793,7 @@ void GitPlugin::resetRepository()
QTC_ASSERT(state.hasTopLevel(), return); QTC_ASSERT(state.hasTopLevel(), return);
QString topLevel = state.topLevel(); QString topLevel = state.topLevel();
LogChangeDialog dialog(true, ICore::mainWindow()); LogChangeDialog dialog(true, ICore::dialogParent());
ResetItemDelegate delegate(dialog.widget()); ResetItemDelegate delegate(dialog.widget());
dialog.setWindowTitle(tr("Undo Changes to %1").arg(QDir::toNativeSeparators(topLevel))); dialog.setWindowTitle(tr("Undo Changes to %1").arg(QDir::toNativeSeparators(topLevel)));
if (dialog.runDialog(topLevel, QString(), LogChangeWidget::IncludeRemotes)) if (dialog.runDialog(topLevel, QString(), LogChangeWidget::IncludeRemotes))
@@ -818,7 +818,7 @@ void GitPlugin::startRebase()
const QString topLevel = state.topLevel(); const QString topLevel = state.topLevel();
if (topLevel.isEmpty() || !m_gitClient->canRebase(topLevel)) if (topLevel.isEmpty() || !m_gitClient->canRebase(topLevel))
return; return;
LogChangeDialog dialog(false, ICore::mainWindow()); LogChangeDialog dialog(false, ICore::dialogParent());
RebaseItemDelegate delegate(dialog.widget()); RebaseItemDelegate delegate(dialog.widget());
dialog.setWindowTitle(tr("Interactive Rebase")); dialog.setWindowTitle(tr("Interactive Rebase"));
if (!dialog.runDialog(topLevel)) if (!dialog.runDialog(topLevel))
@@ -832,7 +832,7 @@ void GitPlugin::startChangeRelatedAction(const Id &id)
const VcsBasePluginState state = currentState(); const VcsBasePluginState state = currentState();
ChangeSelectionDialog dialog(state.hasTopLevel() ? state.topLevel() : PathChooser::homePath(), ChangeSelectionDialog dialog(state.hasTopLevel() ? state.topLevel() : PathChooser::homePath(),
id, ICore::mainWindow()); id, ICore::dialogParent());
int result = dialog.exec(); int result = dialog.exec();
@@ -1234,7 +1234,7 @@ void GitPlugin::applyPatch(const QString &workingDirectory, QString file)
// Prompt for file // Prompt for file
if (file.isEmpty()) { if (file.isEmpty()) {
const QString filter = tr("Patches (*.patch *.diff)"); const QString filter = tr("Patches (*.patch *.diff)");
file = QFileDialog::getOpenFileName(ICore::mainWindow(), tr("Choose Patch"), QString(), filter); file = QFileDialog::getOpenFileName(ICore::dialogParent(), tr("Choose Patch"), QString(), filter);
if (file.isEmpty()) { if (file.isEmpty()) {
m_gitClient->endStashScope(workingDirectory); m_gitClient->endStashScope(workingDirectory);
return; return;
@@ -1302,7 +1302,7 @@ template <class NonModalDialog>
dialog->show(); dialog->show();
dialog->raise(); dialog->raise();
} else { } else {
dialog = new NonModalDialog(ICore::mainWindow()); dialog = new NonModalDialog(ICore::dialogParent());
dialog->refresh(topLevel, true); dialog->refresh(topLevel, true);
dialog->show(); dialog->show();
} }