diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -103,7 +103,7 @@ btn->setAutoExclusive(true); btn->setCheckable(true); btn->setIcon(icon); - btn->setIconSize(QSize(64,64)); + btn->setIconSize(QSize(48,48)); btn->setFlat(true); m_lateral.m_stack->addWidget(w); m_lateral.m_map[key] = {btn, w}; @@ -122,9 +122,9 @@ m_currEditorView = view; }); - setupButton("3d", i18n("&3D"), QIcon(":/icon/atelier"), new Viewer3D(this)); - setupButton("gcode", i18n("&GCode"), QIcon(":/icon/atelier"), gcodeEditor); - setupButton("video", i18n("&Video"), QIcon(":/icon/atelier"), new VideoMonitorWidget(this)); + setupButton("3d", i18n("&3D"), QIcon::fromTheme("draw-cuboid", QIcon(":/icon/atelier")), new Viewer3D(this)); + setupButton("gcode", i18n("&GCode"), QIcon::fromTheme("accessories-text-editor", QIcon(":/icon/atelier")), gcodeEditor); + setupButton("video", i18n("&Video"), QIcon::fromTheme("camera-web", QIcon(":/icon/atelier")), new VideoMonitorWidget(this)); buttonLayout->addStretch(); m_lateral.m_toolBar->setLayout(buttonLayout); } @@ -134,28 +134,24 @@ // Actions for the Toolbar QAction *action; action = actionCollection()->addAction(QStringLiteral("open_gcode")); + action->setIcon(QIcon::fromTheme("document-open", style()->standardIcon(QStyle::SP_DirOpenIcon))); action->setText(i18n("&Open GCode")); connect(action, &QAction::triggered, this, &MainWindow::openFile); action = actionCollection()->addAction(QStringLiteral("new_instance")); + action->setIcon(QIcon::fromTheme("list-add", QIcon())); action->setText(i18n("&New Connection")); connect(action, &QAction::triggered, this, &MainWindow::newAtCoreInstance); action = actionCollection()->addAction(QStringLiteral("profiles")); + action->setIcon(QIcon::fromTheme("document-properties", QIcon())); action->setText(i18n("&Profiles")); connect(action, &QAction::triggered, [this] { std::unique_ptr pd(new ProfilesDialog); pd->exec(); emit(profilesChanged()); }); - #ifdef Q_OS_LINUX - //only set icons from theme on linux - actionCollection()->action(QStringLiteral("profiles"))->setIcon(QIcon::fromTheme("emblem-favorite")); - #endif - //use style's standardIcon for the icons we can. - actionCollection()->action(QStringLiteral("open_gcode"))->setIcon(style()->standardIcon(QStyle::SP_DirOpenIcon)); - action = KStandardAction::quit(qApp, SLOT(quit()), actionCollection()); setupGUI(Default, ":/atelierui"); diff --git a/src/widgets/atcoreinstancewidget.cpp b/src/widgets/atcoreinstancewidget.cpp --- a/src/widgets/atcoreinstancewidget.cpp +++ b/src/widgets/atcoreinstancewidget.cpp @@ -54,7 +54,7 @@ m_toolBar = new QToolBar(); auto lb = new QAction; - lb->setIcon(style()->standardIcon(QStyle::SP_DirHomeIcon)); + lb->setIcon(QIcon::fromTheme("go-home", style()->standardIcon(QStyle::SP_DirHomeIcon))); lb->setDisabled(true); m_toolBar->addAction(lb); @@ -100,7 +100,7 @@ m_mainToolBar = new QToolBar(); m_mainToolBar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); - m_printAction = new QAction(style()->standardIcon(QStyle::SP_MediaPlay),i18n("Print")); + m_printAction = new QAction(QIcon::fromTheme("media-playback-start", style()->standardIcon(QStyle::SP_MediaPlay)),i18n("Print")); connect(m_printAction, &QAction::triggered, [ this ](){ if(m_core.state() == AtCore::BUSY) { pausePrint(); @@ -114,11 +114,11 @@ }); m_mainToolBar->addAction(m_printAction); - auto stopAction = new QAction(style()->standardIcon(QStyle::SP_MediaStop),i18n("Stop")); + auto stopAction = new QAction(QIcon::fromTheme("media-playback-stop", style()->standardIcon(QStyle::SP_MediaStop)), i18n("Stop")); connect(stopAction, &QAction::triggered, this, &AtCoreInstanceWidget::stopPrint); connect(stopAction, &QAction::triggered, [this](){ m_printAction->setText(i18n("Print")); - m_printAction->setIcon(style()->standardIcon(QStyle::SP_MediaPlay)); + m_printAction->setIcon(QIcon::fromTheme("media-playback-start", style()->standardIcon(QStyle::SP_MediaPlay))); }); m_mainToolBar->addAction(stopAction); @@ -154,7 +154,7 @@ m_connectWidget->setLayout(connectLayout); m_connectToolBar->addWidget(m_connectWidget); - m_connectButton = new QPushButton(i18n("Connect")); + m_connectButton = new QPushButton(QIcon::fromTheme("network-connect", style()->standardIcon(QStyle::SP_DialogCloseButton)), i18n("Connect")); m_connectButton->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed); connect(this, &AtCoreInstanceWidget::disableDisconnect, m_connectButton, &QPushButton::setDisabled); connect(m_connectButton, &QPushButton::clicked, this, &AtCoreInstanceWidget::connectButtonClicked); @@ -310,6 +310,7 @@ case AtCore::CONNECTING: { m_core.setSerialTimerInterval(0); m_connectButton->setText(i18n("Disconnect")); + m_connectButton->setIcon(QIcon::fromTheme("network-disconnect")); m_connectToolBar->setHidden(true); m_mainToolBar->setHidden(false); stateString = i18n("Connecting..."); @@ -330,6 +331,7 @@ ui->logWidget->addLog(i18n("Serial disconnected")); m_core.setSerialTimerInterval(100); m_connectButton->setText(i18n("Connect")); + m_connectButton->setIcon(QIcon::fromTheme("network-connect")); m_connectToolBar->setHidden(false); m_mainToolBar->setHidden(true); enableControls(false); @@ -344,18 +346,18 @@ ui->printProgressWidget->setVisible(false); disconnect(&m_core, &AtCore::printProgressChanged, ui->printProgressWidget, &PrintProgressWidget::updateProgressBar); m_printAction->setText(i18n("Print")); - m_printAction->setIcon(style()->standardIcon(QStyle::SP_MediaPlay)); + m_printAction->setIcon(QIcon::fromTheme("document-edit", style()->standardIcon(QStyle::SP_MediaPlay))); } break; case AtCore::BUSY: { stateString = i18n("Printing"); emit disableDisconnect(true); m_printAction->setText(i18n("Pause")); - m_printAction->setIcon(style()->standardIcon(QStyle::SP_MediaPause)); + m_printAction->setIcon(QIcon::fromTheme("media-playback-pause", style()->standardIcon(QStyle::SP_MediaPause))); } break; case AtCore::PAUSE: { stateString = i18n("Paused"); m_printAction->setText(i18n("Resume")); - m_printAction->setIcon(style()->standardIcon(QStyle::SP_MediaPlay)); + m_printAction->setIcon(QIcon::fromTheme("media-playback-start", style()->standardIcon(QStyle::SP_MediaPlay))); } break; case AtCore::STOP: { stateString = i18n("Stoping Print");