diff --git a/CMakeLists.txt b/CMakeLists.txt index 87bacf7e..735782c3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,7 +57,8 @@ get_directory_property(ARCH_WIDTH DIRECTORY "monero" DEFINITION ARCH_WIDTH) if(STATIC) message(STATUS "Initiating static build") set(Boost_USE_STATIC_LIBS ON) - set(CMAKE_FIND_LIBRARY_SUFFIXES ".a") + set(CMAKE_FIND_LIBRARY_SUFFIXES ".a") + add_definitions(-DMONERO_GUI_STATIC) endif() # Include password strength library diff --git a/monero-wallet-gui.pro b/monero-wallet-gui.pro index f8e30e33..a2844848 100644 --- a/monero-wallet-gui.pro +++ b/monero-wallet-gui.pro @@ -46,9 +46,9 @@ INCLUDEPATH += $$WALLET_ROOT/include \ $$WALLET_ROOT/src HEADERS += \ - filter.h \ - clipboardAdapter.h \ - oscursor.h \ + src/main/filter.h \ + src/main/clipboardAdapter.h \ + src/main/oscursor.h \ src/libwalletqt/WalletManager.h \ src/libwalletqt/Wallet.h \ src/libwalletqt/PendingTransaction.h \ @@ -57,8 +57,8 @@ HEADERS += \ src/libwalletqt/QRCodeImageProvider.h \ src/libwalletqt/Transfer.h \ src/NetworkType.h \ - oshelper.h \ - TranslationManager.h \ + src/main/oshelper.h \ + src/TranslationManager.h \ src/model/TransactionHistoryModel.h \ src/model/TransactionHistorySortFilterModel.h \ src/QR-Code-generator/BitBuffer.hpp \ @@ -72,8 +72,8 @@ HEADERS += \ src/libwalletqt/SubaddressAccount.h \ src/zxcvbn-c/zxcvbn.h \ src/libwalletqt/UnsignedTransaction.h \ - Logger.h \ - MainApp.h \ + src/main/Logger.h \ + src/main/MainApp.h \ src/qt/FutureScheduler.h \ src/qt/ipc.h \ src/qt/KeysFiles.h \ @@ -83,18 +83,18 @@ HEADERS += \ src/qt/MoneroSettings.h \ src/qt/TailsOS.h -SOURCES += main.cpp \ - filter.cpp \ - clipboardAdapter.cpp \ - oscursor.cpp \ +SOURCES += src/main/main.cpp \ + src/main/filter.cpp \ + src/main/clipboardAdapter.cpp \ + src/main/oscursor.cpp \ src/libwalletqt/WalletManager.cpp \ src/libwalletqt/Wallet.cpp \ src/libwalletqt/PendingTransaction.cpp \ src/libwalletqt/TransactionHistory.cpp \ src/libwalletqt/TransactionInfo.cpp \ src/libwalletqt/QRCodeImageProvider.cpp \ - oshelper.cpp \ - TranslationManager.cpp \ + src/main/oshelper.cpp \ + src/TranslationManager.cpp \ src/model/TransactionHistoryModel.cpp \ src/model/TransactionHistorySortFilterModel.cpp \ src/QR-Code-generator/BitBuffer.cpp \ @@ -108,8 +108,8 @@ SOURCES += main.cpp \ src/libwalletqt/SubaddressAccount.cpp \ src/zxcvbn-c/zxcvbn.c \ src/libwalletqt/UnsignedTransaction.cpp \ - Logger.cpp \ - MainApp.cpp \ + src/main/Logger.cpp \ + src/main/MainApp.cpp \ src/qt/FutureScheduler.cpp \ src/qt/ipc.cpp \ src/qt/KeysFiles.cpp \ diff --git a/src/main/main.cpp b/src/main/main.cpp index 3a9eb014..138c2889 100644 --- a/src/main/main.cpp +++ b/src/main/main.cpp @@ -78,6 +78,8 @@ #include "QR-Code-scanner/QrCodeScanner.h" #endif +#ifdef MONERO_GUI_STATIC + #include #if defined(Q_OS_OSX) Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin); @@ -126,6 +128,8 @@ Q_IMPORT_PLUGIN(QtQuickTemplates2Plugin) Q_IMPORT_PLUGIN(QmlXmlListModelPlugin) Q_IMPORT_PLUGIN(QMultimediaDeclarativeModule) +#endif + bool isIOS = false; bool isAndroid = false; bool isWindows = false; diff --git a/src/main/qml.qrc b/src/main/qml.qrc deleted file mode 100644 index 77179f88..00000000 --- a/src/main/qml.qrc +++ /dev/null @@ -1,255 +0,0 @@ - - - main.qml - LeftPanel.qml - MiddlePanel.qml - images/download-white.png - images/download-white@2x.png - images/external-link-white.png - images/external-link-white@2x.png - images/minus-white.png - images/minus-white@2x.png - images/plus-white.png - images/plus-white@2x.png - components/Label.qml - images/whatIsIcon.png - images/whatIsIcon@2x.png - images/lockIcon.png - components/MenuButton.qml - pages/Account.qml - pages/Transfer.qml - pages/History.qml - pages/AddressBook.qml - pages/Mining.qml - components/NetworkStatusItem.qml - components/Input.qml - components/StandardButton.qml - components/LineEdit.qml - components/TipItem.qml - images/tip.png - components/Scroll.qml - components/MenuButtonDivider.qml - images/moneroIcon.png - components/StandardDropdown.qml - images/whiteDropIndicator.png - images/whiteDropIndicator@2x.png - components/CheckBox.qml - images/uncheckedIcon.png - images/uncheckedIcon@2x.png - components/DatePicker.qml - images/prevMonth.png - images/prevMonth@2x.png - components/TitleBar.qml - images/moneroLogo2.png - images/resize.png - images/resize@2x.png - images/resizeHovered.png - images/resizeHovered@2x.png - images/nextPage.png - images/nextPage@2x.png - lang/languages.xml - lang/flags/bd.png - lang/flags/bg.png - lang/flags/br.png - lang/flags/catalonia.png - lang/flags/cn.png - lang/flags/hr.png - lang/flags/hu.png - lang/flags/cz.png - lang/flags/dk.png - lang/flags/eg.png - lang/flags/esperanto.png - lang/flags/fi.png - lang/flags/fr.png - lang/flags/de.png - lang/flags/in.png - lang/flags/id.png - lang/flags/il.png - lang/flags/ir.png - lang/flags/irl.png - lang/flags/it.png - lang/flags/jp.png - lang/flags/ku.png - lang/flags/lt.png - lang/flags/nl.png - lang/flags/pk.png - lang/flags/ps.png - lang/flags/pl.png - lang/flags/pt.png - lang/flags/ro.png - lang/flags/ru.png - lang/flags/rs.png - lang/flags/sk.png - lang/flags/si.png - lang/flags/za.png - lang/flags/kr.png - lang/flags/es.png - lang/flags/se.png - lang/flags/tw.png - lang/flags/tr.png - lang/flags/ua.png - lang/flags/gb.png - lang/flags/us.png - lang/flags/pirate.png - pages/Receive.qml - pages/TxKey.qml - pages/SharedRingDB.qml - components/effects/ImageMask.qml - components/IconButton.qml - components/PasswordDialog.qml - components/InputDialog.qml - components/ProcessingSplash.qml - components/ProgressBar.qml - components/StandardDialog.qml - pages/Sign.qml - components/DaemonManagerDialog.qml - version.js - components/DaemonConsole.qml - components/QRCodeScanner.qml - components/Notifier.qml - components/TextBlock.qml - components/RemoteNodeEdit.qml - pages/Keys.qml - images/appicon.ico - images/card-background.png - images/card-background@2x.png - images/moneroLogo_white.png - images/question.png - images/question@2x.png - images/titlebarLogo.png - images/titlebarLogo@2x.png - pages/merchant/MerchantTitlebar.qml - images/menuButtonGradient.png - fonts/Roboto-Medium.ttf - fonts/Roboto-Regular.ttf - fonts/Roboto-Light.ttf - fonts/Roboto-Bold.ttf - fonts/RobotoMono-Medium.ttf - fonts/RobotoMono-Regular.ttf - fonts/RobotoMono-Light.ttf - fonts/RobotoMono-Bold.ttf - components/Style.qml - components/qmldir - components/InlineButton.qml - images/lightning.png - images/lightning@2x.png - images/logout.png - images/logout@2x.png - images/moneroIcon-28x28.png - images/moneroIcon-28x28@2x.png - images/lightning-white.png - images/lightning-white@2x.png - components/InputMulti.qml - components/LineEditMulti.qml - components/LabelButton.qml - components/LabelSubheader.qml - images/arrow-right-medium-white.png - images/arrow-right-medium-white@2x.png - images/rightArrow.png - images/rightArrow@2x.png - images/historyBorderRadius.png - components/CheckBox2.qml - components/TextPlain.qml - components/TextPlainArea.qml - js/TxUtils.js - images/warning.png - images/warning@2x.png - images/rightArrowInactive.png - images/rightArrowInactive@2x.png - js/Windows.js - js/Utils.js - components/RadioButton.qml - pages/settings/Settings.qml - pages/settings/SettingsWallet.qml - pages/settings/SettingsNode.qml - pages/settings/SettingsLog.qml - pages/settings/SettingsLayout.qml - pages/settings/SettingsInfo.qml - pages/settings/Navbar.qml - components/WarningBox.qml - images/miningxmr.png - images/miningxmr@2x.png - images/plus-in-circle-medium-white.png - images/plus-in-circle-medium-white@2x.png - pages/merchant/Merchant.qml - pages/merchant/MerchantCheckbox.qml - pages/merchant/MerchantTrackingList.qml - images/merchant/arrow_right.png - images/merchant/bg.png - images/merchant/input_box.png - fonts/FontAwesome/fa-brands-400.ttf - fonts/FontAwesome/fa-regular-400.ttf - fonts/FontAwesome/fa-solid-900.ttf - fonts/FontAwesome/FontAwesome.qml - fonts/FontAwesome/Object.qml - fonts/FontAwesome/qmldir - wizard/WizardAskPassword.qml - wizard/WizardController.qml - wizard/WizardCreateWallet1.qml - wizard/WizardCreateWallet2.qml - wizard/WizardCreateWallet3.qml - wizard/WizardCreateWallet4.qml - wizard/WizardCreateDevice1.qml - wizard/WizardDaemonSettings.qml - wizard/WizardHeader.qml - wizard/WizardHome.qml - wizard/WizardLanguage.qml - wizard/WizardLang.qml - wizard/WizardNav.qml - wizard/WizardWalletInput.qml - wizard/WizardRestoreWallet1.qml - wizard/WizardRestoreWallet2.qml - wizard/WizardRestoreWallet3.qml - wizard/WizardRestoreWallet4.qml - wizard/WizardSummary.qml - wizard/WizardSummaryItem.qml - wizard/WizardModeSelection.qml - wizard/WizardModeRemoteNodeWarning.qml - wizard/WizardModeBootstrap.qml - wizard/WizardMenuItem.qml - js/Wizard.js - components/LanguageSidebar.qml - images/world-flags-globe.png - images/langFlagGrey.png - images/restore-wallet-from-hardware@2x.png - images/restore-wallet-from-hardware.png - images/open-wallet-from-file@2x.png - images/open-wallet-from-file.png - images/restore-wallet@2x.png - images/restore-wallet.png - images/create-wallet@2x.png - images/create-wallet.png - images/remote-node.png - images/remote-node@2x.png - images/local-node.png - images/local-node@2x.png - images/local-node-full.png - images/local-node-full@2x.png - wizard/WizardNavProgressDot.qml - wizard/WizardOpenWallet1.qml - images/arrow-right-in-circle.png - images/arrow-right-in-circle@2x.png - images/themes/white/leftPanelBg.jpg - images/themes/white/middlePanelBg.jpg - images/right.svg - images/middlePanelShadow.png - images/themes/white/titlebarLogo@2x.png - images/themes/white/titlebarLogo.png - images/sidebar.svg - images/fullscreen.svg - images/close.svg - images/minimize.svg - images/themes/white/close.svg - images/themes/white/fullscreen.svg - images/themes/white/minimize.svg - images/themes/white/question.svg - images/themes/white/expand.svg - components/effects/ColorTransition.qml - components/effects/GradientBackground.qml - images/check-white.svg - images/copy.svg - images/edit.svg - images/arrow-right-in-circle-outline-medium-white.svg - images/tails-grey.png - -