From 9473370956645ea2347a317840ec39d4dfe65fe8 Mon Sep 17 00:00:00 2001 From: clemahieu Date: Sun, 29 Mar 2015 21:12:10 -0500 Subject: [PATCH] Adding windows icons. --- CMakeLists.txt | 31 +++++++++++++++++++++++++------ RaiBlocks.ico | Bin 0 -> 28797 bytes RaiBlocks.rc | 1 + rai/icon.hpp | 7 +++++++ rai/plat/unknown/icon.cpp | 5 +++++ rai/plat/windows/icon.cpp | 12 ++++++++++++ rai/qt_wallet/entry.cpp | 2 ++ 7 files changed, 52 insertions(+), 6 deletions(-) create mode 100644 RaiBlocks.ico create mode 100644 RaiBlocks.rc create mode 100644 rai/icon.hpp create mode 100644 rai/plat/unknown/icon.cpp create mode 100644 rai/plat/windows/icon.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 95a57fb4..2b01b0e2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,6 +19,12 @@ else (APPLE) set (PLATFORM_LINK_FLAGS "") endif (APPLE) +if (WIN32) + set (PLATFORM_QT_PACKAGES WinExtras) +else (WIN32) + set (PLATFORM_QT_PACKAGES) +endif (WIN32) + include_directories (${CMAKE_SOURCE_DIR}) find_package (Boost REQUIRED COMPONENTS filesystem system log log_setup thread program_options) @@ -30,7 +36,7 @@ include_directories (${GTEST_INCLUDE_DIR}) find_package (CryptoPP REQUIRED) include_directories (${CRYPTOPP_INCLUDE_DIR}) -find_package (Qt5 REQUIRED COMPONENTS Core Gui Widgets Test) +find_package (Qt5 REQUIRED COMPONENTS Core Gui Widgets Test ${PLATFORM_QT_PACKAGES}) include_directories (${Qt5Core_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS} ${Qt5Test_INCLUDE_DIRS}) include_directories (${CPPNETLIB_INCLUDE_DIRS}) @@ -64,15 +70,15 @@ add_library (blake2 ${BLAKE2_IMPLEMENTATION}) if (APPLE) - set (PLATFORM_NODE_SOURCE rai/plat/osx/working.mm) + set (PLATFORM_SECURE_SOURCE rai/plat/osx/working.mm) elseif (WIN32) - set (PLATFORM_NODE_SOURCE rai/plat/windows/working.cpp) + set (PLATFORM_SECURE_SOURCE rai/plat/windows/working.cpp) elseif (UNIX) - set (PLATFORM_NODE_SOURCE rai/plat/posix/working.cpp) + set (PLATFORM_SECURE_SOURCE rai/plat/posix/working.cpp) endif (APPLE) add_library (secure - ${PLATFORM_NODE_SOURCE} + ${PLATFORM_SECURE_SOURCE} rai/config.hpp rai/secure.cpp rai/secure.hpp @@ -124,7 +130,14 @@ add_library (qt add_executable (landing rai/landing/entry.cpp) +if (WIN32) + set (PLATFORM_WALLET_SOURCE rai/plat/windows/icon.cpp RaiBlocks.rc) +else (WIN32) + set (PLATFORM_WALLET_SOURCE rai/plat/unknown/icon.cpp) +endif (WIN32) + add_executable (qt_wallet ${PLATFORM_GUI_TARGET_PROPERTIES} + ${PLATFORM_WALLET_SOURCE} rai/qt_wallet/entry.cpp) add_executable (qt_system @@ -149,6 +162,12 @@ else (WIN32) set (PLATFORM_LIBS) endif (WIN32) +if (WIN32) + set (PLATFORM_WALLET_LIBS Qt5::WinExtras) +else (WIN32) + set (PLATFORM_WALLET_LIBS) +endif (WIN32) + target_link_libraries (core_test node secure lmdb xxhash ed25519 blake2 ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_LOG_LIBRARY} ${Boost_LOG_SETUP_LIBRARY} ${Boost_THREAD_LIBRARY} ${GTEST_MAIN_LIBRARY} ${GTEST_LIBRARY} ${CRYPTOPP_LIBRARY} ${CPPNETLIB_LIBRARIES} pthread ${PLATFORM_LIBS}) target_link_libraries (slow_test node secure lmdb xxhash ed25519 blake2 ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_LOG_LIBRARY} ${Boost_LOG_SETUP_LIBRARY} ${Boost_THREAD_LIBRARY} ${CRYPTOPP_LIBRARY} ${GTEST_MAIN_LIBRARY} ${GTEST_LIBRARY} ${CPPNETLIB_LIBRARIES} pthread ${PLATFORM_LIBS}) @@ -159,7 +178,7 @@ target_link_libraries (landing node secure lmdb xxhash ed25519 blake2 ${Boost_FI target_link_libraries (qt_test node secure lmdb xxhash ed25519 qt blake2 ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_LOG_LIBRARY} ${Boost_LOG_SETUP_LIBRARY} ${Boost_THREAD_LIBRARY} ${GTEST_LIBRARY} ${CRYPTOPP_LIBRARY} ${CPPNETLIB_LIBRARIES} Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Test ${QT_QTGUI_LIBRARY} pthread ${PLATFORM_LIBS}) -target_link_libraries (qt_wallet node secure lmdb xxhash ed25519 qt blake2 ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_LOG_LIBRARY} ${Boost_LOG_SETUP_LIBRARY} ${Boost_THREAD_LIBRARY} ${CRYPTOPP_LIBRARY} ${CPPNETLIB_LIBRARIES} Qt5::Core Qt5::Gui Qt5::Widgets ${QT_QTGUI_LIBRARY} pthread ${PLATFORM_LIBS}) +target_link_libraries (qt_wallet node secure lmdb xxhash ed25519 qt blake2 ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_LOG_LIBRARY} ${Boost_LOG_SETUP_LIBRARY} ${Boost_THREAD_LIBRARY} ${CRYPTOPP_LIBRARY} ${CPPNETLIB_LIBRARIES} Qt5::Core Qt5::Gui Qt5::Widgets ${QT_QTGUI_LIBRARY} pthread ${PLATFORM_LIBS} ${PLATFORM_WALLET_LIBS}) target_link_libraries (qt_system node secure lmdb xxhash ed25519 qt blake2 ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_LOG_LIBRARY} ${Boost_LOG_SETUP_LIBRARY} ${Boost_THREAD_LIBRARY} ${GTEST_LIBRARY} ${CRYPTOPP_LIBRARY} ${CPPNETLIB_LIBRARIES} Qt5::Core Qt5::Gui Qt5::Widgets ${QT_QTGUI_LIBRARY} pthread ${PLATFORM_LIBS}) diff --git a/RaiBlocks.ico b/RaiBlocks.ico new file mode 100644 index 0000000000000000000000000000000000000000..a7fe4d33da165966c9368660d5b66cc8cd4883ec GIT binary patch literal 28797 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 + +void rai::set_application_icon (QApplication &) +{ +} \ No newline at end of file diff --git a/rai/plat/windows/icon.cpp b/rai/plat/windows/icon.cpp new file mode 100644 index 00000000..36262559 --- /dev/null +++ b/rai/plat/windows/icon.cpp @@ -0,0 +1,12 @@ +#include + +#include +#include +#include + +void rai::set_application_icon (QApplication & application_a) +{ + HICON hIcon = static_cast (LoadImage (GetModuleHandle (nullptr), MAKEINTRESOURCE (1), IMAGE_ICON, 0, 0, LR_DEFAULTSIZE | LR_LOADTRANSPARENT)); + application_a.setWindowIcon (QIcon (QtWin::fromHICON (hIcon))); + DestroyIcon (hIcon); +} \ No newline at end of file diff --git a/rai/qt_wallet/entry.cpp b/rai/qt_wallet/entry.cpp index 3621dc53..f72ae4b9 100644 --- a/rai/qt_wallet/entry.cpp +++ b/rai/qt_wallet/entry.cpp @@ -1,6 +1,7 @@ #include #include +#include #include #include @@ -100,6 +101,7 @@ int main (int argc, char * const * argv) if (!config_error) { QApplication application (argc, const_cast (argv)); + rai::set_application_icon (application); auto service (boost::make_shared ()); rai::processor_service processor; rai::node_init init;