forked from qt-creator/qt-creator
Git: Open LogChangeDialog on top of the main window
Change-Id: I9fe92f4e1e91e7a4a80a34e802d0d6b8d92b77e4 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Petar Perisin <petar.perisin@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
committed by
Orgad Shaneh
parent
05b939db01
commit
089c5dd927
@@ -810,7 +810,7 @@ void GitPlugin::resetRepository()
|
||||
QTC_ASSERT(state.hasTopLevel(), return);
|
||||
QString topLevel = state.topLevel();
|
||||
|
||||
LogChangeDialog dialog(true);
|
||||
LogChangeDialog dialog(true, Core::ICore::mainWindow());
|
||||
dialog.setWindowTitle(tr("Undo Changes to %1").arg(QDir::toNativeSeparators(topLevel)));
|
||||
if (dialog.runDialog(topLevel))
|
||||
m_gitClient->reset(topLevel, dialog.resetFlag(), dialog.commit());
|
||||
@@ -827,7 +827,7 @@ void GitPlugin::startRebase()
|
||||
return;
|
||||
if (!m_gitClient->beginStashScope(topLevel, QLatin1String("Rebase-i")))
|
||||
return;
|
||||
LogChangeDialog dialog(false);
|
||||
LogChangeDialog dialog(false, Core::ICore::mainWindow());
|
||||
dialog.setWindowTitle(tr("Interactive Rebase"));
|
||||
if (dialog.runDialog(topLevel, QString(), false))
|
||||
m_gitClient->interactiveRebase(topLevel, dialog.commit(), false);
|
||||
|
Reference in New Issue
Block a user