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

Clean out old assets stuff, fix button hitbox regression

Browse Source
This commit is contained in:
Sky 2014-01-02 22:10:21 +00:00
parent 66ee0d4955
commit 52bbf07fe5
2 changed files with 0 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gui/MainWindow.cpp
View File

@ -190,10 +190,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
connect(MMC->instances().get(), SIGNAL(dataIsInvalid()), SLOT(selectionBad())); connect(MMC->instances().get(), SIGNAL(dataIsInvalid()), SLOT(selectionBad()));
m_statusLeft = new QLabel(tr("No instance selected"), this); 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_statusLeft, 1);
//statusBar()->addPermanentWidget(m_statusRight, 0);
// Add "manage accounts" button, right align // Add "manage accounts" button, right align
QWidget *spacer = new QWidget(); QWidget *spacer = new QWidget();
@ -1291,32 +1288,3 @@ void MainWindow::checkSetDefaultJava()
MMC->settings()->set("JavaPath", QString("java")); 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."));
}

7
gui/MainWindow.h
View File

@ -142,12 +142,6 @@ slots:
void on_actionInstanceSettings_triggered(); 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. // called when an icon is changed in the icon model.
void iconUpdated(QString); void iconUpdated(QString);
@ -198,7 +192,6 @@ private:
Task *m_versionLoadTask; Task *m_versionLoadTask;
QLabel *m_statusLeft; QLabel *m_statusLeft;
QLabel *m_statusRight;
QMenu *accountMenu; QMenu *accountMenu;
QToolButton *accountMenuButton; QToolButton *accountMenuButton;