# HG changeset patch # User František Kučera # Date 1567110018 -7200 # Node ID 00783e323e66a7b139b1787eb8f5bbe780ea5d32 # Parent 759edaff1755659d0ff9604239856c2848c765c9 main window diff -r 759edaff1755 -r 00783e323e66 cadMousePro-gui/nbproject/configurations.xml --- a/cadMousePro-gui/nbproject/configurations.xml Thu Aug 29 20:23:37 2019 +0200 +++ b/cadMousePro-gui/nbproject/configurations.xml Thu Aug 29 22:20:18 2019 +0200 @@ -41,7 +41,27 @@ + + + + + Proxy.cpp + + + + + + + mocs_compilation.cpp + + + Proxy.cpp + + + + + MouseMainWindow.h cadMouseProGUI.cpp @@ -83,7 +103,9 @@ false - + + @@ -93,20 +115,7 @@ ${MAKE} -f Makefile ${MAKE} -f Makefile clean build/Debug/src/cadMousePro-gui - - - build/Debug/src - src - build/Debug/src/cadMousePro-gui_autogen/include - /usr/include/x86_64-linux-gnu/qt5 - /usr/include/x86_64-linux-gnu/qt5/QtDBus - /usr/include/x86_64-linux-gnu/qt5/QtCore - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ - - - QT_CORE_LIB - QT_DBUS_LIB - + @@ -119,6 +128,8 @@ ex="false" tool="1" flavor2="11"> + + + + + + + + + + + + + + + + build/Debug/src/generated-sources + /usr/include/x86_64-linux-gnu/qt5/QtCore + /usr/include/x86_64-linux-gnu/qt5/QtDBus + /usr/include/x86_64-linux-gnu/qt5 + build/Debug/src + + + QT_CORE_LIB + QT_DBUS_LIB + QT_GUI_LIB + QT_WIDGETS_LIB + + + + + + + /usr/include/x86_64-linux-gnu/qt5/QtCore + /usr/include/x86_64-linux-gnu/qt5/QtDBus + build/qt/src/generated-sources + build/qt/src/cadMousePro-gui_autogen/S5VNLJ26FI + build/qt/src/cadMousePro-gui_autogen + /usr/include/x86_64-linux-gnu/qt5 + build/qt/src + + + + + + + build/qt/src/generated-sources + /usr/include/x86_64-linux-gnu/qt5/QtCore + /usr/include/x86_64-linux-gnu/qt5/QtDBus + /usr/include/x86_64-linux-gnu/qt5 + build/qt/src + + + + + + + /usr/include/x86_64-linux-gnu/qt5/QtCore + /usr/include/x86_64-linux-gnu/qt5/QtDBus + build/Debug/src/generated-sources + /usr/include/x86_64-linux-gnu/qt5/QtWidgets + src + /usr/include/x86_64-linux-gnu/qt5/QtGui + build/Debug/src + /usr/include/x86_64-linux-gnu/qt5 + + + + + build/Debug/src src @@ -145,13 +229,34 @@ /usr/include/x86_64-linux-gnu/qt5/QtDBus /usr/include/x86_64-linux-gnu/qt5/QtCore /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ + /usr/include/x86_64-linux-gnu/qt5/QtWidgets + /usr/include/x86_64-linux-gnu/qt5/QtGui + /usr/include QT_CORE_LIB QT_DBUS_LIB + QT_GUI_LIB + QT_WIDGETS_LIB - + + + + + /usr/include/x86_64-linux-gnu/qt5/QtCore + /usr/include/x86_64-linux-gnu/qt5/QtDBus + build/Debug/src/generated-sources + build/Debug/src/cadMousePro-gui_autogen/S5VNLJ26FI + src + build/Debug/src/cadMousePro-gui_autogen/EWIEGA46WW + /usr/include/x86_64-linux-gnu/qt5/QtGui + build/Debug/src/cadMousePro-gui_autogen + /usr/include/x86_64-linux-gnu/qt5 + build/Debug/src + + + @@ -186,6 +291,8 @@ true + + diff -r 759edaff1755 -r 00783e323e66 cadMousePro-gui/src/CMakeLists.txt --- a/cadMousePro-gui/src/CMakeLists.txt Thu Aug 29 20:23:37 2019 +0200 +++ b/cadMousePro-gui/src/CMakeLists.txt Thu Aug 29 22:20:18 2019 +0200 @@ -5,6 +5,7 @@ set(CMAKE_AUTOMOC ON) # Instruct CMake to run moc automatically when needed set(CMAKE_AUTOUIC ON) # Create code from a list of Qt designer ui files find_package(Qt5 CONFIG REQUIRED Core DBus) +find_package(Qt5Widgets CONFIG REQUIRED) # Add ASan AddressSanitizer set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address") @@ -28,9 +29,11 @@ ${EXECUTABLE_FILE} ${CMAKE_CURRENT_BINARY_DIR}/generated-sources/Proxy.h ${CMAKE_CURRENT_BINARY_DIR}/generated-sources/Proxy.cpp + MouseMainWindow.h cadMouseProGUI.cpp ) # Link libraries: target_link_libraries(${EXECUTABLE_FILE} Qt5::DBus) +target_link_libraries(${EXECUTABLE_FILE} Qt5::Widgets) set_property(TARGET ${EXECUTABLE_FILE} PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE) diff -r 759edaff1755 -r 00783e323e66 cadMousePro-gui/src/MouseMainWindow.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cadMousePro-gui/src/MouseMainWindow.h Thu Aug 29 22:20:18 2019 +0200 @@ -0,0 +1,35 @@ +/** + * cadMousePro + * Copyright © 2019 František Kučera (Frantovo.cz, GlobalCode.info) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#pragma once + +#include + +class MouseMainWindow : public QMainWindow { + + Q_OBJECT +public: + MouseMainWindow() { + resize(640, 480); + setWindowTitle("cadMousePro"); + + } + + virtual ~MouseMainWindow() { + } + +}; \ No newline at end of file diff -r 759edaff1755 -r 00783e323e66 cadMousePro-gui/src/cadMouseProGUI.cpp --- a/cadMousePro-gui/src/cadMouseProGUI.cpp Thu Aug 29 20:23:37 2019 +0200 +++ b/cadMousePro-gui/src/cadMouseProGUI.cpp Thu Aug 29 22:20:18 2019 +0200 @@ -17,22 +17,27 @@ */ #include -#include +#include #include #include "generated-sources/Proxy.h" +#include "MouseMainWindow.h" int main(int argc, char** argv) { std::wcout << L"cadMousePro GUI" << std::endl; - QCoreApplication qtApplication(argc, argv); + QApplication qtApplication(argc, argv); + + MouseMainWindow window; + window.show(); + QDBusConnection connection = QDBusConnection::systemBus(); InfoGlobalcodeMouseCadMouseProInterface* proxy = new InfoGlobalcodeMouseCadMouseProInterface("info.globalcode.mouse.cadMousePro", "/info/globalcode/mouse/cadMousePro", connection, &qtApplication); - + std::wcout << (proxy->isValid() ? L"connected" : L"disconnected") << std::endl; std::wcout << (proxy->devicePresent() ? L"mouse found" : L"mouse not found") << std::endl; std::wcout << L"mouse name: " << proxy->deviceName().toStdWString() << std::endl;