Mercurial > hg > easyhg
annotate changesetscene.h @ 153:70fe12873106
* Show both parents of uncommitted merge; fixes to right-button menus
author | Chris Cannam |
---|---|
date | Thu, 02 Dec 2010 17:55:21 +0000 |
parents | 2fef6b0dfbe8 |
children | 4bad3c5c053a |
rev | line source |
---|---|
Chris@119 | 1 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */ |
Chris@119 | 2 |
Chris@119 | 3 /* |
Chris@119 | 4 EasyMercurial |
Chris@119 | 5 |
Chris@119 | 6 Based on HgExplorer by Jari Korhonen |
Chris@119 | 7 Copyright (c) 2010 Jari Korhonen |
Chris@119 | 8 Copyright (c) 2010 Chris Cannam |
Chris@119 | 9 Copyright (c) 2010 Queen Mary, University of London |
Chris@119 | 10 |
Chris@119 | 11 This program is free software; you can redistribute it and/or |
Chris@119 | 12 modify it under the terms of the GNU General Public License as |
Chris@119 | 13 published by the Free Software Foundation; either version 2 of the |
Chris@119 | 14 License, or (at your option) any later version. See the file |
Chris@119 | 15 COPYING included with this distribution for more information. |
Chris@119 | 16 */ |
Chris@119 | 17 |
Chris@119 | 18 #ifndef CHANGESETSCENE_H |
Chris@119 | 19 #define CHANGESETSCENE_H |
Chris@119 | 20 |
Chris@119 | 21 #include <QGraphicsScene> |
Chris@119 | 22 |
Chris@119 | 23 class ChangesetItem; |
Chris@141 | 24 class UncommittedItem; |
Chris@119 | 25 |
Chris@119 | 26 class ChangesetScene : public QGraphicsScene |
Chris@119 | 27 { |
Chris@119 | 28 Q_OBJECT |
Chris@119 | 29 |
Chris@119 | 30 public: |
Chris@119 | 31 ChangesetScene(); |
Chris@119 | 32 |
Chris@141 | 33 void addChangesetItem(ChangesetItem *item); |
Chris@141 | 34 void addUncommittedItem(UncommittedItem *item); |
Chris@141 | 35 |
Chris@141 | 36 signals: |
Chris@141 | 37 void commit(); |
Chris@141 | 38 void revert(); |
Chris@141 | 39 void diffWorkingFolder(); |
Chris@153 | 40 void showWork(); |
Chris@141 | 41 |
Chris@141 | 42 void updateTo(QString id); |
Chris@148 | 43 void diffToParent(QString id, QString parent); |
Chris@141 | 44 void diffToCurrent(QString id); |
Chris@141 | 45 void mergeFrom(QString id); |
Chris@141 | 46 void tag(QString id); |
Chris@141 | 47 |
Chris@119 | 48 public slots: |
Chris@119 | 49 void changesetDetailShown(); |
Chris@119 | 50 |
Chris@119 | 51 private: |
Chris@119 | 52 ChangesetItem *m_detailShown; |
Chris@119 | 53 }; |
Chris@119 | 54 |
Chris@119 | 55 #endif |