summaryrefslogtreecommitdiffstats
path: root/gui/MainWindow.cpp
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2014-01-19 04:52:34 +0100
committerPetr Mrázek <peterix@gmail.com>2014-01-19 04:52:34 +0100
commitd8413fa5ec594455b3cdec86899b61adba39eb33 (patch)
treeb9ece71804389f66b4a241edc59b8309c7729de2 /gui/MainWindow.cpp
parente6ab57b8b1275137d873c0c465aeffe61c13c324 (diff)
downloadMultiMC-d8413fa5ec594455b3cdec86899b61adba39eb33.tar
MultiMC-d8413fa5ec594455b3cdec86899b61adba39eb33.tar.gz
MultiMC-d8413fa5ec594455b3cdec86899b61adba39eb33.tar.lz
MultiMC-d8413fa5ec594455b3cdec86899b61adba39eb33.tar.xz
MultiMC-d8413fa5ec594455b3cdec86899b61adba39eb33.zip
Use icon theme so we can have more than one icon size per icon
Diffstat (limited to 'gui/MainWindow.cpp')
-rw-r--r--gui/MainWindow.cpp31
1 files changed, 10 insertions, 21 deletions
diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp
index cca1ecac..7c8562cd 100644
--- a/gui/MainWindow.cpp
+++ b/gui/MainWindow.cpp
@@ -128,7 +128,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
// Add the news label to the news toolbar.
{
newsLabel = new QToolButton();
- newsLabel->setIcon(QIcon(":/icons/toolbar/news"));
+ newsLabel->setIcon(QIcon::fromTheme("news"));
newsLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
newsLabel->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
ui->newsToolBar->insertWidget(ui->actionMoreNews, newsLabel);
@@ -203,9 +203,9 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
m_statusLeft = new QLabel(tr("No instance selected"), this);
m_statusRight = new QLabel(tr("No status available"), this);
m_statusRefresh = new QToolButton(this);
+ m_statusRefresh->setCheckable(true);
m_statusRefresh->setToolButtonStyle(Qt::ToolButtonIconOnly);
- m_statusRefresh->setIcon(
- QPixmap(":/icons/toolbar/refresh").scaled(16, 16, Qt::KeepAspectRatio));
+ m_statusRefresh->setIcon(QIcon::fromTheme("refresh"));
statusBar()->addPermanentWidget(m_statusLeft, 1);
statusBar()->addPermanentWidget(m_statusRight, 0);
@@ -241,8 +241,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
accountMenuButton->setMenu(accountMenu);
accountMenuButton->setPopupMode(QToolButton::InstantPopup);
accountMenuButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
- accountMenuButton->setIcon(
- QPixmap(":/icons/toolbar/noaccount").scaled(48, 48, Qt::KeepAspectRatio));
+ accountMenuButton->setIcon(QIcon::fromTheme("noaccount"));
QWidgetAction *accountMenuButtonAction = new QWidgetAction(this);
accountMenuButtonAction->setDefaultWidget(accountMenuButton);
@@ -408,7 +407,7 @@ void MainWindow::repopulateAccountsMenu()
QAction *action = new QAction(tr("No Default Account"), this);
action->setCheckable(true);
- action->setIcon(QPixmap(":/icons/toolbar/noaccount").scaled(48, 48, Qt::KeepAspectRatio));
+ action->setIcon(QIcon::fromTheme("noaccount"));
action->setData("");
if (active_username.isEmpty())
{
@@ -462,8 +461,7 @@ void MainWindow::activeAccountChanged()
}
// Set the icon to the "no account" icon.
- accountMenuButton->setIcon(
- QPixmap(":/icons/toolbar/noaccount").scaled(48, 48, Qt::KeepAspectRatio));
+ accountMenuButton->setIcon(QIcon::fromTheme("noaccount"));
}
bool MainWindow::eventFilter(QObject *obj, QEvent *ev)
@@ -533,8 +531,9 @@ static QString convertStatus(const QString &status)
void MainWindow::reloadStatus()
{
+ m_statusRefresh->setChecked(true);
MMC->statusChecker()->reloadStatus();
- updateStatusUI();
+ //updateStatusUI();
}
static QString makeStatusString(const QMap<QString, QString> statuses)
@@ -555,16 +554,7 @@ void MainWindow::updateStatusUI()
auto statuses = statusChecker->getStatusEntries();
QString status = makeStatusString(statuses);
- if(statusChecker->isLoadingStatus())
- {
- m_statusRefresh->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
- m_statusRefresh->setText(tr("Loading..."));
- }
- else
- {
- m_statusRefresh->setToolButtonStyle(Qt::ToolButtonIconOnly);
- m_statusRefresh->setText(tr(""));
- }
+ m_statusRefresh->setChecked(false);
m_statusRight->setText(status);
@@ -574,8 +564,7 @@ void MainWindow::updateStatusUI()
void MainWindow::updateStatusFailedUI()
{
m_statusRight->setText(makeStatusString(QMap<QString, QString>()));
- m_statusRefresh->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
- m_statusRefresh->setText(tr("Failed."));
+ m_statusRefresh->setChecked(false);
statusTimer.start(60 * 1000);
}