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