monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-11-17 00:07:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2855

Browse source 
b022735 main: add --disable-check-updates flag (selsta)
This commit is contained in:
luigi1111 2020-04-28 15:17:57 -05:00
commit ef93139a80
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
main.qml
View file

@ -1317,8 +1317,6 @@ ApplicationWindow {
openWallet("wizard"); openWallet("wizard");
} }
checkUpdates();
if(persistentSettings.fiatPriceEnabled){ if(persistentSettings.fiatPriceEnabled){
appWindow.fiatApiRefresh(); appWindow.fiatApiRefresh();
appWindow.fiatTimerStart(); appWindow.fiatTimerStart();
@ -2008,7 +2006,10 @@ ApplicationWindow {
Timer { Timer {
id: updatesTimer id: updatesTimer
interval: 3600*1000; running: true; repeat: true interval: 3600 * 1000
repeat: true
running: !disableCheckUpdatesFlag
triggeredOnStart: true
onTriggered: checkUpdates() onTriggered: checkUpdates()
} }

3
src/main/main.cpp
View file

@ -232,6 +232,8 @@ Verify update binary using 'shasum'-compatible (SHA256 algo) output signed by tw
(i.e. 'gpg -b hashes.txt') generated by another maintainer.", "update-binary"); (i.e. 'gpg -b hashes.txt') generated by another maintainer.", "update-binary");
parser.addOption(verifyUpdateOption); parser.addOption(verifyUpdateOption);
QCommandLineOption disableCheckUpdatesOption("disable-check-updates", "Disable automatic check for updates.");
parser.addOption(disableCheckUpdatesOption);
QCommandLineOption testQmlOption("test-qml"); QCommandLineOption testQmlOption("test-qml");
testQmlOption.setFlags(QCommandLineOption::HiddenFromHelp); testQmlOption.setFlags(QCommandLineOption::HiddenFromHelp);
parser.addOption(logPathOption); parser.addOption(logPathOption);
@ -467,6 +469,7 @@ Verify update binary using 'shasum'-compatible (SHA256 algo) output signed by tw
engine.rootContext()->setContextProperty("homePath", QDir::homePath()); engine.rootContext()->setContextProperty("homePath", QDir::homePath());
engine.rootContext()->setContextProperty("applicationDirectory", QApplication::applicationDirPath()); engine.rootContext()->setContextProperty("applicationDirectory", QApplication::applicationDirPath());
engine.rootContext()->setContextProperty("idealThreadCount", QThread::idealThreadCount()); engine.rootContext()->setContextProperty("idealThreadCount", QThread::idealThreadCount());
engine.rootContext()->setContextProperty("disableCheckUpdatesFlag", parser.isSet(disableCheckUpdatesOption));
bool builtWithScanner = false; bool builtWithScanner = false;
#ifdef WITH_SCANNER #ifdef WITH_SCANNER