From 52bbf07fe5b6c614b361df0a66f054d57d36ab5d Mon Sep 17 00:00:00 2001
From: Sky <git@bunnies.cc>
Date: Thu, 2 Jan 2014 22:10:21 +0000
Subject: Clean out old assets stuff, fix button hitbox regression

---
 gui/MainWindow.cpp | 32 --------------------------------
 gui/MainWindow.h   |  7 -------
 2 files changed, 39 deletions(-)

diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp
index ff3800e6..2b911b2c 100644
--- a/gui/MainWindow.cpp
+++ b/gui/MainWindow.cpp
@@ -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."));
-}
diff --git a/gui/MainWindow.h b/gui/MainWindow.h
index d2435ef2..f2315ee6 100644
--- a/gui/MainWindow.h
+++ b/gui/MainWindow.h
@@ -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;
-- 
cgit v1.2.3