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@24
|
550 QString MainWindow::findMyIp()
|
jtkorhonen@17
|
551 {
|
jtkorhonen@24
|
552 QString ipAddr;
|
jtkorhonen@24
|
553
|
jtkorhonen@24
|
554 QList <QHostAddress> ipList = QNetworkInterface::allAddresses();
|
jtkorhonen@17
|
555
|
jtkorhonen@22
|
556
|
jtkorhonen@17
|
557 if (!ipList.isEmpty())
|
jtkorhonen@17
|
558 {
|
jtkorhonen@24
|
559 for(int i = 0; i < ipList.size(); i++)
|
jtkorhonen@24
|
560 {
|
jtkorhonen@24
|
561 QHostAddress addr = ipList.at(i);
|
jtkorhonen@22
|
562
|
jtkorhonen@24
|
563 if (QAbstractSocket::IPv4Protocol == addr.protocol())
|
jtkorhonen@24
|
564 {
|
jtkorhonen@24
|
565 if (addr != QHostAddress::LocalHost)
|
jtkorhonen@24
|
566 {
|
jtkorhonen@24
|
567 return addr.toString();
|
jtkorhonen@24
|
568 }
|
jtkorhonen@24
|
569 }
|
jtkorhonen@22
|
570 }
|
jtkorhonen@17
|
571 }
|
jtkorhonen@17
|
572
|
jtkorhonen@24
|
573 //This won't help your teammate much but is funny ;-)
|
jtkorhonen@24
|
574 return "127.0.0.1";
|
jtkorhonen@17
|
575 }
|
jtkorhonen@17
|
576
|
jtkorhonen@11
|
577 void MainWindow::hgServe()
|
jtkorhonen@11
|
578 {
|
jtkorhonen@11
|
579 if (runningAction == ACT_NONE)
|
jtkorhonen@11
|
580 {
|
jtkorhonen@11
|
581 QStringList params;
|
jtkorhonen@22
|
582 QString msg;
|
jtkorhonen@11
|
583
|
jtkorhonen@24
|
584 QString addr = findMyIp();
|
jtkorhonen@24
|
585 QTextStream(&msg) << "Server running on http://" << addr << ":8000/";
|
jtkorhonen@25
|
586 params << "serve" << "--address" << addr << "--port" << "8000";
|
jtkorhonen@11
|
587
|
jtkorhonen@11
|
588 runner -> startProc(getHgBinaryName(), workFolderPath, params, false);
|
jtkorhonen@11
|
589 runningAction = ACT_SERVE;
|
jtkorhonen@11
|
590
|
jtkorhonen@17
|
591 QMessageBox::information(this, "Serve", msg, QMessageBox::Close);
|
jtkorhonen@11
|
592 runner -> killProc();
|
jtkorhonen@11
|
593 }
|
jtkorhonen@11
|
594 }
|
jtkorhonen@11
|
595
|
jtkorhonen@11
|
596
|
jtkorhonen@11
|
597
|
jtkorhonen@0
|
598 void MainWindow::settings()
|
jtkorhonen@0
|
599 {
|
jtkorhonen@0
|
600 SettingsDialog *settingsDlg = new SettingsDialog(this);
|
jtkorhonen@0
|
601 settingsDlg->setModal(true);
|
jtkorhonen@0
|
602 settingsDlg->exec();
|
jtkorhonen@0
|
603 hgExp -> clearLists();
|
jtkorhonen@0
|
604 enableDisableActions();
|
jtkorhonen@0
|
605 hgStat();
|
jtkorhonen@0
|
606 }
|
jtkorhonen@0
|
607
|
jtkorhonen@2
|
608 #define STDOUT_NEEDS_BIG_WINDOW 512
|
jtkorhonen@2
|
609 #define SMALL_WND_W 500
|
jtkorhonen@2
|
610 #define SMALL_WND_H 300
|
jtkorhonen@2
|
611
|
jtkorhonen@2
|
612 #define BIG_WND_W 1024
|
jtkorhonen@2
|
613 #define BIG_WND_H 768
|
jtkorhonen@2
|
614
|
jtkorhonen@2
|
615
|
jtkorhonen@2
|
616 void MainWindow::presentLongStdoutToUser(QString stdo)
|
jtkorhonen@0
|
617 {
|
jtkorhonen@2
|
618 if (!stdo.isEmpty())
|
jtkorhonen@2
|
619 {
|
jtkorhonen@2
|
620 QDialog dlg;
|
jtkorhonen@0
|
621
|
jtkorhonen@2
|
622 if (stdo.length() > STDOUT_NEEDS_BIG_WINDOW)
|
jtkorhonen@2
|
623 {
|
jtkorhonen@2
|
624 dlg.setMinimumWidth(BIG_WND_W);
|
jtkorhonen@2
|
625 dlg.setMinimumHeight(BIG_WND_H);
|
jtkorhonen@2
|
626 }
|
jtkorhonen@2
|
627 else
|
jtkorhonen@2
|
628 {
|
jtkorhonen@2
|
629 dlg.setMinimumWidth(SMALL_WND_W);
|
jtkorhonen@2
|
630 dlg.setMinimumHeight(SMALL_WND_H);
|
jtkorhonen@2
|
631 }
|
jtkorhonen@0
|
632
|
jtkorhonen@2
|
633 QVBoxLayout *box = new QVBoxLayout;
|
jtkorhonen@2
|
634 QListWidget *list = new QListWidget;
|
jtkorhonen@2
|
635 list-> addItems(stdo.split("\n"));
|
jtkorhonen@2
|
636 QPushButton *btn = new QPushButton(tr("Ok"));
|
jtkorhonen@2
|
637 connect(btn, SIGNAL(clicked()), &dlg, SLOT(accept()));
|
jtkorhonen@0
|
638
|
jtkorhonen@2
|
639 box -> addWidget(list);
|
jtkorhonen@2
|
640 box -> addWidget(btn);
|
jtkorhonen@2
|
641 dlg.setLayout(box);
|
jtkorhonen@2
|
642
|
jtkorhonen@2
|
643 dlg.exec();
|
jtkorhonen@2
|
644 }
|
jtkorhonen@2
|
645 else
|
jtkorhonen@2
|
646 {
|
jtkorhonen@2
|
647 QMessageBox::information(this, tr("HgExplorer"), tr("Mercurial command did not return any output."));
|
jtkorhonen@2
|
648 }
|
jtkorhonen@0
|
649 }
|
jtkorhonen@0
|
650
|
jtkorhonen@0
|
651
|
jtkorhonen@17
|
652 bool MainWindow::areAllSelectedCommitable(QListWidget *workList)
|
jtkorhonen@11
|
653 {
|
jtkorhonen@11
|
654 QList<QListWidgetItem *> selList = workList -> selectedItems();
|
jtkorhonen@17
|
655 for (int i = 0; i < selList.size(); ++i)
|
jtkorhonen@11
|
656 {
|
jtkorhonen@17
|
657 QString tmp = selList.at(i) -> text().mid(0, 1);
|
jtkorhonen@11
|
658 if (tmp == "A")
|
jtkorhonen@11
|
659 {
|
jtkorhonen@11
|
660 //scheduled to be added, ok to commit
|
jtkorhonen@11
|
661 }
|
jtkorhonen@11
|
662 else if (tmp == "M")
|
jtkorhonen@11
|
663 {
|
jtkorhonen@11
|
664 //locally modified, ok to commit
|
jtkorhonen@17
|
665 }
|
jtkorhonen@17
|
666 else if (tmp == "R")
|
jtkorhonen@17
|
667 {
|
jtkorhonen@17
|
668 //user wants to remove from repo, ok to commit
|
jtkorhonen@17
|
669 }
|
jtkorhonen@17
|
670 else
|
jtkorhonen@17
|
671 {
|
jtkorhonen@17
|
672 return false;
|
jtkorhonen@11
|
673 }
|
jtkorhonen@11
|
674 }
|
jtkorhonen@17
|
675 return true;
|
jtkorhonen@11
|
676 }
|
jtkorhonen@11
|
677
|
jtkorhonen@6
|
678 bool MainWindow::isSelectedDeletable(QListWidget *workList)
|
jtkorhonen@0
|
679 {
|
jtkorhonen@0
|
680 QList<QListWidgetItem *> selList = workList -> selectedItems();
|
jtkorhonen@0
|
681 if (selList.count() == 1)
|
jtkorhonen@0
|
682 {
|
jtkorhonen@6
|
683 QString tmp = selList.at(0)->text().mid(0, 1);
|
jtkorhonen@6
|
684 if (tmp == "A")
|
jtkorhonen@0
|
685 {
|
jtkorhonen@6
|
686 //scheduled to be added, ok to remove (won't go to repo)
|
jtkorhonen@6
|
687 return true;
|
jtkorhonen@6
|
688 }
|
jtkorhonen@6
|
689 else if (tmp == "C")
|
jtkorhonen@6
|
690 {
|
jtkorhonen@6
|
691 //Tracked but unchanged, ok to remove
|
jtkorhonen@6
|
692 return true;
|
jtkorhonen@6
|
693 }
|
jtkorhonen@6
|
694 else if (tmp == "M")
|
jtkorhonen@6
|
695 {
|
jtkorhonen@6
|
696 //locally modified, ok to remove from repo
|
jtkorhonen@6
|
697 return true;
|
jtkorhonen@6
|
698 }
|
jtkorhonen@6
|
699 else if (tmp == "!")
|
jtkorhonen@6
|
700 {
|
jtkorhonen@6
|
701 //locally deleted, ok to remove from repo
|
jtkorhonen@0
|
702 return true;
|
jtkorhonen@0
|
703 }
|
jtkorhonen@0
|
704 }
|
jtkorhonen@0
|
705 return false;
|
jtkorhonen@0
|
706 }
|
jtkorhonen@0
|
707
|
jtkorhonen@0
|
708
|
jtkorhonen@17
|
709 bool MainWindow::areAllSelectedUntracked(QListWidget *workList)
|
jtkorhonen@0
|
710 {
|
jtkorhonen@0
|
711 QList<QListWidgetItem *> selList = workList -> selectedItems();
|
jtkorhonen@17
|
712 for (int i = 0; i < selList.size(); ++i)
|
jtkorhonen@0
|
713 {
|
jtkorhonen@17
|
714 QString tmp = selList.at(i) -> text();
|
jtkorhonen@17
|
715
|
jtkorhonen@17
|
716 if (tmp.mid(0,1) != "?")
|
jtkorhonen@0
|
717 {
|
jtkorhonen@17
|
718 return false;
|
jtkorhonen@0
|
719 }
|
jtkorhonen@0
|
720 }
|
jtkorhonen@17
|
721 return true;
|
jtkorhonen@0
|
722 }
|
jtkorhonen@0
|
723
|
jtkorhonen@0
|
724
|
jtkorhonen@0
|
725 bool MainWindow::isSelectedModified(QListWidget *workList)
|
jtkorhonen@0
|
726 {
|
jtkorhonen@0
|
727 QList<QListWidgetItem *> selList = workList -> selectedItems();
|
jtkorhonen@0
|
728 if (selList.count() == 1)
|
jtkorhonen@0
|
729 {
|
jtkorhonen@0
|
730 if (selList.at(0)->text().mid(0, 1) == "M")
|
jtkorhonen@0
|
731 {
|
jtkorhonen@0
|
732 return true;
|
jtkorhonen@0
|
733 }
|
jtkorhonen@0
|
734 }
|
jtkorhonen@0
|
735 return false;
|
jtkorhonen@0
|
736 }
|
jtkorhonen@0
|
737
|
jtkorhonen@17
|
738 void MainWindow::countModifications(QListWidget *workList, int& added, int& modified, int& removed, int& notTracked,
|
jtkorhonen@17
|
739 int& selected,
|
jtkorhonen@17
|
740 int& selectedAdded, int& selectedModified, int& selectedRemoved, int& selectedNotTracked)
|
jtkorhonen@0
|
741 {
|
jtkorhonen@0
|
742 int itemCount = workList -> count();
|
jtkorhonen@0
|
743 if (itemCount > 0)
|
jtkorhonen@0
|
744 {
|
jtkorhonen@0
|
745 int A= 0;
|
jtkorhonen@0
|
746 int M=0;
|
jtkorhonen@0
|
747 int R=0;
|
jtkorhonen@5
|
748 int N=0;
|
jtkorhonen@17
|
749 int S=0;
|
jtkorhonen@17
|
750 int SA=0;
|
jtkorhonen@17
|
751 int SM=0;
|
jtkorhonen@17
|
752 int SR=0;
|
jtkorhonen@17
|
753 int SN=0;
|
jtkorhonen@17
|
754
|
jtkorhonen@0
|
755 for (int i = 0; i < workList -> count(); i++)
|
jtkorhonen@0
|
756 {
|
jtkorhonen@0
|
757 QListWidgetItem *currItem = workList -> item(i);
|
jtkorhonen@0
|
758
|
jtkorhonen@0
|
759 QString tmp = currItem->text().mid(0, 1);
|
jtkorhonen@0
|
760 if (tmp == "M")
|
jtkorhonen@0
|
761 {
|
jtkorhonen@0
|
762 M++;
|
jtkorhonen@0
|
763 }
|
jtkorhonen@0
|
764 else if (tmp == "R")
|
jtkorhonen@0
|
765 {
|
jtkorhonen@0
|
766 R++;
|
jtkorhonen@0
|
767 }
|
jtkorhonen@0
|
768 else if (tmp == "A")
|
jtkorhonen@0
|
769 {
|
jtkorhonen@0
|
770 A++;
|
jtkorhonen@0
|
771 }
|
jtkorhonen@5
|
772 else if (tmp == "?")
|
jtkorhonen@5
|
773 {
|
jtkorhonen@5
|
774 N++;
|
jtkorhonen@5
|
775 }
|
jtkorhonen@0
|
776 }
|
jtkorhonen@0
|
777
|
jtkorhonen@17
|
778 added = A;
|
jtkorhonen@17
|
779 modified = M;
|
jtkorhonen@17
|
780 removed = R;
|
jtkorhonen@17
|
781 notTracked = N;
|
jtkorhonen@17
|
782
|
jtkorhonen@17
|
783 QList <QListWidgetItem *> selList = workList -> selectedItems();
|
jtkorhonen@17
|
784
|
jtkorhonen@17
|
785 S = selList.size();
|
jtkorhonen@17
|
786 for (int i = 0; i < selList.size(); ++i)
|
jtkorhonen@17
|
787 {
|
jtkorhonen@17
|
788 QString tmp = selList.at(i) -> text();
|
jtkorhonen@17
|
789
|
jtkorhonen@17
|
790 if (tmp.mid(0,1) == "A")
|
jtkorhonen@17
|
791 {
|
jtkorhonen@17
|
792 SA++;
|
jtkorhonen@17
|
793 }
|
jtkorhonen@17
|
794 else if (tmp.mid(0,1) == "M")
|
jtkorhonen@17
|
795 {
|
jtkorhonen@17
|
796 SM++;
|
jtkorhonen@17
|
797 }
|
jtkorhonen@17
|
798 else if (tmp.mid(0,1) == "R")
|
jtkorhonen@17
|
799 {
|
jtkorhonen@17
|
800 SR++;
|
jtkorhonen@17
|
801 }
|
jtkorhonen@17
|
802 else if (tmp.mid(0,1) == "?")
|
jtkorhonen@17
|
803 {
|
jtkorhonen@17
|
804 SN++;
|
jtkorhonen@17
|
805 }
|
jtkorhonen@17
|
806 }
|
jtkorhonen@17
|
807
|
jtkorhonen@17
|
808 selected = S;
|
jtkorhonen@17
|
809 selectedAdded = SA;
|
jtkorhonen@17
|
810 selectedModified = SM;
|
jtkorhonen@17
|
811 selectedRemoved = SR;
|
jtkorhonen@17
|
812 selectedNotTracked = SN;
|
jtkorhonen@0
|
813 }
|
jtkorhonen@0
|
814 else
|
jtkorhonen@0
|
815 {
|
jtkorhonen@17
|
816 added = 0;
|
jtkorhonen@17
|
817 modified = 0;
|
jtkorhonen@17
|
818 removed = 0;
|
jtkorhonen@17
|
819 notTracked = 0;
|
jtkorhonen@17
|
820 selected = 0;
|
jtkorhonen@17
|
821 selectedAdded = 0;
|
jtkorhonen@17
|
822 selectedModified = 0;
|
jtkorhonen@17
|
823 selectedRemoved = 0;
|
jtkorhonen@17
|
824 selectedNotTracked = 0;
|
jtkorhonen@0
|
825 }
|
jtkorhonen@0
|
826 }
|
jtkorhonen@0
|
827
|
jtkorhonen@0
|
828
|
jtkorhonen@0
|
829 void MainWindow::timerEvent(QTimerEvent *)
|
jtkorhonen@0
|
830 {
|
jtkorhonen@0
|
831 bool shouldHgStat = false;
|
jtkorhonen@0
|
832
|
jtkorhonen@0
|
833 if (runningAction != ACT_NONE)
|
jtkorhonen@0
|
834 {
|
jtkorhonen@0
|
835 //We are running some hg command...
|
jtkorhonen@0
|
836 if (runner -> isProcRunning() == false)
|
jtkorhonen@0
|
837 {
|
jtkorhonen@0
|
838 //Running has just ended.
|
jtkorhonen@0
|
839 int exitCode = runner -> getExitCode();
|
jtkorhonen@0
|
840
|
jtkorhonen@0
|
841 runner -> hideProgBar();
|
jtkorhonen@0
|
842
|
jtkorhonen@0
|
843 //Clumsy...
|
jtkorhonen@0
|
844 if ((EXITOK(exitCode)) || ((exitCode == 1) && (runningAction == ACT_INCOMING)))
|
jtkorhonen@0
|
845 {
|
jtkorhonen@0
|
846 //Successful running.
|
jtkorhonen@0
|
847 switch(runningAction)
|
jtkorhonen@0
|
848 {
|
jtkorhonen@0
|
849 case ACT_STAT:
|
jtkorhonen@0
|
850 {
|
jtkorhonen@0
|
851 hgExp -> updateWorkFolderFileList(runner -> getStdOut());
|
jtkorhonen@0
|
852 }
|
jtkorhonen@0
|
853 break;
|
jtkorhonen@0
|
854
|
jtkorhonen@0
|
855 case ACT_INCOMING:
|
jtkorhonen@0
|
856 case ACT_ANNOTATE:
|
jtkorhonen@0
|
857 case ACT_RESOLVE_LIST:
|
jtkorhonen@0
|
858 case ACT_RESOLVE_MARK:
|
jtkorhonen@2
|
859 presentLongStdoutToUser(runner -> getStdOut());
|
jtkorhonen@0
|
860 shouldHgStat = true;
|
jtkorhonen@0
|
861 break;
|
jtkorhonen@0
|
862
|
jtkorhonen@0
|
863 case ACT_PULL:
|
jtkorhonen@0
|
864 QMessageBox::information(this, "pull", runner -> getStdOut());
|
jtkorhonen@0
|
865 shouldHgStat = true;
|
jtkorhonen@0
|
866 break;
|
jtkorhonen@0
|
867
|
jtkorhonen@0
|
868 case ACT_PUSH:
|
jtkorhonen@0
|
869 QMessageBox::information(this, "push", runner -> getStdOut());
|
jtkorhonen@0
|
870 shouldHgStat = true;
|
jtkorhonen@0
|
871 break;
|
jtkorhonen@0
|
872
|
jtkorhonen@0
|
873 case ACT_INIT:
|
jtkorhonen@0
|
874 enableDisableActions();
|
jtkorhonen@0
|
875 shouldHgStat = true;
|
jtkorhonen@0
|
876 break;
|
jtkorhonen@0
|
877
|
jtkorhonen@0
|
878 case ACT_CLONEFROMREMOTE:
|
jtkorhonen@0
|
879 QMessageBox::information(this, "clone", runner -> getStdOut());
|
jtkorhonen@0
|
880 enableDisableActions();
|
jtkorhonen@0
|
881 shouldHgStat = true;
|
jtkorhonen@0
|
882 break;
|
jtkorhonen@0
|
883
|
jtkorhonen@0
|
884 case ACT_LOG:
|
jtkorhonen@0
|
885 {
|
jtkorhonen@0
|
886 hgExp -> updateLocalRepoHgLogList(runner -> getStdOut());
|
jtkorhonen@0
|
887 }
|
jtkorhonen@0
|
888 break;
|
jtkorhonen@0
|
889
|
jtkorhonen@0
|
890 case ACT_PARENTS:
|
jtkorhonen@0
|
891 {
|
jtkorhonen@0
|
892 hgExp -> updateLocalRepoParentsList(runner -> getStdOut());
|
jtkorhonen@0
|
893 }
|
jtkorhonen@0
|
894 break;
|
jtkorhonen@0
|
895
|
jtkorhonen@0
|
896 case ACT_HEADS:
|
jtkorhonen@0
|
897 {
|
jtkorhonen@0
|
898 QString stdOut = runner -> getStdOut();
|
jtkorhonen@0
|
899 hgExp -> updateLocalRepoHeadsList(stdOut);
|
jtkorhonen@0
|
900 }
|
jtkorhonen@0
|
901 break;
|
jtkorhonen@0
|
902
|
jtkorhonen@0
|
903 case ACT_REMOVE:
|
jtkorhonen@0
|
904 case ACT_ADD:
|
jtkorhonen@0
|
905 case ACT_COMMIT:
|
jtkorhonen@0
|
906 case ACT_FILEDIFF:
|
jtkorhonen@0
|
907 case ACT_FOLDERDIFF:
|
jtkorhonen@0
|
908 case ACT_CHGSETDIFF:
|
jtkorhonen@0
|
909 case ACT_REVERT:
|
jtkorhonen@11
|
910 case ACT_SERVE:
|
jtkorhonen@0
|
911 shouldHgStat = true;
|
jtkorhonen@0
|
912 break;
|
jtkorhonen@0
|
913
|
jtkorhonen@0
|
914 case ACT_UPDATE:
|
jtkorhonen@0
|
915 QMessageBox::information(this, "update", runner -> getStdOut());
|
jtkorhonen@0
|
916 shouldHgStat = true;
|
jtkorhonen@0
|
917 break;
|
jtkorhonen@0
|
918
|
jtkorhonen@0
|
919 case ACT_MERGE:
|
jtkorhonen@0
|
920 QMessageBox::information(this, "merge", runner -> getStdOut());
|
jtkorhonen@0
|
921 shouldHgStat = true;
|
jtkorhonen@0
|
922 break;
|
jtkorhonen@0
|
923
|
jtkorhonen@0
|
924 default:
|
jtkorhonen@0
|
925 break;
|
jtkorhonen@0
|
926 }
|
jtkorhonen@0
|
927 }
|
jtkorhonen@0
|
928
|
jtkorhonen@0
|
929 //Typical sequence goes stat -> heads -> parents -> log
|
jtkorhonen@0
|
930 if (runningAction == ACT_STAT)
|
jtkorhonen@0
|
931 {
|
jtkorhonen@0
|
932 runningAction = ACT_NONE;
|
jtkorhonen@0
|
933 hgHeads();
|
jtkorhonen@0
|
934 }
|
jtkorhonen@0
|
935 else if (runningAction == ACT_HEADS)
|
jtkorhonen@0
|
936 {
|
jtkorhonen@0
|
937 runningAction = ACT_NONE;
|
jtkorhonen@0
|
938 hgParents();
|
jtkorhonen@0
|
939 }
|
jtkorhonen@0
|
940 else if (runningAction == ACT_PARENTS)
|
jtkorhonen@0
|
941 {
|
jtkorhonen@0
|
942 runningAction = ACT_NONE;
|
jtkorhonen@0
|
943 hgLog();
|
jtkorhonen@0
|
944 }
|
jtkorhonen@0
|
945 else
|
jtkorhonen@0
|
946 {
|
jtkorhonen@0
|
947 runningAction = ACT_NONE;
|
jtkorhonen@0
|
948 if (shouldHgStat)
|
jtkorhonen@0
|
949 {
|
jtkorhonen@0
|
950 hgStat();
|
jtkorhonen@0
|
951 }
|
jtkorhonen@0
|
952 }
|
jtkorhonen@0
|
953 }
|
jtkorhonen@0
|
954 }
|
jtkorhonen@0
|
955 else
|
jtkorhonen@0
|
956 {
|
jtkorhonen@0
|
957 enableDisableActions();
|
jtkorhonen@0
|
958 }
|
jtkorhonen@0
|
959 }
|
jtkorhonen@0
|
960
|
jtkorhonen@0
|
961 void MainWindow::connectActions()
|
jtkorhonen@0
|
962 {
|
jtkorhonen@0
|
963 connect(exitAct, SIGNAL(triggered()), this, SLOT(close()));
|
jtkorhonen@0
|
964 connect(aboutAct, SIGNAL(triggered()), this, SLOT(about()));
|
jtkorhonen@0
|
965 connect(aboutQtAct, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
|
jtkorhonen@0
|
966
|
jtkorhonen@0
|
967 connect(hgStatAct, SIGNAL(triggered()), this, SLOT(hgStat()));
|
jtkorhonen@0
|
968 connect(hgExp, SIGNAL(workFolderViewTypesChanged()), this, SLOT(hgStat()));
|
jtkorhonen@0
|
969 connect(hgRemoveAct, SIGNAL(triggered()), this, SLOT(hgRemove()));
|
jtkorhonen@0
|
970 connect(hgAddAct, SIGNAL(triggered()), this, SLOT(hgAdd()));
|
jtkorhonen@0
|
971 connect(hgCommitAct, SIGNAL(triggered()), this, SLOT(hgCommit()));
|
jtkorhonen@0
|
972 connect(hgFileDiffAct, SIGNAL(triggered()), this, SLOT(hgFileDiff()));
|
jtkorhonen@0
|
973 connect(hgFolderDiffAct, SIGNAL(triggered()), this, SLOT(hgFolderDiff()));
|
jtkorhonen@0
|
974 connect(hgChgSetDiffAct, SIGNAL(triggered()), this, SLOT(hgChgSetDiff()));
|
jtkorhonen@0
|
975 connect(hgUpdateAct, SIGNAL(triggered()), this, SLOT(hgUpdate()));
|
jtkorhonen@0
|
976 connect(hgRevertAct, SIGNAL(triggered()), this, SLOT(hgRevert()));
|
jtkorhonen@0
|
977 connect(hgMergeAct, SIGNAL(triggered()), this, SLOT(hgMerge()));
|
jtkorhonen@0
|
978
|
jtkorhonen@0
|
979 connect(settingsAct, SIGNAL(triggered()), this, SLOT(settings()));
|
jtkorhonen@0
|
980
|
jtkorhonen@0
|
981 connect(hgInitAct, SIGNAL(triggered()), this, SLOT(hgInit()));
|
jtkorhonen@0
|
982 connect(hgCloneFromRemoteAct, SIGNAL(triggered()), this, SLOT(hgCloneFromRemote()));
|
jtkorhonen@0
|
983 connect(hgIncomingAct, SIGNAL(triggered()), this, SLOT(hgIncoming()));
|
jtkorhonen@0
|
984 connect(hgPullAct, SIGNAL(triggered()), this, SLOT(hgPull()));
|
jtkorhonen@0
|
985 connect(hgPushAct, SIGNAL(triggered()), this, SLOT(hgPush()));
|
jtkorhonen@0
|
986
|
jtkorhonen@0
|
987 connect(hgExp, SIGNAL(currentChanged(int)), this, SLOT(tabChanged(int)));
|
jtkorhonen@0
|
988
|
jtkorhonen@0
|
989 connect(hgUpdateToRevAct, SIGNAL(triggered()), this, SLOT(hgUpdateToRev()));
|
jtkorhonen@0
|
990 connect(hgAnnotateAct, SIGNAL(triggered()), this, SLOT(hgAnnotate()));
|
jtkorhonen@0
|
991 connect(hgResolveListAct, SIGNAL(triggered()), this, SLOT(hgResolveList()));
|
jtkorhonen@0
|
992 connect(hgResolveMarkAct, SIGNAL(triggered()), this, SLOT(hgResolveMark()));
|
jtkorhonen@11
|
993 connect(hgServeAct, SIGNAL(triggered()), this, SLOT(hgServe()));
|
jtkorhonen@0
|
994 }
|
jtkorhonen@0
|
995
|
jtkorhonen@0
|
996 void MainWindow::tabChanged(int currTab)
|
jtkorhonen@0
|
997 {
|
jtkorhonen@0
|
998 tabPage = currTab;
|
jtkorhonen@0
|
999 }
|
jtkorhonen@0
|
1000
|
jtkorhonen@0
|
1001 void MainWindow::enableDisableActions()
|
jtkorhonen@0
|
1002 {
|
jtkorhonen@0
|
1003 QDir localRepoDir;
|
jtkorhonen@0
|
1004 QDir workFolderDir;
|
jtkorhonen@0
|
1005 bool workFolderExist;
|
jtkorhonen@0
|
1006 bool localRepoExist;
|
jtkorhonen@0
|
1007
|
jtkorhonen@0
|
1008 remoteRepoActionsEnabled = true;
|
jtkorhonen@0
|
1009 if (remoteRepoPath.isEmpty())
|
jtkorhonen@0
|
1010 {
|
jtkorhonen@0
|
1011 remoteRepoActionsEnabled = false;
|
jtkorhonen@0
|
1012 }
|
jtkorhonen@0
|
1013
|
jtkorhonen@0
|
1014 localRepoActionsEnabled = true;
|
jtkorhonen@0
|
1015 if (workFolderPath.isEmpty())
|
jtkorhonen@0
|
1016 {
|
jtkorhonen@0
|
1017 localRepoActionsEnabled = false;
|
jtkorhonen@0
|
1018 workFolderExist = false;
|
jtkorhonen@0
|
1019 }
|
jtkorhonen@0
|
1020
|
jtkorhonen@0
|
1021 if (!workFolderDir.exists(workFolderPath))
|
jtkorhonen@0
|
1022 {
|
jtkorhonen@0
|
1023 localRepoActionsEnabled = false;
|
jtkorhonen@0
|
1024 workFolderExist = false;
|
jtkorhonen@0
|
1025 }
|
jtkorhonen@0
|
1026 else
|
jtkorhonen@0
|
1027 {
|
jtkorhonen@0
|
1028 workFolderExist = true;
|
jtkorhonen@0
|
1029 }
|
jtkorhonen@0
|
1030
|
jtkorhonen@0
|
1031 if (!localRepoDir.exists(workFolderPath + getHgDirName()))
|
jtkorhonen@0
|
1032 {
|
jtkorhonen@0
|
1033 localRepoActionsEnabled = false;
|
jtkorhonen@0
|
1034 localRepoExist = false;
|
jtkorhonen@0
|
1035 }
|
jtkorhonen@0
|
1036
|
jtkorhonen@0
|
1037 hgCloneFromRemoteAct -> setEnabled(remoteRepoActionsEnabled);
|
jtkorhonen@0
|
1038 hgIncomingAct -> setEnabled(remoteRepoActionsEnabled && remoteRepoActionsEnabled);
|
jtkorhonen@0
|
1039 hgPullAct -> setEnabled(remoteRepoActionsEnabled && remoteRepoActionsEnabled);
|
jtkorhonen@0
|
1040 hgPushAct -> setEnabled(remoteRepoActionsEnabled && remoteRepoActionsEnabled);
|
jtkorhonen@0
|
1041
|
jtkorhonen@0
|
1042 if (tabPage != WORKTAB)
|
jtkorhonen@0
|
1043 {
|
jtkorhonen@0
|
1044 localRepoActionsEnabled = false;
|
jtkorhonen@0
|
1045 }
|
jtkorhonen@0
|
1046
|
jtkorhonen@0
|
1047 hgInitAct -> setEnabled((localRepoExist == false) && (workFolderExist==true));
|
jtkorhonen@0
|
1048 hgStatAct -> setEnabled(localRepoActionsEnabled);
|
jtkorhonen@0
|
1049 hgFileDiffAct -> setEnabled(localRepoActionsEnabled);
|
jtkorhonen@0
|
1050 hgFolderDiffAct -> setEnabled(localRepoActionsEnabled);
|
jtkorhonen@0
|
1051 hgRevertAct -> setEnabled(localRepoActionsEnabled);
|
jtkorhonen@0
|
1052 hgAddAct -> setEnabled(localRepoActionsEnabled);
|
jtkorhonen@0
|
1053 hgRemoveAct -> setEnabled(localRepoActionsEnabled);
|
jtkorhonen@0
|
1054 hgUpdateAct -> setEnabled(localRepoActionsEnabled);
|
jtkorhonen@0
|
1055 hgCommitAct -> setEnabled(localRepoActionsEnabled);
|
jtkorhonen@0
|
1056 hgMergeAct -> setEnabled(localRepoActionsEnabled);
|
jtkorhonen@2
|
1057 hgResolveListAct -> setEnabled(localRepoActionsEnabled);
|
jtkorhonen@2
|
1058 hgResolveMarkAct -> setEnabled(localRepoActionsEnabled);
|
jtkorhonen@2
|
1059 hgAnnotateAct -> setEnabled(localRepoActionsEnabled);
|
jtkorhonen@11
|
1060 hgServeAct -> setEnabled(localRepoActionsEnabled);
|
jtkorhonen@0
|
1061
|
jtkorhonen@0
|
1062 hgExp -> enableDisableOtherTabs();
|
jtkorhonen@0
|
1063
|
jtkorhonen@17
|
1064 int added, modified, removed, notTracked, selected, selectedAdded, selectedModified, selectedRemoved, selectedNotTracked;
|
jtkorhonen@17
|
1065
|
jtkorhonen@17
|
1066 countModifications(hgExp -> workFolderFileList,
|
jtkorhonen@17
|
1067 added, modified, removed, notTracked,
|
jtkorhonen@17
|
1068 selected,
|
jtkorhonen@17
|
1069 selectedAdded, selectedModified, selectedRemoved, selectedNotTracked);
|
jtkorhonen@0
|
1070
|
jtkorhonen@0
|
1071 if (tabPage == WORKTAB)
|
jtkorhonen@0
|
1072 {
|
jtkorhonen@0
|
1073 //Enable / disable actions according to workFolderFileList selections / currentSelection / count
|
jtkorhonen@0
|
1074 hgChgSetDiffAct -> setEnabled(false);
|
jtkorhonen@0
|
1075 hgUpdateToRevAct -> setEnabled(false);
|
jtkorhonen@0
|
1076
|
jtkorhonen@0
|
1077 if (localRepoActionsEnabled)
|
jtkorhonen@0
|
1078 {
|
jtkorhonen@17
|
1079 if ((added == 0) && (modified == 0) && (removed == 0))
|
jtkorhonen@0
|
1080 {
|
jtkorhonen@0
|
1081 hgCommitAct -> setEnabled(false);
|
jtkorhonen@0
|
1082 hgRevertAct -> setEnabled(false);
|
jtkorhonen@0
|
1083 }
|
jtkorhonen@17
|
1084 else if (selected != 0)
|
jtkorhonen@17
|
1085 {
|
jtkorhonen@17
|
1086 if (selectedNotTracked != 0)
|
jtkorhonen@17
|
1087 {
|
jtkorhonen@17
|
1088 hgCommitAct -> setEnabled(false);
|
jtkorhonen@17
|
1089 }
|
jtkorhonen@17
|
1090 else if ((selectedAdded == 0) && (selectedModified == 0) && (selectedRemoved == 0))
|
jtkorhonen@17
|
1091 {
|
jtkorhonen@17
|
1092 hgCommitAct -> setEnabled(false);
|
jtkorhonen@17
|
1093 }
|
jtkorhonen@17
|
1094 }
|
jtkorhonen@0
|
1095
|
jtkorhonen@17
|
1096 if (modified == 0)
|
jtkorhonen@0
|
1097 {
|
jtkorhonen@0
|
1098 hgFolderDiffAct -> setEnabled(false);
|
jtkorhonen@0
|
1099 }
|
jtkorhonen@0
|
1100
|
jtkorhonen@0
|
1101 if (!isSelectedModified(hgExp -> workFolderFileList))
|
jtkorhonen@0
|
1102 {
|
jtkorhonen@0
|
1103 hgFileDiffAct -> setEnabled(false);
|
jtkorhonen@0
|
1104 hgRevertAct -> setEnabled(false);
|
jtkorhonen@0
|
1105 }
|
jtkorhonen@0
|
1106
|
jtkorhonen@5
|
1107 //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
|
1108 if (notTracked == 0)
|
jtkorhonen@0
|
1109 {
|
jtkorhonen@0
|
1110 hgAddAct -> setEnabled(false);
|
jtkorhonen@0
|
1111 }
|
jtkorhonen@0
|
1112
|
jtkorhonen@6
|
1113 if (!isSelectedDeletable(hgExp -> workFolderFileList))
|
jtkorhonen@0
|
1114 {
|
jtkorhonen@0
|
1115 hgRemoveAct -> setEnabled(false);
|
jtkorhonen@0
|
1116 }
|
jtkorhonen@0
|
1117
|
jtkorhonen@2
|
1118 hgResolveListAct -> setEnabled(true);
|
jtkorhonen@2
|
1119
|
jtkorhonen@5
|
1120 if (hgExp -> localRepoHeadsList->count() < 2)
|
jtkorhonen@0
|
1121 {
|
jtkorhonen@0
|
1122 hgMergeAct -> setEnabled(false);
|
jtkorhonen@0
|
1123 }
|
jtkorhonen@0
|
1124
|
jtkorhonen@2
|
1125 QString currentFile = hgExp -> getCurrentFileListLine();
|
jtkorhonen@2
|
1126 if (!currentFile.isEmpty())
|
jtkorhonen@2
|
1127 {
|
jtkorhonen@2
|
1128 hgAnnotateAct -> setEnabled(true);
|
jtkorhonen@2
|
1129 hgResolveMarkAct -> setEnabled(true);
|
jtkorhonen@2
|
1130 }
|
jtkorhonen@2
|
1131 else
|
jtkorhonen@2
|
1132 {
|
jtkorhonen@2
|
1133 hgAnnotateAct -> setEnabled(false);
|
jtkorhonen@2
|
1134 hgResolveMarkAct -> setEnabled(false);
|
jtkorhonen@2
|
1135 }
|
jtkorhonen@0
|
1136 }
|
jtkorhonen@0
|
1137 }
|
jtkorhonen@0
|
1138 else
|
jtkorhonen@0
|
1139 {
|
jtkorhonen@0
|
1140 QList <QListWidgetItem *> headSelList = hgExp -> localRepoHeadsList->selectedItems();
|
jtkorhonen@0
|
1141 QList <QListWidgetItem *> historySelList = hgExp -> localRepoHgLogList->selectedItems();
|
jtkorhonen@0
|
1142
|
jtkorhonen@0
|
1143 if ((historySelList.count() == 2) || (headSelList.count() == 2))
|
jtkorhonen@0
|
1144 {
|
jtkorhonen@0
|
1145 hgChgSetDiffAct -> setEnabled(true);
|
jtkorhonen@0
|
1146 }
|
jtkorhonen@0
|
1147 else
|
jtkorhonen@0
|
1148 {
|
jtkorhonen@0
|
1149 hgChgSetDiffAct -> setEnabled(false);
|
jtkorhonen@0
|
1150 }
|
jtkorhonen@0
|
1151
|
jtkorhonen@17
|
1152 if ((added == 0) && (modified == 0) && (removed == 0))
|
jtkorhonen@0
|
1153 {
|
jtkorhonen@0
|
1154 if (historySelList.count() == 1)
|
jtkorhonen@0
|
1155 {
|
jtkorhonen@0
|
1156 hgUpdateToRevAct -> setEnabled(true);
|
jtkorhonen@0
|
1157 }
|
jtkorhonen@0
|
1158 else
|
jtkorhonen@0
|
1159 {
|
jtkorhonen@0
|
1160 hgUpdateToRevAct -> setEnabled(false);
|
jtkorhonen@0
|
1161 }
|
jtkorhonen@0
|
1162 }
|
jtkorhonen@0
|
1163 else
|
jtkorhonen@0
|
1164 {
|
jtkorhonen@0
|
1165 hgUpdateToRevAct -> setEnabled(false);
|
jtkorhonen@0
|
1166 }
|
jtkorhonen@0
|
1167 }
|
jtkorhonen@0
|
1168 }
|
jtkorhonen@0
|
1169
|
jtkorhonen@0
|
1170 void MainWindow::createActions()
|
jtkorhonen@0
|
1171 {
|
jtkorhonen@0
|
1172 //File actions
|
jtkorhonen@0
|
1173 hgInitAct = new QAction(tr("Init local repository"), this);
|
jtkorhonen@0
|
1174 hgInitAct->setStatusTip(tr("Create an empty local repository in selected folder"));
|
jtkorhonen@0
|
1175
|
jtkorhonen@0
|
1176 hgCloneFromRemoteAct = new QAction(tr("Clone from remote"), this);
|
jtkorhonen@0
|
1177 hgCloneFromRemoteAct->setStatusTip(tr("Clone from remote repository into local repository in selected folder"));
|
jtkorhonen@0
|
1178
|
jtkorhonen@0
|
1179 settingsAct = new QAction(QIcon(":/images/settings.png"), tr("Settings..."), this);
|
jtkorhonen@0
|
1180 settingsAct -> setStatusTip(tr("View and change application settings"));
|
jtkorhonen@0
|
1181 settingsAct -> setIconVisibleInMenu(true);
|
jtkorhonen@0
|
1182
|
jtkorhonen@0
|
1183 exitAct = new QAction(QIcon(":/images/exit.png"), tr("Exit"), this);
|
jtkorhonen@0
|
1184 exitAct->setShortcuts(QKeySequence::Quit);
|
jtkorhonen@0
|
1185 exitAct->setStatusTip(tr("Exit application"));
|
jtkorhonen@0
|
1186 exitAct -> setIconVisibleInMenu(true);
|
jtkorhonen@0
|
1187
|
jtkorhonen@0
|
1188 //Repository actions
|
jtkorhonen@0
|
1189 hgIncomingAct = new QAction(QIcon(":/images/incoming.png"), tr("View incoming changesets"), this);
|
jtkorhonen@0
|
1190 hgIncomingAct -> setStatusTip(tr("View info of changesets incoming to us from remote repository (on pull operation)"));
|
jtkorhonen@0
|
1191
|
jtkorhonen@0
|
1192 hgPullAct = new QAction(QIcon(":/images/pull.png"), tr("Pull from remote"), this);
|
jtkorhonen@0
|
1193 hgPullAct -> setStatusTip(tr("Pull changesets from remote repository to local repository"));
|
jtkorhonen@0
|
1194
|
jtkorhonen@0
|
1195 hgPushAct = new QAction(QIcon(":/images/push.png"), tr("Push to remote"), this);
|
jtkorhonen@0
|
1196 hgPushAct->setStatusTip(tr("Push local changesets to remote repository"));
|
jtkorhonen@0
|
1197
|
jtkorhonen@0
|
1198 //Workfolder actions
|
jtkorhonen@0
|
1199 hgStatAct = new QAction(QIcon(":/images/status.png"), tr("Refresh status"), this);
|
jtkorhonen@20
|
1200 hgStatAct->setStatusTip(tr("Refresh (info of) status of workfolder files"));
|
jtkorhonen@0
|
1201
|
jtkorhonen@0
|
1202 hgFileDiffAct = new QAction(QIcon(":/images/diff.png"), tr("View filediff"), this);
|
jtkorhonen@0
|
1203 hgFileDiffAct->setStatusTip(tr("Filediff: View differences between selected working folder file and local repository file"));
|
jtkorhonen@0
|
1204
|
jtkorhonen@0
|
1205 hgFolderDiffAct = new QAction(QIcon(":/images/folderdiff.png"), tr("View folderdiff"), this);
|
jtkorhonen@0
|
1206 hgFolderDiffAct->setStatusTip(tr("Folderdiff: View all differences between working folder files and local repository files"));
|
jtkorhonen@0
|
1207
|
jtkorhonen@0
|
1208 hgChgSetDiffAct = new QAction(QIcon(":/images/chgsetdiff.png"), tr("View changesetdiff"), this);
|
jtkorhonen@0
|
1209 hgChgSetDiffAct->setStatusTip(tr("Change set diff: View differences between all files of 2 repository changesets"));
|
jtkorhonen@0
|
1210
|
jtkorhonen@0
|
1211 hgRevertAct = new QAction(QIcon(":/images/undo.png"), tr("Undo changes"), this);
|
jtkorhonen@0
|
1212 hgRevertAct->setStatusTip(tr("Undo selected working folder file changes (return to local repository version)"));
|
jtkorhonen@0
|
1213
|
jtkorhonen@0
|
1214 hgAddAct = new QAction(QIcon(":/images/add.png"), tr("Add files"), this);
|
jtkorhonen@17
|
1215 hgAddAct -> setStatusTip(tr("Add working folder file(s) (selected or all yet untracked) to local repository (on next commit)"));
|
jtkorhonen@0
|
1216
|
jtkorhonen@0
|
1217 hgRemoveAct = new QAction(QIcon(":/images/remove.png"), tr("Remove file"), this);
|
jtkorhonen@0
|
1218 hgRemoveAct -> setStatusTip(tr("Remove selected working folder file from local repository (on next commit)"));
|
jtkorhonen@0
|
1219
|
jtkorhonen@0
|
1220 hgUpdateAct = new QAction(QIcon(":/images/update.png"), tr("Update working folder"), this);
|
jtkorhonen@0
|
1221 hgUpdateAct->setStatusTip(tr("Update working folder from local repository"));
|
jtkorhonen@0
|
1222
|
jtkorhonen@11
|
1223 hgCommitAct = new QAction(QIcon(":/images/commit.png"), tr("Commit / Save change(s)"), this);
|
jtkorhonen@20
|
1224 hgCommitAct->setStatusTip(tr("Save selected file(s) or all changed files in working folder (and all subfolders) to local repository"));
|
jtkorhonen@0
|
1225
|
jtkorhonen@0
|
1226 hgMergeAct = new QAction(QIcon(":/images/merge.png"), tr("Merge"), this);
|
jtkorhonen@0
|
1227 hgMergeAct->setStatusTip(tr("Merge two local repository changesets to working folder"));
|
jtkorhonen@0
|
1228
|
jtkorhonen@0
|
1229 //Advanced actions
|
jtkorhonen@0
|
1230 hgUpdateToRevAct = new QAction(tr("Update to revision"), this);
|
jtkorhonen@0
|
1231 hgUpdateToRevAct -> setStatusTip(tr("Update working folder to version selected from history list"));
|
jtkorhonen@0
|
1232
|
jtkorhonen@0
|
1233 hgAnnotateAct = new QAction(tr("Annotate"), this);
|
jtkorhonen@0
|
1234 hgAnnotateAct -> setStatusTip(tr("Show line-by-line version information for selected file"));
|
jtkorhonen@0
|
1235
|
jtkorhonen@0
|
1236 hgResolveListAct = new QAction(tr("Resolve (list)"), this);
|
jtkorhonen@0
|
1237 hgResolveListAct -> setStatusTip(tr("Resolve (list): Show list of files needing merge"));
|
jtkorhonen@0
|
1238
|
jtkorhonen@0
|
1239 hgResolveMarkAct = new QAction(tr("Resolve (mark)"), this);
|
jtkorhonen@0
|
1240 hgResolveMarkAct -> setStatusTip(tr("Resolve (mark): Mark selected file status as resolved"));
|
jtkorhonen@0
|
1241
|
jtkorhonen@11
|
1242 hgServeAct = new QAction(tr("Serve (via http)"), this);
|
jtkorhonen@11
|
1243 hgServeAct -> setStatusTip(tr("Serve local repository via http for workgroup access"));
|
jtkorhonen@11
|
1244
|
jtkorhonen@0
|
1245 //Help actions
|
jtkorhonen@0
|
1246 aboutAct = new QAction(tr("About"), this);
|
jtkorhonen@0
|
1247 aboutAct->setStatusTip(tr("Show the application's About box"));
|
jtkorhonen@0
|
1248
|
jtkorhonen@0
|
1249 aboutQtAct = new QAction(tr("About Qt"), this);
|
jtkorhonen@0
|
1250 aboutQtAct->setStatusTip(tr("Show the Qt library's About box"));
|
jtkorhonen@0
|
1251 }
|
jtkorhonen@0
|
1252
|
jtkorhonen@0
|
1253 void MainWindow::createMenus()
|
jtkorhonen@0
|
1254 {
|
jtkorhonen@0
|
1255 fileMenu = menuBar()->addMenu(tr("File"));
|
jtkorhonen@0
|
1256 fileMenu -> addAction(hgInitAct);
|
jtkorhonen@0
|
1257 fileMenu -> addAction(hgCloneFromRemoteAct);
|
jtkorhonen@0
|
1258 fileMenu -> addSeparator();
|
jtkorhonen@0
|
1259 fileMenu -> addAction(settingsAct);
|
jtkorhonen@0
|
1260 fileMenu -> addSeparator();
|
jtkorhonen@0
|
1261 fileMenu -> addAction(exitAct);
|
jtkorhonen@0
|
1262
|
jtkorhonen@0
|
1263 advancedMenu = menuBar()->addMenu(tr("Advanced"));
|
jtkorhonen@0
|
1264 advancedMenu -> addAction(hgUpdateToRevAct);
|
jtkorhonen@0
|
1265 advancedMenu -> addSeparator();
|
jtkorhonen@0
|
1266 advancedMenu -> addAction(hgAnnotateAct);
|
jtkorhonen@0
|
1267 advancedMenu -> addSeparator();
|
jtkorhonen@0
|
1268 advancedMenu -> addAction(hgResolveListAct);
|
jtkorhonen@0
|
1269 advancedMenu -> addAction(hgResolveMarkAct);
|
jtkorhonen@11
|
1270 advancedMenu -> addSeparator();
|
jtkorhonen@11
|
1271 advancedMenu -> addAction(hgServeAct);
|
jtkorhonen@0
|
1272
|
jtkorhonen@0
|
1273 helpMenu = menuBar()->addMenu(tr("Help"));
|
jtkorhonen@0
|
1274 helpMenu->addAction(aboutAct);
|
jtkorhonen@0
|
1275 helpMenu->addAction(aboutQtAct);
|
jtkorhonen@0
|
1276 }
|
jtkorhonen@0
|
1277
|
jtkorhonen@0
|
1278 void MainWindow::createToolBars()
|
jtkorhonen@0
|
1279 {
|
jtkorhonen@0
|
1280 fileToolBar = addToolBar(tr("File"));
|
jtkorhonen@0
|
1281 fileToolBar -> setIconSize(QSize(MY_ICON_SIZE, MY_ICON_SIZE));
|
jtkorhonen@0
|
1282 fileToolBar -> addAction(settingsAct);
|
jtkorhonen@0
|
1283 fileToolBar -> addAction(exitAct);
|
jtkorhonen@0
|
1284 fileToolBar -> addSeparator();
|
jtkorhonen@0
|
1285 fileToolBar -> addAction(hgChgSetDiffAct);
|
jtkorhonen@0
|
1286 fileToolBar -> setMovable(false);
|
jtkorhonen@0
|
1287
|
jtkorhonen@0
|
1288 repoToolBar = addToolBar(tr(REPOMENU_TITLE));
|
jtkorhonen@0
|
1289 repoToolBar -> setIconSize(QSize(MY_ICON_SIZE, MY_ICON_SIZE));
|
jtkorhonen@0
|
1290 repoToolBar->addAction(hgIncomingAct);
|
jtkorhonen@0
|
1291 repoToolBar->addAction(hgPullAct);
|
jtkorhonen@0
|
1292 repoToolBar->addAction(hgPushAct);
|
jtkorhonen@0
|
1293 repoToolBar -> setMovable(false);
|
jtkorhonen@0
|
1294
|
jtkorhonen@0
|
1295 workFolderToolBar = addToolBar(tr(WORKFOLDERMENU_TITLE));
|
jtkorhonen@0
|
1296 addToolBar(Qt::LeftToolBarArea, workFolderToolBar);
|
jtkorhonen@0
|
1297 workFolderToolBar -> setIconSize(QSize(MY_ICON_SIZE, MY_ICON_SIZE));
|
jtkorhonen@0
|
1298 workFolderToolBar->addAction(hgStatAct);
|
jtkorhonen@0
|
1299 workFolderToolBar->addSeparator();
|
jtkorhonen@0
|
1300 workFolderToolBar->addAction(hgFileDiffAct);
|
jtkorhonen@0
|
1301 workFolderToolBar->addAction(hgFolderDiffAct);
|
jtkorhonen@0
|
1302 workFolderToolBar->addSeparator();
|
jtkorhonen@0
|
1303 workFolderToolBar->addAction(hgRevertAct);
|
jtkorhonen@0
|
1304 workFolderToolBar->addAction(hgUpdateAct);
|
jtkorhonen@0
|
1305 workFolderToolBar->addAction(hgCommitAct);
|
jtkorhonen@0
|
1306 workFolderToolBar->addAction(hgMergeAct);
|
jtkorhonen@0
|
1307 workFolderToolBar->addSeparator();
|
jtkorhonen@0
|
1308 workFolderToolBar->addAction(hgAddAct);
|
jtkorhonen@0
|
1309 workFolderToolBar->addAction(hgRemoveAct);
|
jtkorhonen@0
|
1310 workFolderToolBar -> setMovable(false);
|
jtkorhonen@0
|
1311
|
jtkorhonen@0
|
1312 }
|
jtkorhonen@0
|
1313
|
jtkorhonen@0
|
1314
|
jtkorhonen@0
|
1315 void MainWindow::createStatusBar()
|
jtkorhonen@0
|
1316 {
|
jtkorhonen@0
|
1317 statusBar()->showMessage(tr("Ready"));
|
jtkorhonen@0
|
1318 }
|
jtkorhonen@0
|
1319
|
jtkorhonen@0
|
1320 void MainWindow::readSettings()
|
jtkorhonen@0
|
1321 {
|
jtkorhonen@0
|
1322 QDir workFolder;
|
jtkorhonen@0
|
1323
|
jtkorhonen@0
|
1324 QSettings settings("hgexplorer", "hgexplorer");
|
jtkorhonen@0
|
1325
|
jtkorhonen@0
|
1326 remoteRepoPath = settings.value("remoterepopath", "").toString() ;
|
jtkorhonen@0
|
1327 workFolderPath = settings.value("workfolderpath", "").toString();
|
jtkorhonen@0
|
1328 if (!workFolder.exists(workFolderPath))
|
jtkorhonen@0
|
1329 {
|
jtkorhonen@0
|
1330 workFolderPath = "";
|
jtkorhonen@0
|
1331 }
|
jtkorhonen@0
|
1332
|
jtkorhonen@0
|
1333 userInfo = settings.value("userinfo", "").toString();
|
jtkorhonen@0
|
1334
|
jtkorhonen@0
|
1335 QPoint pos = settings.value("pos", QPoint(200, 200)).toPoint();
|
jtkorhonen@0
|
1336 QSize size = settings.value("size", QSize(400, 400)).toSize();
|
jtkorhonen@0
|
1337 firstStart = settings.value("firststart", QVariant(true)).toBool();
|
jtkorhonen@0
|
1338
|
jtkorhonen@0
|
1339 initialFileTypesBits = (unsigned char) settings.value("viewFileTypes", QVariant(DEFAULT_HG_STAT_BITS)).toInt();
|
jtkorhonen@0
|
1340 resize(size);
|
jtkorhonen@0
|
1341 move(pos);
|
jtkorhonen@0
|
1342 }
|
jtkorhonen@0
|
1343
|
jtkorhonen@17
|
1344
|
jtkorhonen@0
|
1345 void MainWindow::writeSettings()
|
jtkorhonen@0
|
1346 {
|
jtkorhonen@0
|
1347 QSettings settings("hgexplorer", "hgexplorer");
|
jtkorhonen@0
|
1348 settings.setValue("pos", pos());
|
jtkorhonen@0
|
1349 settings.setValue("size", size());
|
jtkorhonen@0
|
1350 settings.setValue("remoterepopath", remoteRepoPath);
|
jtkorhonen@0
|
1351 settings.setValue("workfolderpath", workFolderPath);
|
jtkorhonen@0
|
1352 settings.setValue("userinfo", userInfo);
|
jtkorhonen@0
|
1353 settings.setValue("firststart", firstStart);
|
jtkorhonen@0
|
1354 settings.setValue("viewFileTypes", hgExp -> getFileTypesBits());
|
jtkorhonen@0
|
1355 }
|
jtkorhonen@0
|
1356
|
jtkorhonen@0
|
1357
|
jtkorhonen@0
|
1358
|
jtkorhonen@0
|
1359
|