CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: rename InstanceView to InstancesView

Browse Source 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
This commit is contained in:
Sefa Eyeoglu 2022-10-05 13:11:19 +02:00
parent d1a62c85a6
commit af73c797aa
No known key found for this signature in database
GPG Key ID: C10411294912A422
6 changed files with 55 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
launcher/Application.cpp
View File

@ -38,9 +38,9 @@
#include "BuildConfig.h"
#include "net/PasteUpload.h"
#include "ui/MainWindow.h"
#include "ui/InstanceWindow.h"
#include "ui/instanceview/InstanceView.h"
#include "ui/MainWindow.h"
#include "ui/instanceview/InstancesView.h"
#include "ui/pages/BasePageProvider.h"
#include "ui/pages/global/LauncherPage.h"
@ -610,7 +610,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
// The cat
m_settings->registerSetting("TheCat", false);
m_settings->registerSetting("InstanceDisplayMode", InstanceView::TableMode);
m_settings->registerSetting("InstanceDisplayMode", InstancesView::TableMode);
m_settings->registerSetting("InstSortMode", "Name");
m_settings->registerSetting("SelectedInstance", QString());

4
launcher/CMakeLists.txt
View File

@ -872,8 +872,8 @@ SET(LAUNCHER_SOURCES
ui/instanceview/InstanceGridProxyModel.h
ui/instanceview/InstanceDelegate.h
ui/instanceview/InstanceDelegate.cpp
ui/instanceview/InstanceView.h
ui/instanceview/InstanceView.cpp
ui/instanceview/InstancesView.h
ui/instanceview/InstancesView.cpp
)
if(WIN32)

40
launcher/ui/MainWindow.cpp
View File

@ -90,19 +90,19 @@
#include "JavaCommon.h"
#include "LaunchController.h"
#include "ui/instanceview/InstanceView.h"
#include "ui/widgets/LabeledToolButton.h"
#include "ui/dialogs/AboutDialog.h"
#include "ui/dialogs/CopyInstanceDialog.h"
#include "ui/dialogs/CustomMessageBox.h"
#include "ui/dialogs/EditAccountDialog.h"
#include "ui/dialogs/ExportInstanceDialog.h"
#include "ui/dialogs/IconPickerDialog.h"
#include "ui/dialogs/NewInstanceDialog.h"
#include "ui/dialogs/NewsDialog.h"
#include "ui/dialogs/ProgressDialog.h"
#include "ui/dialogs/AboutDialog.h"
#include "ui/dialogs/VersionSelectDialog.h"
#include "ui/dialogs/CustomMessageBox.h"
#include "ui/dialogs/IconPickerDialog.h"
#include "ui/dialogs/CopyInstanceDialog.h"
#include "ui/dialogs/UpdateDialog.h"
#include "ui/dialogs/EditAccountDialog.h"
#include "ui/dialogs/ExportInstanceDialog.h"
#include "ui/dialogs/VersionSelectDialog.h"
#include "ui/instanceview/InstancesView.h"
#include "ui/widgets/LabeledToolButton.h"
#include "UpdateController.h"
@ -880,10 +880,10 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new MainWindow
// Create the instance list widget
{
view = new InstanceView(ui->centralWidget, APPLICATION->instances().get());
view = new InstancesView(ui->centralWidget, APPLICATION->instances().get());
connect(view, &InstanceView::showContextMenu, this, &MainWindow::showInstanceContextMenu);
connect(filterView, &QLineEdit::textEdited, view, &InstanceView::setFilterQuery);
connect(view, &InstancesView::showContextMenu, this, &MainWindow::showInstanceContextMenu);
connect(filterView, &QLineEdit::textEdited, view, &InstancesView::setFilterQuery);
ui->verticalLayout->addWidget(view);
}
@ -900,20 +900,20 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new MainWindow
int displayMode = APPLICATION->settings()->get("InstanceDisplayMode").toInt();
ui->actionTableMode->setChecked(false);
ui->actionGridMode->setChecked(false);
if (displayMode == InstanceView::TableMode) {
if (displayMode == InstancesView::TableMode) {
ui->actionTableMode->setChecked(true);
} else {
ui->actionGridMode->setChecked(true);
}
view->switchDisplayMode(displayMode == InstanceView::TableMode ? InstanceView::TableMode : InstanceView::GridMode);
view->switchDisplayMode(displayMode == InstancesView::TableMode ? InstancesView::TableMode : InstancesView::GridMode);
connect(ui->actionTableMode, &QAction::triggered, this, [this](bool state){
if (!state) {
ui->actionTableMode->setChecked(true);
}
ui->actionGridMode->setChecked(false);
view->switchDisplayMode(InstanceView::TableMode);
APPLICATION->settings()->set("InstanceDisplayMode", InstanceView::TableMode);
view->switchDisplayMode(InstancesView::TableMode);
APPLICATION->settings()->set("InstanceDisplayMode", InstancesView::TableMode);
});
connect(ui->actionGridMode, &QAction::triggered, this, [this](bool state){
@ -921,15 +921,15 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new MainWindow
ui->actionGridMode->setChecked(true);
}
ui->actionTableMode->setChecked(false);
view->switchDisplayMode(InstanceView::GridMode);
APPLICATION->settings()->set("InstanceDisplayMode", InstanceView::GridMode);
view->switchDisplayMode(InstancesView::GridMode);
APPLICATION->settings()->set("InstanceDisplayMode", InstancesView::GridMode);
});
}
// start instance when double-clicked
connect(view, &InstanceView::instanceActivated, this, &MainWindow::instanceActivated);
connect(view, &InstancesView::instanceActivated, this, &MainWindow::instanceActivated);
// track the selection -- update the instance toolbar
connect(view, &InstanceView::currentInstanceChanged, this, &MainWindow::instanceChanged);
connect(view, &InstancesView::currentInstanceChanged, this, &MainWindow::instanceChanged);
// track icon changes and update the toolbar!
connect(APPLICATION->icons().get(), &IconList::iconUpdated, this, &MainWindow::iconUpdated);

5
launcher/ui/MainWindow.h
View File

@ -56,7 +56,7 @@ class QToolButton;
class LabeledToolButton;
class QLabel;
class QLineEdit;
class InstanceView;
class InstancesView;
class MinecraftLauncher;
class BaseProfilerFactory;
class InstanceTask;
@ -220,7 +220,7 @@ private:
std::unique_ptr<Ui> ui;
// these are managed by Qt's memory management model!
InstanceView *view = nullptr;
InstancesView*view = nullptr;
QLineEdit *filterView = nullptr;
QToolButton *newsLabel = nullptr;
QMenu *accountMenu = nullptr;
@ -234,4 +234,3 @@ private:
// managed by the application object
Task *m_versionLoadTask = nullptr;
};

52
launcher/ui/instanceview/InstanceView.cpp → launcher/ui/instanceview/InstancesView.cpp
View File

@ -22,7 +22,7 @@
* or later.
*/
#include "InstanceView.h"
#include "InstancesView.h"
#include "Application.h"
#include "InstanceDelegate.h"
@ -34,7 +34,7 @@
#include <QSize>
#include <QSortFilterProxyModel>
InstanceView::InstanceView(QWidget* parent, InstanceList* instances) : QStackedWidget(parent), m_instances(instances)
InstancesView::InstancesView(QWidget* parent, InstanceList* instances) : QStackedWidget(parent), m_instances(instances)
{
prepareModel();
createTable();
@ -44,12 +44,12 @@ InstanceView::InstanceView(QWidget* parent, InstanceList* instances) : QStackedW
addWidget(m_grid);
}
void InstanceView::storeState()
void InstancesView::storeState()
{
APPLICATION->settings()->set("InstanceViewTableHeaderState", m_table->horizontalHeader()->saveState().toBase64());
}
void InstanceView::switchDisplayMode(InstanceView::DisplayMode mode)
void InstancesView::switchDisplayMode(InstancesView::DisplayMode mode)
{
m_displayMode = mode;
if (mode == DisplayMode::TableMode) {
@ -59,7 +59,7 @@ void InstanceView::switchDisplayMode(InstanceView::DisplayMode mode)
}
}
void InstanceView::editSelected(InstanceList::Column targetColumn)
void InstancesView::editSelected(InstanceList::Column targetColumn)
{
auto current = currentView()->selectionModel()->currentIndex();
if (current.isValid()) {
@ -67,20 +67,20 @@ void InstanceView::editSelected(InstanceList::Column targetColumn)
}
}
void InstanceView::prepareModel()
void InstancesView::prepareModel()
{
m_tableProxy = new InstanceTableProxyModel(this);
m_tableProxy->setSortCaseSensitivity(Qt::CaseInsensitive);
m_tableProxy->setSourceModel(m_instances);
m_tableProxy->setSortRole(InstanceList::SortRole);
connect(m_tableProxy, &QAbstractItemModel::dataChanged, this, &InstanceView::dataChanged);
connect(m_tableProxy, &QAbstractItemModel::dataChanged, this, &InstancesView::dataChanged);
m_gridProxy = new InstanceGridProxyModel(this);
m_gridProxy->setSourceModel(m_instances);
m_gridProxy->sort(InstanceList::LastPlayedColumn, Qt::DescendingOrder);
connect(m_tableProxy, &QAbstractItemModel::dataChanged, this, &InstanceView::dataChanged);
connect(m_tableProxy, &QAbstractItemModel::dataChanged, this, &InstancesView::dataChanged);
}
void InstanceView::createTable()
void InstancesView::createTable()
{
m_table = new QTableView(this);
m_table->setModel(m_tableProxy);
@ -120,13 +120,13 @@ void InstanceView::createTable()
header->restoreState(QByteArray::fromBase64(APPLICATION->settings()->get("InstanceViewTableHeaderState").toByteArray()));
}
connect(m_table, &QAbstractItemView::doubleClicked, this, &InstanceView::activateInstance);
connect(m_table->selectionModel(), &QItemSelectionModel::currentRowChanged, this, &InstanceView::currentRowChanged);
connect(m_table->selectionModel(), &QItemSelectionModel::currentColumnChanged, this, &InstanceView::selectNameColumn);
connect(m_table, &QWidget::customContextMenuRequested, this, &InstanceView::contextMenuRequested);
connect(m_table, &QAbstractItemView::doubleClicked, this, &InstancesView::activateInstance);
connect(m_table->selectionModel(), &QItemSelectionModel::currentRowChanged, this, &InstancesView::currentRowChanged);
connect(m_table->selectionModel(), &QItemSelectionModel::currentColumnChanged, this, &InstancesView::selectNameColumn);
connect(m_table, &QWidget::customContextMenuRequested, this, &InstancesView::contextMenuRequested);
}
void InstanceView::createGrid()
void InstancesView::createGrid()
{
m_grid = new QListView(this);
m_grid->setModel(m_gridProxy);
@ -146,12 +146,12 @@ void InstanceView::createGrid()
m_grid->setFrameStyle(QFrame::NoFrame);
m_grid->setGridSize(QSize(m_iconSize * 2, m_iconSize * 2));
connect(m_grid, &QAbstractItemView::doubleClicked, this, &InstanceView::activateInstance);
connect(m_grid->selectionModel(), &QItemSelectionModel::currentRowChanged, this, &InstanceView::currentRowChanged);
connect(m_grid, &QWidget::customContextMenuRequested, this, &InstanceView::contextMenuRequested);
connect(m_grid, &QAbstractItemView::doubleClicked, this, &InstancesView::activateInstance);
connect(m_grid->selectionModel(), &QItemSelectionModel::currentRowChanged, this, &InstancesView::currentRowChanged);
connect(m_grid, &QWidget::customContextMenuRequested, this, &InstancesView::contextMenuRequested);
}
InstancePtr InstanceView::currentInstance()
InstancePtr InstancesView::currentInstance()
{
auto current = currentView()->selectionModel()->currentIndex();
if (current.isValid()) {
@ -161,7 +161,7 @@ InstancePtr InstanceView::currentInstance()
return nullptr;
}
void InstanceView::activateInstance(const QModelIndex& index)
void InstancesView::activateInstance(const QModelIndex& index)
{
if (index.isValid()) {
int row = mappedIndex(index).row();
@ -169,7 +169,7 @@ void InstanceView::activateInstance(const QModelIndex& index)
}
}
void InstanceView::currentRowChanged(const QModelIndex& current, const QModelIndex& previous)
void InstancesView::currentRowChanged(const QModelIndex& current, const QModelIndex& previous)
{
// don't fire event, if row changed in inactive model
QSortFilterProxyModel* m = m_tableProxy;
@ -191,14 +191,14 @@ void InstanceView::currentRowChanged(const QModelIndex& current, const QModelInd
emit currentInstanceChanged(inst1, inst2);
}
void InstanceView::selectNameColumn(const QModelIndex& current, const QModelIndex& previous)
void InstancesView::selectNameColumn(const QModelIndex& current, const QModelIndex& previous)
{
// Make sure Name column is always selected
if (current.column() != InstanceList::NameColumn && current.column() != InstanceList::CategoryColumn)
currentView()->setCurrentIndex(current.siblingAtColumn(InstanceList::NameColumn));
}
void InstanceView::dataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)
void InstancesView::dataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)
{
// Notify others if data of the current instance changed
auto current = currentView()->selectionModel()->currentIndex();
@ -211,7 +211,7 @@ void InstanceView::dataChanged(const QModelIndex& topLeft, const QModelIndex& bo
}
}
void InstanceView::contextMenuRequested(const QPoint pos)
void InstancesView::contextMenuRequested(const QPoint pos)
{
QModelIndex index = currentView()->indexAt(pos);
@ -222,7 +222,7 @@ void InstanceView::contextMenuRequested(const QPoint pos)
}
}
QModelIndex InstanceView::mappedIndex(const QModelIndex& index) const
QModelIndex InstancesView::mappedIndex(const QModelIndex& index) const
{
if (index.model() == m_tableProxy)
return m_tableProxy->mapToSource(index);
@ -231,13 +231,13 @@ QModelIndex InstanceView::mappedIndex(const QModelIndex& index) const
return index;
}
void InstanceView::setFilterQuery(const QString& query)
void InstancesView::setFilterQuery(const QString& query)
{
m_gridProxy->setFilterQuery(query);
m_tableProxy->setFilterQuery(query);
}
void InstanceView::setCatDisplayed(bool enabled)
void InstancesView::setCatDisplayed(bool enabled)
{
if (enabled) {
QDateTime now = QDateTime::currentDateTime();

4
launcher/ui/instanceview/InstanceView.h → launcher/ui/instanceview/InstancesView.h
View File

@ -28,13 +28,13 @@
class InstanceTableProxyModel;
class InstanceGridProxyModel;
class InstanceView : public QStackedWidget {
class InstancesView : public QStackedWidget {
Q_OBJECT
public:
enum DisplayMode { TableMode = 0, GridMode };
explicit InstanceView(QWidget* parent = nullptr, InstanceList* instances = nullptr);
explicit InstancesView(QWidget* parent = nullptr, InstanceList* instances = nullptr);
void switchDisplayMode(DisplayMode mode);