annotate mainwindow.cpp @ 162:910c2c5d1873

* Better handling of empty repositories; some tidying & textual fixes
author Chris Cannam
date Fri, 03 Dec 2010 14:43:32 +0000
parents e411bb42d934
children 5c262ac73948
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@98 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>
Chris@90 31 #include <QInputDialog>
Chris@125 32 #include <QRegExp>
jtkorhonen@0 33
Chris@53 34 #include "mainwindow.h"
Chris@69 35 #include "multichoicedialog.h"
Chris@64 36 #include "startupdialog.h"
Chris@53 37 #include "colourset.h"
Chris@62 38 #include "debug.h"
Chris@74 39 #include "logparser.h"
Chris@103 40 #include "confirmcommentdialog.h"
Chris@125 41 #include "incomingdialog.h"
Chris@53 42
jtkorhonen@0 43
jtkorhonen@0 44 MainWindow::MainWindow()
jtkorhonen@0 45 {
jtkorhonen@0 46 QString wndTitle;
jtkorhonen@0 47
Chris@90 48 fsWatcher = 0;
Chris@133 49 commitsSincePush = 0;
Chris@90 50
jtkorhonen@0 51 createActions();
jtkorhonen@0 52 createMenus();
jtkorhonen@0 53 createToolBars();
jtkorhonen@0 54 createStatusBar();
jtkorhonen@0 55
jtkorhonen@0 56 runner = new HgRunner(this);
Chris@109 57 connect(runner, SIGNAL(commandCompleted(HgAction, QString)),
Chris@109 58 this, SLOT(commandCompleted(HgAction, QString)));
Chris@109 59 connect(runner, SIGNAL(commandFailed(HgAction, QString)),
Chris@109 60 this, SLOT(commandFailed(HgAction, QString)));
jtkorhonen@0 61 statusBar()->addPermanentWidget(runner);
jtkorhonen@0 62
Chris@61 63 setWindowTitle(tr("EasyMercurial"));
jtkorhonen@0 64
jtkorhonen@0 65 remoteRepoPath = "";
jtkorhonen@0 66 workFolderPath = "";
jtkorhonen@0 67
jtkorhonen@0 68 readSettings();
jtkorhonen@0 69
jtkorhonen@33 70 justMerged = false;
Chris@98 71 hgTabs = new HgTabWidget((QWidget *) this, remoteRepoPath, workFolderPath);
Chris@141 72 connectTabsSignals();
Chris@98 73 setCentralWidget(hgTabs);
jtkorhonen@0 74
Chris@98 75 connect(hgTabs, SIGNAL(selectionChanged()),
Chris@95 76 this, SLOT(enableDisableActions()));
Chris@95 77
jtkorhonen@0 78 setUnifiedTitleAndToolBarOnMac(true);
jtkorhonen@0 79 connectActions();
Chris@120 80 clearState();
jtkorhonen@0 81 enableDisableActions();
jtkorhonen@0 82
Chris@64 83 if (firstStart) {
Chris@64 84 startupDialog();
jtkorhonen@0 85 }
jtkorhonen@0 86
Chris@112 87 findDiffBinaryName();
Chris@112 88
Chris@64 89 ColourSet *cs = ColourSet::instance();
Chris@64 90 cs->clearDefaultNames();
Chris@64 91 cs->addDefaultName("");
Chris@153 92 cs->addDefaultName("default");
Chris@64 93 cs->addDefaultName(getUserInfo());
Chris@62 94
Chris@72 95 if (workFolderPath == "") {
Chris@72 96 open();
Chris@72 97 }
Chris@72 98
Chris@109 99 hgQueryPaths();
jtkorhonen@0 100 }
jtkorhonen@0 101
jtkorhonen@0 102
jtkorhonen@0 103 void MainWindow::closeEvent(QCloseEvent *)
jtkorhonen@0 104 {
jtkorhonen@0 105 writeSettings();
Chris@90 106 delete fsWatcher;
jtkorhonen@0 107 }
jtkorhonen@0 108
jtkorhonen@0 109
Chris@64 110 QString MainWindow::getUserInfo() const
Chris@64 111 {
Chris@64 112 QSettings settings;
Chris@64 113 settings.beginGroup("User Information");
Chris@64 114 QString name = settings.value("name", getUserRealName()).toString();
Chris@64 115 QString email = settings.value("email", "").toString();
Chris@64 116
Chris@64 117 QString identifier;
Chris@64 118
Chris@64 119 if (email != "") {
Chris@64 120 identifier = QString("%1 <%2>").arg(name).arg(email);
Chris@64 121 } else {
Chris@64 122 identifier = name;
Chris@64 123 }
Chris@64 124
Chris@64 125 return identifier;
Chris@64 126 }
Chris@64 127
jtkorhonen@0 128 void MainWindow::about()
jtkorhonen@0 129 {
Chris@97 130 QMessageBox::about(this, tr("About EasyMercurial"),
Chris@97 131 tr("<qt><h2>About EasyMercurial</h2>"
Chris@97 132 "<p>EasyMercurial is a simple user interface for the "
Chris@97 133 "Mercurial version control system.</p>"
Chris@98 134 "<p>EasyMercurial is based on hgExplorer by "
Chris@97 135 "Jari Korhonen, with thanks.<br>EasyMercurial development carried out by "
Chris@97 136 "Chris Cannam for soundsoftware.ac.uk at the Centre for Digital Music, Queen Mary, University of London."
Chris@97 137 "<ul><li>Copyright &copy; 2010 Jari Korhonen</li>"
Chris@97 138 "<li>Copyright &copy; 2010 Chris Cannam</li>"
Chris@97 139 "<li>Copyright &copy; 2010 Queen Mary, University of London</li>"
Chris@97 140 "</ul>"
Chris@97 141 "<p> This program is free software; you can redistribute it and/or "
Chris@97 142 "modify it under the terms of the GNU General Public License as "
Chris@97 143 "published by the Free Software Foundation; either version 2 of the "
Chris@97 144 "License, or (at your option) any later version. See the file "
Chris@97 145 "COPYING included with this distribution for more information."));
jtkorhonen@0 146 }
jtkorhonen@0 147
Chris@94 148 void MainWindow::clearSelections()
Chris@94 149 {
Chris@98 150 hgTabs->clearSelections();
Chris@94 151 }
jtkorhonen@0 152
Chris@120 153 void MainWindow::hgRefresh()
Chris@120 154 {
Chris@120 155 clearState();
Chris@120 156 hgQueryPaths();
Chris@120 157 }
Chris@120 158
jtkorhonen@0 159 void MainWindow::hgStat()
jtkorhonen@0 160 {
Chris@109 161 QStringList params;
Chris@109 162 params << "stat" << "-ardum";
Chris@153 163
Chris@153 164 // annoyingly, hg stat actually modifies the working directory --
Chris@153 165 // it creates files called hg-checklink and hg-checkexec to test
Chris@153 166 // properties of the filesystem
Chris@153 167 if (fsWatcher) fsWatcher->blockSignals(true);
Chris@153 168
Chris@109 169 runner->requestAction(HgAction(ACT_STAT, workFolderPath, params));
jtkorhonen@0 170 }
jtkorhonen@0 171
Chris@109 172 void MainWindow::hgQueryPaths()
Chris@74 173 {
Chris@109 174 QStringList params;
Chris@109 175 params << "paths";
Chris@109 176 runner->requestAction(HgAction(ACT_QUERY_PATHS, workFolderPath, params));
Chris@74 177 }
Chris@74 178
Chris@109 179 void MainWindow::hgQueryBranch()
Chris@106 180 {
Chris@109 181 QStringList params;
Chris@109 182 params << "branch";
Chris@109 183 runner->requestAction(HgAction(ACT_QUERY_BRANCH, workFolderPath, params));
Chris@106 184 }
Chris@106 185
Chris@109 186 void MainWindow::hgQueryHeads()
jtkorhonen@0 187 {
Chris@109 188 QStringList params;
Chris@137 189 // On empty repos, "hg heads" will fail -- we don't care about
Chris@137 190 // that. Use --closed option so as to include closed branches;
Chris@137 191 // otherwise we'll be stuck if the user updates into one, and our
Chris@137 192 // incremental log will end up with spurious stuff in it because
Chris@137 193 // we won't be pruning at the ends of closed branches
Chris@137 194 params << "heads" << "--closed";
Chris@109 195 runner->requestAction(HgAction(ACT_QUERY_HEADS, workFolderPath, params));
jtkorhonen@0 196 }
jtkorhonen@0 197
jtkorhonen@0 198 void MainWindow::hgLog()
jtkorhonen@0 199 {
Chris@109 200 QStringList params;
Chris@109 201 params << "log";
Chris@109 202 params << "--template";
Chris@125 203 params << Changeset::getLogTemplate();
Chris@109 204
Chris@109 205 runner->requestAction(HgAction(ACT_LOG, workFolderPath, params));
Chris@109 206 }
Chris@109 207
Chris@150 208 void MainWindow::hgLogIncremental(QStringList prune)
Chris@120 209 {
Chris@120 210 QStringList params;
Chris@120 211 params << "log";
Chris@120 212
Chris@150 213 foreach (QString p, prune) {
Chris@153 214 params << "--prune" << Changeset::hashOf(p);
Chris@120 215 }
Chris@120 216
Chris@120 217 params << "--template";
Chris@125 218 params << Changeset::getLogTemplate();
Chris@120 219
Chris@120 220 runner->requestAction(HgAction(ACT_LOG_INCREMENTAL, workFolderPath, params));
Chris@120 221 }
Chris@109 222
Chris@109 223 void MainWindow::hgQueryParents()
Chris@109 224 {
Chris@109 225 QStringList params;
Chris@109 226 params << "parents";
Chris@109 227 runner->requestAction(HgAction(ACT_QUERY_PARENTS, workFolderPath, params));
Chris@109 228 }
Chris@109 229
Chris@109 230 void MainWindow::hgAnnotate()
Chris@109 231 {
Chris@109 232 QStringList params;
Chris@109 233 QString currentFile;//!!! = hgTabs -> getCurrentFileListLine();
Chris@109 234
Chris@109 235 if (!currentFile.isEmpty())
jtkorhonen@0 236 {
Chris@109 237 params << "annotate" << "--" << currentFile.mid(2); //Jump over status marker characters (e.g "M ")
jtkorhonen@0 238
Chris@109 239 runner->requestAction(HgAction(ACT_ANNOTATE, workFolderPath, params));
jtkorhonen@0 240 }
jtkorhonen@0 241 }
jtkorhonen@0 242
Chris@109 243 void MainWindow::hgResolveMark()
Chris@109 244 {
Chris@109 245 QStringList params;
Chris@109 246 QString currentFile;//!!! = hgTabs -> getCurrentFileListLine();
jtkorhonen@0 247
Chris@109 248 if (!currentFile.isEmpty())
jtkorhonen@0 249 {
Chris@109 250 params << "resolve" << "--mark" << "--" << currentFile.mid(2); //Jump over status marker characters (e.g "M ")
jtkorhonen@0 251
Chris@109 252 runner->requestAction(HgAction(ACT_RESOLVE_MARK, workFolderPath, params));
jtkorhonen@0 253 }
jtkorhonen@0 254 }
jtkorhonen@0 255
Chris@109 256 void MainWindow::hgResolveList()
Chris@109 257 {
Chris@109 258 QStringList params;
jtkorhonen@0 259
Chris@109 260 params << "resolve" << "--list";
Chris@109 261 runner->requestAction(HgAction(ACT_RESOLVE_LIST, workFolderPath, params));
Chris@109 262 }
Chris@109 263
Chris@109 264 void MainWindow::hgAdd()
jtkorhonen@0 265 {
Chris@109 266 QStringList params;
jtkorhonen@0 267
Chris@109 268 // hgExplorer permitted adding "all" files -- I'm not sure
Chris@109 269 // that one is a good idea, let's require the user to select
jtkorhonen@0 270
Chris@109 271 QStringList files = hgTabs->getSelectedAddableFiles();
Chris@109 272
Chris@109 273 if (!files.empty()) {
Chris@109 274 params << "add" << "--" << files;
Chris@109 275 runner->requestAction(HgAction(ACT_ADD, workFolderPath, params));
jtkorhonen@0 276 }
jtkorhonen@0 277 }
jtkorhonen@0 278
jtkorhonen@0 279
Chris@98 280 void MainWindow::hgRemove()
Chris@98 281 {
Chris@109 282 QStringList params;
Chris@98 283
Chris@109 284 QStringList files = hgTabs->getSelectedRemovableFiles();
Chris@98 285
Chris@109 286 //!!! todo: confirmation dialog (with file list in it) (or do we
Chris@109 287 // need that? all it does is move the files to the removed
Chris@109 288 // list... doesn't it?)
Chris@98 289
Chris@109 290 if (!files.empty()) {
Chris@109 291 params << "remove" << "--after" << "--force" << "--" << files;
Chris@109 292 runner->requestAction(HgAction(ACT_REMOVE, workFolderPath, params));
Chris@109 293 }
jtkorhonen@0 294 }
jtkorhonen@0 295
jtkorhonen@0 296 void MainWindow::hgCommit()
jtkorhonen@0 297 {
Chris@109 298 QStringList params;
Chris@109 299 QString comment;
Chris@94 300
Chris@157 301 if (justMerged) {
Chris@157 302 comment = mergeCommitComment;
Chris@157 303 }
Chris@157 304
Chris@109 305 QStringList files = hgTabs->getSelectedCommittableFiles();
Chris@127 306 QStringList reportFiles = files;
Chris@127 307 if (reportFiles.empty()) reportFiles = hgTabs->getAllCommittableFiles();
Chris@103 308
Chris@155 309 QString cf(tr("Commit files"));
Chris@155 310
Chris@109 311 if (ConfirmCommentDialog::confirmAndGetLongComment
Chris@109 312 (this,
Chris@155 313 cf,
Chris@155 314 tr("<h3>%1</h3><p>%2").arg(cf)
Chris@155 315 .arg(tr("You are about to commit the following files:")),
Chris@155 316 tr("<h3>%1</h3><p>%2").arg(cf)
Chris@155 317 .arg(tr("You are about to commit %n file(s):", "", reportFiles.size())),
Chris@127 318 reportFiles,
Chris@109 319 comment)) {
Chris@103 320
Chris@157 321 if (!justMerged && !files.empty()) {
Chris@157 322 // User wants to commit selected file(s) (and this is not
Chris@157 323 // merge commit, which would fail if we selected files)
Chris@157 324 params << "commit" << "--message" << comment
Chris@157 325 << "--user" << getUserInfo() << "--" << files;
Chris@109 326 } else {
Chris@109 327 // Commit all changes
Chris@157 328 params << "commit" << "--message" << comment
Chris@157 329 << "--user" << getUserInfo();
jtkorhonen@0 330 }
Chris@109 331
Chris@109 332 runner->requestAction(HgAction(ACT_COMMIT, workFolderPath, params));
jtkorhonen@0 333 }
Chris@157 334
Chris@157 335 justMerged = false;
jtkorhonen@0 336 }
jtkorhonen@0 337
jtkorhonen@34 338 QString MainWindow::filterTag(QString tag)
jtkorhonen@34 339 {
jtkorhonen@34 340 for(int i = 0; i < tag.size(); i++)
jtkorhonen@34 341 {
jtkorhonen@34 342 if (tag[i].isLower() || tag[i].isUpper() || tag[i].isDigit() || (tag[i] == QChar('.')))
jtkorhonen@34 343 {
jtkorhonen@34 344 //ok
jtkorhonen@34 345 }
jtkorhonen@34 346 else
jtkorhonen@34 347 {
jtkorhonen@34 348 tag[i] = QChar('_');
jtkorhonen@34 349 }
jtkorhonen@34 350 }
jtkorhonen@34 351 return tag;
jtkorhonen@34 352 }
jtkorhonen@34 353
jtkorhonen@34 354
jtkorhonen@34 355 void MainWindow::hgTag()
jtkorhonen@34 356 {
Chris@109 357 QStringList params;
Chris@109 358 QString tag;
jtkorhonen@34 359
Chris@109 360 if (ConfirmCommentDialog::confirmAndGetShortComment
Chris@109 361 (this,
Chris@109 362 tr("Tag"),
Chris@109 363 tr("Enter tag:"),
Chris@109 364 tag)) {
Chris@109 365 if (!tag.isEmpty()) //!!! do something better if it is empty
Chris@109 366 {
Chris@109 367 params << "tag" << "--user" << getUserInfo() << filterTag(tag);
Chris@109 368
Chris@109 369 runner->requestAction(HgAction(ACT_TAG, workFolderPath, params));
jtkorhonen@34 370 }
jtkorhonen@34 371 }
jtkorhonen@34 372 }
jtkorhonen@34 373
jtkorhonen@34 374
jtkorhonen@34 375 void MainWindow::hgIgnore()
jtkorhonen@34 376 {
Chris@109 377 QString hgIgnorePath;
Chris@109 378 QStringList params;
Chris@109 379 QString editorName;
Chris@109 380
Chris@109 381 hgIgnorePath = workFolderPath;
Chris@109 382 hgIgnorePath += ".hgignore";
Chris@109 383
Chris@109 384 params << hgIgnorePath;
Chris@112 385
Chris@112 386 //!!!
Chris@112 387 #ifdef Q_OS_LINUX
Chris@112 388
Chris@109 389 editorName = "gedit";
Chris@112 390
Chris@112 391 #else
Chris@112 392
Chris@109 393 editorName = """C:\\Program Files\\Windows NT\\Accessories\\wordpad.exe""";
Chris@112 394
Chris@112 395 #endif
jtkorhonen@34 396
Chris@109 397 HgAction action(ACT_HG_IGNORE, workFolderPath, params);
Chris@109 398 action.executable = editorName;
jtkorhonen@34 399
Chris@109 400 runner->requestAction(action);
jtkorhonen@34 401 }
jtkorhonen@34 402
Chris@112 403 void MainWindow::findDiffBinaryName()
Chris@112 404 {
Chris@112 405 QSettings settings;
Chris@112 406 QString diff = settings.value("extdiffbinary", "").toString();
Chris@112 407 if (diff == "") {
Chris@112 408 QStringList bases;
Chris@112 409 bases << "opendiff" << "kompare" << "kdiff3" << "meld";
Chris@112 410 bool found = false;
Chris@112 411 foreach (QString base, bases) {
Chris@112 412 diff = findExecutable(base);
Chris@112 413 if (diff != base) {
Chris@112 414 found = true;
Chris@112 415 break;
Chris@112 416 }
Chris@112 417 }
Chris@112 418 if (found) {
Chris@112 419 settings.setValue("extdiffbinary", diff);
Chris@112 420 } else {
Chris@112 421 diff = "";
Chris@112 422 }
Chris@112 423 }
Chris@112 424 diffBinaryName = diff;
Chris@112 425 }
jtkorhonen@34 426
jtkorhonen@0 427 void MainWindow::hgFolderDiff()
jtkorhonen@0 428 {
Chris@112 429 if (diffBinaryName == "") return;
Chris@112 430
Chris@109 431 QStringList params;
jtkorhonen@0 432
Chris@112 433 // Diff parent against working folder (folder diff)
Chris@112 434
Chris@148 435 params << "--config" << "extensions.extdiff=" << "extdiff";
Chris@148 436 params << "--program" << diffBinaryName;
Chris@109 437
Chris@153 438 params << hgTabs->getSelectedCommittableFiles(); // may be none: whole dir
Chris@153 439
Chris@109 440 runner->requestAction(HgAction(ACT_FOLDERDIFF, workFolderPath, params));
jtkorhonen@0 441 }
jtkorhonen@0 442
jtkorhonen@0 443
Chris@148 444 void MainWindow::hgDiffToCurrent(QString id)
jtkorhonen@0 445 {
Chris@148 446 QStringList params;
jtkorhonen@0 447
Chris@148 448 // Diff given revision against working folder
jtkorhonen@0 449
Chris@148 450 params << "--config" << "extensions.extdiff=" << "extdiff";
Chris@148 451 params << "--program" << diffBinaryName;
Chris@153 452 params << "--rev" << Changeset::hashOf(id);
Chris@148 453
Chris@148 454 runner->requestAction(HgAction(ACT_FOLDERDIFF, workFolderPath, params));
jtkorhonen@0 455 }
jtkorhonen@0 456
jtkorhonen@0 457
Chris@148 458 void MainWindow::hgDiffToParent(QString child, QString parent)
Chris@148 459 {
Chris@148 460 QStringList params;
Chris@148 461
Chris@148 462 // Diff given revision against working folder
Chris@148 463
Chris@148 464 params << "--config" << "extensions.extdiff=" << "extdiff";
Chris@148 465 params << "--program" << diffBinaryName;
Chris@153 466 params << "--rev" << Changeset::hashOf(parent)
Chris@153 467 << "--rev" << Changeset::hashOf(child);
Chris@148 468
Chris@148 469 runner->requestAction(HgAction(ACT_CHGSETDIFF, workFolderPath, params));
Chris@148 470 }
Chris@148 471
jtkorhonen@0 472
jtkorhonen@0 473 void MainWindow::hgUpdate()
jtkorhonen@0 474 {
Chris@109 475 QStringList params;
jtkorhonen@0 476
Chris@109 477 params << "update";
Chris@109 478
Chris@109 479 runner->requestAction(HgAction(ACT_UPDATE, workFolderPath, params));
jtkorhonen@0 480 }
jtkorhonen@0 481
jtkorhonen@0 482
Chris@148 483 void MainWindow::hgUpdateToRev(QString id)
jtkorhonen@0 484 {
Chris@148 485 QStringList params;
jtkorhonen@0 486
Chris@153 487 params << "update" << "--rev" << Changeset::hashOf(id) << "--check";
jtkorhonen@0 488
Chris@148 489 runner->requestAction(HgAction(ACT_UPDATE, workFolderPath, params));
jtkorhonen@0 490 }
jtkorhonen@0 491
jtkorhonen@0 492
jtkorhonen@0 493 void MainWindow::hgRevert()
jtkorhonen@0 494 {
Chris@109 495 QStringList params;
Chris@109 496 QString comment;
Chris@98 497
Chris@109 498 QStringList files = hgTabs->getSelectedRevertableFiles();
Chris@109 499 if (files.empty()) files = hgTabs->getAllRevertableFiles();
Chris@155 500
Chris@155 501 QString rf(tr("Revert files"));
Chris@109 502
Chris@109 503 if (ConfirmCommentDialog::confirmDangerousFilesAction
Chris@109 504 (this,
Chris@155 505 rf,
Chris@155 506 tr("<h3>%1</h3><p>%2").arg(rf)
Chris@155 507 .arg(tr("You are about to <b>revert</b> the following files to their previous committed state.<br><br>This will <b>throw away any changes</b> that you have made to these files but have not committed:")),
Chris@155 508 tr("<h3>%1</h3><p>%2").arg(rf)
Chris@155 509 .arg(tr("You are about to <b>revert</b> %n file(s).<br><br>This will <b>throw away any changes</b> that you have made to these files but have not committed.", "", files.size())),
Chris@109 510 files)) {
Chris@109 511
Chris@98 512 if (files.empty()) {
Chris@98 513 params << "revert" << "--no-backup";
Chris@98 514 } else {
Chris@98 515 params << "revert" << "--no-backup" << "--" << files;
Chris@98 516 }
Chris@109 517
Chris@109 518 runner->requestAction(HgAction(ACT_REVERT, workFolderPath, params));
jtkorhonen@0 519 }
jtkorhonen@0 520 }
jtkorhonen@0 521
jtkorhonen@33 522 void MainWindow::hgRetryMerge()
jtkorhonen@33 523 {
Chris@109 524 QStringList params;
jtkorhonen@33 525
Chris@109 526 params << "resolve" << "--all";
Chris@109 527 runner->requestAction(HgAction(ACT_RETRY_MERGE, workFolderPath, params));
jtkorhonen@33 528 }
jtkorhonen@33 529
jtkorhonen@33 530
jtkorhonen@0 531 void MainWindow::hgMerge()
jtkorhonen@0 532 {
Chris@109 533 QStringList params;
jtkorhonen@0 534
Chris@109 535 params << "merge";
Chris@109 536
Chris@109 537 runner->requestAction(HgAction(ACT_MERGE, workFolderPath, params));
Chris@157 538
Chris@157 539 mergeCommitComment = tr("Merge");
jtkorhonen@0 540 }
jtkorhonen@0 541
jtkorhonen@0 542
Chris@148 543 void MainWindow::hgMergeFrom(QString id)
Chris@148 544 {
Chris@148 545 QStringList params;
Chris@148 546
Chris@148 547 params << "merge";
Chris@153 548 params << "--rev" << Changeset::hashOf(id);
Chris@148 549
Chris@148 550 runner->requestAction(HgAction(ACT_MERGE, workFolderPath, params));
Chris@157 551
Chris@157 552 mergeCommitComment = "";
Chris@157 553
Chris@157 554 foreach (Changeset *cs, currentHeads) {
Chris@157 555 if (cs->id() == id && !cs->isOnBranch(currentBranch)) {
Chris@157 556 if (cs->branch() == "" || cs->branch() == "default") {
Chris@157 557 mergeCommitComment = tr("Merge from the default branch");
Chris@157 558 } else {
Chris@157 559 mergeCommitComment = tr("Merge from branch \"%1\"").arg(cs->branch());
Chris@157 560 }
Chris@157 561 }
Chris@157 562 }
Chris@157 563
Chris@157 564 if (mergeCommitComment == "") {
Chris@157 565 mergeCommitComment = tr("Merge from %1").arg(id);
Chris@157 566 }
Chris@148 567 }
Chris@148 568
Chris@148 569
jtkorhonen@0 570 void MainWindow::hgCloneFromRemote()
jtkorhonen@0 571 {
Chris@109 572 QStringList params;
jtkorhonen@0 573
Chris@109 574 if (!QDir(workFolderPath).exists()) {
Chris@109 575 if (!QDir().mkpath(workFolderPath)) {
Chris@109 576 DEBUG << "hgCloneFromRemote: Failed to create target path "
Chris@109 577 << workFolderPath << endl;
Chris@109 578 //!!! report error
Chris@109 579 return;
Chris@104 580 }
Chris@109 581 }
Chris@104 582
Chris@109 583 params << "clone" << remoteRepoPath << workFolderPath;
Chris@109 584
Chris@109 585 hgTabs->setWorkFolderAndRepoNames(workFolderPath, remoteRepoPath);
Chris@113 586 hgTabs->updateWorkFolderFileList("");
jtkorhonen@0 587
Chris@109 588 runner->requestAction(HgAction(ACT_CLONEFROMREMOTE, workFolderPath, params));
jtkorhonen@0 589 }
jtkorhonen@0 590
jtkorhonen@0 591 void MainWindow::hgInit()
jtkorhonen@0 592 {
Chris@109 593 QStringList params;
jtkorhonen@0 594
Chris@109 595 params << "init";
Chris@109 596 params << workFolderPath;
jtkorhonen@0 597
Chris@109 598 runner->requestAction(HgAction(ACT_INIT, workFolderPath, params));
jtkorhonen@0 599 }
jtkorhonen@0 600
jtkorhonen@0 601 void MainWindow::hgIncoming()
jtkorhonen@0 602 {
Chris@109 603 QStringList params;
jtkorhonen@0 604
Chris@109 605 params << "incoming" << "--newest-first" << remoteRepoPath;
Chris@125 606 params << "--template" << Changeset::getLogTemplate();
jtkorhonen@0 607
Chris@109 608 runner->requestAction(HgAction(ACT_INCOMING, workFolderPath, params));
jtkorhonen@0 609 }
jtkorhonen@0 610
jtkorhonen@0 611 void MainWindow::hgPull()
jtkorhonen@0 612 {
Chris@126 613 if (QMessageBox::question
Chris@126 614 (this, tr("Confirm pull"),
Chris@126 615 format3(tr("Confirm pull from remote repository"),
Chris@126 616 tr("You are about to pull from the following remote repository:"),
Chris@126 617 remoteRepoPath),
Chris@126 618 QMessageBox::Ok | QMessageBox::Cancel) == QMessageBox::Ok) {
jtkorhonen@0 619
Chris@126 620 QStringList params;
Chris@126 621 params << "pull" << remoteRepoPath;
Chris@126 622 runner->requestAction(HgAction(ACT_PULL, workFolderPath, params));
Chris@126 623 }
jtkorhonen@0 624 }
jtkorhonen@0 625
jtkorhonen@0 626 void MainWindow::hgPush()
jtkorhonen@0 627 {
Chris@126 628 if (QMessageBox::question
Chris@126 629 (this, tr("Confirm push"),
Chris@126 630 format3(tr("Confirm push to remote repository"),
Chris@126 631 tr("You are about to push to the following remote repository:"),
Chris@126 632 remoteRepoPath),
Chris@126 633 QMessageBox::Ok | QMessageBox::Cancel) == QMessageBox::Ok) {
jtkorhonen@0 634
Chris@126 635 QStringList params;
Chris@154 636 params << "push" << "--new-branch" << remoteRepoPath;
Chris@126 637 runner->requestAction(HgAction(ACT_PUSH, workFolderPath, params));
Chris@126 638 }
jtkorhonen@0 639 }
jtkorhonen@0 640
jtkorhonen@28 641 QString MainWindow::listAllUpIpV4Addresses()
jtkorhonen@26 642 {
jtkorhonen@28 643 QString ret;
jtkorhonen@26 644 QList<QNetworkInterface> ifaces = QNetworkInterface::allInterfaces();
jtkorhonen@26 645
jtkorhonen@26 646 for (int i = 0; i < ifaces.count(); i++)
jtkorhonen@26 647 {
jtkorhonen@26 648 QNetworkInterface iface = ifaces.at(i);
jtkorhonen@26 649
jtkorhonen@26 650 if (iface.flags().testFlag(QNetworkInterface::IsUp) && !iface.flags().testFlag(QNetworkInterface::IsLoopBack))
jtkorhonen@26 651 {
jtkorhonen@26 652 for (int j=0; j<iface.addressEntries().count(); j++)
jtkorhonen@26 653 {
jtkorhonen@28 654 QHostAddress tmp = iface.addressEntries().at(j).ip();
jtkorhonen@28 655 if (QAbstractSocket::IPv4Protocol == tmp.protocol())
jtkorhonen@24 656 {
jtkorhonen@28 657 if (!ret.isEmpty())
jtkorhonen@28 658 {
jtkorhonen@28 659 ret += " ";
jtkorhonen@28 660 }
jtkorhonen@28 661 ret += tmp.toString();
jtkorhonen@24 662 }
jtkorhonen@24 663 }
jtkorhonen@22 664 }
jtkorhonen@17 665 }
jtkorhonen@28 666 return ret;
jtkorhonen@28 667 }
jtkorhonen@17 668
Chris@120 669 void MainWindow::clearState()
Chris@120 670 {
Chris@120 671 foreach (Changeset *cs, currentParents) delete cs;
Chris@120 672 currentParents.clear();
Chris@120 673 foreach (Changeset *cs, currentHeads) delete cs;
Chris@120 674 currentHeads.clear();
Chris@120 675 currentBranch = "";
Chris@120 676 needNewLog = true;
Chris@120 677 }
jtkorhonen@17 678
jtkorhonen@11 679 void MainWindow::hgServe()
jtkorhonen@11 680 {
Chris@109 681 QStringList params;
Chris@109 682 QString msg;
jtkorhonen@11 683
Chris@109 684 QString addrs = listAllUpIpV4Addresses();
Chris@109 685 QTextStream(&msg) << "Server running on address(es) (" << addrs << "), port 8000";
Chris@109 686 params << "serve";
jtkorhonen@11 687
Chris@109 688 runner->requestAction(HgAction(ACT_SERVE, workFolderPath, params));
Chris@109 689
Chris@109 690 QMessageBox::information(this, "Serve", msg, QMessageBox::Close);
Chris@109 691 //!!! runner -> killCurrentCommand();
jtkorhonen@11 692 }
jtkorhonen@11 693
Chris@64 694 void MainWindow::startupDialog()
Chris@64 695 {
Chris@64 696 StartupDialog *dlg = new StartupDialog(this);
Chris@65 697 if (dlg->exec()) firstStart = false;
Chris@64 698 }
jtkorhonen@11 699
Chris@69 700 void MainWindow::open()
Chris@69 701 {
Chris@86 702 bool done = false;
Chris@69 703
Chris@86 704 while (!done) {
Chris@69 705
Chris@86 706 MultiChoiceDialog *d = new MultiChoiceDialog
Chris@86 707 (tr("Open Repository"),
Chris@86 708 tr("<qt><big>What would you like to open?</big></qt>"),
Chris@86 709 this);
Chris@69 710
Chris@86 711 d->addChoice("remote",
Chris@86 712 tr("<qt><center><img src=\":images/browser-64.png\"><br>Remote repository</center></qt>"),
Chris@86 713 tr("Open a remote Mercurial repository, by cloning from its URL into a local folder."),
Chris@86 714 MultiChoiceDialog::UrlToDirectoryArg);
Chris@69 715
Chris@86 716 d->addChoice("local",
Chris@86 717 tr("<qt><center><img src=\":images/hglogo-64.png\"><br>Local repository</center></qt>"),
Chris@86 718 tr("Open an existing local Mercurial repository."),
Chris@86 719 MultiChoiceDialog::DirectoryArg);
Chris@69 720
Chris@86 721 d->addChoice("init",
Chris@86 722 tr("<qt><center><img src=\":images/hdd_unmount-64.png\"><br>File folder</center></qt>"),
Chris@86 723 tr("Open a local folder, by creating a Mercurial repository in it."),
Chris@86 724 MultiChoiceDialog::DirectoryArg);
Chris@79 725
Chris@86 726 d->setCurrentChoice("local");
Chris@86 727
Chris@86 728 if (d->exec() == QDialog::Accepted) {
Chris@86 729
Chris@86 730 QString choice = d->getCurrentChoice();
Chris@86 731 QString arg = d->getArgument().trimmed();
Chris@86 732
Chris@86 733 bool result = false;
Chris@86 734
Chris@86 735 if (choice == "local") {
Chris@86 736 result = openLocal(arg);
Chris@86 737 } else if (choice == "remote") {
Chris@86 738 result = openRemote(arg, d->getAdditionalArgument().trimmed());
Chris@86 739 } else if (choice == "init") {
Chris@86 740 result = openInit(arg);
Chris@86 741 }
Chris@86 742
Chris@86 743 if (result) {
Chris@86 744 enableDisableActions();
Chris@120 745 clearState();
Chris@109 746 hgQueryPaths();
Chris@91 747 done = true;
Chris@91 748 }
Chris@86 749
Chris@86 750 } else {
Chris@86 751
Chris@86 752 // cancelled
Chris@86 753 done = true;
Chris@69 754 }
Chris@79 755
Chris@86 756 delete d;
Chris@69 757 }
Chris@69 758 }
Chris@69 759
Chris@145 760 void MainWindow::open(QString local)
Chris@145 761 {
Chris@145 762 if (openLocal(local)) {
Chris@145 763 enableDisableActions();
Chris@145 764 clearState();
Chris@145 765 hgQueryPaths();
Chris@145 766 }
Chris@145 767 }
Chris@145 768
Chris@79 769 bool MainWindow::complainAboutFilePath(QString arg)
Chris@79 770 {
Chris@79 771 QMessageBox::critical
Chris@79 772 (this, tr("File chosen"),
Chris@84 773 tr("<qt><b>Folder required</b><br><br>You asked to open \"%1\".<br>This is a file; to open a repository, you need to choose a folder.</qt>").arg(xmlEncode(arg)));
Chris@79 774 return false;
Chris@79 775 }
Chris@79 776
Chris@79 777 bool MainWindow::complainAboutUnknownFolder(QString arg)
Chris@79 778 {
Chris@79 779 QMessageBox::critical
Chris@79 780 (this, tr("Folder does not exist"),
Chris@84 781 tr("<qt><b>Folder does not exist</b><br><br>You asked to open \"%1\".<br>This folder does not exist, and it cannot be created because its parent does not exist either.</qt>").arg(xmlEncode(arg)));
Chris@84 782 return false;
Chris@84 783 }
Chris@84 784
Chris@84 785 bool MainWindow::complainAboutInitInRepo(QString arg)
Chris@84 786 {
Chris@84 787 QMessageBox::critical
Chris@84 788 (this, tr("Path is in existing repository"),
Chris@84 789 tr("<qt><b>Path is in an existing repository</b><br><br>You asked to initialise a repository at \"%1\".<br>This path is already inside an existing repository.</qt>").arg(xmlEncode(arg)));
Chris@84 790 return false;
Chris@84 791 }
Chris@84 792
Chris@84 793 bool MainWindow::complainAboutInitFile(QString arg)
Chris@84 794 {
Chris@84 795 QMessageBox::critical
Chris@84 796 (this, tr("Path is a file"),
Chris@84 797 tr("<qt><b>Path is a file</b><br><br>You asked to initialise a repository at \"%1\".<br>This is an existing file; it is only possible to initialise in folders.</qt>").arg(xmlEncode(arg)));
Chris@84 798 return false;
Chris@84 799 }
Chris@84 800
Chris@84 801 bool MainWindow::complainAboutCloneToExisting(QString arg)
Chris@84 802 {
Chris@84 803 QMessageBox::critical
Chris@84 804 (this, tr("Path is in existing repository"),
Chris@84 805 tr("<qt><b>Local path is in an existing repository</b><br><br>You asked to open a remote repository by cloning it to the local path \"%1\".<br>This path is already inside an existing repository.<br>Please provide a new folder name for the local repository.</qt>").arg(xmlEncode(arg)));
Chris@84 806 return false;
Chris@84 807 }
Chris@84 808
Chris@84 809 bool MainWindow::complainAboutCloneToFile(QString arg)
Chris@84 810 {
Chris@84 811 QMessageBox::critical
Chris@84 812 (this, tr("Path is a file"),
Chris@84 813 tr("<qt><b>Local path is a file</b><br><br>You asked to open a remote repository by cloning it to the local path \"%1\".<br>This path is an existing file.<br>Please provide a new folder name for the local repository.</qt>").arg(xmlEncode(arg)));
Chris@84 814 return false;
Chris@84 815 }
Chris@84 816
Chris@84 817 bool MainWindow::complainAboutCloneToExistingFolder(QString arg)
Chris@84 818 {
Chris@84 819 QMessageBox::critical
Chris@84 820 (this, tr("Folder exists"),
Chris@84 821 tr("<qt><b>Local folder already exists</b><br><br>You asked to open a remote repository by cloning it to the local path \"%1\".<br>This is the path of an existing folder.<br>Please provide a new folder name for the local repository.</qt>").arg(xmlEncode(arg)));
Chris@79 822 return false;
Chris@79 823 }
Chris@79 824
Chris@79 825 bool MainWindow::askToOpenParentRepo(QString arg, QString parent)
Chris@79 826 {
Chris@79 827 return (QMessageBox::question
Chris@84 828 (this, tr("Path is inside a repository"),
Chris@86 829 tr("<qt><b>Open the repository that contains this path?</b><br><br>You asked to open \"%1\".<br>This is not the root folder of a repository.<br>But it is inside a repository, whose root is at \"%2\". <br><br>Would you like to open that repository instead?</qt>")
Chris@79 830 .arg(xmlEncode(arg)).arg(xmlEncode(parent)),
Chris@79 831 QMessageBox::Ok | QMessageBox::Cancel,
Chris@79 832 QMessageBox::Ok)
Chris@79 833 == QMessageBox::Ok);
Chris@79 834 }
Chris@79 835
Chris@79 836 bool MainWindow::askToInitExisting(QString arg)
Chris@79 837 {
Chris@79 838 return (QMessageBox::question
Chris@84 839 (this, tr("Folder has no repository"),
Chris@84 840 tr("<qt><b>Initialise a repository here?</b><br><br>You asked to open \"%1\".<br>This folder does not contain a Mercurial repository.<br><br>Would you like to initialise a repository here?</qt>")
Chris@79 841 .arg(xmlEncode(arg)),
Chris@79 842 QMessageBox::Ok | QMessageBox::Cancel,
Chris@79 843 QMessageBox::Ok)
Chris@79 844 == QMessageBox::Ok);
Chris@79 845 }
Chris@79 846
Chris@79 847 bool MainWindow::askToInitNew(QString arg)
Chris@79 848 {
Chris@79 849 return (QMessageBox::question
Chris@84 850 (this, tr("Folder does not exist"),
Chris@84 851 tr("<qt><b>Initialise a new repository?</b><br><br>You asked to open \"%1\".<br>This folder does not yet exist.<br><br>Would you like to create the folder and initialise a new empty repository in it?</qt>")
Chris@84 852 .arg(xmlEncode(arg)),
Chris@84 853 QMessageBox::Ok | QMessageBox::Cancel,
Chris@84 854 QMessageBox::Ok)
Chris@84 855 == QMessageBox::Ok);
Chris@84 856 }
Chris@84 857
Chris@84 858 bool MainWindow::askToOpenInsteadOfInit(QString arg)
Chris@84 859 {
Chris@84 860 return (QMessageBox::question
Chris@84 861 (this, tr("Repository exists"),
Chris@84 862 tr("<qt><b>Open existing repository?</b><br><br>You asked to initialise a new repository at \"%1\".<br>This folder already contains a repository. Would you like to open it?</qt>")
Chris@79 863 .arg(xmlEncode(arg)),
Chris@79 864 QMessageBox::Ok | QMessageBox::Cancel,
Chris@79 865 QMessageBox::Ok)
Chris@79 866 == QMessageBox::Ok);
Chris@79 867 }
Chris@79 868
Chris@79 869 bool MainWindow::openLocal(QString local)
Chris@79 870 {
Chris@79 871 DEBUG << "open " << local << endl;
Chris@79 872
Chris@79 873 FolderStatus status = getFolderStatus(local);
Chris@79 874 QString containing = getContainingRepoFolder(local);
Chris@79 875
Chris@79 876 switch (status) {
Chris@79 877
Chris@79 878 case FolderHasRepo:
Chris@79 879 // fine
Chris@79 880 break;
Chris@79 881
Chris@79 882 case FolderExists:
Chris@79 883 if (containing != "") {
Chris@79 884 if (!askToOpenParentRepo(local, containing)) return false;
Chris@84 885 local = containing;
Chris@79 886 } else {
Chris@86 887 //!!! No -- this is likely to happen far more by accident
Chris@86 888 // than because the user actually wanted to init something.
Chris@86 889 // Don't ask, just politely reject.
Chris@79 890 if (!askToInitExisting(local)) return false;
Chris@79 891 return openInit(local);
Chris@79 892 }
Chris@79 893 break;
Chris@79 894
Chris@79 895 case FolderParentExists:
Chris@79 896 if (containing != "") {
Chris@79 897 if (!askToOpenParentRepo(local, containing)) return false;
Chris@84 898 local = containing;
Chris@79 899 } else {
Chris@79 900 if (!askToInitNew(local)) return false;
Chris@79 901 return openInit(local);
Chris@79 902 }
Chris@79 903 break;
Chris@79 904
Chris@79 905 case FolderUnknown:
Chris@84 906 if (containing != "") {
Chris@84 907 if (!askToOpenParentRepo(local, containing)) return false;
Chris@84 908 local = containing;
Chris@84 909 } else {
Chris@84 910 return complainAboutUnknownFolder(local);
Chris@84 911 }
Chris@84 912 break;
Chris@79 913
Chris@79 914 case FolderIsFile:
Chris@79 915 return complainAboutFilePath(local);
Chris@79 916 }
Chris@79 917
Chris@79 918 workFolderPath = local;
Chris@79 919 remoteRepoPath = "";
Chris@79 920 return true;
Chris@79 921 }
Chris@79 922
Chris@79 923 bool MainWindow::openRemote(QString remote, QString local)
Chris@79 924 {
Chris@79 925 DEBUG << "clone " << remote << " to " << local << endl;
Chris@84 926
Chris@84 927 FolderStatus status = getFolderStatus(local);
Chris@84 928 QString containing = getContainingRepoFolder(local);
Chris@84 929
Chris@84 930 DEBUG << "status = " << status << ", containing = " << containing << endl;
Chris@84 931
Chris@84 932 if (status == FolderHasRepo || containing != "") {
Chris@84 933 return complainAboutCloneToExisting(local);
Chris@84 934 }
Chris@84 935
Chris@84 936 if (status == FolderIsFile) {
Chris@84 937 return complainAboutCloneToFile(local);
Chris@84 938 }
Chris@84 939
Chris@84 940 if (status == FolderUnknown) {
Chris@84 941 return complainAboutUnknownFolder(local);
Chris@84 942 }
Chris@84 943
Chris@84 944 if (status == FolderExists) {
Chris@84 945 //!!! we can do better than this surely?
Chris@84 946 return complainAboutCloneToExistingFolder(local);
Chris@84 947 }
Chris@84 948
Chris@84 949 workFolderPath = local;
Chris@84 950 remoteRepoPath = remote;
Chris@84 951 hgCloneFromRemote();
Chris@84 952
Chris@79 953 return true;
Chris@79 954 }
Chris@79 955
Chris@84 956 bool MainWindow::openInit(QString local)
Chris@79 957 {
Chris@84 958 DEBUG << "openInit " << local << endl;
Chris@84 959
Chris@84 960 FolderStatus status = getFolderStatus(local);
Chris@84 961 QString containing = getContainingRepoFolder(local);
Chris@84 962
Chris@84 963 DEBUG << "status = " << status << ", containing = " << containing << endl;
Chris@84 964
Chris@84 965 if (status == FolderHasRepo) {
Chris@84 966 if (!askToOpenInsteadOfInit(local)) return false;
Chris@84 967 }
Chris@84 968
Chris@84 969 if (containing != "") {
Chris@84 970 return complainAboutInitInRepo(local);
Chris@84 971 }
Chris@84 972
Chris@84 973 if (status == FolderIsFile) {
Chris@84 974 return complainAboutInitFile(local);
Chris@84 975 }
Chris@84 976
Chris@84 977 if (status == FolderUnknown) {
Chris@84 978 return complainAboutUnknownFolder(local);
Chris@84 979 }
Chris@84 980
Chris@84 981 workFolderPath = local;
Chris@84 982 remoteRepoPath = "";
Chris@84 983 hgInit();
Chris@79 984 return true;
Chris@79 985 }
Chris@79 986
jtkorhonen@0 987 void MainWindow::settings()
jtkorhonen@0 988 {
Chris@69 989 /*!!!
jtkorhonen@0 990 SettingsDialog *settingsDlg = new SettingsDialog(this);
jtkorhonen@0 991 settingsDlg->setModal(true);
jtkorhonen@0 992 settingsDlg->exec();
Chris@98 993 hgTabs -> clearLists();
jtkorhonen@0 994 enableDisableActions();
jtkorhonen@0 995 hgStat();
Chris@69 996 */
jtkorhonen@0 997 }
jtkorhonen@0 998
jtkorhonen@2 999 #define STDOUT_NEEDS_BIG_WINDOW 512
jtkorhonen@2 1000 #define SMALL_WND_W 500
jtkorhonen@2 1001 #define SMALL_WND_H 300
jtkorhonen@2 1002
jtkorhonen@2 1003 #define BIG_WND_W 1024
jtkorhonen@2 1004 #define BIG_WND_H 768
jtkorhonen@2 1005
jtkorhonen@2 1006
jtkorhonen@2 1007 void MainWindow::presentLongStdoutToUser(QString stdo)
jtkorhonen@0 1008 {
jtkorhonen@2 1009 if (!stdo.isEmpty())
jtkorhonen@2 1010 {
jtkorhonen@2 1011 QDialog dlg;
jtkorhonen@0 1012
jtkorhonen@2 1013 if (stdo.length() > STDOUT_NEEDS_BIG_WINDOW)
jtkorhonen@2 1014 {
jtkorhonen@2 1015 dlg.setMinimumWidth(BIG_WND_W);
jtkorhonen@2 1016 dlg.setMinimumHeight(BIG_WND_H);
jtkorhonen@2 1017 }
jtkorhonen@2 1018 else
jtkorhonen@2 1019 {
jtkorhonen@2 1020 dlg.setMinimumWidth(SMALL_WND_W);
jtkorhonen@2 1021 dlg.setMinimumHeight(SMALL_WND_H);
jtkorhonen@2 1022 }
jtkorhonen@0 1023
jtkorhonen@2 1024 QVBoxLayout *box = new QVBoxLayout;
jtkorhonen@2 1025 QListWidget *list = new QListWidget;
jtkorhonen@2 1026 list-> addItems(stdo.split("\n"));
jtkorhonen@2 1027 QPushButton *btn = new QPushButton(tr("Ok"));
jtkorhonen@2 1028 connect(btn, SIGNAL(clicked()), &dlg, SLOT(accept()));
jtkorhonen@0 1029
jtkorhonen@2 1030 box -> addWidget(list);
jtkorhonen@2 1031 box -> addWidget(btn);
jtkorhonen@2 1032 dlg.setLayout(box);
jtkorhonen@2 1033
jtkorhonen@2 1034 dlg.exec();
jtkorhonen@2 1035 }
jtkorhonen@2 1036 else
jtkorhonen@2 1037 {
Chris@98 1038 QMessageBox::information(this, tr("EasyMercurial"), tr("Mercurial command did not return any output."));
jtkorhonen@2 1039 }
jtkorhonen@0 1040 }
jtkorhonen@0 1041
Chris@90 1042 void MainWindow::updateFileSystemWatcher()
Chris@90 1043 {
Chris@90 1044 delete fsWatcher;
Chris@90 1045 fsWatcher = new QFileSystemWatcher();
Chris@90 1046 std::deque<QString> pending;
Chris@90 1047 pending.push_back(workFolderPath);
Chris@90 1048 while (!pending.empty()) {
Chris@90 1049 QString path = pending.front();
Chris@90 1050 pending.pop_front();
Chris@90 1051 fsWatcher->addPath(path);
Chris@90 1052 DEBUG << "Added to file system watcher: " << path << endl;
Chris@90 1053 QDir d(path);
Chris@90 1054 if (d.exists()) {
Chris@115 1055 d.setFilter(QDir::Dirs | QDir::NoDotAndDotDot | QDir::Readable);
Chris@90 1056 foreach (QString entry, d.entryList()) {
Chris@90 1057 if (entry == ".hg") continue;
Chris@90 1058 QString entryPath = d.absoluteFilePath(entry);
Chris@90 1059 pending.push_back(entryPath);
Chris@90 1060 }
Chris@90 1061 }
Chris@90 1062 }
Chris@90 1063 connect(fsWatcher, SIGNAL(directoryChanged(QString)),
Chris@90 1064 this, SLOT(fsDirectoryChanged(QString)));
Chris@90 1065 connect(fsWatcher, SIGNAL(fileChanged(QString)),
Chris@90 1066 this, SLOT(fsFileChanged(QString)));
Chris@90 1067 }
Chris@90 1068
Chris@122 1069 void MainWindow::fsDirectoryChanged(QString d)
Chris@90 1070 {
Chris@122 1071 DEBUG << "MainWindow::fsDirectoryChanged " << d << endl;
Chris@90 1072 hgStat();
Chris@90 1073 }
Chris@90 1074
Chris@122 1075 void MainWindow::fsFileChanged(QString f)
Chris@90 1076 {
Chris@122 1077 DEBUG << "MainWindow::fsFileChanged " << f << endl;
Chris@90 1078 hgStat();
Chris@90 1079 }
Chris@90 1080
Chris@125 1081 QString MainWindow::format3(QString head, QString intro, QString code)
Chris@125 1082 {
Chris@125 1083 if (intro == "") {
Chris@125 1084 return QString("<qt><h3>%1</h3><code>%2</code>")
Chris@125 1085 .arg(head).arg(xmlEncode(code).replace("\n", "<br>"));
Chris@126 1086 } else if (code == "") {
Chris@126 1087 return QString("<qt><h3>%1</h3><p>%2</p>")
Chris@126 1088 .arg(head).arg(intro);
Chris@125 1089 } else {
Chris@125 1090 return QString("<qt><h3>%1</h3><p>%2</p><code>%3</code>")
Chris@125 1091 .arg(head).arg(intro).arg(xmlEncode(code).replace("\n", "<br>"));
Chris@125 1092 }
Chris@125 1093 }
Chris@125 1094
Chris@120 1095 void MainWindow::showIncoming(QString output)
Chris@120 1096 {
Chris@120 1097 runner->hide();
Chris@125 1098 IncomingDialog *d = new IncomingDialog(this, output);
Chris@125 1099 d->exec();
Chris@125 1100 delete d;
Chris@125 1101 }
Chris@125 1102
Chris@125 1103 int MainWindow::extractChangeCount(QString text)
Chris@125 1104 {
Chris@125 1105 QRegExp re("added (\\d+) ch\\w+ with (\\d+) ch\\w+ to (\\d+) f\\w+");
Chris@125 1106 if (re.indexIn(text) >= 0) {
Chris@125 1107 return re.cap(1).toInt();
Chris@125 1108 } else if (text.contains("no changes")) {
Chris@125 1109 return 0;
Chris@125 1110 } else {
Chris@125 1111 return -1; // unknown
Chris@125 1112 }
Chris@120 1113 }
Chris@120 1114
Chris@120 1115 void MainWindow::showPushResult(QString output)
Chris@120 1116 {
Chris@125 1117 QString report;
Chris@125 1118 int n = extractChangeCount(output);
Chris@125 1119 if (n > 0) {
Chris@125 1120 report = tr("Pushed %n changeset(s)", "", n);
Chris@125 1121 } else if (n == 0) {
Chris@125 1122 report = tr("No changes to push");
Chris@125 1123 } else {
Chris@125 1124 report = tr("Push complete");
Chris@125 1125 }
Chris@125 1126 report = format3(report, tr("The push command output was:"), output);
Chris@120 1127 runner->hide();
Chris@125 1128 QMessageBox::information(this, "Push complete", report);
Chris@120 1129 }
Chris@120 1130
Chris@120 1131 void MainWindow::showPullResult(QString output)
Chris@120 1132 {
Chris@125 1133 QString report;
Chris@125 1134 int n = extractChangeCount(output);
Chris@125 1135 if (n > 0) {
Chris@125 1136 report = tr("Pulled %n changeset(s)", "", n);
Chris@125 1137 } else if (n == 0) {
Chris@125 1138 report = tr("No changes to pull");
Chris@125 1139 } else {
Chris@125 1140 report = tr("Pull complete");
Chris@125 1141 }
Chris@125 1142 report = format3(report, tr("The pull command output was:"), output);
Chris@120 1143 runner->hide();
Chris@125 1144
Chris@125 1145 //!!! and something about updating
Chris@125 1146
Chris@125 1147 QMessageBox::information(this, "Pull complete", report);
Chris@120 1148 }
Chris@120 1149
Chris@143 1150 void MainWindow::commandFailed(HgAction action, QString output)
Chris@62 1151 {
Chris@62 1152 DEBUG << "MainWindow::commandFailed" << endl;
Chris@74 1153
Chris@113 1154 // Some commands we just have to ignore bad return values from:
Chris@113 1155
Chris@113 1156 switch(action.action) {
Chris@113 1157 case ACT_NONE:
Chris@113 1158 // uh huh
Chris@113 1159 return;
Chris@113 1160 case ACT_INCOMING:
Chris@113 1161 // returns non-zero code if the check was successful but there
Chris@113 1162 // are no changes pending
Chris@143 1163 if (output.trimmed() == "") showIncoming("");
Chris@113 1164 return;
Chris@162 1165 case ACT_QUERY_HEADS:
Chris@162 1166 // fails if repo is empty; we don't care (if there's a genuine
Chris@162 1167 // problem, something else will fail too). Need to do this,
Chris@162 1168 // otherwise empty repo state will not be reflected properly
Chris@162 1169 // (since heads/log procedure never completes for empty repo)
Chris@162 1170 enableDisableActions();
Chris@162 1171 return;
Chris@113 1172 case ACT_FOLDERDIFF:
Chris@113 1173 case ACT_CHGSETDIFF:
Chris@113 1174 // external program, unlikely to be anything useful in stderr
Chris@113 1175 // and some return with failure codes when something as basic
Chris@113 1176 // as the user closing the window via the wm happens
Chris@113 1177 return;
Chris@113 1178
Chris@113 1179 default:
Chris@114 1180 break;
Chris@113 1181 }
Chris@113 1182
Chris@113 1183 QString command = action.executable;
Chris@113 1184 if (command == "") command = "hg";
Chris@113 1185 foreach (QString arg, action.params) {
Chris@113 1186 command += " " + arg;
Chris@113 1187 }
Chris@113 1188
Chris@113 1189 QString message = tr("<qt><h3>Command failed</h3>"
Chris@113 1190 "<p>The following command failed:</p>"
Chris@113 1191 "<code>%1</code>"
Chris@113 1192 "%2</qt>")
Chris@113 1193 .arg(command)
Chris@143 1194 .arg((output.trimmed() != "") ?
Chris@113 1195 tr("<p>Its output said:</p><code>%1</code>")
Chris@143 1196 .arg(xmlEncode(output.left(800))
Chris@113 1197 .replace("\n", "<br>"))
Chris@113 1198 : "");
Chris@113 1199
Chris@113 1200 QMessageBox::warning(this, tr("Command failed"), message);
Chris@150 1201
Chris@150 1202 /* todo:
Chris@150 1203 if ((runningAction == ACT_MERGE) && (exitCode != 0))
Chris@150 1204 {
Chris@150 1205 // If we had a failed merge, offer to retry
Chris@150 1206 if (QMessageBox::Ok == QMessageBox::information(this, tr("Retry merge ?"), tr("Merge attempt failed. retry ?"), QMessageBox::Ok | QMessageBox::Cancel))
Chris@150 1207 {
Chris@150 1208 runningAction = ACT_NONE;
Chris@150 1209 hgRetryMerge();
Chris@150 1210 }
Chris@150 1211 else
Chris@150 1212 {
Chris@150 1213 runningAction = ACT_NONE;
Chris@150 1214 hgStat();
Chris@150 1215 }
Chris@150 1216 }
Chris@150 1217 else
Chris@150 1218 {
Chris@150 1219 */
Chris@62 1220 }
Chris@62 1221
Chris@109 1222 void MainWindow::commandCompleted(HgAction completedAction, QString output)
jtkorhonen@0 1223 {
Chris@109 1224 HGACTIONS action = completedAction.action;
Chris@109 1225
Chris@109 1226 if (action == ACT_NONE) return;
Chris@109 1227
Chris@150 1228 bool shouldHgStat = false;
Chris@150 1229 bool headsChanged = false;
Chris@150 1230 QStringList oldHeadIds;
Chris@150 1231
Chris@150 1232 switch (action) {
Chris@109 1233
Chris@109 1234 case ACT_QUERY_PATHS:
jtkorhonen@0 1235 {
Chris@109 1236 DEBUG << "stdout is " << output << endl;
Chris@109 1237 LogParser lp(output, "=");
Chris@109 1238 LogList ll = lp.parse();
Chris@109 1239 DEBUG << ll.size() << " results" << endl;
Chris@109 1240 if (!ll.empty()) {
Chris@109 1241 remoteRepoPath = lp.parse()[0]["default"].trimmed();
Chris@109 1242 DEBUG << "Set remote path to " << remoteRepoPath << endl;
Chris@109 1243 }
Chris@109 1244 MultiChoiceDialog::addRecentArgument("local", workFolderPath);
Chris@109 1245 MultiChoiceDialog::addRecentArgument("remote", remoteRepoPath);
Chris@109 1246 hgTabs->setWorkFolderAndRepoNames(workFolderPath, remoteRepoPath);
Chris@109 1247 break;
Chris@109 1248 }
jtkorhonen@0 1249
Chris@109 1250 case ACT_QUERY_BRANCH:
Chris@109 1251 currentBranch = output.trimmed();
Chris@109 1252 break;
jtkorhonen@0 1253
Chris@109 1254 case ACT_STAT:
Chris@153 1255 if (fsWatcher) fsWatcher->blockSignals(false);
Chris@113 1256 hgTabs->updateWorkFolderFileList(output);
Chris@109 1257 updateFileSystemWatcher();
Chris@109 1258 break;
Chris@109 1259
Chris@109 1260 case ACT_INCOMING:
Chris@120 1261 showIncoming(output);
Chris@120 1262 break;
Chris@120 1263
Chris@109 1264 case ACT_ANNOTATE:
Chris@109 1265 case ACT_RESOLVE_LIST:
Chris@109 1266 case ACT_RESOLVE_MARK:
Chris@109 1267 presentLongStdoutToUser(output);
Chris@109 1268 shouldHgStat = true;
Chris@109 1269 break;
Chris@109 1270
Chris@109 1271 case ACT_PULL:
Chris@120 1272 showPullResult(output);
Chris@109 1273 shouldHgStat = true;
Chris@109 1274 break;
Chris@109 1275
Chris@109 1276 case ACT_PUSH:
Chris@120 1277 showPushResult(output);
Chris@109 1278 break;
Chris@109 1279
Chris@109 1280 case ACT_INIT:
Chris@109 1281 MultiChoiceDialog::addRecentArgument("init", workFolderPath);
Chris@109 1282 MultiChoiceDialog::addRecentArgument("local", workFolderPath);
Chris@109 1283 enableDisableActions();
Chris@109 1284 shouldHgStat = true;
Chris@109 1285 break;
Chris@109 1286
Chris@109 1287 case ACT_CLONEFROMREMOTE:
Chris@109 1288 MultiChoiceDialog::addRecentArgument("local", workFolderPath);
Chris@109 1289 MultiChoiceDialog::addRecentArgument("remote", remoteRepoPath);
Chris@109 1290 MultiChoiceDialog::addRecentArgument("remote", workFolderPath, true);
Chris@109 1291 QMessageBox::information(this, "Clone", output);
Chris@109 1292 enableDisableActions();
Chris@109 1293 shouldHgStat = true;
Chris@109 1294 break;
Chris@109 1295
Chris@109 1296 case ACT_LOG:
Chris@120 1297 hgTabs->setNewLog(output);
Chris@120 1298 needNewLog = false;
Chris@120 1299 break;
Chris@120 1300
Chris@120 1301 case ACT_LOG_INCREMENTAL:
Chris@120 1302 hgTabs->addIncrementalLog(output);
Chris@109 1303 break;
Chris@109 1304
Chris@109 1305 case ACT_QUERY_PARENTS:
Chris@152 1306 {
Chris@109 1307 foreach (Changeset *cs, currentParents) delete cs;
Chris@109 1308 currentParents = Changeset::parseChangesets(output);
Chris@152 1309 QStringList parentIds = Changeset::getIds(currentParents);
Chris@153 1310 hgTabs->setCurrent(parentIds, currentBranch);
Chris@152 1311 }
Chris@109 1312 break;
Chris@109 1313
Chris@109 1314 case ACT_QUERY_HEADS:
Chris@150 1315 {
Chris@150 1316 oldHeadIds = Changeset::getIds(currentHeads);
Chris@150 1317 Changesets newHeads = Changeset::parseChangesets(output);
Chris@150 1318 QStringList newHeadIds = Changeset::getIds(newHeads);
Chris@150 1319 if (oldHeadIds != newHeadIds) {
Chris@150 1320 DEBUG << "Heads changed, will prompt an incremental log if appropriate" << endl;
Chris@150 1321 headsChanged = true;
Chris@150 1322 foreach (Changeset *cs, currentHeads) delete cs;
Chris@150 1323 currentHeads = newHeads;
Chris@150 1324 }
Chris@150 1325 }
Chris@109 1326 break;
Chris@130 1327
Chris@130 1328 case ACT_COMMIT:
Chris@130 1329 hgTabs->clearSelections();
Chris@130 1330 shouldHgStat = true;
Chris@130 1331 break;
Chris@109 1332
Chris@109 1333 case ACT_REMOVE:
Chris@109 1334 case ACT_ADD:
Chris@116 1335 case ACT_REVERT:
Chris@116 1336 hgTabs->clearSelections();
Chris@116 1337 shouldHgStat = true;
Chris@116 1338 break;
Chris@116 1339
Chris@109 1340 case ACT_FOLDERDIFF:
Chris@109 1341 case ACT_CHGSETDIFF:
Chris@109 1342 case ACT_SERVE:
Chris@109 1343 case ACT_TAG:
Chris@109 1344 case ACT_HG_IGNORE:
Chris@109 1345 shouldHgStat = true;
Chris@109 1346 break;
Chris@109 1347
Chris@109 1348 case ACT_UPDATE:
Chris@162 1349 QMessageBox::information(this, tr("Update"), tr("<qt><h3>Update successful</h3><p>%1</p>").arg(xmlEncode(output)));
Chris@109 1350 shouldHgStat = true;
Chris@109 1351 break;
Chris@109 1352
Chris@109 1353 case ACT_MERGE:
Chris@162 1354 QMessageBox::information(this, tr("Update"), tr("<qt><h3>Merge successful</h3><p>%1</p>").arg(xmlEncode(output)));
Chris@109 1355 shouldHgStat = true;
Chris@109 1356 justMerged = true;
Chris@109 1357 break;
Chris@109 1358
Chris@109 1359 case ACT_RETRY_MERGE:
Chris@150 1360 QMessageBox::information(this, tr("Merge retry"),
Chris@150 1361 tr("Merge retry successful."));
Chris@109 1362 shouldHgStat = true;
Chris@109 1363 justMerged = true;
Chris@109 1364 break;
Chris@109 1365
Chris@109 1366 default:
Chris@109 1367 break;
Chris@109 1368 }
Chris@108 1369
Chris@121 1370 // Sequence when no full log required:
Chris@150 1371 // paths -> branch -> stat -> heads ->
Chris@150 1372 // incremental-log (only if heads changed) -> parents
Chris@150 1373 //
Chris@121 1374 // Sequence when full log required:
Chris@121 1375 // paths -> branch -> stat -> heads -> parents -> log
Chris@150 1376 //
Chris@150 1377 // Note we want to call enableDisableActions only once, at the end
Chris@150 1378 // of whichever sequence is in use.
Chris@150 1379
Chris@156 1380 bool noMore = false;
Chris@156 1381
Chris@150 1382 switch (action) {
Chris@150 1383
Chris@150 1384 case ACT_QUERY_PATHS:
Chris@109 1385 hgQueryBranch();
Chris@150 1386 break;
Chris@150 1387
Chris@150 1388 case ACT_QUERY_BRANCH:
Chris@109 1389 hgStat();
Chris@150 1390 break;
Chris@150 1391
Chris@150 1392 case ACT_STAT:
Chris@150 1393 hgQueryHeads();
Chris@150 1394 break;
Chris@150 1395
Chris@150 1396 case ACT_QUERY_HEADS:
Chris@150 1397 if (headsChanged && !needNewLog) {
Chris@150 1398 hgLogIncremental(oldHeadIds);
Chris@121 1399 } else {
Chris@150 1400 hgQueryParents();
Chris@121 1401 }
Chris@150 1402 break;
Chris@150 1403
Chris@150 1404 case ACT_LOG_INCREMENTAL:
Chris@109 1405 hgQueryParents();
Chris@150 1406 break;
Chris@150 1407
Chris@150 1408 case ACT_QUERY_PARENTS:
Chris@120 1409 if (needNewLog) {
Chris@120 1410 hgLog();
Chris@150 1411 } else {
Chris@150 1412 // we're done
Chris@156 1413 noMore = true;
Chris@120 1414 }
Chris@150 1415 break;
Chris@150 1416
Chris@150 1417 case ACT_LOG:
Chris@150 1418 // we're done
Chris@156 1419 noMore = true;
Chris@150 1420
Chris@150 1421 default:
Chris@109 1422 if (shouldHgStat) {
Chris@109 1423 hgQueryPaths();
Chris@150 1424 } else {
Chris@156 1425 noMore = true;
jtkorhonen@0 1426 }
Chris@150 1427 break;
Chris@150 1428 }
Chris@156 1429
Chris@156 1430 if (noMore) {
Chris@156 1431 enableDisableActions();
Chris@156 1432 hgTabs->updateHistory();
Chris@156 1433 }
jtkorhonen@0 1434 }
jtkorhonen@0 1435
jtkorhonen@0 1436 void MainWindow::connectActions()
jtkorhonen@0 1437 {
jtkorhonen@0 1438 connect(exitAct, SIGNAL(triggered()), this, SLOT(close()));
jtkorhonen@0 1439 connect(aboutAct, SIGNAL(triggered()), this, SLOT(about()));
jtkorhonen@0 1440 connect(aboutQtAct, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
jtkorhonen@0 1441
Chris@120 1442 connect(hgRefreshAct, SIGNAL(triggered()), this, SLOT(hgRefresh()));
jtkorhonen@0 1443 connect(hgRemoveAct, SIGNAL(triggered()), this, SLOT(hgRemove()));
jtkorhonen@0 1444 connect(hgAddAct, SIGNAL(triggered()), this, SLOT(hgAdd()));
jtkorhonen@0 1445 connect(hgCommitAct, SIGNAL(triggered()), this, SLOT(hgCommit()));
jtkorhonen@0 1446 connect(hgFolderDiffAct, SIGNAL(triggered()), this, SLOT(hgFolderDiff()));
Chris@149 1447 // connect(hgChgSetDiffAct, SIGNAL(triggered()), this, SLOT(hgChgSetDiff()));
jtkorhonen@0 1448 connect(hgUpdateAct, SIGNAL(triggered()), this, SLOT(hgUpdate()));
jtkorhonen@0 1449 connect(hgRevertAct, SIGNAL(triggered()), this, SLOT(hgRevert()));
jtkorhonen@0 1450 connect(hgMergeAct, SIGNAL(triggered()), this, SLOT(hgMerge()));
jtkorhonen@33 1451 connect(hgRetryMergeAct, SIGNAL(triggered()), this, SLOT(hgRetryMerge()));
jtkorhonen@34 1452 connect(hgTagAct, SIGNAL(triggered()), this, SLOT(hgTag()));
jtkorhonen@34 1453 connect(hgIgnoreAct, SIGNAL(triggered()), this, SLOT(hgIgnore()));
jtkorhonen@0 1454
jtkorhonen@0 1455 connect(settingsAct, SIGNAL(triggered()), this, SLOT(settings()));
Chris@69 1456 connect(openAct, SIGNAL(triggered()), this, SLOT(open()));
jtkorhonen@0 1457
jtkorhonen@0 1458 connect(hgInitAct, SIGNAL(triggered()), this, SLOT(hgInit()));
jtkorhonen@0 1459 connect(hgCloneFromRemoteAct, SIGNAL(triggered()), this, SLOT(hgCloneFromRemote()));
jtkorhonen@0 1460 connect(hgIncomingAct, SIGNAL(triggered()), this, SLOT(hgIncoming()));
jtkorhonen@0 1461 connect(hgPullAct, SIGNAL(triggered()), this, SLOT(hgPull()));
jtkorhonen@0 1462 connect(hgPushAct, SIGNAL(triggered()), this, SLOT(hgPush()));
jtkorhonen@0 1463
Chris@109 1464 // connect(hgTabs, SIGNAL(currentChanged(int)), this, SLOT(tabChanged(int)));
jtkorhonen@0 1465
Chris@148 1466 // connect(hgUpdateToRevAct, SIGNAL(triggered()), this, SLOT(hgUpdateToRev()));
jtkorhonen@0 1467 connect(hgAnnotateAct, SIGNAL(triggered()), this, SLOT(hgAnnotate()));
jtkorhonen@0 1468 connect(hgResolveListAct, SIGNAL(triggered()), this, SLOT(hgResolveList()));
jtkorhonen@0 1469 connect(hgResolveMarkAct, SIGNAL(triggered()), this, SLOT(hgResolveMark()));
jtkorhonen@11 1470 connect(hgServeAct, SIGNAL(triggered()), this, SLOT(hgServe()));
Chris@94 1471 connect(clearSelectionsAct, SIGNAL(triggered()), this, SLOT(clearSelections()));
jtkorhonen@0 1472 }
Chris@141 1473
Chris@141 1474 void MainWindow::connectTabsSignals()
Chris@141 1475 {
Chris@141 1476 connect(hgTabs, SIGNAL(commit()),
Chris@141 1477 this, SLOT(hgCommit()));
Chris@141 1478
Chris@141 1479 connect(hgTabs, SIGNAL(revert()),
Chris@141 1480 this, SLOT(hgRevert()));
Chris@141 1481
Chris@141 1482 connect(hgTabs, SIGNAL(diffWorkingFolder()),
Chris@141 1483 this, SLOT(hgFolderDiff()));
Chris@148 1484
Chris@141 1485 connect(hgTabs, SIGNAL(updateTo(QString)),
Chris@148 1486 this, SLOT(hgUpdateToRev(QString)));
Chris@141 1487
Chris@141 1488 connect(hgTabs, SIGNAL(diffToCurrent(QString)),
Chris@148 1489 this, SLOT(hgDiffToCurrent(QString)));
Chris@141 1490
Chris@148 1491 connect(hgTabs, SIGNAL(diffToParent(QString, QString)),
Chris@148 1492 this, SLOT(hgDiffToParent(QString, QString)));
Chris@141 1493
Chris@141 1494 connect(hgTabs, SIGNAL(mergeFrom(QString)),
Chris@148 1495 this, SLOT(hgMergeFrom(QString)));
Chris@148 1496 /*
Chris@141 1497 connect(hgTabs, SIGNAL(tag(QString)),
Chris@148 1498 this, SLOT(hgTag(QString)));
Chris@141 1499 */
Chris@141 1500 }
Chris@141 1501
Chris@109 1502 /*!!!
jtkorhonen@0 1503 void MainWindow::tabChanged(int currTab)
jtkorhonen@0 1504 {
jtkorhonen@0 1505 tabPage = currTab;
jtkorhonen@32 1506
jtkorhonen@0 1507 }
Chris@109 1508 */
jtkorhonen@0 1509 void MainWindow::enableDisableActions()
jtkorhonen@0 1510 {
Chris@90 1511 DEBUG << "MainWindow::enableDisableActions" << endl;
Chris@90 1512
Chris@115 1513 //!!! should also do things like set the status texts for the
Chris@115 1514 //!!! actions appropriately by context
Chris@115 1515
jtkorhonen@0 1516 QDir localRepoDir;
jtkorhonen@0 1517 QDir workFolderDir;
Chris@145 1518 bool workFolderExist = true;
Chris@145 1519 bool localRepoExist = true;
jtkorhonen@0 1520
jtkorhonen@0 1521 remoteRepoActionsEnabled = true;
Chris@90 1522 if (remoteRepoPath.isEmpty()) {
jtkorhonen@0 1523 remoteRepoActionsEnabled = false;
jtkorhonen@0 1524 }
jtkorhonen@0 1525
jtkorhonen@0 1526 localRepoActionsEnabled = true;
Chris@90 1527 if (workFolderPath.isEmpty()) {
jtkorhonen@0 1528 localRepoActionsEnabled = false;
jtkorhonen@0 1529 workFolderExist = false;
jtkorhonen@0 1530 }
jtkorhonen@0 1531
Chris@90 1532 if (!workFolderDir.exists(workFolderPath)) {
jtkorhonen@0 1533 localRepoActionsEnabled = false;
jtkorhonen@0 1534 workFolderExist = false;
Chris@90 1535 } else {
jtkorhonen@0 1536 workFolderExist = true;
jtkorhonen@0 1537 }
jtkorhonen@0 1538
Chris@112 1539 if (!localRepoDir.exists(workFolderPath + "/.hg")) {
jtkorhonen@0 1540 localRepoActionsEnabled = false;
jtkorhonen@0 1541 localRepoExist = false;
jtkorhonen@0 1542 }
jtkorhonen@0 1543
jtkorhonen@0 1544 hgCloneFromRemoteAct -> setEnabled(remoteRepoActionsEnabled);
jtkorhonen@0 1545 hgIncomingAct -> setEnabled(remoteRepoActionsEnabled && remoteRepoActionsEnabled);
jtkorhonen@0 1546 hgPullAct -> setEnabled(remoteRepoActionsEnabled && remoteRepoActionsEnabled);
jtkorhonen@0 1547 hgPushAct -> setEnabled(remoteRepoActionsEnabled && remoteRepoActionsEnabled);
Chris@73 1548 /*
jtkorhonen@0 1549 if (tabPage != WORKTAB)
jtkorhonen@0 1550 {
jtkorhonen@0 1551 localRepoActionsEnabled = false;
jtkorhonen@0 1552 }
Chris@73 1553 */
Chris@112 1554 bool haveDiff = (diffBinaryName != "");
Chris@112 1555
jtkorhonen@0 1556 hgInitAct -> setEnabled((localRepoExist == false) && (workFolderExist==true));
Chris@120 1557 hgRefreshAct -> setEnabled(localRepoActionsEnabled);
Chris@112 1558 hgFolderDiffAct -> setEnabled(localRepoActionsEnabled && haveDiff);
jtkorhonen@0 1559 hgRevertAct -> setEnabled(localRepoActionsEnabled);
jtkorhonen@0 1560 hgAddAct -> setEnabled(localRepoActionsEnabled);
jtkorhonen@0 1561 hgRemoveAct -> setEnabled(localRepoActionsEnabled);
jtkorhonen@0 1562 hgUpdateAct -> setEnabled(localRepoActionsEnabled);
jtkorhonen@0 1563 hgCommitAct -> setEnabled(localRepoActionsEnabled);
jtkorhonen@0 1564 hgMergeAct -> setEnabled(localRepoActionsEnabled);
jtkorhonen@33 1565 hgRetryMergeAct -> setEnabled(localRepoActionsEnabled);
jtkorhonen@2 1566 hgResolveListAct -> setEnabled(localRepoActionsEnabled);
jtkorhonen@2 1567 hgResolveMarkAct -> setEnabled(localRepoActionsEnabled);
jtkorhonen@2 1568 hgAnnotateAct -> setEnabled(localRepoActionsEnabled);
jtkorhonen@11 1569 hgServeAct -> setEnabled(localRepoActionsEnabled);
jtkorhonen@34 1570 hgTagAct -> setEnabled(localRepoActionsEnabled);
jtkorhonen@34 1571 hgIgnoreAct -> setEnabled(localRepoActionsEnabled);
jtkorhonen@0 1572
Chris@98 1573 //!!!hgTabs -> enableDisableOtherTabs(tabPage);
jtkorhonen@0 1574
Chris@90 1575 DEBUG << "localRepoActionsEnabled = " << localRepoActionsEnabled << endl;
Chris@98 1576 DEBUG << "canCommit = " << hgTabs->canCommit() << endl;
Chris@90 1577
Chris@90 1578 //!!! new stuff:
Chris@98 1579 hgAddAct->setEnabled(localRepoActionsEnabled && hgTabs->canAdd());
Chris@98 1580 hgRemoveAct->setEnabled(localRepoActionsEnabled && hgTabs->canRemove());
Chris@98 1581 hgCommitAct->setEnabled(localRepoActionsEnabled && hgTabs->canCommit());
Chris@98 1582 hgRevertAct->setEnabled(localRepoActionsEnabled && hgTabs->canCommit());
Chris@98 1583 hgFolderDiffAct->setEnabled(localRepoActionsEnabled && hgTabs->canDoDiff());
Chris@90 1584
Chris@108 1585 // A default merge makes sense if:
Chris@108 1586 // * there is only one parent (if there are two, we have an uncommitted merge) and
Chris@108 1587 // * there are exactly two heads that have the same branch as the current branch and
Chris@108 1588 // * our parent is one of those heads
Chris@108 1589 //
Chris@108 1590 // A default update makes sense if:
Chris@108 1591 // * there is only one parent and
Chris@108 1592 // * the parent is not one of the current heads
Chris@156 1593
Chris@108 1594 bool canMerge = false;
Chris@108 1595 bool canUpdate = false;
Chris@156 1596 bool haveMerge = false;
Chris@162 1597 bool emptyRepo = false;
Chris@156 1598 int currentBranchHeads = 0;
Chris@156 1599
Chris@108 1600 if (currentParents.size() == 1) {
Chris@156 1601 bool parentIsHead = false;
Chris@108 1602 Changeset *parent = currentParents[0];
Chris@108 1603 foreach (Changeset *head, currentHeads) {
Chris@108 1604 DEBUG << "head branch " << head->branch() << ", current branch " << currentBranch << endl;
Chris@108 1605 if (head->isOnBranch(currentBranch)) {
Chris@108 1606 ++currentBranchHeads;
Chris@108 1607 if (parent->id() == head->id()) {
Chris@108 1608 parentIsHead = true;
Chris@108 1609 }
Chris@108 1610 }
Chris@108 1611 }
Chris@108 1612 if (currentBranchHeads == 2 && parentIsHead) {
Chris@108 1613 canMerge = true;
Chris@108 1614 }
Chris@108 1615 if (!parentIsHead) {
Chris@108 1616 canUpdate = true;
Chris@108 1617 DEBUG << "parent id = " << parent->id() << endl;
Chris@108 1618 DEBUG << " head ids "<<endl;
Chris@108 1619 foreach (Changeset *h, currentHeads) {
Chris@108 1620 DEBUG << "head id = " << h->id() << endl;
Chris@108 1621 }
Chris@108 1622 }
Chris@162 1623 } else if (currentParents.size() == 0) {
Chris@162 1624 emptyRepo = true;
Chris@156 1625 } else {
Chris@156 1626 haveMerge = true;
Chris@108 1627 }
Chris@156 1628
Chris@108 1629 hgMergeAct->setEnabled(localRepoActionsEnabled && canMerge);
Chris@108 1630 hgUpdateAct->setEnabled(localRepoActionsEnabled && canUpdate);
Chris@115 1631
Chris@115 1632 // Set the state field on the file status widget
Chris@115 1633
Chris@115 1634 QString branchText;
Chris@115 1635 if (currentBranch == "" || currentBranch == "default") {
Chris@115 1636 branchText = tr("the default branch");
Chris@115 1637 } else {
Chris@115 1638 branchText = tr("branch \"%1\"").arg(currentBranch);
Chris@115 1639 }
Chris@156 1640
Chris@156 1641 //!!! Want "merge failed" report
Chris@156 1642
Chris@162 1643 if (emptyRepo) {
Chris@162 1644 hgTabs->setState(tr("Nothing committed to this repository yet"));
Chris@162 1645 } else if (canMerge) {
Chris@156 1646 hgTabs->setState(tr("<b>Awaiting merge</b> on %1").arg(branchText));
Chris@156 1647 } else if (haveMerge) {
Chris@157 1648 hgTabs->setState(tr("Have merged but not yet committed on %1").arg(branchText));
Chris@156 1649 } else if (canUpdate) {
Chris@115 1650 hgTabs->setState(tr("On %1. Not at the head of the branch: consider updating").arg(branchText));
Chris@156 1651 } else if (currentBranchHeads > 1) {
Chris@156 1652 hgTabs->setState(tr("At one of %n heads of %1", "", currentBranchHeads).arg(branchText));
Chris@115 1653 } else {
Chris@115 1654 hgTabs->setState(tr("At the head of %1").arg(branchText));
Chris@115 1655 }
jtkorhonen@0 1656 }
jtkorhonen@0 1657
jtkorhonen@0 1658 void MainWindow::createActions()
jtkorhonen@0 1659 {
jtkorhonen@0 1660 //File actions
jtkorhonen@0 1661 hgInitAct = new QAction(tr("Init local repository"), this);
jtkorhonen@0 1662 hgInitAct->setStatusTip(tr("Create an empty local repository in selected folder"));
jtkorhonen@0 1663
jtkorhonen@0 1664 hgCloneFromRemoteAct = new QAction(tr("Clone from remote"), this);
jtkorhonen@0 1665 hgCloneFromRemoteAct->setStatusTip(tr("Clone from remote repository into local repository in selected folder"));
jtkorhonen@0 1666
Chris@69 1667 openAct = new QAction(QIcon(":/images/fileopen.png"), tr("Open..."), this);
Chris@69 1668 openAct -> setStatusTip(tr("Open repository"));
Chris@69 1669 openAct -> setIconVisibleInMenu(true);
Chris@69 1670
jtkorhonen@0 1671 settingsAct = new QAction(QIcon(":/images/settings.png"), tr("Settings..."), this);
jtkorhonen@0 1672 settingsAct -> setStatusTip(tr("View and change application settings"));
jtkorhonen@0 1673 settingsAct -> setIconVisibleInMenu(true);
jtkorhonen@0 1674
jtkorhonen@0 1675 exitAct = new QAction(QIcon(":/images/exit.png"), tr("Exit"), this);
jtkorhonen@0 1676 exitAct->setShortcuts(QKeySequence::Quit);
jtkorhonen@0 1677 exitAct->setStatusTip(tr("Exit application"));
jtkorhonen@0 1678 exitAct -> setIconVisibleInMenu(true);
jtkorhonen@0 1679
jtkorhonen@0 1680 //Repository actions
Chris@120 1681 hgRefreshAct = new QAction(QIcon(":/images/status.png"), tr("Refresh"), this);
Chris@120 1682 hgRefreshAct->setStatusTip(tr("Refresh (info of) status of workfolder files"));
Chris@61 1683
Chris@61 1684 hgIncomingAct = new QAction(QIcon(":/images/incoming.png"), tr("Preview"), this);
jtkorhonen@0 1685 hgIncomingAct -> setStatusTip(tr("View info of changesets incoming to us from remote repository (on pull operation)"));
jtkorhonen@0 1686
Chris@61 1687 hgPullAct = new QAction(QIcon(":/images/pull.png"), tr("Pull"), this);
jtkorhonen@0 1688 hgPullAct -> setStatusTip(tr("Pull changesets from remote repository to local repository"));
jtkorhonen@0 1689
Chris@61 1690 hgPushAct = new QAction(QIcon(":/images/push.png"), tr("Push"), this);
jtkorhonen@0 1691 hgPushAct->setStatusTip(tr("Push local changesets to remote repository"));
jtkorhonen@0 1692
jtkorhonen@0 1693 //Workfolder actions
Chris@99 1694 hgFolderDiffAct = new QAction(QIcon(":/images/folderdiff.png"), tr("Diff"), this);
jtkorhonen@0 1695 hgFolderDiffAct->setStatusTip(tr("Folderdiff: View all differences between working folder files and local repository files"));
jtkorhonen@0 1696
jtkorhonen@0 1697 hgChgSetDiffAct = new QAction(QIcon(":/images/chgsetdiff.png"), tr("View changesetdiff"), this);
jtkorhonen@0 1698 hgChgSetDiffAct->setStatusTip(tr("Change set diff: View differences between all files of 2 repository changesets"));
jtkorhonen@0 1699
Chris@61 1700 hgRevertAct = new QAction(QIcon(":/images/undo.png"), tr("Revert"), this);
jtkorhonen@0 1701 hgRevertAct->setStatusTip(tr("Undo selected working folder file changes (return to local repository version)"));
jtkorhonen@0 1702
Chris@61 1703 hgAddAct = new QAction(QIcon(":/images/add.png"), tr("Add"), this);
jtkorhonen@17 1704 hgAddAct -> setStatusTip(tr("Add working folder file(s) (selected or all yet untracked) to local repository (on next commit)"));
jtkorhonen@0 1705
Chris@61 1706 hgRemoveAct = new QAction(QIcon(":/images/remove.png"), tr("Remove"), this);
jtkorhonen@0 1707 hgRemoveAct -> setStatusTip(tr("Remove selected working folder file from local repository (on next commit)"));
jtkorhonen@0 1708
Chris@61 1709 hgUpdateAct = new QAction(QIcon(":/images/update.png"), tr("Update"), this);
jtkorhonen@0 1710 hgUpdateAct->setStatusTip(tr("Update working folder from local repository"));
jtkorhonen@0 1711
Chris@61 1712 hgCommitAct = new QAction(QIcon(":/images/commit.png"), tr("Commit"), this);
jtkorhonen@20 1713 hgCommitAct->setStatusTip(tr("Save selected file(s) or all changed files in working folder (and all subfolders) to local repository"));
jtkorhonen@0 1714
jtkorhonen@0 1715 hgMergeAct = new QAction(QIcon(":/images/merge.png"), tr("Merge"), this);
jtkorhonen@0 1716 hgMergeAct->setStatusTip(tr("Merge two local repository changesets to working folder"));
jtkorhonen@0 1717
jtkorhonen@0 1718 //Advanced actions
Chris@148 1719 /* hgUpdateToRevAct = new QAction(tr("Update to revision"), this);
jtkorhonen@0 1720 hgUpdateToRevAct -> setStatusTip(tr("Update working folder to version selected from history list"));
Chris@148 1721 */
jtkorhonen@0 1722 hgAnnotateAct = new QAction(tr("Annotate"), this);
jtkorhonen@0 1723 hgAnnotateAct -> setStatusTip(tr("Show line-by-line version information for selected file"));
jtkorhonen@0 1724
jtkorhonen@0 1725 hgResolveListAct = new QAction(tr("Resolve (list)"), this);
jtkorhonen@0 1726 hgResolveListAct -> setStatusTip(tr("Resolve (list): Show list of files needing merge"));
jtkorhonen@0 1727
jtkorhonen@0 1728 hgResolveMarkAct = new QAction(tr("Resolve (mark)"), this);
jtkorhonen@0 1729 hgResolveMarkAct -> setStatusTip(tr("Resolve (mark): Mark selected file status as resolved"));
jtkorhonen@0 1730
jtkorhonen@33 1731 hgRetryMergeAct = new QAction(tr("Retry merge"), this);
jtkorhonen@33 1732 hgRetryMergeAct -> setStatusTip(tr("Retry merge after failed merge attempt."));
jtkorhonen@33 1733
jtkorhonen@34 1734 hgTagAct = new QAction(tr("Tag revision"), this);
jtkorhonen@34 1735 hgTagAct -> setStatusTip(tr("Give decsriptive name (tag) to current workfolder parent revision."));
jtkorhonen@34 1736
jtkorhonen@34 1737 hgIgnoreAct = new QAction(tr("Edit .hgignore"), this);
jtkorhonen@34 1738 hgIgnoreAct -> setStatusTip(tr("Edit .hgignore file (file contains names of files that should be ignored by mercurial)"));
jtkorhonen@34 1739
jtkorhonen@11 1740 hgServeAct = new QAction(tr("Serve (via http)"), this);
jtkorhonen@11 1741 hgServeAct -> setStatusTip(tr("Serve local repository via http for workgroup access"));
jtkorhonen@11 1742
jtkorhonen@0 1743 //Help actions
jtkorhonen@0 1744 aboutAct = new QAction(tr("About"), this);
jtkorhonen@0 1745 aboutAct->setStatusTip(tr("Show the application's About box"));
jtkorhonen@0 1746
jtkorhonen@0 1747 aboutQtAct = new QAction(tr("About Qt"), this);
jtkorhonen@0 1748 aboutQtAct->setStatusTip(tr("Show the Qt library's About box"));
Chris@94 1749
Chris@94 1750 // Miscellaneous
Chris@94 1751 clearSelectionsAct = new QAction(tr("Clear selections"), this);
Chris@94 1752 clearSelectionsAct->setShortcut(Qt::Key_Escape);
jtkorhonen@0 1753 }
jtkorhonen@0 1754
jtkorhonen@0 1755 void MainWindow::createMenus()
jtkorhonen@0 1756 {
jtkorhonen@0 1757 fileMenu = menuBar()->addMenu(tr("File"));
Chris@131 1758 /* fileMenu -> addAction(hgInitAct);
jtkorhonen@0 1759 fileMenu -> addAction(hgCloneFromRemoteAct);
Chris@94 1760 fileMenu->addAction(clearSelectionsAct); //!!! can't live here!
jtkorhonen@0 1761 fileMenu -> addSeparator();
Chris@131 1762 */
Chris@69 1763 fileMenu -> addAction(openAct);
jtkorhonen@0 1764 fileMenu -> addAction(settingsAct);
jtkorhonen@0 1765 fileMenu -> addSeparator();
jtkorhonen@0 1766 fileMenu -> addAction(exitAct);
jtkorhonen@0 1767
jtkorhonen@0 1768 advancedMenu = menuBar()->addMenu(tr("Advanced"));
Chris@131 1769 /*
jtkorhonen@0 1770 advancedMenu -> addAction(hgUpdateToRevAct);
jtkorhonen@0 1771 advancedMenu -> addSeparator();
jtkorhonen@0 1772 advancedMenu -> addAction(hgAnnotateAct);
jtkorhonen@0 1773 advancedMenu -> addSeparator();
jtkorhonen@33 1774 advancedMenu -> addAction(hgRetryMergeAct);
jtkorhonen@0 1775 advancedMenu -> addAction(hgResolveListAct);
jtkorhonen@0 1776 advancedMenu -> addAction(hgResolveMarkAct);
jtkorhonen@11 1777 advancedMenu -> addSeparator();
jtkorhonen@34 1778 advancedMenu -> addAction(hgTagAct);
jtkorhonen@34 1779 advancedMenu -> addSeparator();
Chris@131 1780 */
jtkorhonen@34 1781 advancedMenu -> addAction(hgIgnoreAct);
jtkorhonen@34 1782 advancedMenu -> addSeparator();
jtkorhonen@11 1783 advancedMenu -> addAction(hgServeAct);
jtkorhonen@0 1784
jtkorhonen@0 1785 helpMenu = menuBar()->addMenu(tr("Help"));
jtkorhonen@0 1786 helpMenu->addAction(aboutAct);
Chris@128 1787 //!!! helpMenu->addAction(aboutQtAct);
jtkorhonen@0 1788 }
jtkorhonen@0 1789
jtkorhonen@0 1790 void MainWindow::createToolBars()
jtkorhonen@0 1791 {
jtkorhonen@0 1792 fileToolBar = addToolBar(tr("File"));
jtkorhonen@0 1793 fileToolBar -> setIconSize(QSize(MY_ICON_SIZE, MY_ICON_SIZE));
Chris@69 1794 fileToolBar -> addAction(openAct);
Chris@120 1795 fileToolBar -> addAction(hgRefreshAct);
jtkorhonen@0 1796 fileToolBar -> addSeparator();
Chris@61 1797 // fileToolBar -> addAction(hgChgSetDiffAct);
jtkorhonen@0 1798 fileToolBar -> setMovable(false);
jtkorhonen@0 1799
jtkorhonen@0 1800 repoToolBar = addToolBar(tr(REPOMENU_TITLE));
jtkorhonen@0 1801 repoToolBar -> setIconSize(QSize(MY_ICON_SIZE, MY_ICON_SIZE));
jtkorhonen@0 1802 repoToolBar->addAction(hgIncomingAct);
jtkorhonen@0 1803 repoToolBar->addAction(hgPullAct);
jtkorhonen@0 1804 repoToolBar->addAction(hgPushAct);
jtkorhonen@0 1805 repoToolBar -> setMovable(false);
jtkorhonen@0 1806
jtkorhonen@0 1807 workFolderToolBar = addToolBar(tr(WORKFOLDERMENU_TITLE));
jtkorhonen@0 1808 addToolBar(Qt::LeftToolBarArea, workFolderToolBar);
jtkorhonen@0 1809 workFolderToolBar -> setIconSize(QSize(MY_ICON_SIZE, MY_ICON_SIZE));
Chris@95 1810 workFolderToolBar->addAction(hgFolderDiffAct);
jtkorhonen@0 1811 workFolderToolBar->addSeparator();
jtkorhonen@0 1812 workFolderToolBar->addAction(hgRevertAct);
jtkorhonen@0 1813 workFolderToolBar->addAction(hgUpdateAct);
jtkorhonen@0 1814 workFolderToolBar->addAction(hgCommitAct);
jtkorhonen@0 1815 workFolderToolBar->addAction(hgMergeAct);
jtkorhonen@0 1816 workFolderToolBar->addSeparator();
jtkorhonen@0 1817 workFolderToolBar->addAction(hgAddAct);
jtkorhonen@0 1818 workFolderToolBar->addAction(hgRemoveAct);
jtkorhonen@0 1819 workFolderToolBar -> setMovable(false);
Chris@61 1820
Chris@61 1821 foreach (QToolButton *tb, findChildren<QToolButton *>()) {
Chris@61 1822 tb->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
Chris@61 1823 }
jtkorhonen@0 1824 }
jtkorhonen@0 1825
jtkorhonen@0 1826
jtkorhonen@0 1827 void MainWindow::createStatusBar()
jtkorhonen@0 1828 {
jtkorhonen@0 1829 statusBar()->showMessage(tr("Ready"));
jtkorhonen@0 1830 }
jtkorhonen@0 1831
Chris@69 1832
Chris@69 1833 //!!! review these:
Chris@69 1834
jtkorhonen@0 1835 void MainWindow::readSettings()
jtkorhonen@0 1836 {
jtkorhonen@0 1837 QDir workFolder;
jtkorhonen@0 1838
Chris@61 1839 QSettings settings;
jtkorhonen@0 1840
jtkorhonen@30 1841 remoteRepoPath = settings.value("remoterepopath", "").toString();
jtkorhonen@0 1842 workFolderPath = settings.value("workfolderpath", "").toString();
jtkorhonen@0 1843 if (!workFolder.exists(workFolderPath))
jtkorhonen@0 1844 {
jtkorhonen@0 1845 workFolderPath = "";
jtkorhonen@0 1846 }
jtkorhonen@0 1847
jtkorhonen@0 1848 QPoint pos = settings.value("pos", QPoint(200, 200)).toPoint();
jtkorhonen@0 1849 QSize size = settings.value("size", QSize(400, 400)).toSize();
jtkorhonen@0 1850 firstStart = settings.value("firststart", QVariant(true)).toBool();
jtkorhonen@0 1851
Chris@109 1852 //!!! initialFileTypesBits = (unsigned char) settings.value("viewFileTypes", QVariant(DEFAULT_HG_STAT_BITS)).toInt();
jtkorhonen@0 1853 resize(size);
jtkorhonen@0 1854 move(pos);
jtkorhonen@0 1855 }
jtkorhonen@0 1856
jtkorhonen@17 1857
jtkorhonen@0 1858 void MainWindow::writeSettings()
jtkorhonen@0 1859 {
Chris@61 1860 QSettings settings;
jtkorhonen@0 1861 settings.setValue("pos", pos());
jtkorhonen@0 1862 settings.setValue("size", size());
jtkorhonen@0 1863 settings.setValue("remoterepopath", remoteRepoPath);
jtkorhonen@0 1864 settings.setValue("workfolderpath", workFolderPath);
jtkorhonen@0 1865 settings.setValue("firststart", firstStart);
Chris@98 1866 //!!!settings.setValue("viewFileTypes", hgTabs -> getFileTypesBits());
jtkorhonen@0 1867 }
jtkorhonen@0 1868
jtkorhonen@0 1869
jtkorhonen@0 1870
jtkorhonen@0 1871