forked from qt-creator/qt-creator
Git: inline changeselectiondialog.ui
Change-Id: I7f4758119623559cec4f1b91a305d3ad55fe55dc Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
@@ -26,16 +26,22 @@
|
||||
#pragma once
|
||||
|
||||
#include <utils/environment.h>
|
||||
#include <utils/fileutils.h>
|
||||
#include <utils/filepath.h>
|
||||
#include <utils/id.h>
|
||||
|
||||
#include <QDialog>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
class QPlainTextEdit;
|
||||
class QPushButton;
|
||||
class QStringListModel;
|
||||
QT_END_NAMESPACE
|
||||
|
||||
namespace Utils { class QtcProcess; }
|
||||
namespace Utils {
|
||||
class CompletingLineEdit;
|
||||
class PathChooser;
|
||||
class QtcProcess;
|
||||
} // Utils
|
||||
|
||||
namespace Git {
|
||||
namespace Internal {
|
||||
@@ -49,8 +55,6 @@ enum ChangeCommand {
|
||||
Show
|
||||
};
|
||||
|
||||
namespace Ui { class ChangeSelectionDialog; }
|
||||
|
||||
class ChangeSelectionDialog : public QDialog
|
||||
{
|
||||
Q_OBJECT
|
||||
@@ -73,14 +77,20 @@ private:
|
||||
|
||||
void enableButtons(bool b);
|
||||
|
||||
Ui::ChangeSelectionDialog *m_ui;
|
||||
|
||||
std::unique_ptr<Utils::QtcProcess> m_process;
|
||||
Utils::FilePath m_gitExecutable;
|
||||
Utils::Environment m_gitEnvironment;
|
||||
ChangeCommand m_command = NoCommand;
|
||||
QStringListModel *m_changeModel = nullptr;
|
||||
Utils::FilePath m_oldWorkingDir;
|
||||
|
||||
Utils::PathChooser *m_workingDirectoryChooser;
|
||||
Utils::CompletingLineEdit *m_changeNumberEdit;
|
||||
QPlainTextEdit *m_detailsText;
|
||||
QPushButton *m_checkoutButton;
|
||||
QPushButton *m_revertButton;
|
||||
QPushButton *m_cherryPickButton;
|
||||
QPushButton *m_showButton;
|
||||
};
|
||||
|
||||
} // namespace Internal
|
||||
|
||||
Reference in New Issue
Block a user