Commit 089c5dd9 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Orgad Shaneh
Browse files

Git: Open LogChangeDialog on top of the main window



Change-Id: I9fe92f4e1e91e7a4a80a34e802d0d6b8d92b77e4
Reviewed-by: default avatarAndré Hartmann <aha_1980@gmx.de>
Reviewed-by: default avatarPetar Perisin <petar.perisin@gmail.com>
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent 05b939db
......@@ -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);
......
......@@ -75,7 +75,7 @@ class LogChangeDialog : public QDialog
{
Q_OBJECT
public:
LogChangeDialog(bool isReset, QWidget *parent = 0);
LogChangeDialog(bool isReset, QWidget *parent);
bool runDialog(const QString &repository, const QString &commit = QString(),
bool includeRemote = true);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment