Merge branch 'master' into hid1

This commit is contained in:
Pooh 2017-10-23 11:46:39 +03:00 committed by GitHub
commit a0f6a741b1
16 changed files with 60 additions and 17 deletions

View file

@ -210,8 +210,9 @@ MainWindow::MainWindow(QWidget* parent, Qt::WindowFlags flags)
connect(ui->listWidget, SIGNAL(currentRowChanged(int)), this, SLOT(setNewPage(int)));
connect(ui->stackPages, SIGNAL(currentChanged(int)), this, SLOT(setNewPage(int)));
//ui->stackPages->setCurrentIndex(Settings->getLastPageInMainWindow());
setNewPage(Settings->getLastPageInMainWindow());
int lastpageindex = Settings->getLastPageInMainWindow();
if(lastpageindex < ui->stackPages->count()) //Do not crash when a page was removed after last run
setNewPage(lastpageindex);
ui->splitter->setStretchFactor(0, 0);
ui->splitter->setStretchFactor(1, 1);