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