From c13946aa5ecf1fb588fbc5089bf7d3f1e0f564c6 Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Sun, 5 Dec 2021 04:17:08 +0100 Subject: [PATCH] Simple working meson build --- .gitmodules | 6 + CMakeLists.txt | 2 +- meson.build | 259 +++++++++ meson/nheko.h | 9 + meson/version.h | 4 + src/Logging.cpp | 2 +- src/UserSettingsPage.cpp | 2 +- src/main.cpp | 2 +- .../.github/FUNDING.yml | 1 + .../.github/workflows/build-cmake.yml | 56 ++ .../SingleApplication-3.3.0/.gitignore | 16 + .../SingleApplication-3.3.0/CHANGELOG.md | 301 ++++++++++ .../SingleApplication-3.3.0/CMakeLists.txt | 40 ++ subprojects/SingleApplication-3.3.0/LICENSE | 24 + subprojects/SingleApplication-3.3.0/README.md | 304 ++++++++++ .../SingleApplication-3.3.0/SingleApplication | 1 + .../SingleApplication-3.3.0/Windows.md | 46 ++ .../examples/basic/CMakeLists.txt | 12 + .../examples/basic/basic.pro | 5 + .../examples/basic/main.cpp | 10 + .../examples/calculator/CMakeLists.txt | 21 + .../examples/calculator/button.cpp | 73 +++ .../examples/calculator/button.h | 68 +++ .../examples/calculator/calculator.cpp | 406 +++++++++++++ .../examples/calculator/calculator.h | 117 ++++ .../examples/calculator/calculator.pro | 11 + .../examples/calculator/main.cpp | 71 +++ .../examples/sending_arguments/CMakeLists.txt | 20 + .../examples/sending_arguments/main.cpp | 28 + .../sending_arguments/messagereceiver.cpp | 12 + .../sending_arguments/messagereceiver.h | 15 + .../sending_arguments/sending_arguments.pro | 9 + .../SingleApplication-3.3.0/meson.build | 23 + .../singleapplication.cpp | 271 +++++++++ .../singleapplication.h | 154 +++++ .../singleapplication.pri | 20 + .../singleapplication_p.cpp | 531 ++++++++++++++++++ .../singleapplication_p.h | 109 ++++ subprojects/blurhash | 1 + subprojects/mtxclient | 1 + subprojects/spdlog.wrap | 12 + 41 files changed, 3071 insertions(+), 4 deletions(-) create mode 100644 .gitmodules create mode 100644 meson.build create mode 100644 meson/nheko.h create mode 100644 meson/version.h create mode 100644 subprojects/SingleApplication-3.3.0/.github/FUNDING.yml create mode 100644 subprojects/SingleApplication-3.3.0/.github/workflows/build-cmake.yml create mode 100644 subprojects/SingleApplication-3.3.0/.gitignore create mode 100644 subprojects/SingleApplication-3.3.0/CHANGELOG.md create mode 100644 subprojects/SingleApplication-3.3.0/CMakeLists.txt create mode 100644 subprojects/SingleApplication-3.3.0/LICENSE create mode 100644 subprojects/SingleApplication-3.3.0/README.md create mode 100644 subprojects/SingleApplication-3.3.0/SingleApplication create mode 100644 subprojects/SingleApplication-3.3.0/Windows.md create mode 100644 subprojects/SingleApplication-3.3.0/examples/basic/CMakeLists.txt create mode 100755 subprojects/SingleApplication-3.3.0/examples/basic/basic.pro create mode 100755 subprojects/SingleApplication-3.3.0/examples/basic/main.cpp create mode 100644 subprojects/SingleApplication-3.3.0/examples/calculator/CMakeLists.txt create mode 100644 subprojects/SingleApplication-3.3.0/examples/calculator/button.cpp create mode 100644 subprojects/SingleApplication-3.3.0/examples/calculator/button.h create mode 100644 subprojects/SingleApplication-3.3.0/examples/calculator/calculator.cpp create mode 100644 subprojects/SingleApplication-3.3.0/examples/calculator/calculator.h create mode 100644 subprojects/SingleApplication-3.3.0/examples/calculator/calculator.pro create mode 100644 subprojects/SingleApplication-3.3.0/examples/calculator/main.cpp create mode 100644 subprojects/SingleApplication-3.3.0/examples/sending_arguments/CMakeLists.txt create mode 100755 subprojects/SingleApplication-3.3.0/examples/sending_arguments/main.cpp create mode 100644 subprojects/SingleApplication-3.3.0/examples/sending_arguments/messagereceiver.cpp create mode 100644 subprojects/SingleApplication-3.3.0/examples/sending_arguments/messagereceiver.h create mode 100755 subprojects/SingleApplication-3.3.0/examples/sending_arguments/sending_arguments.pro create mode 100644 subprojects/SingleApplication-3.3.0/meson.build create mode 100644 subprojects/SingleApplication-3.3.0/singleapplication.cpp create mode 100644 subprojects/SingleApplication-3.3.0/singleapplication.h create mode 100644 subprojects/SingleApplication-3.3.0/singleapplication.pri create mode 100644 subprojects/SingleApplication-3.3.0/singleapplication_p.cpp create mode 100644 subprojects/SingleApplication-3.3.0/singleapplication_p.h create mode 160000 subprojects/blurhash create mode 160000 subprojects/mtxclient create mode 100644 subprojects/spdlog.wrap diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..59c350c8 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "subprojects/mtxclient"] + path = subprojects/mtxclient + url = https://nheko.im/nheko-reborn/mtxclient.git +[submodule "subprojects/blurhash"] + path = subprojects/blurhash + url = https://nheko.im/nheko-reborn/blurhash.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 3fd8beb0..c337a830 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -295,7 +295,7 @@ cmake_host_system_information(RESULT BUILD_HOST QUERY HOSTNAME) include(CheckSymbolExists) check_symbol_exists(backtrace_symbols_fd "execinfo.h" HAVE_BACKTRACE_SYMBOLS_FD) -configure_file(cmake/nheko.h config/nheko.h) +configure_file(cmake/nheko.h config_nheko.h) # diff --git a/meson.build b/meson.build new file mode 100644 index 00000000..39706195 --- /dev/null +++ b/meson.build @@ -0,0 +1,259 @@ +project( + 'nheko', + 'cpp', + license: 'GPL-3.0-or-later', + version: '0.9.0', + default_options: ['cpp_std=c++17', 'b_pie=true', 'default_library=static'] +) + +qt5 = import('qt5') +qt5_dep = dependency('qt5', modules: ['Core', 'Qml', 'Quick', 'QuickWidgets', 'Widgets', 'DBus', 'Multimedia', 'Svg'], include_type: 'system') +inc = include_directories('src', 'includes', 'third_party/cpp-httplib-0.5.12') + +deps = [ + qt5_dep, + dependency('mtxclient', static: true, version : '>=0.6.0', fallback: ['mtxclient', 'matrix_client_dep']), + dependency('blurhash'), + dependency('spdlog'), + dependency('cmark'), + dependency('lmdb'), + dependency('Qt5Keychain'), + dependency('threads'), +] + +single_app_dep = subproject('SingleApplication-3.3.0').get_variable('singleapplication_dep') + +deps += [single_app_dep] + +compiler = meson.get_compiler('cpp') +backtrace_check = '''#include +#ifndef HAVE_BACKTRACE_SYMBOLS_FD +#error "No backtrace support" +#endif +void func() { + void *array[50]; + size_t size = backtrace(array, 50); + backtrace_symbols_fd(array, size, STDERR_FILENO); +} +''' +backtrace_exists = compiler.links(backtrace_check) + +conf_data = configuration_data() +conf_data.set('PROJECT_VERSION', meson.project_version()) +conf_data.set('HOST_SYSTEM_NAME', host_machine.system()) +conf_data.set10('HAVE_BACKTRACE_SYMBOLS_FD', backtrace_exists) +conf_data.set10('SPDLOG_DEBUG_ON', get_option('buildtype') == 'debug') +configure_file(input : 'meson/nheko.h', + output : 'config_nheko.h', + configuration : conf_data) + +vcs_tag(input: 'meson/version.h', output: 'nheko_version.h', replace_string: '@PROJECT_VERSION@') + +moc_files = qt5.preprocess(moc_headers : + [ + # Dialogs + 'src/dialogs/CreateRoom.h', + 'src/dialogs/FallbackAuth.h', + 'src/dialogs/ImageOverlay.h', + 'src/dialogs/Logout.h', + 'src/dialogs/PreviewUploadOverlay.h', + 'src/dialogs/ReCaptcha.h', + + # Emoji + 'src/emoji/EmojiModel.h', + 'src/emoji/Provider.h', + + # Timeline + 'src/timeline/CommunitiesModel.h', + 'src/timeline/EventStore.h', + 'src/timeline/InputBar.h', + 'src/timeline/Reaction.h', + 'src/timeline/TimelineViewManager.h', + 'src/timeline/TimelineModel.h', + 'src/timeline/DelegateChooser.h', + 'src/timeline/Permissions.h', + 'src/timeline/RoomlistModel.h', + + # UI components + 'src/ui/Badge.h', + 'src/ui/FlatButton.h', + 'src/ui/FloatingButton.h', + 'src/ui/InfoMessage.h', + 'src/ui/Label.h', + 'src/ui/LoadingIndicator.h', + 'src/ui/MxcAnimatedImage.h', + 'src/ui/MxcMediaProxy.h', + 'src/ui/Menu.h', + 'src/ui/NhekoCursorShape.h', + 'src/ui/NhekoDropArea.h', + 'src/ui/NhekoGlobalObject.h', + 'src/ui/OverlayWidget.h', + 'src/ui/RaisedButton.h', + 'src/ui/Ripple.h', + 'src/ui/RippleOverlay.h', + 'src/ui/RoomSettings.h', + 'src/ui/SnackBar.h', + 'src/ui/TextField.h', + 'src/ui/TextLabel.h', + 'src/ui/Theme.h', + 'src/ui/ThemeManager.h', + 'src/ui/ToggleButton.h', + 'src/ui/UIA.h', + 'src/ui/UserProfile.h', + + 'src/voip/CallDevices.h', + 'src/voip/CallManager.h', + 'src/voip/WebRTCSession.h', + + 'src/encryption/DeviceVerificationFlow.h', + 'src/encryption/Olm.h', + 'src/encryption/SelfVerificationStatus.h', + 'src/encryption/VerificationManager.h', + + 'src/notifications/Manager.h', + + 'src/AvatarProvider.h', + 'src/BlurhashProvider.h', + 'src/CacheCryptoStructs.h', + 'src/Cache_p.h', + 'src/ChatPage.h', + 'src/Clipboard.h', + 'src/CombinedImagePackModel.h', + 'src/CompletionProxyModel.h', + 'src/ImagePackListModel.h', + 'src/InviteesModel.h', + 'src/JdenticonProvider.h', + 'src/LoginPage.h', + 'src/MainWindow.h', + 'src/MemberList.h', + 'src/MxcImageProvider.h', + 'src/RegisterPage.h', + 'src/SSOHandler.h', + 'src/SingleImagePackModel.h', + 'src/TrayIcon.h', + 'src/UserSettingsPage.h', + 'src/UsersModel.h', + 'src/RoomDirectoryModel.h', + 'src/RoomsModel.h', + 'src/WelcomePage.h', + 'src/ReadReceiptsModel.h', + ], + include_directories: inc, + dependencies: deps) + +sources = [ + # Dialogs + 'src/dialogs/CreateRoom.cpp', + 'src/dialogs/FallbackAuth.cpp', + 'src/dialogs/ImageOverlay.cpp', + 'src/dialogs/Logout.cpp', + 'src/dialogs/PreviewUploadOverlay.cpp', + 'src/dialogs/ReCaptcha.cpp', + + # Emoji + 'src/emoji/EmojiModel.cpp', + 'src/emoji/Provider.cpp', + + + # Timeline + 'src/timeline/CommunitiesModel.cpp', + 'src/timeline/EventStore.cpp', + 'src/timeline/InputBar.cpp', + 'src/timeline/Reaction.cpp', + 'src/timeline/TimelineViewManager.cpp', + 'src/timeline/TimelineModel.cpp', + 'src/timeline/DelegateChooser.cpp', + 'src/timeline/Permissions.cpp', + 'src/timeline/RoomlistModel.cpp', + + # UI components + 'src/ui/Badge.cpp', + 'src/ui/DropShadow.cpp', + 'src/ui/FlatButton.cpp', + 'src/ui/FloatingButton.cpp', + 'src/ui/InfoMessage.cpp', + 'src/ui/Label.cpp', + 'src/ui/LoadingIndicator.cpp', + 'src/ui/MxcAnimatedImage.cpp', + 'src/ui/MxcMediaProxy.cpp', + 'src/ui/NhekoCursorShape.cpp', + 'src/ui/NhekoDropArea.cpp', + 'src/ui/NhekoGlobalObject.cpp', + 'src/ui/OverlayModal.cpp', + 'src/ui/OverlayWidget.cpp', + 'src/ui/RaisedButton.cpp', + 'src/ui/Ripple.cpp', + 'src/ui/RippleOverlay.cpp', + 'src/ui/RoomSettings.cpp', + 'src/ui/SnackBar.cpp', + 'src/ui/TextField.cpp', + 'src/ui/TextLabel.cpp', + 'src/ui/Theme.cpp', + 'src/ui/ThemeManager.cpp', + 'src/ui/ToggleButton.cpp', + 'src/ui/UIA.cpp', + 'src/ui/UserProfile.cpp', + + 'src/voip/CallDevices.cpp', + 'src/voip/CallManager.cpp', + 'src/voip/WebRTCSession.cpp', + + 'src/encryption/DeviceVerificationFlow.cpp', + 'src/encryption/Olm.cpp', + 'src/encryption/SelfVerificationStatus.cpp', + 'src/encryption/VerificationManager.cpp', + + # Generic notification stuff + 'src/notifications/Manager.cpp', + + 'src/AvatarProvider.cpp', + 'src/BlurhashProvider.cpp', + 'src/Cache.cpp', + 'src/ChatPage.cpp', + 'src/Clipboard.cpp', + 'src/ColorImageProvider.cpp', + 'src/CompletionProxyModel.cpp', + 'src/EventAccessors.cpp', + 'src/InviteesModel.cpp', + 'src/JdenticonProvider.cpp', + 'src/Logging.cpp', + 'src/LoginPage.cpp', + 'src/MainWindow.cpp', + 'src/MatrixClient.cpp', + 'src/MemberList.cpp', + 'src/MxcImageProvider.cpp', + 'src/ReadReceiptsModel.cpp', + 'src/RegisterPage.cpp', + 'src/SSOHandler.cpp', + 'src/CombinedImagePackModel.cpp', + 'src/SingleImagePackModel.cpp', + 'src/ImagePackListModel.cpp', + 'src/TrayIcon.cpp', + 'src/UserSettingsPage.cpp', + 'src/UsersModel.cpp', + 'src/RoomDirectoryModel.cpp', + 'src/RoomsModel.cpp', + 'src/Utils.cpp', + 'src/WelcomePage.cpp', + 'src/main.cpp', + + 'third_party/blurhash/blurhash.cpp', + ] + +if host_machine.system() == 'darwin' + sources += ['src/notifications/ManagerMac.mm', 'src/notifications/ManagerMac.cpp', 'src/emoji/MacHelper.mm'] +elif host_machine.system() == 'windows' + sources += ['src/notifications/ManagerWin.cpp', 'src/wintoastlib.cpp'] +else + sources += ['src/notifications/ManagerLinux.cpp'] +endif + +resources = qt5.compile_resources(name: 'res', sources: 'resources/res.qrc') + +executable('nheko', + sources, moc_files, resources, + cpp_args: '-DQAPPLICATION_CLASS=QApplication', + include_directories: inc, + dependencies : deps, + install: true) + diff --git a/meson/nheko.h b/meson/nheko.h new file mode 100644 index 00000000..fc4f8469 --- /dev/null +++ b/meson/nheko.h @@ -0,0 +1,9 @@ +#include "nheko_version.h" + +namespace nheko { +constexpr auto build_os = "@HOST_SYSTEM_NAME@"; +// clang-format off +constexpr auto enable_debug_log = @SPDLOG_DEBUG_ON@; +} + +#mesondefine HAVE_BACKTRACE_SYMBOLS_FD diff --git a/meson/version.h b/meson/version.h new file mode 100644 index 00000000..e06d7e97 --- /dev/null +++ b/meson/version.h @@ -0,0 +1,4 @@ +namespace nheko { +constexpr auto version = "@PROJECT_VERSION@"; +} + diff --git a/src/Logging.cpp b/src/Logging.cpp index a18a1cee..3c27f4f7 100644 --- a/src/Logging.cpp +++ b/src/Logging.cpp @@ -3,7 +3,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later #include "Logging.h" -#include "config/nheko.h" +#include "config_nheko.h" #include "spdlog/sinks/rotating_file_sink.h" #include "spdlog/sinks/stdout_color_sinks.h" diff --git a/src/UserSettingsPage.cpp b/src/UserSettingsPage.cpp index f8c05e38..d4455d58 100644 --- a/src/UserSettingsPage.cpp +++ b/src/UserSettingsPage.cpp @@ -34,7 +34,7 @@ #include "ui/ToggleButton.h" #include "voip/CallDevices.h" -#include "config/nheko.h" +#include "config_nheko.h" QSharedPointer UserSettings::instance_; diff --git a/src/main.cpp b/src/main.cpp index b87e50ff..2508b729 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -27,7 +27,7 @@ #include "MainWindow.h" #include "MatrixClient.h" #include "Utils.h" -#include "config/nheko.h" +#include "config_nheko.h" #include "singleapplication.h" #if defined(Q_OS_MAC) diff --git a/subprojects/SingleApplication-3.3.0/.github/FUNDING.yml b/subprojects/SingleApplication-3.3.0/.github/FUNDING.yml new file mode 100644 index 00000000..3ca4d97a --- /dev/null +++ b/subprojects/SingleApplication-3.3.0/.github/FUNDING.yml @@ -0,0 +1 @@ +github: itay-grudev diff --git a/subprojects/SingleApplication-3.3.0/.github/workflows/build-cmake.yml b/subprojects/SingleApplication-3.3.0/.github/workflows/build-cmake.yml new file mode 100644 index 00000000..6344b504 --- /dev/null +++ b/subprojects/SingleApplication-3.3.0/.github/workflows/build-cmake.yml @@ -0,0 +1,56 @@ +name: "CI: Build Test" + +on: [push, pull_request] + +jobs: + build: + + strategy: + matrix: + qt_version: [5.12.6, 5.13.2, 5.14.0, 5.15.0, 6.0.0] + platform: [ubuntu-20.04, windows-latest, macos-latest] + include: + - qt_version: 6.0.0 + additional_arguments: -D QT_DEFAULT_MAJOR_VERSION=6 + - platform: ubuntu-20.04 + CXXFLAGS: -Wall -Wextra -pedantic -Werror + - platform: macos-latest + CXXFLAGS: -Wall -Wextra -pedantic -Werror + - platform: windows-latest + CXXFLAGS: /W4 /WX + + runs-on: ${{ matrix.platform }} + env: + CXXFLAGS: ${{ matrix.CXXFLAGS }} + + steps: + - uses: actions/checkout@v2.3.4 + + - name: Install Qt + uses: jurplel/install-qt-action@v2.11.1 + with: + version: ${{ matrix.qt_version }} + + - name: cmake + run: cmake . ${{ matrix.additional_arguments }} + + - name: cmake build + run: cmake --build . + + - name: Build example - basic (cmake) + working-directory: examples/basic/ + run: | + cmake . ${{ matrix.additional_arguments }} + cmake --build . + + - name: Build example - calculator (cmake) + working-directory: examples/calculator/ + run: | + cmake . ${{ matrix.additional_arguments }} + cmake --build . + + - name: Build example - sending_arguments (cmake) + working-directory: examples/sending_arguments/ + run: | + cmake . ${{ matrix.additional_arguments }} + cmake --build . diff --git a/subprojects/SingleApplication-3.3.0/.gitignore b/subprojects/SingleApplication-3.3.0/.gitignore new file mode 100644 index 00000000..35533fe8 --- /dev/null +++ b/subprojects/SingleApplication-3.3.0/.gitignore @@ -0,0 +1,16 @@ +/examples/*/*.o +/examples/*/Makefile +/examples/*/moc_*.cpp +/examples/*/moc_predefs.h +/examples/*/*.qmake.stash +/examples/basic/basic +/examples/calculator/calculator +/examples/sending_arguments/sending_arguments +/**/CMakeLists.txt.user +/**/CMakeCache.txt +/**/CMakeCache/* +/**/CMakeFiles/* +/**/Makefile +/**/cmake_install.cmake +/**/*_autogen/ +libSingleApplication.a diff --git a/subprojects/SingleApplication-3.3.0/CHANGELOG.md b/subprojects/SingleApplication-3.3.0/CHANGELOG.md new file mode 100644 index 00000000..51669b90 --- /dev/null +++ b/subprojects/SingleApplication-3.3.0/CHANGELOG.md @@ -0,0 +1,301 @@ +Changelog +========= + +If by accident I have forgotten to credit someone in the CHANGELOG, email me and I will fix it. + + +__3.3.0__ +--------- + +* Fixed message fragmentation issue causing crashes and incorrectly and inconsistently received messages. - _Nils Jeisecke_ + +__3.2.0__ +--------- + +* Added support for Qt 6 - _Jonas Kvinge_ +* Fixed warning in `Qt 5.9` with `min`/`max` functions on Windows - _Nick Korotysh_ +* Fix return value of connectToPrimary() when connect is successful - _Jonas Kvinge_ +* Fix build issue with MinGW GCC pedantic mode - _Iakov Kirilenko_ +* Fixed conversion from `int` to `quint32` and Clang Tidy warnings - _Hennadii Chernyshchyk_ + +__3.1.5__ +--------- + +* Improved library stability in edge cases and very rapid process initialisation +* Fixed Bug where the shared memory block may have been modified without a lock +* Fixed Bug causing `instanceStarted()` to not get emitted when a second instance + has been started before the primary has initiated it's `QLocalServer`. + +__3.1.4__ +--------- +* Officially supporting and build-testing against Qt 5.15 +* Fixed an MSVC C4996 warning that suggests using `strncpy_s`. + + _Hennadii Chernyshchyk_ + +__3.1.3.1__ +--------- +* CMake build system improvements +* Fixed Clang Tidy warnings + + _Hennadii Chernyshchyk_ + +__3.1.3__ +--------- +* Improved `CMakeLists.txt` + + _Hennadii Chernyshchyk_ + +__3.1.2__ +--------- + +* Fix a crash when exiting an application on Android and iOS + + _Emeric Grange_ + +__3.1.1a__ +---------- + +* Added currentUser() method that returns the user the current instance is running as. + + _Leander Schulten_ + +__3.1.0a__ +---------- + +* Added primaryUser() method that returns the user the primary instance is running as. + +__3.0.19__ +---------- + +* Fixed code warning for depricated functions in Qt 5.10 related to `QTime` and `qrand()`. + + _Hennadii Chernyshchyk_ + _Anton Filimonov_ + _Jonas Kvinge_ + +__3.0.18__ +---------- + +* Fallback to standard QApplication class on iOS and Android systems where + the library is not supported. + +* Added Build CI tests to verify the library builds successfully on Linux, Windows and MacOS across multiple Qt versions. + + _Anton Filimonov_ + +__3.0.17__ +---------- + +* Fixed compilation warning/error caused by `geteuid()` on unix based systems. + + _Iakov Kirilenko_ + +* Added CMake support + + _Hennadii Chernyshchyk_ + +__3.0.16__ +---------- + +* Use geteuid and getpwuid to get username on Unix, fallback to environment variable. + + _Jonas Kvinge_ + +__3.0.15__ +---------- + +* Bug Fix: sendMessage() might return false even though data was actually written. + + _Jonas Kvinge_ + +__3.0.14__ +---------- + +* Fixed uninitialised variables in the `SingleApplicationPrivate` constructor. + +__3.0.13a__ +---------- + +* Process socket events asynchronously +* Fix undefined variable error on Windows + + _Francis Giraldeau_ + +__3.0.12a__ +---------- + +* Removed signal handling. + +__3.0.11a__ +---------- + +* Fixed bug where the message sent by the second process was not received + correctly when the message is sent immediately following a connection. + + _Francis Giraldeau_ + +* Refactored code and implemented shared memory block consistency checks + via `qChecksum()` (CRC-16). +* Explicit `qWarning` and `qCritical` when the library is unable to initialise + correctly. + +__3.0.10__ +---------- + +* Removed C style casts and eliminated all clang warnings. Fixed `instanceId` + reading from only one byte in the message deserialization. Cleaned up + serialization code using `QDataStream`. Changed connection type to use + `quint8 enum` rather than `char`. +* Renamed `SingleAppConnectionType` to `ConnectionType`. Added initialization + values to all `ConnectionType` enum cases. + + _Jedidiah Buck McCready_ + +__3.0.9__ +--------- + +* Added SingleApplicationPrivate::primaryPid() as a solution to allow + bringing the primary window of an application to the foreground on + Windows. + + _Eelco van Dam from Peacs BV_ + +__3.0.8__ +--------- + +* Bug fix - changed QApplication::instance() to QCoreApplication::instance() + + _Evgeniy Bazhenov_ + +__3.0.7a__ +---------- + +* Fixed compilation error with Mingw32 in MXE thanks to Vitaly Tonkacheyev. +* Removed QMutex used for thread safe behaviour. The implementation now uses + QCoreApplication::instance() to get an instance to SingleApplication for + memory deallocation. + +__3.0.6a__ +---------- + +* Reverted GetUserName API usage on Windows. Fixed bug with missing library. +* Fixed bug in the Calculator example, preventing it's window to be raised + on Windows. + + Special thanks to Charles Gunawan. + +__3.0.5a__ +---------- + +* Fixed a memory leak in the SingleApplicationPrivate destructor. + + _Sergei Moiseev_ + +__3.0.4a__ +---------- + +* Fixed shadow and uninitialised variable warnings. + + _Paul Walmsley_ + +__3.0.3a__ +---------- + +* Removed Microsoft Windows specific code for getting username due to + multiple problems and compiler differences on Windows platforms. On + Windows the shared memory block in User mode now includes the user's + home path (which contains the user's username). + +* Explicitly getting absolute path of the user's home directory as on Unix + a relative path (`~`) may be returned. + +__3.0.2a__ +---------- + +* Fixed bug on Windows when username containing wide characters causes the + library to crash. + + _Le Liu_ + +__3.0.1a__ +---------- + +* Allows the application path and version to be excluded from the server name + hash. The following flags were added for this purpose: + * `SingleApplication::Mode::ExcludeAppVersion` + * `SingleApplication::Mode::ExcludeAppPath` +* Allow a non elevated process to connect to a local server created by an + elevated process run by the same user on Windows +* Fixes a problem with upper case letters in paths on Windows + + _Le Liu_ + +__v3.0a__ +--------- + +* Deprecated secondary instances count. +* Added a sendMessage() method to send a message to the primary instance. +* Added a receivedMessage() signal, emitted when a message is received from a + secondary instance. +* The SingleApplication constructor's third parameter is now a bool + specifying if the current instance should be allowed to run as a secondary + instance if there is already a primary instance. +* The SingleApplication constructor accept a fourth parameter specifying if + the SingleApplication block should be User-wide or System-wide. +* SingleApplication no longer relies on `applicationName` and + `organizationName` to be set. It instead concatenates all of the following + data and computes a `SHA256` hash which is used as the key of the + `QSharedMemory` block and the `QLocalServer`. Since at least + `applicationFilePath` is always present there is no need to explicitly set + any of the following prior to initialising `SingleApplication`. + * `QCoreApplication::applicationName` + * `QCoreApplication::applicationVersion` + * `QCoreApplication::applicationFilePath` + * `QCoreApplication::organizationName` + * `QCoreApplication::organizationDomain` + * User name or home directory path if in User mode +* The primary instance is no longer notified when a secondary instance had + been started by default. A `Mode` flag for this feature exists. +* Added `instanceNumber()` which represents a unique identifier for each + secondary instance started. When called from the primary instance will + return `0`. + +__v2.4__ +-------- + +* Stability improvements +* Support for secondary instances. +* The library now recovers safely after the primary process has crashed +and the shared memory had not been deleted. + +__v2.3__ +-------- + +* Improved pimpl design and inheritance safety. + + _Vladislav Pyatnichenko_ + +__v2.2__ +-------- + +* The `QAPPLICATION_CLASS` macro can now be defined in the file including the +Single Application header or with a `DEFINES+=` statement in the project file. + +__v2.1__ +-------- + +* A race condition can no longer occur when starting two processes nearly + simultaneously. + + Fix issue [#3](https://github.com/itay-grudev/SingleApplication/issues/3) + +__v2.0__ +-------- + +* SingleApplication is now being passed a reference to `argc` instead of a + copy. + + Fix issue [#1](https://github.com/itay-grudev/SingleApplication/issues/1) + +* Improved documentation. diff --git a/subprojects/SingleApplication-3.3.0/CMakeLists.txt b/subprojects/SingleApplication-3.3.0/CMakeLists.txt new file mode 100644 index 00000000..ae1b1439 --- /dev/null +++ b/subprojects/SingleApplication-3.3.0/CMakeLists.txt @@ -0,0 +1,40 @@ +cmake_minimum_required(VERSION 3.7.0) + +project(SingleApplication LANGUAGES CXX) + +set(CMAKE_AUTOMOC ON) + +add_library(${PROJECT_NAME} STATIC + singleapplication.cpp + singleapplication_p.cpp +) +add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME}) + +if(NOT QT_DEFAULT_MAJOR_VERSION) + set(QT_DEFAULT_MAJOR_VERSION 5 CACHE STRING "Qt version to use (5 or 6), defaults to 5") +endif() + +# Find dependencies +set(QT_COMPONENTS Core Network) +set(QT_LIBRARIES Qt${QT_DEFAULT_MAJOR_VERSION}::Core Qt${QT_DEFAULT_MAJOR_VERSION}::Network) + +if(QAPPLICATION_CLASS STREQUAL QApplication) + list(APPEND QT_COMPONENTS Widgets) + list(APPEND QT_LIBRARIES Qt${QT_DEFAULT_MAJOR_VERSION}::Widgets) +elseif(QAPPLICATION_CLASS STREQUAL QGuiApplication) + list(APPEND QT_COMPONENTS Gui) + list(APPEND QT_LIBRARIES Qt${QT_DEFAULT_MAJOR_VERSION}::Gui) +else() + set(QAPPLICATION_CLASS QCoreApplication) +endif() + +find_package(Qt${QT_DEFAULT_MAJOR_VERSION} COMPONENTS ${QT_COMPONENTS} REQUIRED) + +target_link_libraries(${PROJECT_NAME} PUBLIC ${QT_LIBRARIES}) + +if(WIN32) + target_link_libraries(${PROJECT_NAME} PRIVATE advapi32) +endif() + +target_compile_definitions(${PROJECT_NAME} PUBLIC QAPPLICATION_CLASS=${QAPPLICATION_CLASS}) +target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/subprojects/SingleApplication-3.3.0/LICENSE b/subprojects/SingleApplication-3.3.0/LICENSE new file mode 100644 index 00000000..a82e5a68 --- /dev/null +++ b/subprojects/SingleApplication-3.3.0/LICENSE @@ -0,0 +1,24 @@ +The MIT License (MIT) + +Copyright (c) Itay Grudev 2015 - 2020 + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + +Note: Some of the examples include code not distributed under the terms of the +MIT License. diff --git a/subprojects/SingleApplication-3.3.0/README.md b/subprojects/SingleApplication-3.3.0/README.md new file mode 100644 index 00000000..457ab339 --- /dev/null +++ b/subprojects/SingleApplication-3.3.0/README.md @@ -0,0 +1,304 @@ +SingleApplication +================= +[![CI](https://github.com/itay-grudev/SingleApplication/workflows/CI:%20Build%20Test/badge.svg)](https://github.com/itay-grudev/SingleApplication/actions) + +This is a replacement of the QtSingleApplication for `Qt5` and `Qt6`. + +Keeps the Primary Instance of your Application and kills each subsequent +instances. It can (if enabled) spawn secondary (non-related to the primary) +instances and can send data to the primary instance from secondary instances. + +Usage +----- + +The `SingleApplication` class inherits from whatever `Q[Core|Gui]Application` +class you specify via the `QAPPLICATION_CLASS` macro (`QCoreApplication` is the +default). Further usage is similar to the use of the `Q[Core|Gui]Application` +classes. + +You can use the library as if you use any other `QCoreApplication` derived +class: + +```cpp +#include +#include + +int main( int argc, char* argv[] ) +{ + SingleApplication app( argc, argv ); + + return app.exec(); +} +``` + +To include the library files I would recommend that you add it as a git +submodule to your project. Here is how: + +```bash +git submodule add git@github.com:itay-grudev/SingleApplication.git singleapplication +``` + +**Qmake:** + +Then include the `singleapplication.pri` file in your `.pro` project file. + +```qmake +include(singleapplication/singleapplication.pri) +DEFINES += QAPPLICATION_CLASS=QApplication +``` + +**CMake:** + +Then include the subdirectory in your `CMakeLists.txt` project file. + +```cmake +set(QAPPLICATION_CLASS QApplication CACHE STRING "Inheritance class for SingleApplication") +add_subdirectory(src/third-party/singleapplication) +target_link_libraries(${PROJECT_NAME} SingleApplication::SingleApplication) +``` + + +The library sets up a `QLocalServer` and a `QSharedMemory` block. The first +instance of your Application is your Primary Instance. It would check if the +shared memory block exists and if not it will start a `QLocalServer` and listen +for connections. Each subsequent instance of your application would check if the +shared memory block exists and if it does, it will connect to the QLocalServer +to notify the primary instance that a new instance had been started, after which +it would terminate with status code `0`. In the Primary Instance +`SingleApplication` would emit the `instanceStarted()` signal upon detecting +that a new instance had been started. + +The library uses `stdlib` to terminate the program with the `exit()` function. + +Also don't forget to specify which `QCoreApplication` class your app is using if it +is not `QCoreApplication` as in examples above. + +The `Instance Started` signal +----------------------------- + +The SingleApplication class implements a `instanceStarted()` signal. You can +bind to that signal to raise your application's window when a new instance had +been started, for example. + +```cpp +// window is a QWindow instance +QObject::connect( + &app, + &SingleApplication::instanceStarted, + &window, + &QWindow::raise +); +``` + +Using `SingleApplication::instance()` is a neat way to get the +`SingleApplication` instance for binding to it's signals anywhere in your +program. + +__Note:__ On Windows the ability to bring the application windows to the +foreground is restricted. See [Windows specific implementations](Windows.md) +for a workaround and an example implementation. + + +Secondary Instances +------------------- + +If you want to be able to launch additional Secondary Instances (not related to +your Primary Instance) you have to enable that with the third parameter of the +`SingleApplication` constructor. The default is `false` meaning no Secondary +Instances. Here is an example of how you would start a Secondary Instance send +a message with the command line arguments to the primary instance and then shut +down. + +```cpp +int main(int argc, char *argv[]) +{ + SingleApplication app( argc, argv, true ); + + if( app.isSecondary() ) { + app.sendMessage( app.arguments().join(' ')).toUtf8() ); + app.exit( 0 ); + } + + return app.exec(); +} +``` + +*__Note:__ A secondary instance won't cause the emission of the +`instanceStarted()` signal by default. See `SingleApplication::Mode` for more +details.* + +You can check whether your instance is a primary or secondary with the following +methods: + +```cpp +app.isPrimary(); +// or +app.isSecondary(); +``` + +*__Note:__ If your Primary Instance is terminated a newly launched instance +will replace the Primary one even if the Secondary flag has been set.* + +Examples +-------- + +There are three examples provided in this repository: + +* Basic example that prevents a secondary instance from starting [`examples/basic`](https://github.com/itay-grudev/SingleApplication/tree/master/examples/basic) +* An example of a graphical application raising it's parent window [`examples/calculator`](https://github.com/itay-grudev/SingleApplication/tree/master/examples/calculator) +* A console application sending the primary instance it's command line parameters [`examples/sending_arguments`](https://github.com/itay-grudev/SingleApplication/tree/master/examples/sending_arguments) + +API +--- + +### Members + +```cpp +SingleApplication::SingleApplication( int &argc, char *argv[], bool allowSecondary = false, Options options = Mode::User, int timeout = 100, QString userData = QString() ) +``` + +Depending on whether `allowSecondary` is set, this constructor may terminate +your app if there is already a primary instance running. Additional `Options` +can be specified to set whether the SingleApplication block should work +user-wide or system-wide. Additionally the `Mode::SecondaryNotification` may be +used to notify the primary instance whenever a secondary instance had been +started (disabled by default). `timeout` specifies the maximum time in +milliseconds to wait for blocking operations. Setting `userData` provides additional data that will isolate this instance from other instances that do not have the same (or any) user data set. + +*__Note:__ `argc` and `argv` may be changed as Qt removes arguments that it +recognizes.* + +*__Note:__ `Mode::SecondaryNotification` only works if set on both the primary +and the secondary instance.* + +*__Note:__ Operating system can restrict the shared memory blocks to the same +user, in which case the User/System modes will have no effect and the block will +be user wide.* + +--- + +```cpp +bool SingleApplication::sendMessage( QByteArray message, int timeout = 100 ) +``` + +Sends `message` to the Primary Instance. Uses `timeout` as a the maximum timeout +in milliseconds for blocking functions + +--- + +```cpp +bool SingleApplication::isPrimary() +``` + +Returns if the instance is the primary instance. + +--- + +```cpp +bool SingleApplication::isSecondary() +``` +Returns if the instance is a secondary instance. + +--- + +```cpp +quint32 SingleApplication::instanceId() +``` + +Returns a unique identifier for the current instance. + +--- + +```cpp +qint64 SingleApplication::primaryPid() +``` + +Returns the process ID (PID) of the primary instance. + +--- + +```cpp +QString SingleApplication::primaryUser() +``` + +Returns the username the primary instance is running as. + +--- + +```cpp +QString SingleApplication::currentUser() +``` + +Returns the username the current instance is running as. + +### Signals + +```cpp +void SingleApplication::instanceStarted() +``` + +Triggered whenever a new instance had been started, except for secondary +instances if the `Mode::SecondaryNotification` flag is not specified. + +--- + +```cpp +void SingleApplication::receivedMessage( quint32 instanceId, QByteArray message ) +``` + +Triggered whenever there is a message received from a secondary instance. + +--- + +### Flags + +```cpp +enum SingleApplication::Mode +``` + +* `Mode::User` - The SingleApplication block should apply user wide. This adds + user specific data to the key used for the shared memory and server name. + This is the default functionality. +* `Mode::System` – The SingleApplication block applies system-wide. +* `Mode::SecondaryNotification` – Whether to trigger `instanceStarted()` even + whenever secondary instances are started. +* `Mode::ExcludeAppPath` – Excludes the application path from the server name + (and memory block) hash. +* `Mode::ExcludeAppVersion` – Excludes the application version from the server + name (and memory block) hash. + +*__Note:__ `Mode::SecondaryNotification` only works if set on both the primary +and the secondary instance.* + +*__Note:__ Operating system can restrict the shared memory blocks to the same +user, in which case the User/System modes will have no effect and the block will +be user wide.* + +--- + +Versioning +---------- + +Each major version introduces either very significant changes or is not +backwards compatible with the previous version. Minor versions only add +additional features, bug fixes or performance improvements and are backwards +compatible with the previous release. See [`CHANGELOG.md`](CHANGELOG.md) for +more details. + +Implementation +-------------- + +The library is implemented with a QSharedMemory block which is thread safe and +guarantees a race condition will not occur. It also uses a QLocalSocket to +notify the main process that a new instance had been spawned and thus invoke the +`instanceStarted()` signal and for messaging the primary instance. + +Additionally the library can recover from being forcefully killed on *nix +systems and will reset the memory block given that there are no other +instances running. + +License +------- +This library and it's supporting documentation are released under +`The MIT License (MIT)` with the exception of the Qt calculator examples which +is distributed under the BSD license. diff --git a/subprojects/SingleApplication-3.3.0/SingleApplication b/subprojects/SingleApplication-3.3.0/SingleApplication new file mode 100644 index 00000000..8ead1a42 --- /dev/null +++ b/subprojects/SingleApplication-3.3.0/SingleApplication @@ -0,0 +1 @@ +#include "singleapplication.h" diff --git a/subprojects/SingleApplication-3.3.0/Windows.md b/subprojects/SingleApplication-3.3.0/Windows.md new file mode 100644 index 00000000..13c52da0 --- /dev/null +++ b/subprojects/SingleApplication-3.3.0/Windows.md @@ -0,0 +1,46 @@ +Windows Specific Implementations +================================ + +Setting the foreground window +----------------------------- + +In the `instanceStarted()` example in the `README` we demonstrated how an +application can bring it's primary instance window whenever a second copy +of the application is started. + +On Windows the ability to bring the application windows to the foreground is +restricted, see [`AllowSetForegroundWindow()`][AllowSetForegroundWindow] for more +details. + +The background process (the primary instance) can bring its windows to the +foreground if it is allowed by the current foreground process (the secondary +instance). To bypass this `SingleApplication` must be initialized with the +`allowSecondary` parameter set to `true` and the `options` parameter must +include `Mode::SecondaryNotification`, See `SingleApplication::Mode` for more +details. + +Here is an example: + +```cpp +if( app.isSecondary() ) { + // This API requires LIBS += User32.lib to be added to the project + AllowSetForegroundWindow( DWORD( app.primaryPid() ) ); +} + +if( app.isPrimary() ) { + QObject::connect( + &app, + &SingleApplication::instanceStarted, + this, + &App::instanceStarted + ); +} +``` + +```cpp +void App::instanceStarted() { + QApplication::setActiveWindow( [window/widget to set to the foreground] ); +} +``` + +[AllowSetForegroundWindow]: https://msdn.microsoft.com/en-us/library/windows/desktop/ms632668.aspx diff --git a/subprojects/SingleApplication-3.3.0/examples/basic/CMakeLists.txt b/subprojects/SingleApplication-3.3.0/examples/basic/CMakeLists.txt new file mode 100644 index 00000000..c1429230 --- /dev/null +++ b/subprojects/SingleApplication-3.3.0/examples/basic/CMakeLists.txt @@ -0,0 +1,12 @@ +cmake_minimum_required(VERSION 3.7.0) + +project(basic LANGUAGES CXX) + +# SingleApplication base class +set(QAPPLICATION_CLASS QCoreApplication) +add_subdirectory(../.. SingleApplication) + +add_executable(basic main.cpp) + +target_link_libraries(${PROJECT_NAME} SingleApplication::SingleApplication) + diff --git a/subprojects/SingleApplication-3.3.0/examples/basic/basic.pro b/subprojects/SingleApplication-3.3.0/examples/basic/basic.pro new file mode 100755 index 00000000..b7af16cf --- /dev/null +++ b/subprojects/SingleApplication-3.3.0/examples/basic/basic.pro @@ -0,0 +1,5 @@ +# Single Application implementation +include(../../singleapplication.pri) +DEFINES += QAPPLICATION_CLASS=QCoreApplication + +SOURCES += main.cpp diff --git a/subprojects/SingleApplication-3.3.0/examples/basic/main.cpp b/subprojects/SingleApplication-3.3.0/examples/basic/main.cpp new file mode 100755 index 00000000..b2092c6d --- /dev/null +++ b/subprojects/SingleApplication-3.3.0/examples/basic/main.cpp @@ -0,0 +1,10 @@ +#include + +int main(int argc, char *argv[]) +{ + SingleApplication app( argc, argv ); + + qWarning() << "Started a new instance"; + + return app.exec(); +} diff --git a/subprojects/SingleApplication-3.3.0/examples/calculator/CMakeLists.txt b/subprojects/SingleApplication-3.3.0/examples/calculator/CMakeLists.txt new file mode 100644 index 00000000..82305f04 --- /dev/null +++ b/subprojects/SingleApplication-3.3.0/examples/calculator/CMakeLists.txt @@ -0,0 +1,21 @@ +cmake_minimum_required(VERSION 3.7.0) + +project(calculator LANGUAGES CXX) + +set(CMAKE_AUTOMOC ON) + +# SingleApplication base class +set(QAPPLICATION_CLASS QApplication) +add_subdirectory(../.. SingleApplication) + +find_package(Qt${QT_DEFAULT_MAJOR_VERSION} COMPONENTS Core REQUIRED) + +add_executable(${PROJECT_NAME} + button.h + calculator.h + button.cpp + calculator.cpp + main.cpp +) + +target_link_libraries(${PROJECT_NAME} SingleApplication::SingleApplication) diff --git a/subprojects/SingleApplication-3.3.0/examples/calculator/button.cpp b/subprojects/SingleApplication-3.3.0/examples/calculator/button.cpp new file mode 100644 index 00000000..d6cca0a0 --- /dev/null +++ b/subprojects/SingleApplication-3.3.0/examples/calculator/button.cpp @@ -0,0 +1,73 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include + +#include "button.h" + +//! [0] +Button::Button(const QString &text, QWidget *parent) + : QToolButton(parent) +{ + setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); + setText(text); +} +//! [0] + +//! [1] +QSize Button::sizeHint() const +//! [1] //! [2] +{ + QSize size = QToolButton::sizeHint(); + size.rheight() += 20; + size.rwidth() = qMax(size.width(), size.height()); + return size; +} +//! [2] diff --git a/subprojects/SingleApplication-3.3.0/examples/calculator/button.h b/subprojects/SingleApplication-3.3.0/examples/calculator/button.h new file mode 100644 index 00000000..2c014c7b --- /dev/null +++ b/subprojects/SingleApplication-3.3.0/examples/calculator/button.h @@ -0,0 +1,68 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef BUTTON_H +#define BUTTON_H + +#include + +//! [0] +class Button : public QToolButton +{ + Q_OBJECT + +public: + explicit Button(const QString &text, QWidget *parent = 0); + + QSize sizeHint() const Q_DECL_OVERRIDE; +}; +//! [0] + +#endif diff --git a/subprojects/SingleApplication-3.3.0/examples/calculator/calculator.cpp b/subprojects/SingleApplication-3.3.0/examples/calculator/calculator.cpp new file mode 100644 index 00000000..3d34c2a7 --- /dev/null +++ b/subprojects/SingleApplication-3.3.0/examples/calculator/calculator.cpp @@ -0,0 +1,406 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include + +#include + +#include "button.h" +#include "calculator.h" + +//! [0] +Calculator::Calculator(QWidget *parent) + : QWidget(parent) +{ + sumInMemory = 0.0; + sumSoFar = 0.0; + factorSoFar = 0.0; + waitingForOperand = true; +//! [0] + +//! [1] + display = new QLineEdit("0"); +//! [1] //! [2] + display->setReadOnly(true); + display->setAlignment(Qt::AlignRight); + display->setMaxLength(15); + + QFont font = display->font(); + font.setPointSize(font.pointSize() + 8); + display->setFont(font); +//! [2] + +//! [4] + for (int i = 0; i < NumDigitButtons; ++i) { + digitButtons[i] = createButton(QString::number(i), SLOT(digitClicked())); + } + + Button *pointButton = createButton(".", SLOT(pointClicked())); + Button *changeSignButton = createButton("\302\261", SLOT(changeSignClicked())); + + Button *backspaceButton = createButton("Backspace", SLOT(backspaceClicked())); + Button *clearButton = createButton("Clear", SLOT(clear())); + Button *clearAllButton = createButton("Clear All", SLOT(clearAll())); + + Button *clearMemoryButton = createButton("MC", SLOT(clearMemory())); + Button *readMemoryButton = createButton("MR", SLOT(readMemory())); + Button *setMemoryButton = createButton("MS", SLOT(setMemory())); + Button *addToMemoryButton = createButton("M+", SLOT(addToMemory())); + + Button *divisionButton = createButton("\303\267", SLOT(multiplicativeOperatorClicked())); + Button *timesButton = createButton("\303\227", SLOT(multiplicativeOperatorClicked())); + Button *minusButton = createButton("-", SLOT(additiveOperatorClicked())); + Button *plusButton = createButton("+", SLOT(additiveOperatorClicked())); + + Button *squareRootButton = createButton("Sqrt", SLOT(unaryOperatorClicked())); + Button *powerButton = createButton("x\302\262", SLOT(unaryOperatorClicked())); + Button *reciprocalButton = createButton("1/x", SLOT(unaryOperatorClicked())); + Button *equalButton = createButton("=", SLOT(equalClicked())); +//! [4] + +//! [5] + QGridLayout *mainLayout = new QGridLayout; +//! [5] //! [6] + mainLayout->setSizeConstraint(QLayout::SetFixedSize); + mainLayout->addWidget(display, 0, 0, 1, 6); + mainLayout->addWidget(backspaceButton, 1, 0, 1, 2); + mainLayout->addWidget(clearButton, 1, 2, 1, 2); + mainLayout->addWidget(clearAllButton, 1, 4, 1, 2); + + mainLayout->addWidget(clearMemoryButton, 2, 0); + mainLayout->addWidget(readMemoryButton, 3, 0); + mainLayout->addWidget(setMemoryButton, 4, 0); + mainLayout->addWidget(addToMemoryButton, 5, 0); + + for (int i = 1; i < NumDigitButtons; ++i) { + int row = ((9 - i) / 3) + 2; + int column = ((i - 1) % 3) + 1; + mainLayout->addWidget(digitButtons[i], row, column); + } + + mainLayout->addWidget(digitButtons[0], 5, 1); + mainLayout->addWidget(pointButton, 5, 2); + mainLayout->addWidget(changeSignButton, 5, 3); + + mainLayout->addWidget(divisionButton, 2, 4); + mainLayout->addWidget(timesButton, 3, 4); + mainLayout->addWidget(minusButton, 4, 4); + mainLayout->addWidget(plusButton, 5, 4); + + mainLayout->addWidget(squareRootButton, 2, 5); + mainLayout->addWidget(powerButton, 3, 5); + mainLayout->addWidget(reciprocalButton, 4, 5); + mainLayout->addWidget(equalButton, 5, 5); + setLayout(mainLayout); + + setWindowTitle("Calculator"); +} +//! [6] + +//! [7] +void Calculator::digitClicked() +{ + Button *clickedButton = qobject_cast