comparison mainwindow.cpp @ 141:e6c6b88d19b9

* Start hooking up right-button menus on changeset & uncommitted items
author Chris Cannam
date Tue, 30 Nov 2010 17:56:11 +0000
parents a4044b4b3e35
children f61f032b06f9
comparison
equal deleted inserted replaced
140:bad40d7e7a2b 141:e6c6b88d19b9
67 67
68 readSettings(); 68 readSettings();
69 69
70 justMerged = false; 70 justMerged = false;
71 hgTabs = new HgTabWidget((QWidget *) this, remoteRepoPath, workFolderPath); 71 hgTabs = new HgTabWidget((QWidget *) this, remoteRepoPath, workFolderPath);
72 connectTabsSignals();
72 setCentralWidget(hgTabs); 73 setCentralWidget(hgTabs);
73 74
74 connect(hgTabs, SIGNAL(selectionChanged()), 75 connect(hgTabs, SIGNAL(selectionChanged()),
75 this, SLOT(enableDisableActions())); 76 this, SLOT(enableDisableActions()));
76 77
1387 connect(hgResolveListAct, SIGNAL(triggered()), this, SLOT(hgResolveList())); 1388 connect(hgResolveListAct, SIGNAL(triggered()), this, SLOT(hgResolveList()));
1388 connect(hgResolveMarkAct, SIGNAL(triggered()), this, SLOT(hgResolveMark())); 1389 connect(hgResolveMarkAct, SIGNAL(triggered()), this, SLOT(hgResolveMark()));
1389 connect(hgServeAct, SIGNAL(triggered()), this, SLOT(hgServe())); 1390 connect(hgServeAct, SIGNAL(triggered()), this, SLOT(hgServe()));
1390 connect(clearSelectionsAct, SIGNAL(triggered()), this, SLOT(clearSelections())); 1391 connect(clearSelectionsAct, SIGNAL(triggered()), this, SLOT(clearSelections()));
1391 } 1392 }
1393
1394 void MainWindow::connectTabsSignals()
1395 {
1396 connect(hgTabs, SIGNAL(commit()),
1397 this, SLOT(hgCommit()));
1398
1399 connect(hgTabs, SIGNAL(revert()),
1400 this, SLOT(hgRevert()));
1401
1402 connect(hgTabs, SIGNAL(diffWorkingFolder()),
1403 this, SLOT(hgFolderDiff()));
1404 /*!!!!
1405 connect(hgTabs, SIGNAL(updateTo(QString)),
1406 this, SIGNAL(updateTo(QString)));
1407
1408 connect(hgTabs, SIGNAL(diffToCurrent(QString)),
1409 this, SIGNAL(diffToCurrent(QString)));
1410
1411 connect(hgTabs, SIGNAL(diffToPrevious(QString)),
1412 this, SIGNAL(diffToPrevious(QString)));
1413
1414 connect(hgTabs, SIGNAL(mergeFrom(QString)),
1415 this, SIGNAL(mergeFrom(QString)));
1416
1417 connect(hgTabs, SIGNAL(tag(QString)),
1418 this, SIGNAL(tag(QString)));
1419 */
1420 }
1421
1392 /*!!! 1422 /*!!!
1393 void MainWindow::tabChanged(int currTab) 1423 void MainWindow::tabChanged(int currTab)
1394 { 1424 {
1395 tabPage = currTab; 1425 tabPage = currTab;
1396 1426