From 5d4f7a8cf714a0fea1db6eac486c186b19e20faf Mon Sep 17 00:00:00 2001 From: Josh Klontz Date: Sat, 14 Sep 2013 15:05:14 -0400 Subject: [PATCH] started writing default OpenBR GUI interface --- app/CMakeLists.txt | 3 +++ app/OpenBR/CMakeLists.txt | 4 ++++ app/OpenBR/OpenBR.cpp | 18 ++++++++++++++++++ openbr/CMakeLists.txt | 2 +- openbr/icons/glyphicons_190_circle_plus@2x.png | Bin 1566 -> 0 bytes openbr/icons/icons.qrc | 8 -------- openbr/icons/openbr.icns | Bin 86802 -> 0 bytes openbr/icons/openbr.ico | Bin 136014 -> 0 bytes openbr/icons/openbr.png | Bin 12456 -> 0 bytes share/openbr/icons.qrc | 5 +++++ 10 files changed, 31 insertions(+), 9 deletions(-) create mode 100644 app/OpenBR/CMakeLists.txt create mode 100644 app/OpenBR/OpenBR.cpp delete mode 100644 openbr/icons/glyphicons_190_circle_plus@2x.png delete mode 100644 openbr/icons/icons.qrc delete mode 100644 openbr/icons/openbr.icns delete mode 100644 openbr/icons/openbr.ico delete mode 100644 openbr/icons/openbr.png create mode 100644 share/openbr/icons.qrc diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 9fbe2b8..af4aa9b 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -3,3 +3,6 @@ add_subdirectory(br) # Build examples/tests add_subdirectory(examples) + +# Build OpenBR GUI application +add_subdirectory(OpenBR) diff --git a/app/OpenBR/CMakeLists.txt b/app/OpenBR/CMakeLists.txt new file mode 100644 index 0000000..7f463a8 --- /dev/null +++ b/app/OpenBR/CMakeLists.txt @@ -0,0 +1,4 @@ +add_executable(OpenBR OpenBR.cpp) +qt5_use_modules(OpenBR ${QT_DEPENDENCIES}) +target_link_libraries(OpenBR openbr ${BR_THIRDPARTY_LIBS}) +install(TARGETS OpenBR RUNTIME DESTINATION bin) diff --git a/app/OpenBR/OpenBR.cpp b/app/OpenBR/OpenBR.cpp new file mode 100644 index 0000000..282e173 --- /dev/null +++ b/app/OpenBR/OpenBR.cpp @@ -0,0 +1,18 @@ +#include +#include +#include + +int main(int argc, char *argv[]) +{ + QApplication application(argc, argv); + br::Context::initialize(argc, argv); + + QMainWindow mainWindow; + mainWindow.setWindowIcon(QIcon(":/openbr.png")); + mainWindow.setWindowTitle("OpenBR"); + mainWindow.show(); + + const int result = application.exec(); + br::Context::finalize(); + return result; +} diff --git a/openbr/CMakeLists.txt b/openbr/CMakeLists.txt index e343c83..bc9b2b5 100644 --- a/openbr/CMakeLists.txt +++ b/openbr/CMakeLists.txt @@ -10,7 +10,7 @@ include(plugins/plugins.cmake) # Optional GUI module if(NOT ${BR_EMBEDDED}) aux_source_directory(gui BR_GUI) - qt5_add_resources(BR_ICONS icons/icons.qrc) + qt5_add_resources(BR_ICONS ../share/openbr/icons.qrc) file(GLOB HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/gui/*.h) install(FILES ${HEADERS} DESTINATION include/openbr/gui) endif() diff --git a/openbr/icons/glyphicons_190_circle_plus@2x.png b/openbr/icons/glyphicons_190_circle_plus@2x.png deleted file mode 100644 index e026a41..0000000 Binary files a/openbr/icons/glyphicons_190_circle_plus@2x.png and /dev/null differ diff --git a/openbr/icons/icons.qrc b/openbr/icons/icons.qrc deleted file mode 100644 index 7fb3fed..0000000 --- a/openbr/icons/icons.qrc +++ /dev/null @@ -1,8 +0,0 @@ - - - glyphicons_190_circle_plus@2x.png - openbr.icns - openbr.ico - openbr.png - - diff --git a/openbr/icons/openbr.icns b/openbr/icons/openbr.icns deleted file mode 100644 index df9b60d..0000000 Binary files a/openbr/icons/openbr.icns and /dev/null differ diff --git a/openbr/icons/openbr.ico b/openbr/icons/openbr.ico deleted file mode 100644 index 16d0121..0000000 Binary files a/openbr/icons/openbr.ico and /dev/null differ diff --git a/openbr/icons/openbr.png b/openbr/icons/openbr.png deleted file mode 100644 index ea6ac53..0000000 Binary files a/openbr/icons/openbr.png and /dev/null differ diff --git a/share/openbr/icons.qrc b/share/openbr/icons.qrc new file mode 100644 index 0000000..e4667ae --- /dev/null +++ b/share/openbr/icons.qrc @@ -0,0 +1,5 @@ + + + openbr.png + + -- libgit2 0.21.4