annotate historywidget.h @ 159:087d7cdde662

* Add InConflict state (not yet used)
author Chris Cannam
date Fri, 03 Dec 2010 12:29:57 +0000
parents 6bcb4a4d6521
children 4bad3c5c053a
rev   line source
Chris@116 1 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
Chris@116 2
Chris@116 3 /*
Chris@116 4 EasyMercurial
Chris@116 5
Chris@116 6 Based on HgExplorer by Jari Korhonen
Chris@116 7 Copyright (c) 2010 Jari Korhonen
Chris@116 8 Copyright (c) 2010 Chris Cannam
Chris@116 9 Copyright (c) 2010 Queen Mary, University of London
Chris@116 10
Chris@116 11 This program is free software; you can redistribute it and/or
Chris@116 12 modify it under the terms of the GNU General Public License as
Chris@116 13 published by the Free Software Foundation; either version 2 of the
Chris@116 14 License, or (at your option) any later version. See the file
Chris@116 15 COPYING included with this distribution for more information.
Chris@116 16 */
Chris@116 17
Chris@116 18 #ifndef HISTORYWIDGET_H
Chris@116 19 #define HISTORYWIDGET_H
Chris@116 20
Chris@116 21 #include "changeset.h"
Chris@116 22
Chris@116 23 #include <QWidget>
Chris@133 24 #include <QSet>
Chris@116 25
Chris@116 26 class Panned;
Chris@116 27 class Panner;
Chris@129 28 class UncommittedItem;
Chris@145 29 class QGraphicsScene;
Chris@116 30
Chris@116 31 class HistoryWidget : public QWidget
Chris@116 32 {
Chris@116 33 Q_OBJECT
Chris@116 34
Chris@116 35 public:
Chris@116 36 HistoryWidget();
Chris@116 37 virtual ~HistoryWidget();
Chris@116 38
Chris@153 39 void setCurrent(QStringList ids, QString branch, bool showUncommitted);
Chris@128 40
Chris@120 41 void parseNewLog(QString log);
Chris@120 42 void parseIncrementalLog(QString log);
Chris@134 43
Chris@134 44 bool haveNewItems() const { return !m_newIds.empty(); }
Chris@141 45
Chris@154 46 void update();
Chris@154 47
Chris@141 48 signals:
Chris@141 49 void commit();
Chris@141 50 void revert();
Chris@141 51 void diffWorkingFolder();
Chris@153 52 void showWork();
Chris@141 53
Chris@141 54 void updateTo(QString id);
Chris@148 55 void diffToParent(QString id, QString parent);
Chris@141 56 void diffToCurrent(QString id);
Chris@141 57 void mergeFrom(QString id);
Chris@141 58 void tag(QString id);
Chris@116 59
Chris@116 60 private:
Chris@116 61 Changesets m_changesets;
Chris@128 62 QStringList m_currentIds;
Chris@153 63 QString m_currentBranch;
Chris@133 64 QSet<QString> m_newIds;
Chris@145 65 bool m_showUncommitted;
Chris@154 66 bool m_refreshNeeded;
Chris@116 67
Chris@116 68 Panned *m_panned;
Chris@116 69 Panner *m_panner;
Chris@116 70
Chris@145 71 QGraphicsScene *scene();
Chris@116 72 void clearChangesets();
Chris@133 73 void replaceChangesets(Changesets);
Chris@133 74 void addChangesets(Changesets);
Chris@120 75 void layoutAll();
Chris@122 76 void setChangesetParents();
Chris@133 77 void updateNewAndCurrentItems();
Chris@141 78 void connectSceneSignals();
Chris@116 79 };
Chris@116 80
Chris@116 81 #endif