1 files changed, 159 insertions, 151 deletions

diff --git a/application/widgets/PageContainer.cpp b/application/widgets/PageContainer.cpp
index 98de57e8..376e119b 100644
--- a/application/widgets/PageContainer.cpp
+++ b/application/widgets/PageContainer.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2013-2018 MultiMC Contributors
+/* Copyright 2013-2019 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,196 +36,204 @@
 class PageEntryFilterModel : public QSortFilterProxyModel
 {
 public:
-	explicit PageEntryFilterModel(QObject *parent = 0) : QSortFilterProxyModel(parent)
-	{
-	}
+    explicit PageEntryFilterModel(QObject *parent = 0) : QSortFilterProxyModel(parent)
+    {
+    }
 
 protected:
-	bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
-	{
-		const QString pattern = filterRegExp().pattern();
-		const auto model = static_cast<PageModel *>(sourceModel());
-		const auto page = model->pages().at(sourceRow);
-		if (!page->shouldDisplay())
-			return false;
-		// Regular contents check, then check page-filter.
-		return QSortFilterProxyModel::filterAcceptsRow(sourceRow, sourceParent);
-	}
+    bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
+    {
+        const QString pattern = filterRegExp().pattern();
+        const auto model = static_cast<PageModel *>(sourceModel());
+        const auto page = model->pages().at(sourceRow);
+        if (!page->shouldDisplay())
+            return false;
+        // Regular contents check, then check page-filter.
+        return QSortFilterProxyModel::filterAcceptsRow(sourceRow, sourceParent);
+    }
 };
 
 PageContainer::PageContainer(BasePageProvider *pageProvider, QString defaultId,
-							 QWidget *parent)
-	: QWidget(parent)
+                             QWidget *parent)
+    : QWidget(parent)
 {
-	createUI();
-	m_model = new PageModel(this);
-	m_proxyModel = new PageEntryFilterModel(this);
-	int counter = 0;
-	auto pages = pageProvider->getPages();
-	for (auto page : pages)
-	{
-		page->stackIndex = m_pageStack->addWidget(dynamic_cast<QWidget *>(page));
-		page->listIndex = counter;
-		page->setParentContainer(this);
-		counter++;
-	}
-	m_model->setPages(pages);
-
-	m_proxyModel->setSourceModel(m_model);
-	m_proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
-
-	m_pageList->setIconSize(QSize(pageIconSize, pageIconSize));
-	m_pageList->setSelectionMode(QAbstractItemView::SingleSelection);
-	m_pageList->setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
-	m_pageList->setSizeAdjustPolicy(QAbstractScrollArea::AdjustToContents);
-	m_pageList->setModel(m_proxyModel);
-	connect(m_pageList->selectionModel(), SIGNAL(currentRowChanged(QModelIndex, QModelIndex)),
-			this, SLOT(currentChanged(QModelIndex)));
-	m_pageStack->setStackingMode(QStackedLayout::StackOne);
-	m_pageList->setFocus();
-	selectPage(defaultId);
+    createUI();
+    m_model = new PageModel(this);
+    m_proxyModel = new PageEntryFilterModel(this);
+    int counter = 0;
+    auto pages = pageProvider->getPages();
+    for (auto page : pages)
+    {
+        page->stackIndex = m_pageStack->addWidget(dynamic_cast<QWidget *>(page));
+        page->listIndex = counter;
+        page->setParentContainer(this);
+        counter++;
+    }
+    m_model->setPages(pages);
+
+    m_proxyModel->setSourceModel(m_model);
+    m_proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
+
+    m_pageList->setIconSize(QSize(pageIconSize, pageIconSize));
+    m_pageList->setSelectionMode(QAbstractItemView::SingleSelection);
+    m_pageList->setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
+    m_pageList->setSizeAdjustPolicy(QAbstractScrollArea::AdjustToContents);
+    m_pageList->setModel(m_proxyModel);
+    connect(m_pageList->selectionModel(), SIGNAL(currentRowChanged(QModelIndex, QModelIndex)),
+            this, SLOT(currentChanged(QModelIndex)));
+    m_pageStack->setStackingMode(QStackedLayout::StackOne);
+    m_pageList->setFocus();
+    selectPage(defaultId);
 }
 
 bool PageContainer::selectPage(QString pageId)
 {
-	// now find what we want to have selected...
-	auto page = m_model->findPageEntryById(pageId);
-	QModelIndex index;
-	if (page)
-	{
-		index = m_proxyModel->mapFromSource(m_model->index(page->listIndex));
-	}
-	if(!index.isValid())
-	{
-		index = m_proxyModel->index(0, 0);
-	}
-	if (index.isValid())
-	{
-		m_pageList->setCurrentIndex(index);
-		return true;
-	}
-	return false;
+    // now find what we want to have selected...
+    auto page = m_model->findPageEntryById(pageId);
+    QModelIndex index;
+    if (page)
+    {
+        index = m_proxyModel->mapFromSource(m_model->index(page->listIndex));
+    }
+    if(!index.isValid())
+    {
+        index = m_proxyModel->index(0, 0);
+    }
+    if (index.isValid())
+    {
+        m_pageList->setCurrentIndex(index);
+        return true;
+    }
+    return false;
 }
 
 void PageContainer::refreshContainer()
 {
-	m_proxyModel->invalidate();
-	if(!m_currentPage->shouldDisplay())
-	{
-		auto index = m_proxyModel->index(0, 0);
-		if(index.isValid())
-		{
-			m_pageList->setCurrentIndex(index);
-		}
-		else
-		{
-			// FIXME: unhandled corner case: what to do when there's no page to select?
-		}
-	}
+    m_proxyModel->invalidate();
+    if(!m_currentPage->shouldDisplay())
+    {
+        auto index = m_proxyModel->index(0, 0);
+        if(index.isValid())
+        {
+            m_pageList->setCurrentIndex(index);
+        }
+        else
+        {
+            // FIXME: unhandled corner case: what to do when there's no page to select?
+        }
+    }
 }
 
 void PageContainer::createUI()
 {
-	m_pageStack = new QStackedLayout;
-	m_pageList = new PageView;
-	m_header = new QLabel();
-	m_iconHeader = new IconLabel(this, QIcon(), QSize(24, 24));
-
-	QFont headerLabelFont = m_header->font();
-	headerLabelFont.setBold(true);
-	const int pointSize = headerLabelFont.pointSize();
-	if (pointSize > 0)
-		headerLabelFont.setPointSize(pointSize + 2);
-	m_header->setFont(headerLabelFont);
-
-	QHBoxLayout *headerHLayout = new QHBoxLayout;
-	const int leftMargin = MMC->style()->pixelMetric(QStyle::PM_LayoutLeftMargin);
-	headerHLayout->addSpacerItem(
-		new QSpacerItem(leftMargin, 0, QSizePolicy::Fixed, QSizePolicy::Ignored));
-	headerHLayout->addWidget(m_header);
-	headerHLayout->addSpacerItem(
-		new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Ignored));
-	headerHLayout->addWidget(m_iconHeader);
-	const int rightMargin = MMC->style()->pixelMetric(QStyle::PM_LayoutRightMargin);
-	headerHLayout->addSpacerItem(
-		new QSpacerItem(rightMargin, 0, QSizePolicy::Fixed, QSizePolicy::Ignored));
-
-	m_pageStack->setMargin(0);
-	m_pageStack->addWidget(new QWidget(this));
-
-	m_layout = new QGridLayout;
-	m_layout->addLayout(headerHLayout, 0, 1, 1, 1);
-	m_layout->addWidget(m_pageList, 0, 0, 2, 1);
-	m_layout->addLayout(m_pageStack, 1, 1, 1, 1);
-	m_layout->setColumnStretch(1, 4);
-	setLayout(m_layout);
+    m_pageStack = new QStackedLayout;
+    m_pageList = new PageView;
+    m_header = new QLabel();
+    m_iconHeader = new IconLabel(this, QIcon(), QSize(24, 24));
+
+    QFont headerLabelFont = m_header->font();
+    headerLabelFont.setBold(true);
+    const int pointSize = headerLabelFont.pointSize();
+    if (pointSize > 0)
+        headerLabelFont.setPointSize(pointSize + 2);
+    m_header->setFont(headerLabelFont);
+
+    QHBoxLayout *headerHLayout = new QHBoxLayout;
+    const int leftMargin = MMC->style()->pixelMetric(QStyle::PM_LayoutLeftMargin);
+    headerHLayout->addSpacerItem(new QSpacerItem(leftMargin, 0, QSizePolicy::Fixed, QSizePolicy::Ignored));
+    headerHLayout->addWidget(m_header);
+    headerHLayout->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Ignored));
+    headerHLayout->addWidget(m_iconHeader);
+    const int rightMargin = MMC->style()->pixelMetric(QStyle::PM_LayoutRightMargin);
+    headerHLayout->addSpacerItem(new QSpacerItem(rightMargin, 0, QSizePolicy::Fixed, QSizePolicy::Ignored));
+    headerHLayout->setContentsMargins(0, 6, 0, 0);
+
+    m_pageStack->setMargin(0);
+    m_pageStack->addWidget(new QWidget(this));
+
+    m_layout = new QGridLayout;
+    m_layout->addLayout(headerHLayout, 0, 1, 1, 1);
+    m_layout->addWidget(m_pageList, 0, 0, 2, 1);
+    m_layout->addLayout(m_pageStack, 1, 1, 1, 1);
+    m_layout->setColumnStretch(1, 4);
+    m_layout->setContentsMargins(0,0,0,6);
+    setLayout(m_layout);
 }
 
 void PageContainer::addButtons(QWidget *buttons)
 {
-	m_layout->addWidget(buttons, 2, 0, 1, 2);
+    m_layout->addWidget(buttons, 2, 0, 1, 2);
 }
 
 void PageContainer::addButtons(QLayout *buttons)
 {
-	m_layout->addLayout(buttons, 2, 0, 1, 2);
+    m_layout->addLayout(buttons, 2, 0, 1, 2);
 }
 
 void PageContainer::showPage(int row)
 {
-	if (m_currentPage)
-	{
-		m_currentPage->closed();
-	}
-	if (row != -1)
-	{
-		m_currentPage = m_model->pages().at(row);
-	}
-	else
-	{
-		m_currentPage = nullptr;
-	}
-	if (m_currentPage)
-	{
-		m_pageStack->setCurrentIndex(m_currentPage->stackIndex);
-		m_header->setText(m_currentPage->displayName());
-		m_iconHeader->setIcon(m_currentPage->icon());
-		m_currentPage->opened();
-	}
-	else
-	{
-		m_pageStack->setCurrentIndex(0);
-		m_header->setText(QString());
-		m_iconHeader->setIcon(MMC->getThemedIcon("bug"));
-	}
+    if (m_currentPage)
+    {
+        m_currentPage->closed();
+    }
+    if (row != -1)
+    {
+        m_currentPage = m_model->pages().at(row);
+    }
+    else
+    {
+        m_currentPage = nullptr;
+    }
+    if (m_currentPage)
+    {
+        m_pageStack->setCurrentIndex(m_currentPage->stackIndex);
+        m_header->setText(m_currentPage->displayName());
+        m_iconHeader->setIcon(m_currentPage->icon());
+        m_currentPage->opened();
+    }
+    else
+    {
+        m_pageStack->setCurrentIndex(0);
+        m_header->setText(QString());
+        m_iconHeader->setIcon(MMC->getThemedIcon("bug"));
+    }
 }
 
 void PageContainer::help()
 {
-	if (m_currentPage)
-	{
-		QString pageId = m_currentPage->helpPage();
-		if (pageId.isEmpty())
-			return;
-		DesktopServices::openUrl(QUrl("https://github.com/MultiMC/MultiMC5/wiki/" + pageId));
-	}
+    if (m_currentPage)
+    {
+        QString pageId = m_currentPage->helpPage();
+        if (pageId.isEmpty())
+            return;
+        DesktopServices::openUrl(QUrl("https://github.com/MultiMC/MultiMC5/wiki/" + pageId));
+    }
 }
 
 void PageContainer::currentChanged(const QModelIndex &current)
 {
-	showPage(current.isValid() ? m_proxyModel->mapToSource(current).row() : -1);
+    showPage(current.isValid() ? m_proxyModel->mapToSource(current).row() : -1);
 }
 
 bool PageContainer::prepareToClose()
 {
-	for (auto page : m_model->pages())
-	{
-		if (!page->apply())
-			return false;
-	}
-	if (m_currentPage)
-	{
-		m_currentPage->closed();
-	}
-	return true;
+    if(!saveAll())
+    {
+        return false;
+    }
+    if (m_currentPage)
+    {
+        m_currentPage->closed();
+    }
+    return true;
+}
+
+bool PageContainer::saveAll()
+{
+    for (auto page : m_model->pages())
+    {
+        if (!page->apply())
+            return false;
+    }
+    return true;
 }