Git: Prevent checking unmerged files in submit editor

Change-Id: Ic226638a522ca92f61b8b6736a325c1cc747ff62
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2012-12-25 19:38:07 +02:00
parent 30d548ea3a
commit 65b7874341
8 changed files with 28 additions and 13 deletions

View File

@@ -36,6 +36,13 @@
namespace VcsBase {
enum CheckMode
{
Unchecked,
Checked,
Uncheckable
};
class VCSBASE_EXPORT SubmitFileModel : public QStandardItemModel
{
Q_OBJECT
@@ -44,7 +51,7 @@ public:
// Convenience to create and add rows containing a file plus status text.
QList<QStandardItem *> addFile(const QString &fileName, const QString &status = QString(),
bool checked = true, const QVariant &data = QVariant());
CheckMode checkMode = Checked, const QVariant &data = QVariant());
// Find convenience that returns the whole row (as opposed to QStandardItemModel::find).
QList<QStandardItem *> findRow(const QString &text, int column = 0) const;