comparison src/historywidget.h @ 559:95877ad67d3e

Merge from branch "find"
author Chris Cannam
date Mon, 27 Feb 2012 17:08:47 +0000
parents d932ce55c364
children 533519ebc0cb
comparison
equal deleted inserted replaced
553:9c8147c9f245 559:95877ad67d3e
26 26
27 class Panned; 27 class Panned;
28 class Panner; 28 class Panner;
29 class UncommittedItem; 29 class UncommittedItem;
30 class QGraphicsScene; 30 class QGraphicsScene;
31 class FindWidget;
31 32
32 class HistoryWidget : public QWidget 33 class HistoryWidget : public QWidget
33 { 34 {
34 Q_OBJECT 35 Q_OBJECT
35 36
66 void closeBranch(QString id); 67 void closeBranch(QString id);
67 void tag(QString id); 68 void tag(QString id);
68 69
69 private slots: 70 private slots:
70 void showClosedChanged(bool); 71 void showClosedChanged(bool);
72
73 public slots:
74 void setSearchText(QString);
71 75
72 private: 76 private:
73 Changesets m_changesets; 77 Changesets m_changesets;
74 QStringList m_currentIds; 78 QStringList m_currentIds;
75 QString m_currentBranch; 79 QString m_currentBranch;
76 QSet<QString> m_newIds; 80 QSet<QString> m_newIds;
77 QSet<QString> m_closedIds; 81 QSet<QString> m_closedIds;
78 bool m_showUncommitted; 82 bool m_showUncommitted;
79 bool m_refreshNeeded; 83 bool m_refreshNeeded;
80 84
85 FindWidget *m_findWidget;
81 Panned *m_panned; 86 Panned *m_panned;
82 Panner *m_panner; 87 Panner *m_panner;
83 QCheckBox *m_showClosedBranches; 88 QCheckBox *m_showClosedBranches;
89
90 QString m_searchText;
84 91
85 QGraphicsScene *scene(); 92 QGraphicsScene *scene();
86 void clearChangesets(); 93 void clearChangesets();
87 void replaceChangesets(Changesets); 94 void replaceChangesets(Changesets);
88 void addChangesets(Changesets); 95 void addChangesets(Changesets);
89 void layoutAll(); 96 void layoutAll();
90 void setChangesetParents(); 97 void setChangesetParents();
91 void updateNewAndCurrentItems(); 98 void updateNewAndCurrentItems();
92 void connectSceneSignals(); 99 void connectSceneSignals();
100 void updateSearchStatus();
93 }; 101 };
94 102
95 #endif 103 #endif