Sneederix/sneedmc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clean up the main window constructor a bit

Browse Source
This commit is contained in:
Petr Mrázek 2013-08-26 07:09:54 +02:00
parent a63c7340a6
commit e6999b3b62
1 changed files with 69 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
gui/mainwindow.cpp
View File

@ -74,13 +74,16 @@ MainWindow::MainWindow ( QWidget *parent ) :
instList ( globalSettings->get ( "InstanceDir" ).toString() ) instList ( globalSettings->get ( "InstanceDir" ).toString() )
{ {
ui->setupUi ( this ); ui->setupUi ( this );
setWindowTitle ( QString ( "MultiMC %1" ).arg ( AppVersion::current.toString() ) );
ui->instanceToolBar->setEnabled(false);
// Set the selected instance to null // Set the selected instance to null
m_selectedInstance = nullptr; m_selectedInstance = nullptr;
// Set active instance to null. // Set active instance to null.
m_activeInst = nullptr; m_activeInst = nullptr;
// The instance action toolbar customizations
{
ui->instanceToolBar->setEnabled(false);
// the rename label is inside the rename tool button // the rename label is inside the rename tool button
renameButton = new LabeledToolButton(); renameButton = new LabeledToolButton();
renameButton->setText("Instance Name"); renameButton->setText("Instance Name");
@ -88,12 +91,14 @@ MainWindow::MainWindow ( QWidget *parent ) :
ui->instanceToolBar->insertWidget(ui->actionLaunchInstance, renameButton); ui->instanceToolBar->insertWidget(ui->actionLaunchInstance, renameButton);
ui->instanceToolBar->insertSeparator(ui->actionLaunchInstance); ui->instanceToolBar->insertSeparator(ui->actionLaunchInstance);
renameButton->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Preferred); renameButton->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Preferred);
// Create the widget }
// Create the instance list widget
{
view = new KCategorizedView ( ui->centralWidget ); view = new KCategorizedView ( ui->centralWidget );
drawer = new KCategoryDrawer ( view ); drawer = new KCategoryDrawer ( view );
view->setSelectionMode ( QAbstractItemView::SingleSelection ); view->setSelectionMode ( QAbstractItemView::SingleSelection );
//view->setSpacing( KDialog::spacingHint() );
view->setCategoryDrawer ( drawer ); view->setCategoryDrawer ( drawer );
view->setCollapsibleBlocks ( true ); view->setCollapsibleBlocks ( true );
view->setViewMode ( QListView::IconMode ); view->setViewMode ( QListView::IconMode );
@ -111,48 +116,51 @@ MainWindow::MainWindow ( QWidget *parent ) :
proxymodel->setSortRole ( KCategorizedSortFilterProxyModel::CategorySortRole ); proxymodel->setSortRole ( KCategorizedSortFilterProxyModel::CategorySortRole );
proxymodel->setFilterRole ( KCategorizedSortFilterProxyModel::CategorySortRole ); proxymodel->setFilterRole ( KCategorizedSortFilterProxyModel::CategorySortRole );
//proxymodel->setDynamicSortFilter ( true ); //proxymodel->setDynamicSortFilter ( true );
// FIXME: instList should be global-ish, or at least not tied to the main window... maybe the application itself?
proxymodel->setSourceModel ( &instList ); proxymodel->setSourceModel ( &instList );
proxymodel->sort ( 0 ); proxymodel->sort ( 0 );
view->setFrameShape ( QFrame::NoFrame ); view->setFrameShape ( QFrame::NoFrame );
view->setModel ( proxymodel );
ui->horizontalLayout->addWidget ( view );
}
// The cat background
{
bool cat_enable = globalSettings->get("TheCat").toBool(); bool cat_enable = globalSettings->get("TheCat").toBool();
ui->actionCAT->setChecked(cat_enable); ui->actionCAT->setChecked(cat_enable);
connect(ui->actionCAT, SIGNAL(toggled(bool)), SLOT(onCatToggled(bool))); connect(ui->actionCAT, SIGNAL(toggled(bool)), SLOT(onCatToggled(bool)));
setCatBackground(cat_enable); setCatBackground(cat_enable);
}
ui->horizontalLayout->addWidget ( view ); // start instance when double-clicked
setWindowTitle ( QString ( "MultiMC %1" ).arg ( AppVersion::current.toString() ) );
// TODO: Make this work with the new settings system.
// restoreGeometry(settings->getConfig().value("MainWindowGeometry", saveGeometry()).toByteArray());
// restoreState(settings->getConfig().value("MainWindowState", saveState()).toByteArray());
view->setModel ( proxymodel );
connect(view, SIGNAL(doubleClicked(const QModelIndex &)), this, SLOT(instanceActivated(const QModelIndex &))); connect(view, SIGNAL(doubleClicked(const QModelIndex &)), this, SLOT(instanceActivated(const QModelIndex &)));
auto selectionmodel = view->selectionModel(); // track the selection -- update the instance toolbar
connect( connect(
selectionmodel, view->selectionModel(),
SIGNAL(currentChanged(const QModelIndex &,const QModelIndex &)), SIGNAL(currentChanged(const QModelIndex &,const QModelIndex &)),
this, this,
SLOT(instanceChanged(const QModelIndex &,const QModelIndex &)) SLOT(instanceChanged(const QModelIndex &,const QModelIndex &))
); );
// model reset -> selection is invalid. All the instance pointers are wrong.
// FIXME: stop using POINTERS everywhere
connect(&instList,SIGNAL(dataIsInvalid()),SLOT(selectionBad())); connect(&instList,SIGNAL(dataIsInvalid()),SLOT(selectionBad()));
// Load the instances. FIXME: this is not the place I'd say.
instList.loadList();
//FIXME: WTF // run the things that load and download other things... FIXME: this is NOT the place
// FIXME: invisible actions in the background = NOPE.
{
instList.loadList();
if (!MinecraftVersionList::getMainList().isLoaded()) if (!MinecraftVersionList::getMainList().isLoaded())
{ {
m_versionLoadTask = MinecraftVersionList::getMainList().getLoadTask(); m_versionLoadTask = MinecraftVersionList::getMainList().getLoadTask();
startTask(m_versionLoadTask); startTask(m_versionLoadTask);
} }
//FIXME: WTF X 2
if (!LWJGLVersionList::get().isLoaded()) if (!LWJGLVersionList::get().isLoaded())
{ {
LWJGLVersionList::get().loadList(); LWJGLVersionList::get().loadList();
} }
//FIXME: I guess you get the idea. This is a quick hack.
assets_downloader = new OneSixAssets(); assets_downloader = new OneSixAssets();
assets_downloader->start(); assets_downloader->start();
}
} }
MainWindow::~MainWindow() MainWindow::~MainWindow()