diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,13 +1,14 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) +set(CMAKE_AUTORCC ON) set(atelier_SRCS main.cpp mainwindow.cpp ) add_subdirectory(dialogs) add_subdirectory(widgets) -add_executable(atelier ${atelier_SRCS}) +add_executable(atelier ${atelier_SRCS} icons.qrc) target_link_libraries(atelier AtelierWidgets AtelierDialogs KF5::AtCore KF5::Solid KF5::XmlGui KF5::ConfigWidgets) diff --git a/src/icons.qrc b/src/icons.qrc new file mode 100644 --- /dev/null +++ b/src/icons.qrc @@ -0,0 +1,6 @@ + + + ../deploy/atelier.png + + + diff --git a/src/main.cpp b/src/main.cpp --- a/src/main.cpp +++ b/src/main.cpp @@ -22,6 +22,7 @@ int main(int argc, char *argv[]) { + QApplication app(argc, argv); QCoreApplication::setOrganizationName("KDE"); @@ -62,6 +63,7 @@ KAboutData::setApplicationData(aboutData); MainWindow *m = new MainWindow(); + m->setWindowIcon(QIcon(":/icon/atelier")); m->show(); return app.exec(); } diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -156,12 +156,13 @@ #ifdef Q_OS_LINUX //only set icons from theme on linux - actionCollection()->action(QStringLiteral("open_gcode"))->setIcon(QIcon::fromTheme("document-open")); actionCollection()->action(QStringLiteral("profiles"))->setIcon(QIcon::fromTheme("emblem-favorite")); - actionCollection()->action(QStringLiteral("print"))->setIcon(QIcon::fromTheme("media-playback-start")); - actionCollection()->action(QStringLiteral("pause"))->setIcon(QIcon::fromTheme("media-playback-pause")); - actionCollection()->action(QStringLiteral("stop"))->setIcon(QIcon::fromTheme("media-playback-stop")); #endif + //use style's standardIcon for the icons we can. + actionCollection()->action(QStringLiteral("open_gcode"))->setIcon(style()->standardIcon(QStyle::SP_DirOpenIcon)); + actionCollection()->action(QStringLiteral("print"))->setIcon(style()->standardIcon(QStyle::SP_MediaPlay)); + actionCollection()->action(QStringLiteral("pause"))->setIcon(style()->standardIcon(QStyle::SP_MediaPause)); + actionCollection()->action(QStringLiteral("stop"))->setIcon(style()->standardIcon(QStyle::SP_MediaPlay)); // Actions for the Docks