jtkorhonen@0
|
1 /****************************************************************************
|
jtkorhonen@30
|
2 ** Copyright (C) Jari Korhonen, 2010 (under lgpl)
|
jtkorhonen@30
|
3 ****************************************************************************/
|
jtkorhonen@0
|
4
|
jtkorhonen@0
|
5 #include <QtGui>
|
jtkorhonen@0
|
6 #include <QStringList>
|
jtkorhonen@0
|
7 #include <QDir>
|
jtkorhonen@24
|
8 #include <QNetworkInterface>
|
jtkorhonen@17
|
9 #include <QHostAddress>
|
jtkorhonen@17
|
10 #include <QHostInfo>
|
jtkorhonen@0
|
11
|
jtkorhonen@0
|
12 #include "mainwindow.h"
|
jtkorhonen@0
|
13 #include "settingsdialog.h"
|
jtkorhonen@0
|
14
|
jtkorhonen@0
|
15
|
jtkorhonen@0
|
16 MainWindow::MainWindow()
|
jtkorhonen@0
|
17 {
|
jtkorhonen@0
|
18 QString wndTitle;
|
jtkorhonen@0
|
19
|
jtkorhonen@0
|
20 createActions();
|
jtkorhonen@0
|
21 createMenus();
|
jtkorhonen@0
|
22 createToolBars();
|
jtkorhonen@0
|
23 createStatusBar();
|
jtkorhonen@0
|
24
|
jtkorhonen@0
|
25 timerId = startTimer(200);
|
jtkorhonen@0
|
26 runner = new HgRunner(this);
|
jtkorhonen@0
|
27 runningAction = ACT_NONE;
|
jtkorhonen@0
|
28 statusBar()->addPermanentWidget(runner);
|
jtkorhonen@0
|
29
|
jtkorhonen@0
|
30 wndTitle.sprintf("%s %s", APPNAME, APPVERSION);
|
jtkorhonen@0
|
31 setWindowTitle(wndTitle);
|
jtkorhonen@0
|
32
|
jtkorhonen@0
|
33 remoteRepoPath = "";
|
jtkorhonen@0
|
34 workFolderPath = "";
|
jtkorhonen@0
|
35
|
jtkorhonen@0
|
36 readSettings();
|
jtkorhonen@0
|
37
|
jtkorhonen@0
|
38 tabPage = 0;
|
jtkorhonen@0
|
39 hgExp = new HgExpWidget((QWidget *) this, remoteRepoPath, workFolderPath, initialFileTypesBits);
|
jtkorhonen@0
|
40 setCentralWidget(hgExp);
|
jtkorhonen@0
|
41
|
jtkorhonen@0
|
42 setUnifiedTitleAndToolBarOnMac(true);
|
jtkorhonen@0
|
43 connectActions();
|
jtkorhonen@0
|
44 enableDisableActions();
|
jtkorhonen@0
|
45
|
jtkorhonen@0
|
46 if (firstStart)
|
jtkorhonen@0
|
47 {
|
jtkorhonen@0
|
48 QMessageBox::information(this, tr("First start todo"), tr("Going to \"Settings\" first."));
|
jtkorhonen@0
|
49 settings();
|
jtkorhonen@0
|
50 }
|
jtkorhonen@0
|
51
|
jtkorhonen@0
|
52 hgStat();
|
jtkorhonen@0
|
53 }
|
jtkorhonen@0
|
54
|
jtkorhonen@0
|
55
|
jtkorhonen@0
|
56 void MainWindow::closeEvent(QCloseEvent *)
|
jtkorhonen@0
|
57 {
|
jtkorhonen@0
|
58 writeSettings();
|
jtkorhonen@0
|
59 }
|
jtkorhonen@0
|
60
|
jtkorhonen@0
|
61
|
jtkorhonen@0
|
62 void MainWindow::about()
|
jtkorhonen@0
|
63 {
|
jtkorhonen@0
|
64 QMessageBox::about(this, tr("About HgExplorer"),
|
jtkorhonen@0
|
65 tr("<b>HgExplorer</b> tries to be Mercurial's <b>VSS Explorer:</b> ;-)<br><br>"
|
jtkorhonen@0
|
66 "-Hides command line in normal use<br>"
|
jtkorhonen@0
|
67 "-Makes common operations easier<br><br>"
|
jtkorhonen@0
|
68 "(c) 2010 (lgpl), Jari Korhonen (jtkorhonen@gmail.com)<br><br>"
|
jtkorhonen@0
|
69 "-Needs Mercurial ;-) (thanks Matt Mackall, Bryan O'Sullivan and others !)<br>"
|
jtkorhonen@0
|
70 "-Uses excellent Nuvola icons (c) David Vignoni (Thanks, David !)<br>"
|
jtkorhonen@29
|
71 "-Needs Qt4, mingw (in windows), python, kdiff3 (Thanks to all of you !)<br>"
|
jtkorhonen@29
|
72 "-Windows standalone install uses hg / python / kdiff3 from TortoiseHg (BIG Thanks !)<br>"
|
jtkorhonen@29
|
73 "-Windows standalone install uses InstallJammer setup tool (Thanks, great tool !)<br>"));
|
jtkorhonen@0
|
74 }
|
jtkorhonen@0
|
75
|
jtkorhonen@0
|
76
|
jtkorhonen@0
|
77 void MainWindow::hgStat()
|
jtkorhonen@0
|
78 {
|
jtkorhonen@0
|
79 if (hgStatAct -> isEnabled())
|
jtkorhonen@0
|
80 {
|
jtkorhonen@0
|
81 if (runningAction == ACT_NONE)
|
jtkorhonen@0
|
82 {
|
jtkorhonen@0
|
83 QStringList params;
|
jtkorhonen@0
|
84
|
jtkorhonen@0
|
85 QString statFlags = hgExp -> getStatFlags();
|
jtkorhonen@0
|
86 if (statFlags.isEmpty())
|
jtkorhonen@0
|
87 {
|
jtkorhonen@0
|
88 params << "stat";
|
jtkorhonen@0
|
89 }
|
jtkorhonen@0
|
90 else
|
jtkorhonen@0
|
91 {
|
jtkorhonen@0
|
92 params << "stat" << "-" + statFlags;
|
jtkorhonen@0
|
93 }
|
jtkorhonen@0
|
94
|
jtkorhonen@0
|
95
|
jtkorhonen@0
|
96 runner -> startProc(getHgBinaryName(), workFolderPath, params);
|
jtkorhonen@0
|
97 runningAction = ACT_STAT;
|
jtkorhonen@0
|
98 }
|
jtkorhonen@0
|
99 }
|
jtkorhonen@0
|
100 }
|
jtkorhonen@0
|
101
|
jtkorhonen@0
|
102 void MainWindow::hgHeads()
|
jtkorhonen@0
|
103 {
|
jtkorhonen@0
|
104 if (runningAction == ACT_NONE)
|
jtkorhonen@0
|
105 {
|
jtkorhonen@0
|
106 QStringList params;
|
jtkorhonen@0
|
107 params << "heads";
|
jtkorhonen@0
|
108
|
jtkorhonen@0
|
109 //on empty repos, "hg heads" will fail, don't care of that.
|
jtkorhonen@0
|
110 runner -> startProc(getHgBinaryName(), workFolderPath, params, false);
|
jtkorhonen@0
|
111 runningAction = ACT_HEADS;
|
jtkorhonen@0
|
112 }
|
jtkorhonen@0
|
113 }
|
jtkorhonen@0
|
114
|
jtkorhonen@0
|
115 void MainWindow::hgLog()
|
jtkorhonen@0
|
116 {
|
jtkorhonen@0
|
117 if (runningAction == ACT_NONE)
|
jtkorhonen@0
|
118 {
|
jtkorhonen@0
|
119 QStringList params;
|
jtkorhonen@0
|
120 params << "glog" << "--verbose";
|
jtkorhonen@0
|
121
|
jtkorhonen@0
|
122 runner -> startProc(getHgBinaryName(), workFolderPath, params);
|
jtkorhonen@0
|
123 runningAction = ACT_LOG;
|
jtkorhonen@0
|
124 }
|
jtkorhonen@0
|
125 }
|
jtkorhonen@0
|
126
|
jtkorhonen@0
|
127
|
jtkorhonen@0
|
128 void MainWindow::hgParents()
|
jtkorhonen@0
|
129 {
|
jtkorhonen@0
|
130 if (runningAction == ACT_NONE)
|
jtkorhonen@0
|
131 {
|
jtkorhonen@0
|
132 QStringList params;
|
jtkorhonen@0
|
133 params << "parents";
|
jtkorhonen@0
|
134
|
jtkorhonen@0
|
135 runner -> startProc(getHgBinaryName(), workFolderPath, params);
|
jtkorhonen@0
|
136 runningAction = ACT_PARENTS;
|
jtkorhonen@0
|
137 }
|
jtkorhonen@0
|
138 }
|
jtkorhonen@0
|
139
|
jtkorhonen@0
|
140
|
jtkorhonen@0
|
141
|
jtkorhonen@0
|
142 void MainWindow::hgRemove()
|
jtkorhonen@0
|
143 {
|
jtkorhonen@0
|
144 if (runningAction == ACT_NONE)
|
jtkorhonen@0
|
145 {
|
jtkorhonen@0
|
146 QStringList params;
|
jtkorhonen@0
|
147 QString currentFile = hgExp -> getCurrentFileListLine();
|
jtkorhonen@0
|
148
|
jtkorhonen@0
|
149 if (!currentFile.isEmpty())
|
jtkorhonen@0
|
150 {
|
jtkorhonen@6
|
151 if (QMessageBox::Ok == QMessageBox::warning(this, "Remove file", "Really remove file " + currentFile.mid(2) + "?",
|
jtkorhonen@6
|
152 QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Cancel))
|
jtkorhonen@6
|
153 {
|
jtkorhonen@6
|
154 params << "remove" << "--after" << "--force" << currentFile.mid(2); //Jump over status marker characters (e.g "M ")
|
jtkorhonen@0
|
155
|
jtkorhonen@6
|
156 runner -> startProc(getHgBinaryName(), workFolderPath, params);
|
jtkorhonen@6
|
157 runningAction = ACT_REMOVE;
|
jtkorhonen@6
|
158 }
|
jtkorhonen@0
|
159 }
|
jtkorhonen@0
|
160 }
|
jtkorhonen@0
|
161 }
|
jtkorhonen@0
|
162
|
jtkorhonen@0
|
163 void MainWindow::hgAnnotate()
|
jtkorhonen@0
|
164 {
|
jtkorhonen@0
|
165 if (runningAction == ACT_NONE)
|
jtkorhonen@0
|
166 {
|
jtkorhonen@0
|
167 QStringList params;
|
jtkorhonen@0
|
168 QString currentFile = hgExp -> getCurrentFileListLine();
|
jtkorhonen@0
|
169
|
jtkorhonen@0
|
170 if (!currentFile.isEmpty())
|
jtkorhonen@0
|
171 {
|
jtkorhonen@0
|
172 params << "annotate" << currentFile.mid(2); //Jump over status marker characters (e.g "M ")
|
jtkorhonen@0
|
173
|
jtkorhonen@0
|
174 runner -> startProc(getHgBinaryName(), workFolderPath, params);
|
jtkorhonen@0
|
175 runningAction = ACT_ANNOTATE;
|
jtkorhonen@0
|
176 }
|
jtkorhonen@0
|
177 }
|
jtkorhonen@0
|
178 }
|
jtkorhonen@0
|
179
|
jtkorhonen@0
|
180
|
jtkorhonen@0
|
181 void MainWindow::hgResolveMark()
|
jtkorhonen@0
|
182 {
|
jtkorhonen@0
|
183 if (runningAction == ACT_NONE)
|
jtkorhonen@0
|
184 {
|
jtkorhonen@0
|
185 QStringList params;
|
jtkorhonen@0
|
186 QString currentFile = hgExp -> getCurrentFileListLine();
|
jtkorhonen@0
|
187
|
jtkorhonen@0
|
188 if (!currentFile.isEmpty())
|
jtkorhonen@0
|
189 {
|
jtkorhonen@0
|
190 params << "resolve" << "--mark" << currentFile.mid(2); //Jump over status marker characters (e.g "M ")
|
jtkorhonen@0
|
191
|
jtkorhonen@0
|
192 runner -> startProc(getHgBinaryName(), workFolderPath, params);
|
jtkorhonen@0
|
193 runningAction = ACT_RESOLVE_MARK;
|
jtkorhonen@0
|
194 }
|
jtkorhonen@0
|
195 }
|
jtkorhonen@0
|
196 }
|
jtkorhonen@0
|
197
|
jtkorhonen@0
|
198
|
jtkorhonen@0
|
199
|
jtkorhonen@0
|
200 void MainWindow::hgResolveList()
|
jtkorhonen@0
|
201 {
|
jtkorhonen@0
|
202 if (runningAction == ACT_NONE)
|
jtkorhonen@0
|
203 {
|
jtkorhonen@0
|
204 QStringList params;
|
jtkorhonen@0
|
205
|
jtkorhonen@0
|
206 params << "resolve" << "--list";
|
jtkorhonen@0
|
207 runner -> startProc(getHgBinaryName(), workFolderPath, params);
|
jtkorhonen@0
|
208 runningAction = ACT_RESOLVE_LIST;
|
jtkorhonen@0
|
209 }
|
jtkorhonen@0
|
210 }
|
jtkorhonen@0
|
211
|
jtkorhonen@0
|
212
|
jtkorhonen@0
|
213
|
jtkorhonen@0
|
214 void MainWindow::hgAdd()
|
jtkorhonen@0
|
215 {
|
jtkorhonen@0
|
216 if (runningAction == ACT_NONE)
|
jtkorhonen@0
|
217 {
|
jtkorhonen@0
|
218 QStringList params;
|
jtkorhonen@0
|
219
|
jtkorhonen@5
|
220 QString currentFile = hgExp -> getCurrentFileListLine();
|
jtkorhonen@5
|
221
|
jtkorhonen@17
|
222 if (areAllSelectedUntracked(hgExp -> workFolderFileList))
|
jtkorhonen@5
|
223 {
|
jtkorhonen@17
|
224 //User wants to add selected file(s)
|
jtkorhonen@17
|
225 params << "add";
|
jtkorhonen@17
|
226
|
jtkorhonen@17
|
227 QList <QListWidgetItem *> selList = hgExp -> workFolderFileList -> selectedItems();
|
jtkorhonen@17
|
228
|
jtkorhonen@17
|
229 for (int i = 0; i < selList.size(); ++i)
|
jtkorhonen@17
|
230 {
|
jtkorhonen@17
|
231 QString tmp = selList.at(i)->text();
|
jtkorhonen@17
|
232 params.append(tmp.mid(2));
|
jtkorhonen@17
|
233 }
|
jtkorhonen@5
|
234 }
|
jtkorhonen@5
|
235 else
|
jtkorhonen@5
|
236 {
|
jtkorhonen@5
|
237 //Add all untracked files
|
jtkorhonen@5
|
238 params << "add";
|
jtkorhonen@5
|
239 }
|
jtkorhonen@0
|
240
|
jtkorhonen@0
|
241 runner -> startProc(getHgBinaryName(), workFolderPath, params);
|
jtkorhonen@0
|
242 runningAction = ACT_ADD;
|
jtkorhonen@0
|
243 }
|
jtkorhonen@0
|
244 }
|
jtkorhonen@0
|
245
|
jtkorhonen@0
|
246 int MainWindow::getCommitComment(QString& comment)
|
jtkorhonen@0
|
247 {
|
jtkorhonen@0
|
248 int ret;
|
jtkorhonen@0
|
249
|
jtkorhonen@0
|
250 QDialog dlg(this);
|
jtkorhonen@0
|
251
|
jtkorhonen@0
|
252 QLabel *commentLabel = new QLabel(tr("Comment:"));
|
jtkorhonen@0
|
253 QLineEdit *commentEdit = new QLineEdit;
|
jtkorhonen@0
|
254 commentEdit -> setFixedWidth(400);
|
jtkorhonen@0
|
255 QHBoxLayout *commentLayout = new QHBoxLayout;
|
jtkorhonen@0
|
256 commentLayout -> addWidget(commentLabel);
|
jtkorhonen@0
|
257 commentLayout -> addWidget(commentEdit);
|
jtkorhonen@0
|
258
|
jtkorhonen@0
|
259 QPushButton *btnOk = new QPushButton(tr("Ok"));
|
jtkorhonen@0
|
260 QPushButton *btnCancel = new QPushButton(tr("Cancel"));
|
jtkorhonen@0
|
261 QHBoxLayout *btnLayout = new QHBoxLayout;
|
jtkorhonen@0
|
262 btnLayout -> addWidget(btnOk);
|
jtkorhonen@0
|
263 btnLayout -> addWidget(btnCancel);
|
jtkorhonen@0
|
264
|
jtkorhonen@0
|
265 QVBoxLayout *mainLayout = new QVBoxLayout;
|
jtkorhonen@0
|
266 mainLayout -> addLayout(commentLayout);
|
jtkorhonen@0
|
267 mainLayout -> addLayout(btnLayout);
|
jtkorhonen@0
|
268
|
jtkorhonen@0
|
269 dlg.setLayout(mainLayout);
|
jtkorhonen@0
|
270
|
jtkorhonen@0
|
271 dlg.setWindowTitle(tr("Save (commit)"));
|
jtkorhonen@0
|
272
|
jtkorhonen@0
|
273 connect(btnOk, SIGNAL(clicked()), &dlg, SLOT(accept()));
|
jtkorhonen@0
|
274 connect(btnCancel, SIGNAL(clicked()), &dlg, SLOT(reject()));
|
jtkorhonen@0
|
275
|
jtkorhonen@0
|
276 ret = dlg.exec();
|
jtkorhonen@0
|
277 comment = commentEdit -> text();
|
jtkorhonen@0
|
278 return ret;
|
jtkorhonen@0
|
279 }
|
jtkorhonen@0
|
280
|
jtkorhonen@0
|
281 void MainWindow::hgCommit()
|
jtkorhonen@0
|
282 {
|
jtkorhonen@0
|
283 if (runningAction == ACT_NONE)
|
jtkorhonen@0
|
284 {
|
jtkorhonen@0
|
285 QStringList params;
|
jtkorhonen@0
|
286 QString comment;
|
jtkorhonen@0
|
287
|
jtkorhonen@0
|
288 if (QDialog::Accepted == getCommitComment(comment))
|
jtkorhonen@0
|
289 {
|
jtkorhonen@0
|
290 if (!comment.isEmpty())
|
jtkorhonen@0
|
291 {
|
jtkorhonen@11
|
292 QString currentFile = hgExp -> getCurrentFileListLine();
|
jtkorhonen@11
|
293
|
jtkorhonen@17
|
294 if (areAllSelectedCommitable(hgExp -> workFolderFileList))
|
jtkorhonen@11
|
295 {
|
jtkorhonen@17
|
296 //User wants to commit selected file(s)
|
jtkorhonen@17
|
297 params << "commit" << "--message" << comment << "--user" << userInfo;
|
jtkorhonen@17
|
298
|
jtkorhonen@17
|
299 QList <QListWidgetItem *> selList = hgExp -> workFolderFileList -> selectedItems();
|
jtkorhonen@17
|
300 for (int i = 0; i < selList.size(); ++i)
|
jtkorhonen@17
|
301 {
|
jtkorhonen@17
|
302 QString tmp = selList.at(i)->text();
|
jtkorhonen@17
|
303 params.append(tmp.mid(2));
|
jtkorhonen@17
|
304 }
|
jtkorhonen@11
|
305 }
|
jtkorhonen@11
|
306 else
|
jtkorhonen@11
|
307 {
|
jtkorhonen@11
|
308 //Commit all changes
|
jtkorhonen@11
|
309 params << "commit" << "--message" << comment << "--user" << userInfo;
|
jtkorhonen@11
|
310 }
|
jtkorhonen@0
|
311
|
jtkorhonen@0
|
312 runner -> startProc(getHgBinaryName(), workFolderPath, params);
|
jtkorhonen@0
|
313 runningAction = ACT_COMMIT;
|
jtkorhonen@0
|
314 }
|
jtkorhonen@0
|
315 }
|
jtkorhonen@0
|
316 }
|
jtkorhonen@0
|
317 }
|
jtkorhonen@0
|
318
|
jtkorhonen@0
|
319 void MainWindow::hgFileDiff()
|
jtkorhonen@0
|
320 {
|
jtkorhonen@0
|
321 if (runningAction == ACT_NONE)
|
jtkorhonen@0
|
322 {
|
jtkorhonen@0
|
323 QStringList params;
|
jtkorhonen@0
|
324
|
jtkorhonen@0
|
325 QString currentFile = hgExp -> getCurrentFileListLine();
|
jtkorhonen@0
|
326
|
jtkorhonen@0
|
327 if (!currentFile.isEmpty())
|
jtkorhonen@0
|
328 {
|
jtkorhonen@0
|
329 //Diff parent file against working folder file
|
jtkorhonen@0
|
330 params << "kdiff3" << currentFile.mid(2);
|
jtkorhonen@0
|
331 runner -> startProc(getHgBinaryName(), workFolderPath, params, false);
|
jtkorhonen@0
|
332 runningAction = ACT_FILEDIFF;
|
jtkorhonen@0
|
333 }
|
jtkorhonen@0
|
334 }
|
jtkorhonen@0
|
335 }
|
jtkorhonen@0
|
336
|
jtkorhonen@0
|
337
|
jtkorhonen@0
|
338 void MainWindow::hgFolderDiff()
|
jtkorhonen@0
|
339 {
|
jtkorhonen@0
|
340 if (runningAction == ACT_NONE)
|
jtkorhonen@0
|
341 {
|
jtkorhonen@0
|
342 QStringList params;
|
jtkorhonen@0
|
343
|
jtkorhonen@0
|
344 //Diff parent against working folder (folder diff)
|
jtkorhonen@0
|
345 params << "kdiff3";
|
jtkorhonen@0
|
346 runner -> startProc(getHgBinaryName(), workFolderPath, params, false);
|
jtkorhonen@0
|
347 runningAction = ACT_FOLDERDIFF;
|
jtkorhonen@0
|
348 }
|
jtkorhonen@0
|
349 }
|
jtkorhonen@0
|
350
|
jtkorhonen@0
|
351
|
jtkorhonen@0
|
352 void MainWindow::hgChgSetDiff()
|
jtkorhonen@0
|
353 {
|
jtkorhonen@0
|
354 if (runningAction == ACT_NONE)
|
jtkorhonen@0
|
355 {
|
jtkorhonen@0
|
356 QStringList params;
|
jtkorhonen@0
|
357
|
jtkorhonen@0
|
358 //Diff 2 history log versions against each other
|
jtkorhonen@0
|
359 QString revA;
|
jtkorhonen@0
|
360 QString revB;
|
jtkorhonen@0
|
361
|
jtkorhonen@0
|
362 hgExp -> getHistoryDiffRevisions(revA, revB);
|
jtkorhonen@0
|
363
|
jtkorhonen@0
|
364 if ((!revA.isEmpty()) && (!revB.isEmpty()))
|
jtkorhonen@0
|
365 {
|
jtkorhonen@0
|
366 params << "kdiff3" << "--rev" << revA << "--rev" << revB;
|
jtkorhonen@0
|
367 runner -> startProc(getHgBinaryName(), workFolderPath, params, false);
|
jtkorhonen@0
|
368 runningAction = ACT_CHGSETDIFF;
|
jtkorhonen@0
|
369 }
|
jtkorhonen@0
|
370 else
|
jtkorhonen@0
|
371 {
|
jtkorhonen@0
|
372 QMessageBox::information(this, tr("Changeset diff"), tr("Please select two changesets from history list or heads list first."));
|
jtkorhonen@0
|
373 }
|
jtkorhonen@0
|
374 }
|
jtkorhonen@0
|
375 }
|
jtkorhonen@0
|
376
|
jtkorhonen@0
|
377
|
jtkorhonen@0
|
378
|
jtkorhonen@0
|
379 void MainWindow::hgUpdate()
|
jtkorhonen@0
|
380 {
|
jtkorhonen@0
|
381 if (runningAction == ACT_NONE)
|
jtkorhonen@0
|
382 {
|
jtkorhonen@0
|
383 QStringList params;
|
jtkorhonen@0
|
384
|
jtkorhonen@0
|
385
|
jtkorhonen@0
|
386 params << "update";
|
jtkorhonen@0
|
387
|
jtkorhonen@0
|
388
|
jtkorhonen@0
|
389 runner -> startProc(getHgBinaryName(), workFolderPath, params);
|
jtkorhonen@0
|
390 runningAction = ACT_UPDATE;
|
jtkorhonen@0
|
391 }
|
jtkorhonen@0
|
392 }
|
jtkorhonen@0
|
393
|
jtkorhonen@0
|
394
|
jtkorhonen@0
|
395 void MainWindow::hgUpdateToRev()
|
jtkorhonen@0
|
396 {
|
jtkorhonen@0
|
397 if (runningAction == ACT_NONE)
|
jtkorhonen@0
|
398 {
|
jtkorhonen@0
|
399 QStringList params;
|
jtkorhonen@0
|
400 QString rev;
|
jtkorhonen@0
|
401
|
jtkorhonen@0
|
402 hgExp -> getUpdateToRevRevision(rev);
|
jtkorhonen@0
|
403
|
jtkorhonen@0
|
404 hgExp -> setCurrentIndex(WORKTAB);
|
jtkorhonen@0
|
405 enableDisableActions();
|
jtkorhonen@0
|
406
|
jtkorhonen@0
|
407 params << "update" << "--rev" << rev << "--clean";
|
jtkorhonen@0
|
408
|
jtkorhonen@0
|
409 runner -> startProc(getHgBinaryName(), workFolderPath, params);
|
jtkorhonen@0
|
410
|
jtkorhonen@0
|
411 runningAction = ACT_UPDATE;
|
jtkorhonen@0
|
412 }
|
jtkorhonen@0
|
413 }
|
jtkorhonen@0
|
414
|
jtkorhonen@0
|
415
|
jtkorhonen@0
|
416 void MainWindow::hgRevert()
|
jtkorhonen@0
|
417 {
|
jtkorhonen@0
|
418 if (runningAction == ACT_NONE)
|
jtkorhonen@0
|
419 {
|
jtkorhonen@0
|
420 QStringList params;
|
jtkorhonen@0
|
421 QString currentFile = hgExp -> getCurrentFileListLine();
|
jtkorhonen@0
|
422
|
jtkorhonen@5
|
423 params << "revert" << "--no-backup" << currentFile.mid(2);
|
jtkorhonen@0
|
424
|
jtkorhonen@0
|
425 runner -> startProc(getHgBinaryName(), workFolderPath, params);
|
jtkorhonen@0
|
426 runningAction = ACT_REVERT;
|
jtkorhonen@0
|
427 }
|
jtkorhonen@0
|
428 }
|
jtkorhonen@0
|
429
|
jtkorhonen@0
|
430 void MainWindow::hgMerge()
|
jtkorhonen@0
|
431 {
|
jtkorhonen@0
|
432 if (runningAction == ACT_NONE)
|
jtkorhonen@0
|
433 {
|
jtkorhonen@0
|
434 QStringList params;
|
jtkorhonen@0
|
435
|
jtkorhonen@0
|
436 params << "merge";
|
jtkorhonen@0
|
437
|
jtkorhonen@0
|
438 runner -> startProc(getHgBinaryName(), workFolderPath, params);
|
jtkorhonen@0
|
439 runningAction = ACT_MERGE;
|
jtkorhonen@0
|
440 }
|
jtkorhonen@0
|
441 }
|
jtkorhonen@0
|
442
|
jtkorhonen@0
|
443
|
jtkorhonen@0
|
444 void MainWindow::hgCloneFromRemote()
|
jtkorhonen@0
|
445 {
|
jtkorhonen@0
|
446 if (runningAction == ACT_NONE)
|
jtkorhonen@0
|
447 {
|
jtkorhonen@0
|
448 QStringList params;
|
jtkorhonen@0
|
449
|
jtkorhonen@0
|
450 params << "clone" << remoteRepoPath << workFolderPath;
|
jtkorhonen@0
|
451
|
jtkorhonen@0
|
452 runner -> startProc(getHgBinaryName(), workFolderPath, params);
|
jtkorhonen@0
|
453 runningAction = ACT_CLONEFROMREMOTE;
|
jtkorhonen@0
|
454 }
|
jtkorhonen@0
|
455 }
|
jtkorhonen@0
|
456
|
jtkorhonen@0
|
457
|
jtkorhonen@0
|
458 void MainWindow::hgInit()
|
jtkorhonen@0
|
459 {
|
jtkorhonen@0
|
460 if (runningAction == ACT_NONE)
|
jtkorhonen@0
|
461 {
|
jtkorhonen@0
|
462 QStringList params;
|
jtkorhonen@0
|
463
|
jtkorhonen@0
|
464 params << "init";
|
jtkorhonen@0
|
465
|
jtkorhonen@0
|
466 runner -> startProc(getHgBinaryName(), workFolderPath, params);
|
jtkorhonen@0
|
467 runningAction = ACT_INIT;
|
jtkorhonen@0
|
468 }
|
jtkorhonen@0
|
469 }
|
jtkorhonen@0
|
470
|
jtkorhonen@0
|
471
|
jtkorhonen@0
|
472 void MainWindow::hgIncoming()
|
jtkorhonen@0
|
473 {
|
jtkorhonen@0
|
474 if (runningAction == ACT_NONE)
|
jtkorhonen@0
|
475 {
|
jtkorhonen@0
|
476 QStringList params;
|
jtkorhonen@0
|
477
|
jtkorhonen@0
|
478 params << "incoming" << "--newest-first" << remoteRepoPath;
|
jtkorhonen@0
|
479
|
jtkorhonen@0
|
480 runner -> startProc(getHgBinaryName(), workFolderPath, params, false);
|
jtkorhonen@0
|
481 runningAction = ACT_INCOMING;
|
jtkorhonen@0
|
482 }
|
jtkorhonen@0
|
483 }
|
jtkorhonen@0
|
484
|
jtkorhonen@0
|
485
|
jtkorhonen@0
|
486 void MainWindow::hgPull()
|
jtkorhonen@0
|
487 {
|
jtkorhonen@0
|
488 if (runningAction == ACT_NONE)
|
jtkorhonen@0
|
489 {
|
jtkorhonen@0
|
490 QStringList params;
|
jtkorhonen@0
|
491
|
jtkorhonen@0
|
492 params << "pull" << remoteRepoPath;
|
jtkorhonen@0
|
493
|
jtkorhonen@0
|
494 runner -> startProc(getHgBinaryName(), workFolderPath, params);
|
jtkorhonen@0
|
495 runningAction = ACT_PULL;
|
jtkorhonen@0
|
496 }
|
jtkorhonen@0
|
497 }
|
jtkorhonen@0
|
498
|
jtkorhonen@0
|
499
|
jtkorhonen@0
|
500 void MainWindow::hgPush()
|
jtkorhonen@0
|
501 {
|
jtkorhonen@0
|
502 if (runningAction == ACT_NONE)
|
jtkorhonen@0
|
503 {
|
jtkorhonen@0
|
504 QStringList params;
|
jtkorhonen@0
|
505
|
jtkorhonen@0
|
506 params << "push" << remoteRepoPath;
|
jtkorhonen@0
|
507
|
jtkorhonen@0
|
508 runner -> startProc(getHgBinaryName(), workFolderPath, params);
|
jtkorhonen@0
|
509 runningAction = ACT_PUSH;
|
jtkorhonen@0
|
510 }
|
jtkorhonen@0
|
511 }
|
jtkorhonen@0
|
512
|
jtkorhonen@0
|
513
|
jtkorhonen@26
|
514
|
jtkorhonen@28
|
515 QString MainWindow::listAllUpIpV4Addresses()
|
jtkorhonen@26
|
516 {
|
jtkorhonen@28
|
517 QString ret;
|
jtkorhonen@26
|
518 QList<QNetworkInterface> ifaces = QNetworkInterface::allInterfaces();
|
jtkorhonen@26
|
519
|
jtkorhonen@26
|
520 for (int i = 0; i < ifaces.count(); i++)
|
jtkorhonen@26
|
521 {
|
jtkorhonen@26
|
522 QNetworkInterface iface = ifaces.at(i);
|
jtkorhonen@26
|
523
|
jtkorhonen@26
|
524 if (iface.flags().testFlag(QNetworkInterface::IsUp) && !iface.flags().testFlag(QNetworkInterface::IsLoopBack))
|
jtkorhonen@26
|
525 {
|
jtkorhonen@26
|
526 for (int j=0; j<iface.addressEntries().count(); j++)
|
jtkorhonen@26
|
527 {
|
jtkorhonen@28
|
528 QHostAddress tmp = iface.addressEntries().at(j).ip();
|
jtkorhonen@28
|
529 if (QAbstractSocket::IPv4Protocol == tmp.protocol())
|
jtkorhonen@24
|
530 {
|
jtkorhonen@28
|
531 if (!ret.isEmpty())
|
jtkorhonen@28
|
532 {
|
jtkorhonen@28
|
533 ret += " ";
|
jtkorhonen@28
|
534 }
|
jtkorhonen@28
|
535 ret += tmp.toString();
|
jtkorhonen@24
|
536 }
|
jtkorhonen@24
|
537 }
|
jtkorhonen@22
|
538 }
|
jtkorhonen@17
|
539 }
|
jtkorhonen@28
|
540 return ret;
|
jtkorhonen@28
|
541 }
|
jtkorhonen@17
|
542
|
jtkorhonen@17
|
543
|
jtkorhonen@11
|
544 void MainWindow::hgServe()
|
jtkorhonen@11
|
545 {
|
jtkorhonen@11
|
546 if (runningAction == ACT_NONE)
|
jtkorhonen@11
|
547 {
|
jtkorhonen@11
|
548 QStringList params;
|
jtkorhonen@22
|
549 QString msg;
|
jtkorhonen@11
|
550
|
jtkorhonen@28
|
551 QString addrs = listAllUpIpV4Addresses();
|
jtkorhonen@28
|
552 QTextStream(&msg) << "Server running on address(es) (" << addrs << "), port 8000";
|
jtkorhonen@28
|
553 params << "serve";
|
jtkorhonen@11
|
554
|
jtkorhonen@11
|
555 runner -> startProc(getHgBinaryName(), workFolderPath, params, false);
|
jtkorhonen@11
|
556 runningAction = ACT_SERVE;
|
jtkorhonen@11
|
557
|
jtkorhonen@17
|
558 QMessageBox::information(this, "Serve", msg, QMessageBox::Close);
|
jtkorhonen@11
|
559 runner -> killProc();
|
jtkorhonen@11
|
560 }
|
jtkorhonen@11
|
561 }
|
jtkorhonen@11
|
562
|
jtkorhonen@11
|
563
|
jtkorhonen@11
|
564
|
jtkorhonen@0
|
565 void MainWindow::settings()
|
jtkorhonen@0
|
566 {
|
jtkorhonen@0
|
567 SettingsDialog *settingsDlg = new SettingsDialog(this);
|
jtkorhonen@0
|
568 settingsDlg->setModal(true);
|
jtkorhonen@0
|
569 settingsDlg->exec();
|
jtkorhonen@0
|
570 hgExp -> clearLists();
|
jtkorhonen@0
|
571 enableDisableActions();
|
jtkorhonen@0
|
572 hgStat();
|
jtkorhonen@0
|
573 }
|
jtkorhonen@0
|
574
|
jtkorhonen@2
|
575 #define STDOUT_NEEDS_BIG_WINDOW 512
|
jtkorhonen@2
|
576 #define SMALL_WND_W 500
|
jtkorhonen@2
|
577 #define SMALL_WND_H 300
|
jtkorhonen@2
|
578
|
jtkorhonen@2
|
579 #define BIG_WND_W 1024
|
jtkorhonen@2
|
580 #define BIG_WND_H 768
|
jtkorhonen@2
|
581
|
jtkorhonen@2
|
582
|
jtkorhonen@2
|
583 void MainWindow::presentLongStdoutToUser(QString stdo)
|
jtkorhonen@0
|
584 {
|
jtkorhonen@2
|
585 if (!stdo.isEmpty())
|
jtkorhonen@2
|
586 {
|
jtkorhonen@2
|
587 QDialog dlg;
|
jtkorhonen@0
|
588
|
jtkorhonen@2
|
589 if (stdo.length() > STDOUT_NEEDS_BIG_WINDOW)
|
jtkorhonen@2
|
590 {
|
jtkorhonen@2
|
591 dlg.setMinimumWidth(BIG_WND_W);
|
jtkorhonen@2
|
592 dlg.setMinimumHeight(BIG_WND_H);
|
jtkorhonen@2
|
593 }
|
jtkorhonen@2
|
594 else
|
jtkorhonen@2
|
595 {
|
jtkorhonen@2
|
596 dlg.setMinimumWidth(SMALL_WND_W);
|
jtkorhonen@2
|
597 dlg.setMinimumHeight(SMALL_WND_H);
|
jtkorhonen@2
|
598 }
|
jtkorhonen@0
|
599
|
jtkorhonen@2
|
600 QVBoxLayout *box = new QVBoxLayout;
|
jtkorhonen@2
|
601 QListWidget *list = new QListWidget;
|
jtkorhonen@2
|
602 list-> addItems(stdo.split("\n"));
|
jtkorhonen@2
|
603 QPushButton *btn = new QPushButton(tr("Ok"));
|
jtkorhonen@2
|
604 connect(btn, SIGNAL(clicked()), &dlg, SLOT(accept()));
|
jtkorhonen@0
|
605
|
jtkorhonen@2
|
606 box -> addWidget(list);
|
jtkorhonen@2
|
607 box -> addWidget(btn);
|
jtkorhonen@2
|
608 dlg.setLayout(box);
|
jtkorhonen@2
|
609
|
jtkorhonen@2
|
610 dlg.exec();
|
jtkorhonen@2
|
611 }
|
jtkorhonen@2
|
612 else
|
jtkorhonen@2
|
613 {
|
jtkorhonen@2
|
614 QMessageBox::information(this, tr("HgExplorer"), tr("Mercurial command did not return any output."));
|
jtkorhonen@2
|
615 }
|
jtkorhonen@0
|
616 }
|
jtkorhonen@0
|
617
|
jtkorhonen@0
|
618
|
jtkorhonen@17
|
619 bool MainWindow::areAllSelectedCommitable(QListWidget *workList)
|
jtkorhonen@11
|
620 {
|
jtkorhonen@11
|
621 QList<QListWidgetItem *> selList = workList -> selectedItems();
|
jtkorhonen@17
|
622 for (int i = 0; i < selList.size(); ++i)
|
jtkorhonen@11
|
623 {
|
jtkorhonen@17
|
624 QString tmp = selList.at(i) -> text().mid(0, 1);
|
jtkorhonen@11
|
625 if (tmp == "A")
|
jtkorhonen@11
|
626 {
|
jtkorhonen@11
|
627 //scheduled to be added, ok to commit
|
jtkorhonen@11
|
628 }
|
jtkorhonen@11
|
629 else if (tmp == "M")
|
jtkorhonen@11
|
630 {
|
jtkorhonen@11
|
631 //locally modified, ok to commit
|
jtkorhonen@17
|
632 }
|
jtkorhonen@17
|
633 else if (tmp == "R")
|
jtkorhonen@17
|
634 {
|
jtkorhonen@17
|
635 //user wants to remove from repo, ok to commit
|
jtkorhonen@17
|
636 }
|
jtkorhonen@17
|
637 else
|
jtkorhonen@17
|
638 {
|
jtkorhonen@17
|
639 return false;
|
jtkorhonen@11
|
640 }
|
jtkorhonen@11
|
641 }
|
jtkorhonen@17
|
642 return true;
|
jtkorhonen@11
|
643 }
|
jtkorhonen@11
|
644
|
jtkorhonen@6
|
645 bool MainWindow::isSelectedDeletable(QListWidget *workList)
|
jtkorhonen@0
|
646 {
|
jtkorhonen@0
|
647 QList<QListWidgetItem *> selList = workList -> selectedItems();
|
jtkorhonen@0
|
648 if (selList.count() == 1)
|
jtkorhonen@0
|
649 {
|
jtkorhonen@6
|
650 QString tmp = selList.at(0)->text().mid(0, 1);
|
jtkorhonen@6
|
651 if (tmp == "A")
|
jtkorhonen@0
|
652 {
|
jtkorhonen@6
|
653 //scheduled to be added, ok to remove (won't go to repo)
|
jtkorhonen@6
|
654 return true;
|
jtkorhonen@6
|
655 }
|
jtkorhonen@6
|
656 else if (tmp == "C")
|
jtkorhonen@6
|
657 {
|
jtkorhonen@6
|
658 //Tracked but unchanged, ok to remove
|
jtkorhonen@6
|
659 return true;
|
jtkorhonen@6
|
660 }
|
jtkorhonen@6
|
661 else if (tmp == "M")
|
jtkorhonen@6
|
662 {
|
jtkorhonen@6
|
663 //locally modified, ok to remove from repo
|
jtkorhonen@6
|
664 return true;
|
jtkorhonen@6
|
665 }
|
jtkorhonen@6
|
666 else if (tmp == "!")
|
jtkorhonen@6
|
667 {
|
jtkorhonen@6
|
668 //locally deleted, ok to remove from repo
|
jtkorhonen@0
|
669 return true;
|
jtkorhonen@0
|
670 }
|
jtkorhonen@0
|
671 }
|
jtkorhonen@0
|
672 return false;
|
jtkorhonen@0
|
673 }
|
jtkorhonen@0
|
674
|
jtkorhonen@0
|
675
|
jtkorhonen@17
|
676 bool MainWindow::areAllSelectedUntracked(QListWidget *workList)
|
jtkorhonen@0
|
677 {
|
jtkorhonen@0
|
678 QList<QListWidgetItem *> selList = workList -> selectedItems();
|
jtkorhonen@17
|
679 for (int i = 0; i < selList.size(); ++i)
|
jtkorhonen@0
|
680 {
|
jtkorhonen@17
|
681 QString tmp = selList.at(i) -> text();
|
jtkorhonen@17
|
682
|
jtkorhonen@17
|
683 if (tmp.mid(0,1) != "?")
|
jtkorhonen@0
|
684 {
|
jtkorhonen@17
|
685 return false;
|
jtkorhonen@0
|
686 }
|
jtkorhonen@0
|
687 }
|
jtkorhonen@17
|
688 return true;
|
jtkorhonen@0
|
689 }
|
jtkorhonen@0
|
690
|
jtkorhonen@0
|
691
|
jtkorhonen@0
|
692 bool MainWindow::isSelectedModified(QListWidget *workList)
|
jtkorhonen@0
|
693 {
|
jtkorhonen@0
|
694 QList<QListWidgetItem *> selList = workList -> selectedItems();
|
jtkorhonen@0
|
695 if (selList.count() == 1)
|
jtkorhonen@0
|
696 {
|
jtkorhonen@0
|
697 if (selList.at(0)->text().mid(0, 1) == "M")
|
jtkorhonen@0
|
698 {
|
jtkorhonen@0
|
699 return true;
|
jtkorhonen@0
|
700 }
|
jtkorhonen@0
|
701 }
|
jtkorhonen@0
|
702 return false;
|
jtkorhonen@0
|
703 }
|
jtkorhonen@0
|
704
|
jtkorhonen@17
|
705 void MainWindow::countModifications(QListWidget *workList, int& added, int& modified, int& removed, int& notTracked,
|
jtkorhonen@17
|
706 int& selected,
|
jtkorhonen@17
|
707 int& selectedAdded, int& selectedModified, int& selectedRemoved, int& selectedNotTracked)
|
jtkorhonen@0
|
708 {
|
jtkorhonen@0
|
709 int itemCount = workList -> count();
|
jtkorhonen@0
|
710 if (itemCount > 0)
|
jtkorhonen@0
|
711 {
|
jtkorhonen@0
|
712 int A= 0;
|
jtkorhonen@0
|
713 int M=0;
|
jtkorhonen@0
|
714 int R=0;
|
jtkorhonen@5
|
715 int N=0;
|
jtkorhonen@17
|
716 int S=0;
|
jtkorhonen@17
|
717 int SA=0;
|
jtkorhonen@17
|
718 int SM=0;
|
jtkorhonen@17
|
719 int SR=0;
|
jtkorhonen@17
|
720 int SN=0;
|
jtkorhonen@17
|
721
|
jtkorhonen@0
|
722 for (int i = 0; i < workList -> count(); i++)
|
jtkorhonen@0
|
723 {
|
jtkorhonen@0
|
724 QListWidgetItem *currItem = workList -> item(i);
|
jtkorhonen@0
|
725
|
jtkorhonen@0
|
726 QString tmp = currItem->text().mid(0, 1);
|
jtkorhonen@0
|
727 if (tmp == "M")
|
jtkorhonen@0
|
728 {
|
jtkorhonen@0
|
729 M++;
|
jtkorhonen@0
|
730 }
|
jtkorhonen@0
|
731 else if (tmp == "R")
|
jtkorhonen@0
|
732 {
|
jtkorhonen@0
|
733 R++;
|
jtkorhonen@0
|
734 }
|
jtkorhonen@0
|
735 else if (tmp == "A")
|
jtkorhonen@0
|
736 {
|
jtkorhonen@0
|
737 A++;
|
jtkorhonen@0
|
738 }
|
jtkorhonen@5
|
739 else if (tmp == "?")
|
jtkorhonen@5
|
740 {
|
jtkorhonen@5
|
741 N++;
|
jtkorhonen@5
|
742 }
|
jtkorhonen@0
|
743 }
|
jtkorhonen@0
|
744
|
jtkorhonen@17
|
745 added = A;
|
jtkorhonen@17
|
746 modified = M;
|
jtkorhonen@17
|
747 removed = R;
|
jtkorhonen@17
|
748 notTracked = N;
|
jtkorhonen@17
|
749
|
jtkorhonen@17
|
750 QList <QListWidgetItem *> selList = workList -> selectedItems();
|
jtkorhonen@17
|
751
|
jtkorhonen@17
|
752 S = selList.size();
|
jtkorhonen@17
|
753 for (int i = 0; i < selList.size(); ++i)
|
jtkorhonen@17
|
754 {
|
jtkorhonen@17
|
755 QString tmp = selList.at(i) -> text();
|
jtkorhonen@17
|
756
|
jtkorhonen@17
|
757 if (tmp.mid(0,1) == "A")
|
jtkorhonen@17
|
758 {
|
jtkorhonen@17
|
759 SA++;
|
jtkorhonen@17
|
760 }
|
jtkorhonen@17
|
761 else if (tmp.mid(0,1) == "M")
|
jtkorhonen@17
|
762 {
|
jtkorhonen@17
|
763 SM++;
|
jtkorhonen@17
|
764 }
|
jtkorhonen@17
|
765 else if (tmp.mid(0,1) == "R")
|
jtkorhonen@17
|
766 {
|
jtkorhonen@17
|
767 SR++;
|
jtkorhonen@17
|
768 }
|
jtkorhonen@17
|
769 else if (tmp.mid(0,1) == "?")
|
jtkorhonen@17
|
770 {
|
jtkorhonen@17
|
771 SN++;
|
jtkorhonen@17
|
772 }
|
jtkorhonen@17
|
773 }
|
jtkorhonen@17
|
774
|
jtkorhonen@17
|
775 selected = S;
|
jtkorhonen@17
|
776 selectedAdded = SA;
|
jtkorhonen@17
|
777 selectedModified = SM;
|
jtkorhonen@17
|
778 selectedRemoved = SR;
|
jtkorhonen@17
|
779 selectedNotTracked = SN;
|
jtkorhonen@0
|
780 }
|
jtkorhonen@0
|
781 else
|
jtkorhonen@0
|
782 {
|
jtkorhonen@17
|
783 added = 0;
|
jtkorhonen@17
|
784 modified = 0;
|
jtkorhonen@17
|
785 removed = 0;
|
jtkorhonen@17
|
786 notTracked = 0;
|
jtkorhonen@17
|
787 selected = 0;
|
jtkorhonen@17
|
788 selectedAdded = 0;
|
jtkorhonen@17
|
789 selectedModified = 0;
|
jtkorhonen@17
|
790 selectedRemoved = 0;
|
jtkorhonen@17
|
791 selectedNotTracked = 0;
|
jtkorhonen@0
|
792 }
|
jtkorhonen@0
|
793 }
|
jtkorhonen@0
|
794
|
jtkorhonen@0
|
795
|
jtkorhonen@0
|
796 void MainWindow::timerEvent(QTimerEvent *)
|
jtkorhonen@0
|
797 {
|
jtkorhonen@0
|
798 bool shouldHgStat = false;
|
jtkorhonen@0
|
799
|
jtkorhonen@0
|
800 if (runningAction != ACT_NONE)
|
jtkorhonen@0
|
801 {
|
jtkorhonen@0
|
802 //We are running some hg command...
|
jtkorhonen@0
|
803 if (runner -> isProcRunning() == false)
|
jtkorhonen@0
|
804 {
|
jtkorhonen@0
|
805 //Running has just ended.
|
jtkorhonen@0
|
806 int exitCode = runner -> getExitCode();
|
jtkorhonen@0
|
807
|
jtkorhonen@0
|
808 runner -> hideProgBar();
|
jtkorhonen@0
|
809
|
jtkorhonen@0
|
810 //Clumsy...
|
jtkorhonen@0
|
811 if ((EXITOK(exitCode)) || ((exitCode == 1) && (runningAction == ACT_INCOMING)))
|
jtkorhonen@0
|
812 {
|
jtkorhonen@0
|
813 //Successful running.
|
jtkorhonen@0
|
814 switch(runningAction)
|
jtkorhonen@0
|
815 {
|
jtkorhonen@0
|
816 case ACT_STAT:
|
jtkorhonen@0
|
817 {
|
jtkorhonen@0
|
818 hgExp -> updateWorkFolderFileList(runner -> getStdOut());
|
jtkorhonen@0
|
819 }
|
jtkorhonen@0
|
820 break;
|
jtkorhonen@0
|
821
|
jtkorhonen@0
|
822 case ACT_INCOMING:
|
jtkorhonen@0
|
823 case ACT_ANNOTATE:
|
jtkorhonen@0
|
824 case ACT_RESOLVE_LIST:
|
jtkorhonen@0
|
825 case ACT_RESOLVE_MARK:
|
jtkorhonen@2
|
826 presentLongStdoutToUser(runner -> getStdOut());
|
jtkorhonen@0
|
827 shouldHgStat = true;
|
jtkorhonen@0
|
828 break;
|
jtkorhonen@0
|
829
|
jtkorhonen@0
|
830 case ACT_PULL:
|
jtkorhonen@0
|
831 QMessageBox::information(this, "pull", runner -> getStdOut());
|
jtkorhonen@0
|
832 shouldHgStat = true;
|
jtkorhonen@0
|
833 break;
|
jtkorhonen@0
|
834
|
jtkorhonen@0
|
835 case ACT_PUSH:
|
jtkorhonen@0
|
836 QMessageBox::information(this, "push", runner -> getStdOut());
|
jtkorhonen@0
|
837 shouldHgStat = true;
|
jtkorhonen@0
|
838 break;
|
jtkorhonen@0
|
839
|
jtkorhonen@0
|
840 case ACT_INIT:
|
jtkorhonen@0
|
841 enableDisableActions();
|
jtkorhonen@0
|
842 shouldHgStat = true;
|
jtkorhonen@0
|
843 break;
|
jtkorhonen@0
|
844
|
jtkorhonen@0
|
845 case ACT_CLONEFROMREMOTE:
|
jtkorhonen@0
|
846 QMessageBox::information(this, "clone", runner -> getStdOut());
|
jtkorhonen@0
|
847 enableDisableActions();
|
jtkorhonen@0
|
848 shouldHgStat = true;
|
jtkorhonen@0
|
849 break;
|
jtkorhonen@0
|
850
|
jtkorhonen@0
|
851 case ACT_LOG:
|
jtkorhonen@0
|
852 {
|
jtkorhonen@0
|
853 hgExp -> updateLocalRepoHgLogList(runner -> getStdOut());
|
jtkorhonen@0
|
854 }
|
jtkorhonen@0
|
855 break;
|
jtkorhonen@0
|
856
|
jtkorhonen@0
|
857 case ACT_PARENTS:
|
jtkorhonen@0
|
858 {
|
jtkorhonen@0
|
859 hgExp -> updateLocalRepoParentsList(runner -> getStdOut());
|
jtkorhonen@0
|
860 }
|
jtkorhonen@0
|
861 break;
|
jtkorhonen@0
|
862
|
jtkorhonen@0
|
863 case ACT_HEADS:
|
jtkorhonen@0
|
864 {
|
jtkorhonen@0
|
865 QString stdOut = runner -> getStdOut();
|
jtkorhonen@0
|
866 hgExp -> updateLocalRepoHeadsList(stdOut);
|
jtkorhonen@0
|
867 }
|
jtkorhonen@0
|
868 break;
|
jtkorhonen@0
|
869
|
jtkorhonen@0
|
870 case ACT_REMOVE:
|
jtkorhonen@0
|
871 case ACT_ADD:
|
jtkorhonen@0
|
872 case ACT_COMMIT:
|
jtkorhonen@0
|
873 case ACT_FILEDIFF:
|
jtkorhonen@0
|
874 case ACT_FOLDERDIFF:
|
jtkorhonen@0
|
875 case ACT_CHGSETDIFF:
|
jtkorhonen@0
|
876 case ACT_REVERT:
|
jtkorhonen@11
|
877 case ACT_SERVE:
|
jtkorhonen@0
|
878 shouldHgStat = true;
|
jtkorhonen@0
|
879 break;
|
jtkorhonen@0
|
880
|
jtkorhonen@0
|
881 case ACT_UPDATE:
|
jtkorhonen@0
|
882 QMessageBox::information(this, "update", runner -> getStdOut());
|
jtkorhonen@0
|
883 shouldHgStat = true;
|
jtkorhonen@0
|
884 break;
|
jtkorhonen@0
|
885
|
jtkorhonen@0
|
886 case ACT_MERGE:
|
jtkorhonen@0
|
887 QMessageBox::information(this, "merge", runner -> getStdOut());
|
jtkorhonen@0
|
888 shouldHgStat = true;
|
jtkorhonen@0
|
889 break;
|
jtkorhonen@0
|
890
|
jtkorhonen@0
|
891 default:
|
jtkorhonen@0
|
892 break;
|
jtkorhonen@0
|
893 }
|
jtkorhonen@0
|
894 }
|
jtkorhonen@0
|
895
|
jtkorhonen@0
|
896 //Typical sequence goes stat -> heads -> parents -> log
|
jtkorhonen@0
|
897 if (runningAction == ACT_STAT)
|
jtkorhonen@0
|
898 {
|
jtkorhonen@0
|
899 runningAction = ACT_NONE;
|
jtkorhonen@0
|
900 hgHeads();
|
jtkorhonen@0
|
901 }
|
jtkorhonen@0
|
902 else if (runningAction == ACT_HEADS)
|
jtkorhonen@0
|
903 {
|
jtkorhonen@0
|
904 runningAction = ACT_NONE;
|
jtkorhonen@0
|
905 hgParents();
|
jtkorhonen@0
|
906 }
|
jtkorhonen@0
|
907 else if (runningAction == ACT_PARENTS)
|
jtkorhonen@0
|
908 {
|
jtkorhonen@0
|
909 runningAction = ACT_NONE;
|
jtkorhonen@0
|
910 hgLog();
|
jtkorhonen@0
|
911 }
|
jtkorhonen@0
|
912 else
|
jtkorhonen@0
|
913 {
|
jtkorhonen@0
|
914 runningAction = ACT_NONE;
|
jtkorhonen@0
|
915 if (shouldHgStat)
|
jtkorhonen@0
|
916 {
|
jtkorhonen@0
|
917 hgStat();
|
jtkorhonen@0
|
918 }
|
jtkorhonen@0
|
919 }
|
jtkorhonen@0
|
920 }
|
jtkorhonen@0
|
921 }
|
jtkorhonen@0
|
922 else
|
jtkorhonen@0
|
923 {
|
jtkorhonen@0
|
924 enableDisableActions();
|
jtkorhonen@0
|
925 }
|
jtkorhonen@0
|
926 }
|
jtkorhonen@0
|
927
|
jtkorhonen@0
|
928 void MainWindow::connectActions()
|
jtkorhonen@0
|
929 {
|
jtkorhonen@0
|
930 connect(exitAct, SIGNAL(triggered()), this, SLOT(close()));
|
jtkorhonen@0
|
931 connect(aboutAct, SIGNAL(triggered()), this, SLOT(about()));
|
jtkorhonen@0
|
932 connect(aboutQtAct, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
|
jtkorhonen@0
|
933
|
jtkorhonen@0
|
934 connect(hgStatAct, SIGNAL(triggered()), this, SLOT(hgStat()));
|
jtkorhonen@0
|
935 connect(hgExp, SIGNAL(workFolderViewTypesChanged()), this, SLOT(hgStat()));
|
jtkorhonen@0
|
936 connect(hgRemoveAct, SIGNAL(triggered()), this, SLOT(hgRemove()));
|
jtkorhonen@0
|
937 connect(hgAddAct, SIGNAL(triggered()), this, SLOT(hgAdd()));
|
jtkorhonen@0
|
938 connect(hgCommitAct, SIGNAL(triggered()), this, SLOT(hgCommit()));
|
jtkorhonen@0
|
939 connect(hgFileDiffAct, SIGNAL(triggered()), this, SLOT(hgFileDiff()));
|
jtkorhonen@0
|
940 connect(hgFolderDiffAct, SIGNAL(triggered()), this, SLOT(hgFolderDiff()));
|
jtkorhonen@0
|
941 connect(hgChgSetDiffAct, SIGNAL(triggered()), this, SLOT(hgChgSetDiff()));
|
jtkorhonen@0
|
942 connect(hgUpdateAct, SIGNAL(triggered()), this, SLOT(hgUpdate()));
|
jtkorhonen@0
|
943 connect(hgRevertAct, SIGNAL(triggered()), this, SLOT(hgRevert()));
|
jtkorhonen@0
|
944 connect(hgMergeAct, SIGNAL(triggered()), this, SLOT(hgMerge()));
|
jtkorhonen@0
|
945
|
jtkorhonen@0
|
946 connect(settingsAct, SIGNAL(triggered()), this, SLOT(settings()));
|
jtkorhonen@0
|
947
|
jtkorhonen@0
|
948 connect(hgInitAct, SIGNAL(triggered()), this, SLOT(hgInit()));
|
jtkorhonen@0
|
949 connect(hgCloneFromRemoteAct, SIGNAL(triggered()), this, SLOT(hgCloneFromRemote()));
|
jtkorhonen@0
|
950 connect(hgIncomingAct, SIGNAL(triggered()), this, SLOT(hgIncoming()));
|
jtkorhonen@0
|
951 connect(hgPullAct, SIGNAL(triggered()), this, SLOT(hgPull()));
|
jtkorhonen@0
|
952 connect(hgPushAct, SIGNAL(triggered()), this, SLOT(hgPush()));
|
jtkorhonen@0
|
953
|
jtkorhonen@0
|
954 connect(hgExp, SIGNAL(currentChanged(int)), this, SLOT(tabChanged(int)));
|
jtkorhonen@0
|
955
|
jtkorhonen@0
|
956 connect(hgUpdateToRevAct, SIGNAL(triggered()), this, SLOT(hgUpdateToRev()));
|
jtkorhonen@0
|
957 connect(hgAnnotateAct, SIGNAL(triggered()), this, SLOT(hgAnnotate()));
|
jtkorhonen@0
|
958 connect(hgResolveListAct, SIGNAL(triggered()), this, SLOT(hgResolveList()));
|
jtkorhonen@0
|
959 connect(hgResolveMarkAct, SIGNAL(triggered()), this, SLOT(hgResolveMark()));
|
jtkorhonen@11
|
960 connect(hgServeAct, SIGNAL(triggered()), this, SLOT(hgServe()));
|
jtkorhonen@0
|
961 }
|
jtkorhonen@0
|
962
|
jtkorhonen@0
|
963 void MainWindow::tabChanged(int currTab)
|
jtkorhonen@0
|
964 {
|
jtkorhonen@0
|
965 tabPage = currTab;
|
jtkorhonen@0
|
966 }
|
jtkorhonen@0
|
967
|
jtkorhonen@0
|
968 void MainWindow::enableDisableActions()
|
jtkorhonen@0
|
969 {
|
jtkorhonen@0
|
970 QDir localRepoDir;
|
jtkorhonen@0
|
971 QDir workFolderDir;
|
jtkorhonen@0
|
972 bool workFolderExist;
|
jtkorhonen@0
|
973 bool localRepoExist;
|
jtkorhonen@0
|
974
|
jtkorhonen@0
|
975 remoteRepoActionsEnabled = true;
|
jtkorhonen@0
|
976 if (remoteRepoPath.isEmpty())
|
jtkorhonen@0
|
977 {
|
jtkorhonen@0
|
978 remoteRepoActionsEnabled = false;
|
jtkorhonen@0
|
979 }
|
jtkorhonen@0
|
980
|
jtkorhonen@0
|
981 localRepoActionsEnabled = true;
|
jtkorhonen@0
|
982 if (workFolderPath.isEmpty())
|
jtkorhonen@0
|
983 {
|
jtkorhonen@0
|
984 localRepoActionsEnabled = false;
|
jtkorhonen@0
|
985 workFolderExist = false;
|
jtkorhonen@0
|
986 }
|
jtkorhonen@0
|
987
|
jtkorhonen@0
|
988 if (!workFolderDir.exists(workFolderPath))
|
jtkorhonen@0
|
989 {
|
jtkorhonen@0
|
990 localRepoActionsEnabled = false;
|
jtkorhonen@0
|
991 workFolderExist = false;
|
jtkorhonen@0
|
992 }
|
jtkorhonen@0
|
993 else
|
jtkorhonen@0
|
994 {
|
jtkorhonen@0
|
995 workFolderExist = true;
|
jtkorhonen@0
|
996 }
|
jtkorhonen@0
|
997
|
jtkorhonen@0
|
998 if (!localRepoDir.exists(workFolderPath + getHgDirName()))
|
jtkorhonen@0
|
999 {
|
jtkorhonen@0
|
1000 localRepoActionsEnabled = false;
|
jtkorhonen@0
|
1001 localRepoExist = false;
|
jtkorhonen@0
|
1002 }
|
jtkorhonen@0
|
1003
|
jtkorhonen@0
|
1004 hgCloneFromRemoteAct -> setEnabled(remoteRepoActionsEnabled);
|
jtkorhonen@0
|
1005 hgIncomingAct -> setEnabled(remoteRepoActionsEnabled && remoteRepoActionsEnabled);
|
jtkorhonen@0
|
1006 hgPullAct -> setEnabled(remoteRepoActionsEnabled && remoteRepoActionsEnabled);
|
jtkorhonen@0
|
1007 hgPushAct -> setEnabled(remoteRepoActionsEnabled && remoteRepoActionsEnabled);
|
jtkorhonen@0
|
1008
|
jtkorhonen@0
|
1009 if (tabPage != WORKTAB)
|
jtkorhonen@0
|
1010 {
|
jtkorhonen@0
|
1011 localRepoActionsEnabled = false;
|
jtkorhonen@0
|
1012 }
|
jtkorhonen@0
|
1013
|
jtkorhonen@0
|
1014 hgInitAct -> setEnabled((localRepoExist == false) && (workFolderExist==true));
|
jtkorhonen@0
|
1015 hgStatAct -> setEnabled(localRepoActionsEnabled);
|
jtkorhonen@0
|
1016 hgFileDiffAct -> setEnabled(localRepoActionsEnabled);
|
jtkorhonen@0
|
1017 hgFolderDiffAct -> setEnabled(localRepoActionsEnabled);
|
jtkorhonen@0
|
1018 hgRevertAct -> setEnabled(localRepoActionsEnabled);
|
jtkorhonen@0
|
1019 hgAddAct -> setEnabled(localRepoActionsEnabled);
|
jtkorhonen@0
|
1020 hgRemoveAct -> setEnabled(localRepoActionsEnabled);
|
jtkorhonen@0
|
1021 hgUpdateAct -> setEnabled(localRepoActionsEnabled);
|
jtkorhonen@0
|
1022 hgCommitAct -> setEnabled(localRepoActionsEnabled);
|
jtkorhonen@0
|
1023 hgMergeAct -> setEnabled(localRepoActionsEnabled);
|
jtkorhonen@2
|
1024 hgResolveListAct -> setEnabled(localRepoActionsEnabled);
|
jtkorhonen@2
|
1025 hgResolveMarkAct -> setEnabled(localRepoActionsEnabled);
|
jtkorhonen@2
|
1026 hgAnnotateAct -> setEnabled(localRepoActionsEnabled);
|
jtkorhonen@11
|
1027 hgServeAct -> setEnabled(localRepoActionsEnabled);
|
jtkorhonen@0
|
1028
|
jtkorhonen@0
|
1029 hgExp -> enableDisableOtherTabs();
|
jtkorhonen@0
|
1030
|
jtkorhonen@17
|
1031 int added, modified, removed, notTracked, selected, selectedAdded, selectedModified, selectedRemoved, selectedNotTracked;
|
jtkorhonen@17
|
1032
|
jtkorhonen@17
|
1033 countModifications(hgExp -> workFolderFileList,
|
jtkorhonen@17
|
1034 added, modified, removed, notTracked,
|
jtkorhonen@17
|
1035 selected,
|
jtkorhonen@17
|
1036 selectedAdded, selectedModified, selectedRemoved, selectedNotTracked);
|
jtkorhonen@0
|
1037
|
jtkorhonen@0
|
1038 if (tabPage == WORKTAB)
|
jtkorhonen@0
|
1039 {
|
jtkorhonen@0
|
1040 //Enable / disable actions according to workFolderFileList selections / currentSelection / count
|
jtkorhonen@0
|
1041 hgChgSetDiffAct -> setEnabled(false);
|
jtkorhonen@0
|
1042 hgUpdateToRevAct -> setEnabled(false);
|
jtkorhonen@0
|
1043
|
jtkorhonen@0
|
1044 if (localRepoActionsEnabled)
|
jtkorhonen@0
|
1045 {
|
jtkorhonen@17
|
1046 if ((added == 0) && (modified == 0) && (removed == 0))
|
jtkorhonen@0
|
1047 {
|
jtkorhonen@0
|
1048 hgCommitAct -> setEnabled(false);
|
jtkorhonen@0
|
1049 hgRevertAct -> setEnabled(false);
|
jtkorhonen@0
|
1050 }
|
jtkorhonen@17
|
1051 else if (selected != 0)
|
jtkorhonen@17
|
1052 {
|
jtkorhonen@17
|
1053 if (selectedNotTracked != 0)
|
jtkorhonen@17
|
1054 {
|
jtkorhonen@17
|
1055 hgCommitAct -> setEnabled(false);
|
jtkorhonen@17
|
1056 }
|
jtkorhonen@17
|
1057 else if ((selectedAdded == 0) && (selectedModified == 0) && (selectedRemoved == 0))
|
jtkorhonen@17
|
1058 {
|
jtkorhonen@17
|
1059 hgCommitAct -> setEnabled(false);
|
jtkorhonen@17
|
1060 }
|
jtkorhonen@17
|
1061 }
|
jtkorhonen@0
|
1062
|
jtkorhonen@17
|
1063 if (modified == 0)
|
jtkorhonen@0
|
1064 {
|
jtkorhonen@0
|
1065 hgFolderDiffAct -> setEnabled(false);
|
jtkorhonen@0
|
1066 }
|
jtkorhonen@0
|
1067
|
jtkorhonen@0
|
1068 if (!isSelectedModified(hgExp -> workFolderFileList))
|
jtkorhonen@0
|
1069 {
|
jtkorhonen@0
|
1070 hgFileDiffAct -> setEnabled(false);
|
jtkorhonen@0
|
1071 hgRevertAct -> setEnabled(false);
|
jtkorhonen@0
|
1072 }
|
jtkorhonen@0
|
1073
|
jtkorhonen@5
|
1074 //JK 14.5.2010: Fixed confusing add button. Now this is simple: If we have something to add (any non-tracked files), add is enabled.
|
jtkorhonen@17
|
1075 if (notTracked == 0)
|
jtkorhonen@0
|
1076 {
|
jtkorhonen@0
|
1077 hgAddAct -> setEnabled(false);
|
jtkorhonen@0
|
1078 }
|
jtkorhonen@0
|
1079
|
jtkorhonen@6
|
1080 if (!isSelectedDeletable(hgExp -> workFolderFileList))
|
jtkorhonen@0
|
1081 {
|
jtkorhonen@0
|
1082 hgRemoveAct -> setEnabled(false);
|
jtkorhonen@0
|
1083 }
|
jtkorhonen@0
|
1084
|
jtkorhonen@2
|
1085 hgResolveListAct -> setEnabled(true);
|
jtkorhonen@2
|
1086
|
jtkorhonen@5
|
1087 if (hgExp -> localRepoHeadsList->count() < 2)
|
jtkorhonen@0
|
1088 {
|
jtkorhonen@0
|
1089 hgMergeAct -> setEnabled(false);
|
jtkorhonen@0
|
1090 }
|
jtkorhonen@0
|
1091
|
jtkorhonen@2
|
1092 QString currentFile = hgExp -> getCurrentFileListLine();
|
jtkorhonen@2
|
1093 if (!currentFile.isEmpty())
|
jtkorhonen@2
|
1094 {
|
jtkorhonen@2
|
1095 hgAnnotateAct -> setEnabled(true);
|
jtkorhonen@2
|
1096 hgResolveMarkAct -> setEnabled(true);
|
jtkorhonen@2
|
1097 }
|
jtkorhonen@2
|
1098 else
|
jtkorhonen@2
|
1099 {
|
jtkorhonen@2
|
1100 hgAnnotateAct -> setEnabled(false);
|
jtkorhonen@2
|
1101 hgResolveMarkAct -> setEnabled(false);
|
jtkorhonen@2
|
1102 }
|
jtkorhonen@0
|
1103 }
|
jtkorhonen@0
|
1104 }
|
jtkorhonen@0
|
1105 else
|
jtkorhonen@0
|
1106 {
|
jtkorhonen@0
|
1107 QList <QListWidgetItem *> headSelList = hgExp -> localRepoHeadsList->selectedItems();
|
jtkorhonen@0
|
1108 QList <QListWidgetItem *> historySelList = hgExp -> localRepoHgLogList->selectedItems();
|
jtkorhonen@0
|
1109
|
jtkorhonen@0
|
1110 if ((historySelList.count() == 2) || (headSelList.count() == 2))
|
jtkorhonen@0
|
1111 {
|
jtkorhonen@0
|
1112 hgChgSetDiffAct -> setEnabled(true);
|
jtkorhonen@0
|
1113 }
|
jtkorhonen@0
|
1114 else
|
jtkorhonen@0
|
1115 {
|
jtkorhonen@0
|
1116 hgChgSetDiffAct -> setEnabled(false);
|
jtkorhonen@0
|
1117 }
|
jtkorhonen@0
|
1118
|
jtkorhonen@30
|
1119 if (historySelList.count() == 1)
|
jtkorhonen@0
|
1120 {
|
jtkorhonen@30
|
1121 hgUpdateToRevAct -> setEnabled(true);
|
jtkorhonen@0
|
1122 }
|
jtkorhonen@0
|
1123 else
|
jtkorhonen@0
|
1124 {
|
jtkorhonen@0
|
1125 hgUpdateToRevAct -> setEnabled(false);
|
jtkorhonen@0
|
1126 }
|
jtkorhonen@0
|
1127 }
|
jtkorhonen@0
|
1128 }
|
jtkorhonen@0
|
1129
|
jtkorhonen@0
|
1130 void MainWindow::createActions()
|
jtkorhonen@0
|
1131 {
|
jtkorhonen@0
|
1132 //File actions
|
jtkorhonen@0
|
1133 hgInitAct = new QAction(tr("Init local repository"), this);
|
jtkorhonen@0
|
1134 hgInitAct->setStatusTip(tr("Create an empty local repository in selected folder"));
|
jtkorhonen@0
|
1135
|
jtkorhonen@0
|
1136 hgCloneFromRemoteAct = new QAction(tr("Clone from remote"), this);
|
jtkorhonen@0
|
1137 hgCloneFromRemoteAct->setStatusTip(tr("Clone from remote repository into local repository in selected folder"));
|
jtkorhonen@0
|
1138
|
jtkorhonen@0
|
1139 settingsAct = new QAction(QIcon(":/images/settings.png"), tr("Settings..."), this);
|
jtkorhonen@0
|
1140 settingsAct -> setStatusTip(tr("View and change application settings"));
|
jtkorhonen@0
|
1141 settingsAct -> setIconVisibleInMenu(true);
|
jtkorhonen@0
|
1142
|
jtkorhonen@0
|
1143 exitAct = new QAction(QIcon(":/images/exit.png"), tr("Exit"), this);
|
jtkorhonen@0
|
1144 exitAct->setShortcuts(QKeySequence::Quit);
|
jtkorhonen@0
|
1145 exitAct->setStatusTip(tr("Exit application"));
|
jtkorhonen@0
|
1146 exitAct -> setIconVisibleInMenu(true);
|
jtkorhonen@0
|
1147
|
jtkorhonen@0
|
1148 //Repository actions
|
jtkorhonen@0
|
1149 hgIncomingAct = new QAction(QIcon(":/images/incoming.png"), tr("View incoming changesets"), this);
|
jtkorhonen@0
|
1150 hgIncomingAct -> setStatusTip(tr("View info of changesets incoming to us from remote repository (on pull operation)"));
|
jtkorhonen@0
|
1151
|
jtkorhonen@0
|
1152 hgPullAct = new QAction(QIcon(":/images/pull.png"), tr("Pull from remote"), this);
|
jtkorhonen@0
|
1153 hgPullAct -> setStatusTip(tr("Pull changesets from remote repository to local repository"));
|
jtkorhonen@0
|
1154
|
jtkorhonen@0
|
1155 hgPushAct = new QAction(QIcon(":/images/push.png"), tr("Push to remote"), this);
|
jtkorhonen@0
|
1156 hgPushAct->setStatusTip(tr("Push local changesets to remote repository"));
|
jtkorhonen@0
|
1157
|
jtkorhonen@0
|
1158 //Workfolder actions
|
jtkorhonen@0
|
1159 hgStatAct = new QAction(QIcon(":/images/status.png"), tr("Refresh status"), this);
|
jtkorhonen@20
|
1160 hgStatAct->setStatusTip(tr("Refresh (info of) status of workfolder files"));
|
jtkorhonen@0
|
1161
|
jtkorhonen@0
|
1162 hgFileDiffAct = new QAction(QIcon(":/images/diff.png"), tr("View filediff"), this);
|
jtkorhonen@0
|
1163 hgFileDiffAct->setStatusTip(tr("Filediff: View differences between selected working folder file and local repository file"));
|
jtkorhonen@0
|
1164
|
jtkorhonen@0
|
1165 hgFolderDiffAct = new QAction(QIcon(":/images/folderdiff.png"), tr("View folderdiff"), this);
|
jtkorhonen@0
|
1166 hgFolderDiffAct->setStatusTip(tr("Folderdiff: View all differences between working folder files and local repository files"));
|
jtkorhonen@0
|
1167
|
jtkorhonen@0
|
1168 hgChgSetDiffAct = new QAction(QIcon(":/images/chgsetdiff.png"), tr("View changesetdiff"), this);
|
jtkorhonen@0
|
1169 hgChgSetDiffAct->setStatusTip(tr("Change set diff: View differences between all files of 2 repository changesets"));
|
jtkorhonen@0
|
1170
|
jtkorhonen@0
|
1171 hgRevertAct = new QAction(QIcon(":/images/undo.png"), tr("Undo changes"), this);
|
jtkorhonen@0
|
1172 hgRevertAct->setStatusTip(tr("Undo selected working folder file changes (return to local repository version)"));
|
jtkorhonen@0
|
1173
|
jtkorhonen@0
|
1174 hgAddAct = new QAction(QIcon(":/images/add.png"), tr("Add files"), this);
|
jtkorhonen@17
|
1175 hgAddAct -> setStatusTip(tr("Add working folder file(s) (selected or all yet untracked) to local repository (on next commit)"));
|
jtkorhonen@0
|
1176
|
jtkorhonen@0
|
1177 hgRemoveAct = new QAction(QIcon(":/images/remove.png"), tr("Remove file"), this);
|
jtkorhonen@0
|
1178 hgRemoveAct -> setStatusTip(tr("Remove selected working folder file from local repository (on next commit)"));
|
jtkorhonen@0
|
1179
|
jtkorhonen@0
|
1180 hgUpdateAct = new QAction(QIcon(":/images/update.png"), tr("Update working folder"), this);
|
jtkorhonen@0
|
1181 hgUpdateAct->setStatusTip(tr("Update working folder from local repository"));
|
jtkorhonen@0
|
1182
|
jtkorhonen@11
|
1183 hgCommitAct = new QAction(QIcon(":/images/commit.png"), tr("Commit / Save change(s)"), this);
|
jtkorhonen@20
|
1184 hgCommitAct->setStatusTip(tr("Save selected file(s) or all changed files in working folder (and all subfolders) to local repository"));
|
jtkorhonen@0
|
1185
|
jtkorhonen@0
|
1186 hgMergeAct = new QAction(QIcon(":/images/merge.png"), tr("Merge"), this);
|
jtkorhonen@0
|
1187 hgMergeAct->setStatusTip(tr("Merge two local repository changesets to working folder"));
|
jtkorhonen@0
|
1188
|
jtkorhonen@0
|
1189 //Advanced actions
|
jtkorhonen@0
|
1190 hgUpdateToRevAct = new QAction(tr("Update to revision"), this);
|
jtkorhonen@0
|
1191 hgUpdateToRevAct -> setStatusTip(tr("Update working folder to version selected from history list"));
|
jtkorhonen@0
|
1192
|
jtkorhonen@0
|
1193 hgAnnotateAct = new QAction(tr("Annotate"), this);
|
jtkorhonen@0
|
1194 hgAnnotateAct -> setStatusTip(tr("Show line-by-line version information for selected file"));
|
jtkorhonen@0
|
1195
|
jtkorhonen@0
|
1196 hgResolveListAct = new QAction(tr("Resolve (list)"), this);
|
jtkorhonen@0
|
1197 hgResolveListAct -> setStatusTip(tr("Resolve (list): Show list of files needing merge"));
|
jtkorhonen@0
|
1198
|
jtkorhonen@0
|
1199 hgResolveMarkAct = new QAction(tr("Resolve (mark)"), this);
|
jtkorhonen@0
|
1200 hgResolveMarkAct -> setStatusTip(tr("Resolve (mark): Mark selected file status as resolved"));
|
jtkorhonen@0
|
1201
|
jtkorhonen@11
|
1202 hgServeAct = new QAction(tr("Serve (via http)"), this);
|
jtkorhonen@11
|
1203 hgServeAct -> setStatusTip(tr("Serve local repository via http for workgroup access"));
|
jtkorhonen@11
|
1204
|
jtkorhonen@0
|
1205 //Help actions
|
jtkorhonen@0
|
1206 aboutAct = new QAction(tr("About"), this);
|
jtkorhonen@0
|
1207 aboutAct->setStatusTip(tr("Show the application's About box"));
|
jtkorhonen@0
|
1208
|
jtkorhonen@0
|
1209 aboutQtAct = new QAction(tr("About Qt"), this);
|
jtkorhonen@0
|
1210 aboutQtAct->setStatusTip(tr("Show the Qt library's About box"));
|
jtkorhonen@0
|
1211 }
|
jtkorhonen@0
|
1212
|
jtkorhonen@0
|
1213 void MainWindow::createMenus()
|
jtkorhonen@0
|
1214 {
|
jtkorhonen@0
|
1215 fileMenu = menuBar()->addMenu(tr("File"));
|
jtkorhonen@0
|
1216 fileMenu -> addAction(hgInitAct);
|
jtkorhonen@0
|
1217 fileMenu -> addAction(hgCloneFromRemoteAct);
|
jtkorhonen@0
|
1218 fileMenu -> addSeparator();
|
jtkorhonen@0
|
1219 fileMenu -> addAction(settingsAct);
|
jtkorhonen@0
|
1220 fileMenu -> addSeparator();
|
jtkorhonen@0
|
1221 fileMenu -> addAction(exitAct);
|
jtkorhonen@0
|
1222
|
jtkorhonen@0
|
1223 advancedMenu = menuBar()->addMenu(tr("Advanced"));
|
jtkorhonen@0
|
1224 advancedMenu -> addAction(hgUpdateToRevAct);
|
jtkorhonen@0
|
1225 advancedMenu -> addSeparator();
|
jtkorhonen@0
|
1226 advancedMenu -> addAction(hgAnnotateAct);
|
jtkorhonen@0
|
1227 advancedMenu -> addSeparator();
|
jtkorhonen@0
|
1228 advancedMenu -> addAction(hgResolveListAct);
|
jtkorhonen@0
|
1229 advancedMenu -> addAction(hgResolveMarkAct);
|
jtkorhonen@11
|
1230 advancedMenu -> addSeparator();
|
jtkorhonen@11
|
1231 advancedMenu -> addAction(hgServeAct);
|
jtkorhonen@0
|
1232
|
jtkorhonen@0
|
1233 helpMenu = menuBar()->addMenu(tr("Help"));
|
jtkorhonen@0
|
1234 helpMenu->addAction(aboutAct);
|
jtkorhonen@0
|
1235 helpMenu->addAction(aboutQtAct);
|
jtkorhonen@0
|
1236 }
|
jtkorhonen@0
|
1237
|
jtkorhonen@0
|
1238 void MainWindow::createToolBars()
|
jtkorhonen@0
|
1239 {
|
jtkorhonen@0
|
1240 fileToolBar = addToolBar(tr("File"));
|
jtkorhonen@0
|
1241 fileToolBar -> setIconSize(QSize(MY_ICON_SIZE, MY_ICON_SIZE));
|
jtkorhonen@0
|
1242 fileToolBar -> addAction(settingsAct);
|
jtkorhonen@0
|
1243 fileToolBar -> addAction(exitAct);
|
jtkorhonen@0
|
1244 fileToolBar -> addSeparator();
|
jtkorhonen@0
|
1245 fileToolBar -> addAction(hgChgSetDiffAct);
|
jtkorhonen@0
|
1246 fileToolBar -> setMovable(false);
|
jtkorhonen@0
|
1247
|
jtkorhonen@0
|
1248 repoToolBar = addToolBar(tr(REPOMENU_TITLE));
|
jtkorhonen@0
|
1249 repoToolBar -> setIconSize(QSize(MY_ICON_SIZE, MY_ICON_SIZE));
|
jtkorhonen@0
|
1250 repoToolBar->addAction(hgIncomingAct);
|
jtkorhonen@0
|
1251 repoToolBar->addAction(hgPullAct);
|
jtkorhonen@0
|
1252 repoToolBar->addAction(hgPushAct);
|
jtkorhonen@0
|
1253 repoToolBar -> setMovable(false);
|
jtkorhonen@0
|
1254
|
jtkorhonen@0
|
1255 workFolderToolBar = addToolBar(tr(WORKFOLDERMENU_TITLE));
|
jtkorhonen@0
|
1256 addToolBar(Qt::LeftToolBarArea, workFolderToolBar);
|
jtkorhonen@0
|
1257 workFolderToolBar -> setIconSize(QSize(MY_ICON_SIZE, MY_ICON_SIZE));
|
jtkorhonen@0
|
1258 workFolderToolBar->addAction(hgStatAct);
|
jtkorhonen@0
|
1259 workFolderToolBar->addSeparator();
|
jtkorhonen@0
|
1260 workFolderToolBar->addAction(hgFileDiffAct);
|
jtkorhonen@0
|
1261 workFolderToolBar->addAction(hgFolderDiffAct);
|
jtkorhonen@0
|
1262 workFolderToolBar->addSeparator();
|
jtkorhonen@0
|
1263 workFolderToolBar->addAction(hgRevertAct);
|
jtkorhonen@0
|
1264 workFolderToolBar->addAction(hgUpdateAct);
|
jtkorhonen@0
|
1265 workFolderToolBar->addAction(hgCommitAct);
|
jtkorhonen@0
|
1266 workFolderToolBar->addAction(hgMergeAct);
|
jtkorhonen@0
|
1267 workFolderToolBar->addSeparator();
|
jtkorhonen@0
|
1268 workFolderToolBar->addAction(hgAddAct);
|
jtkorhonen@0
|
1269 workFolderToolBar->addAction(hgRemoveAct);
|
jtkorhonen@0
|
1270 workFolderToolBar -> setMovable(false);
|
jtkorhonen@0
|
1271
|
jtkorhonen@0
|
1272 }
|
jtkorhonen@0
|
1273
|
jtkorhonen@0
|
1274
|
jtkorhonen@0
|
1275 void MainWindow::createStatusBar()
|
jtkorhonen@0
|
1276 {
|
jtkorhonen@0
|
1277 statusBar()->showMessage(tr("Ready"));
|
jtkorhonen@0
|
1278 }
|
jtkorhonen@0
|
1279
|
jtkorhonen@0
|
1280 void MainWindow::readSettings()
|
jtkorhonen@0
|
1281 {
|
jtkorhonen@0
|
1282 QDir workFolder;
|
jtkorhonen@0
|
1283
|
jtkorhonen@0
|
1284 QSettings settings("hgexplorer", "hgexplorer");
|
jtkorhonen@0
|
1285
|
jtkorhonen@30
|
1286 remoteRepoPath = settings.value("remoterepopath", "").toString();
|
jtkorhonen@0
|
1287 workFolderPath = settings.value("workfolderpath", "").toString();
|
jtkorhonen@0
|
1288 if (!workFolder.exists(workFolderPath))
|
jtkorhonen@0
|
1289 {
|
jtkorhonen@0
|
1290 workFolderPath = "";
|
jtkorhonen@0
|
1291 }
|
jtkorhonen@0
|
1292
|
jtkorhonen@30
|
1293 for(int i = 0; i < NUM_PATHS_IN_MRU_LIST; i++)
|
jtkorhonen@30
|
1294 {
|
jtkorhonen@30
|
1295 QString tmp;
|
jtkorhonen@30
|
1296
|
jtkorhonen@30
|
1297 tmp.sprintf("remoterepomrupath%d", i);
|
jtkorhonen@30
|
1298 remoteRepoMruList[i] = settings.value(tmp, "").toString();
|
jtkorhonen@30
|
1299
|
jtkorhonen@30
|
1300 tmp.sprintf("workfoldermru%d", i);
|
jtkorhonen@30
|
1301 workFolderMruList[i] = settings.value(tmp, "").toString();
|
jtkorhonen@30
|
1302 }
|
jtkorhonen@30
|
1303
|
jtkorhonen@0
|
1304 userInfo = settings.value("userinfo", "").toString();
|
jtkorhonen@0
|
1305
|
jtkorhonen@0
|
1306 QPoint pos = settings.value("pos", QPoint(200, 200)).toPoint();
|
jtkorhonen@0
|
1307 QSize size = settings.value("size", QSize(400, 400)).toSize();
|
jtkorhonen@0
|
1308 firstStart = settings.value("firststart", QVariant(true)).toBool();
|
jtkorhonen@0
|
1309
|
jtkorhonen@0
|
1310 initialFileTypesBits = (unsigned char) settings.value("viewFileTypes", QVariant(DEFAULT_HG_STAT_BITS)).toInt();
|
jtkorhonen@0
|
1311 resize(size);
|
jtkorhonen@0
|
1312 move(pos);
|
jtkorhonen@0
|
1313 }
|
jtkorhonen@0
|
1314
|
jtkorhonen@17
|
1315
|
jtkorhonen@0
|
1316 void MainWindow::writeSettings()
|
jtkorhonen@0
|
1317 {
|
jtkorhonen@0
|
1318 QSettings settings("hgexplorer", "hgexplorer");
|
jtkorhonen@0
|
1319 settings.setValue("pos", pos());
|
jtkorhonen@0
|
1320 settings.setValue("size", size());
|
jtkorhonen@0
|
1321 settings.setValue("remoterepopath", remoteRepoPath);
|
jtkorhonen@0
|
1322 settings.setValue("workfolderpath", workFolderPath);
|
jtkorhonen@30
|
1323
|
jtkorhonen@30
|
1324 for(int i = 0; i < NUM_PATHS_IN_MRU_LIST; i++)
|
jtkorhonen@30
|
1325 {
|
jtkorhonen@30
|
1326 QString tmp;
|
jtkorhonen@30
|
1327
|
jtkorhonen@30
|
1328 tmp.sprintf("remoterepomrupath%d", i);
|
jtkorhonen@30
|
1329 settings.setValue(tmp, remoteRepoMruList[i]);
|
jtkorhonen@30
|
1330
|
jtkorhonen@30
|
1331 tmp.sprintf("workfoldermru%d", i);
|
jtkorhonen@30
|
1332 settings.setValue(tmp, workFolderMruList[i]);
|
jtkorhonen@30
|
1333 }
|
jtkorhonen@30
|
1334
|
jtkorhonen@0
|
1335 settings.setValue("userinfo", userInfo);
|
jtkorhonen@0
|
1336 settings.setValue("firststart", firstStart);
|
jtkorhonen@0
|
1337 settings.setValue("viewFileTypes", hgExp -> getFileTypesBits());
|
jtkorhonen@0
|
1338 }
|
jtkorhonen@0
|
1339
|
jtkorhonen@0
|
1340
|
jtkorhonen@0
|
1341
|
jtkorhonen@0
|
1342
|