monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-12-23 03:59:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3808

Browse source 
621c119 main: add compile time option to disable desktop entry dialog (selsta)
This commit is contained in:
luigi1111 2022-01-24 15:22:57 -05:00
commit c2f706a28a
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
3 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -12,6 +12,7 @@ option(STATIC "Link libraries statically, requires static Qt")
option(USE_DEVICE_TREZOR "Trezor support compilation" ON) option(USE_DEVICE_TREZOR "Trezor support compilation" ON)
option(WITH_SCANNER "Enable webcam QR scanner" OFF) option(WITH_SCANNER "Enable webcam QR scanner" OFF)
option(WITH_DESKTOP_ENTRY "Ask to install desktop entry on first startup" ON)
option(DEV_MODE "Checkout latest monero master on build" OFF) option(DEV_MODE "Checkout latest monero master on build" OFF)
list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_SOURCE_DIR}/cmake") list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_SOURCE_DIR}/cmake")
@ -112,6 +113,10 @@ if(WITH_SCANNER)
add_definitions(-DWITH_SCANNER) add_definitions(-DWITH_SCANNER)
endif() endif()
if(WITH_DESKTOP_ENTRY)
add_definitions(-DWITH_DESKTOP_ENTRY)
endif()
# Sodium # Sodium
find_library(SODIUM_LIBRARY sodium) find_library(SODIUM_LIBRARY sodium)
message(STATUS "libsodium: libraries at ${SODIUM_LIBRARY}") message(STATUS "libsodium: libraries at ${SODIUM_LIBRARY}")

3
main.qml
View file

@ -1338,7 +1338,8 @@ ApplicationWindow {
appWindow.fiatTimerStart(); appWindow.fiatTimerStart();
} }
if (persistentSettings.askDesktopShortcut && !persistentSettings.portable) { const desktopEntryEnabled = (typeof builtWithDesktopEntry != "undefined") && builtWithDesktopEntry;
if (persistentSettings.askDesktopShortcut && !persistentSettings.portable && desktopEntryEnabled) {
persistentSettings.askDesktopShortcut = false; persistentSettings.askDesktopShortcut = false;
if (isTails) { if (isTails) {

6
src/main/main.cpp
View file

@ -503,6 +503,12 @@ Verify update binary using 'shasum'-compatible (SHA256 algo) output signed by tw
#endif #endif
engine.rootContext()->setContextProperty("builtWithScanner", builtWithScanner); engine.rootContext()->setContextProperty("builtWithScanner", builtWithScanner);
bool builtWithDesktopEntry = false;
#ifdef WITH_DESKTOP_ENTRY
builtWithDesktopEntry = true;
#endif
engine.rootContext()->setContextProperty("builtWithDesktopEntry", builtWithDesktopEntry);
engine.rootContext()->setContextProperty("moneroVersion", MONERO_VERSION_FULL); engine.rootContext()->setContextProperty("moneroVersion", MONERO_VERSION_FULL);
// Load main window (context properties needs to be defined obove this line) // Load main window (context properties needs to be defined obove this line)