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

Git: Factor out the central widget from LogChangeDialog

Browse Source 
To be used for "amend previous commit" feature

Change-Id: Id1190d67bdd1a3dd3866a6a0f9d41be5f9baaa4a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-04-29 19:05:31 +03:00
committed by Orgad Shaneh
parent 7b851602cc
commit c702639a8e
2 changed files with 100 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/plugins/git/logchangedialog.h
View File

@@ -31,9 +31,9 @@
#define LOGCHANGEDDIALOG_H
#include <QDialog>
#include <QTreeView>
QT_BEGIN_NAMESPACE
class QTreeView;
class QDialogButtonBox;
class QComboBox;
class QStandardItemModel;
@@ -43,13 +43,31 @@ QT_END_NAMESPACE
namespace Git {
namespace Internal {
// A dialog that lists SHA1 and subject of the changes
// Used for reset and interactive rebased
// A widget that lists SHA1 and subject of the changes
// Used for reset and interactive rebase
class LogChangeWidget : public QTreeView
{
Q_OBJECT
public:
explicit LogChangeWidget(QWidget *parent = 0);
bool init(const QString &repository);
QString commit() const;
int commitIndex() const;
private:
bool populateLog(const QString &repository);
const QStandardItem *currentItem(int column = 0) const;
QStandardItemModel *m_model;
};
class LogChangeDialog : public QDialog
{
Q_OBJECT
public:
explicit LogChangeDialog(bool isReset, QWidget *parent = 0);
LogChangeDialog(bool isReset, QWidget *parent = 0);
bool runDialog(const QString &repository);
@@ -58,11 +76,7 @@ public:
QString resetFlag() const;
private:
bool populateLog(const QString &repository);
const QStandardItem *currentItem(int column = 0) const;
QTreeView *m_treeView;
QStandardItemModel *m_model;
LogChangeWidget *widget;
QDialogButtonBox *m_dialogButtonBox;
QComboBox *m_resetTypeComboBox;
};