annotate mainwindow.cpp @ 94:44ed7766d55a

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