Mercurial > trustbridge > trustbridge
comparison ui/mainwindow.cpp @ 657:37ffc8ddb698
Fix merge errors
| author | Andre Heinecke <andre.heinecke@intevation.de> |
|---|---|
| date | Wed, 25 Jun 2014 15:31:08 +0200 |
| parents | 0ca15d937490 |
| children | c7405d526ead |
comparison
equal
deleted
inserted
replaced
| 656:0ca15d937490 | 657:37ffc8ddb698 |
|---|---|
| 1067 return; | 1067 return; |
| 1068 } | 1068 } |
| 1069 | 1069 |
| 1070 void MainWindow::togglePages(int button) | 1070 void MainWindow::togglePages(int button) |
| 1071 { | 1071 { |
| 1072 UpdatesPanel->hide(); | 1072 mUpdatesPanel->hide(); |
| 1073 mInstallPanel->hide(); | 1073 mInstallPanel->hide(); |
| 1074 mRemovePanel->hide(); | 1074 mRemovePanel->hide(); |
| 1075 mInfoPanel->hide(); | 1075 mInfoPanel->hide(); |
| 1076 switch(button) { | 1076 switch(button) { |
| 1077 case 0: mUpdatesPanel->show(); break; | 1077 case 0: mUpdatesPanel->show(); break; |
| 1122 mUpdatesManual->hide(); | 1122 mUpdatesManual->hide(); |
| 1123 QSize old = mUpdatesWidget->size(); | 1123 QSize old = mUpdatesWidget->size(); |
| 1124 mUpdatesWidget->resize(old.width(), old.height() - mUpdatesManual->height()); | 1124 mUpdatesWidget->resize(old.width(), old.height() - mUpdatesManual->height()); |
| 1125 } | 1125 } |
| 1126 } | 1126 } |
| 1127 >>>>>>> other |