annotate mainwindow.cpp @ 61:bf57a16315bd

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