Mercurial > hg > easyhg
comparison mainwindow.h @ 34:43e3b271d293 Version_0.5.2.
Version 0.5.2. Added hg tag, .hgignore editing.
author | Jari Korhonen <jtkorhonen@gmail.com> |
---|---|
date | Sat, 19 Jun 2010 02:01:36 +0300 |
parents | ff8d64625aa3 |
children | 5986d0758069 |
comparison
equal
deleted
inserted
replaced
33:ff8d64625aa3 | 34:43e3b271d293 |
---|---|
40 ACT_MERGE, | 40 ACT_MERGE, |
41 ACT_RESOLVE_LIST, | 41 ACT_RESOLVE_LIST, |
42 ACT_SERVE, | 42 ACT_SERVE, |
43 ACT_RESOLVE_MARK, | 43 ACT_RESOLVE_MARK, |
44 ACT_RETRY_MERGE, | 44 ACT_RETRY_MERGE, |
45 ACT_TAG, | |
45 }; | 46 }; |
46 | 47 |
47 | 48 |
48 class MainWindow : public QMainWindow | 49 class MainWindow : public QMainWindow |
49 { | 50 { |
95 void hgPull(); | 96 void hgPull(); |
96 void hgUpdateToRev(); | 97 void hgUpdateToRev(); |
97 void hgAnnotate(); | 98 void hgAnnotate(); |
98 void hgResolveList(); | 99 void hgResolveList(); |
99 void hgResolveMark(); | 100 void hgResolveMark(); |
101 void hgTag(); | |
100 void hgServe(); | 102 void hgServe(); |
103 void hgIgnore(); | |
101 | 104 |
102 private: | 105 private: |
103 void hgHeads(); | 106 void hgHeads(); |
104 void hgParents(); | 107 void hgParents(); |
105 void hgLog(); | 108 void hgLog(); |
108 void createMenus(); | 111 void createMenus(); |
109 void createToolBars(); | 112 void createToolBars(); |
110 void createStatusBar(); | 113 void createStatusBar(); |
111 void readSettings(); | 114 void readSettings(); |
112 void splitChangeSets(QStringList *list, QString hgLogOutput); | 115 void splitChangeSets(QStringList *list, QString hgLogOutput); |
113 int getCommitComment(QString& comment); | 116 int getCommentOrTag(QString& commentOrTag, QString question, QString dlgTitle); |
114 void presentLongStdoutToUser(QString stdo); | 117 void presentLongStdoutToUser(QString stdo); |
115 void countModifications(QListWidget *workList, int& added, int& modified, int& removed, int& notTracked, | 118 void countModifications(QListWidget *workList, int& added, int& modified, int& removed, int& notTracked, |
116 int& selected, | 119 int& selected, |
117 int& selectedAdded, int& selectedModified, int& selectedRemoved, int& selectedNotTracked); | 120 int& selectedAdded, int& selectedModified, int& selectedRemoved, int& selectedNotTracked); |
118 bool isSelectedModified(QListWidget *workList); | 121 bool isSelectedModified(QListWidget *workList); |
119 bool areAllSelectedUntracked(QListWidget *workList); | 122 bool areAllSelectedUntracked(QListWidget *workList); |
120 bool isSelectedDeletable(QListWidget *workList); | 123 bool isSelectedDeletable(QListWidget *workList); |
121 bool areAllSelectedCommitable(QListWidget *workList); | 124 bool areAllSelectedCommitable(QListWidget *workList); |
122 QString listAllUpIpV4Addresses(); | 125 QString listAllUpIpV4Addresses(); |
123 | 126 QString filterTag(QString tag); |
124 | 127 |
125 //Actions enabled flags | 128 //Actions enabled flags |
126 bool remoteRepoActionsEnabled; | 129 bool remoteRepoActionsEnabled; |
127 bool localRepoActionsEnabled; | 130 bool localRepoActionsEnabled; |
128 | 131 |
149 QAction *hgRetryMergeAct; | 152 QAction *hgRetryMergeAct; |
150 QAction *hgUpdateToRevAct; | 153 QAction *hgUpdateToRevAct; |
151 QAction *hgAnnotateAct; | 154 QAction *hgAnnotateAct; |
152 QAction *hgResolveListAct; | 155 QAction *hgResolveListAct; |
153 QAction *hgResolveMarkAct; | 156 QAction *hgResolveMarkAct; |
157 QAction *hgTagAct; | |
158 QAction *hgIgnoreAct; | |
154 QAction *hgServeAct; | 159 QAction *hgServeAct; |
155 | 160 |
156 //Menus | 161 //Menus |
157 QMenu *fileMenu; | 162 QMenu *fileMenu; |
158 QMenu *advancedMenu; | 163 QMenu *advancedMenu; |