diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt
index add7566c2..9a19cf10b 100644
--- a/src/citra_qt/CMakeLists.txt
+++ b/src/citra_qt/CMakeLists.txt
@@ -79,6 +79,7 @@ set(UIS
main.ui
)
+file(GLOB_RECURSE TOOLBAR_ICONS ${CMAKE_SOURCE_DIR}/dist/toolbar_icons/*)
file(GLOB_RECURSE ICONS ${CMAKE_SOURCE_DIR}/dist/icons/*)
file(GLOB_RECURSE THEMES ${CMAKE_SOURCE_DIR}/dist/qt_themes/*)
@@ -93,10 +94,10 @@ endif()
if (APPLE)
set(MACOSX_ICON "../../dist/citra.icns")
set_source_files_properties(${MACOSX_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
- add_executable(citra-qt MACOSX_BUNDLE ${SRCS} ${HEADERS} ${UI_HDRS} ${ICONS} ${THEMES} ${MACOSX_ICON})
+ add_executable(citra-qt MACOSX_BUNDLE ${SRCS} ${HEADERS} ${UI_HDRS} ${TOOLBAR_ICONS} ${ICONS} ${THEMES} ${MACOSX_ICON})
set_target_properties(citra-qt PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
else()
- add_executable(citra-qt ${SRCS} ${HEADERS} ${UI_HDRS} ${ICONS} ${THEMES})
+ add_executable(citra-qt ${SRCS} ${HEADERS} ${UI_HDRS} ${TOOLBAR_ICONS} ${ICONS} ${THEMES})
endif()
target_link_libraries(citra-qt PRIVATE audio_core common core input_common network video_core)
target_link_libraries(citra-qt PRIVATE Boost::boost glad nihstro-headers Qt5::OpenGL Qt5::Widgets)
diff --git a/src/citra_qt/main.ui b/src/citra_qt/main.ui
index b13d578f5..666ac57c5 100644
--- a/src/citra_qt/main.ui
+++ b/src/citra_qt/main.ui
@@ -102,6 +102,33 @@
+
+
+ Toolbar
+
+
+
+ 30
+ 28
+
+
+
+ false
+
+
+ TopToolBarArea
+
+
+ false
+
+
+
+
+
+
+
+
+
Load File...
@@ -196,6 +223,75 @@
Create Pica Surface Viewer
+
+
+
+ :/toolbar_icons/rc/load_file.png:/toolbar_icons/rc/load_file.png
+
+
+ Load File...
+
+
+ Load File
+
+
+
+
+
+ :/toolbar_icons/rc/fullscreen.png:/toolbar_icons/rc/fullscreen.png
+
+
+ Toggle fullscreen
+
+
+ Toggle fullscreen
+
+
+
+
+
+ :/toolbar_icons/rc/start.png:/toolbar_icons/rc/start.png
+
+
+ Start
+
+
+ Start emulation
+
+
+
+
+ false
+
+
+
+ :/toolbar_icons/rc/stop.png:/toolbar_icons/rc/stop.png
+
+
+ Stop
+
+
+ Stop emulation
+
+
+
+
+ false
+
+
+
+ :/toolbar_icons/rc/configure.png:/toolbar_icons/rc/configure.png
+
+
+ Configure
+
+
+ Configure
+
+
-
+
+
+
+