comparison src/mainwindow.cpp @ 559:95877ad67d3e

Merge from branch "find"
author Chris Cannam
date Mon, 27 Feb 2012 17:08:47 +0000
parents d932ce55c364
children 533519ebc0cb
comparison
equal deleted inserted replaced
553:9c8147c9f245 559:95877ad67d3e
110 cl->addWidget(m_workStatus, row++, 0); 110 cl->addWidget(m_workStatus, row++, 0);
111 111
112 m_hgTabs = new HgTabWidget(central, m_workFolderPath); 112 m_hgTabs = new HgTabWidget(central, m_workFolderPath);
113 connectTabsSignals(); 113 connectTabsSignals();
114 114
115 cl->addWidget(m_hgTabs, row++, 0); 115 cl->addWidget(m_hgTabs, row++, 0, 1, 2);
116 116
117 connect(m_hgTabs, SIGNAL(selectionChanged()), 117 connect(m_hgTabs, SIGNAL(selectionChanged()),
118 this, SLOT(enableDisableActions())); 118 this, SLOT(enableDisableActions()));
119 connect(m_hgTabs, SIGNAL(showAllChanged()), 119 connect(m_hgTabs, SIGNAL(showAllChanged()),
120 this, SLOT(showAllChanged())); 120 this, SLOT(showAllChanged()));
148 148
149 void MainWindow::closeEvent(QCloseEvent *) 149 void MainWindow::closeEvent(QCloseEvent *)
150 { 150 {
151 writeSettings(); 151 writeSettings();
152 delete m_fsWatcher; 152 delete m_fsWatcher;
153 }
154
155
156 void MainWindow::resizeEvent(QResizeEvent *)
157 {
153 } 158 }
154 159
155 160
156 QString MainWindow::getUserInfo() const 161 QString MainWindow::getUserInfo() const
157 { 162 {