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