annotate mainwindow.cpp @ 51:bf3ab0ffb559

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