From 9b9ad5666a56b429f81a94bd067f5a604445204d Mon Sep 17 00:00:00 2001 From: chelovechishko Date: Sun, 3 Apr 2022 21:58:02 +0900 Subject: [PATCH] gui: make listwidget respect no_icons setting --- retroshare-gui/src/gui/MainWindow.cpp | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp index 974715d63..e1a89a303 100644 --- a/retroshare-gui/src/gui/MainWindow.cpp +++ b/retroshare-gui/src/gui/MainWindow.cpp @@ -1479,8 +1479,28 @@ void MainWindow::settingsChanged() ui->toolBarPage->setIconSize(QSize(toolSize,toolSize)); ui->toolBarAction->setToolButtonStyle(Settings->getToolButtonStyle()); ui->toolBarAction->setIconSize(QSize(toolSize,toolSize)); - int itemSize = Settings->getListItemIconSize(); - ui->listWidget->setIconSize(QSize(itemSize,itemSize)); + switch (Settings->RshareSettings::getToolButtonStyle()) + { + case Qt::ToolButtonTextOnly: + for (int i = 0; i < ui->listWidget->count(); ++i) + { + // annihilate icons + ui->listWidget->item(i)->setIcon(QIcon()); + } + break; + default: + QList pages = ui->stackPages->pages(); + int count = 0; + for (QList::iterator i = pages.begin(); i != pages.end(); ++i) { + ui->listWidget->item(count++)->setIcon((*i)->iconPixmap()); + } + // because 'exit' isn't a 'page', but only 'action' + ui->listWidget->item(count)->setIcon(QIcon(IMAGE_QUIT)) ; + + int itemSize = Settings->getListItemIconSize(); + ui->listWidget->setIconSize(QSize(itemSize,itemSize)); + break; + } } void MainWindow::externalLinkActivated(const QUrl &url)