annotate mainwindow.cpp @ 34:43e3b271d293 Version_0.5.2.

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