Clean out old assets stuff, fix button hitbox regression
This commit is contained in:
		@@ -190,10 +190,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
 | 
			
		||||
	connect(MMC->instances().get(), SIGNAL(dataIsInvalid()), SLOT(selectionBad()));
 | 
			
		||||
 | 
			
		||||
	m_statusLeft = new QLabel(tr("No instance selected"), this);
 | 
			
		||||
	m_statusRight = new QLabel(this);
 | 
			
		||||
	m_statusRight->setAlignment(Qt::AlignRight);
 | 
			
		||||
	statusBar()->addPermanentWidget(m_statusLeft, 1);
 | 
			
		||||
	//statusBar()->addPermanentWidget(m_statusRight, 0);
 | 
			
		||||
 | 
			
		||||
	// Add "manage accounts" button, right align
 | 
			
		||||
	QWidget *spacer = new QWidget();
 | 
			
		||||
@@ -1291,32 +1288,3 @@ void MainWindow::checkSetDefaultJava()
 | 
			
		||||
			MMC->settings()->set("JavaPath", QString("java"));
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void MainWindow::assetsIndexStarted()
 | 
			
		||||
{
 | 
			
		||||
	m_statusRight->setText(tr("Checking assets..."));
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void MainWindow::assetsFilesStarted()
 | 
			
		||||
{
 | 
			
		||||
	m_statusRight->setText(tr("Downloading assets..."));
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void MainWindow::assetsFilesProgress(int succeeded, int failed, int total)
 | 
			
		||||
{
 | 
			
		||||
	QString status = tr("Downloading assets: %1 / %2").arg(succeeded + failed).arg(total);
 | 
			
		||||
	if (failed > 0)
 | 
			
		||||
		status += tr(" (%1 failed)").arg(failed);
 | 
			
		||||
	status += tr("...");
 | 
			
		||||
	m_statusRight->setText(status);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void MainWindow::assetsFailed()
 | 
			
		||||
{
 | 
			
		||||
	m_statusRight->setText(tr("Failed to update assets."));
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void MainWindow::assetsFinished()
 | 
			
		||||
{
 | 
			
		||||
	m_statusRight->setText(tr("Assets up to date."));
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -142,12 +142,6 @@ slots:
 | 
			
		||||
 | 
			
		||||
	void on_actionInstanceSettings_triggered();
 | 
			
		||||
 | 
			
		||||
	void assetsIndexStarted();
 | 
			
		||||
	void assetsFilesStarted();
 | 
			
		||||
	void assetsFilesProgress(int, int, int);
 | 
			
		||||
	void assetsFailed();
 | 
			
		||||
	void assetsFinished();
 | 
			
		||||
 | 
			
		||||
	// called when an icon is changed in the icon model.
 | 
			
		||||
	void iconUpdated(QString);
 | 
			
		||||
 | 
			
		||||
@@ -198,7 +192,6 @@ private:
 | 
			
		||||
	Task *m_versionLoadTask;
 | 
			
		||||
 | 
			
		||||
	QLabel *m_statusLeft;
 | 
			
		||||
	QLabel *m_statusRight;
 | 
			
		||||
 | 
			
		||||
	QMenu *accountMenu;
 | 
			
		||||
	QToolButton *accountMenuButton;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user