highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-12-18 08:32:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

qt: Treat regtest as testnet

Browse Source 
No need to do anything special in the GUI for regtest mode,
but do treat it at testnet not mainnet to prevent confusion.
This commit is contained in:
Wladimir J. van der Laan
2013-12-18 09:45:36 +01:00
parent 57fdd68aac
commit 2ea980a77c
7 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/qt/bitcoin.cpp
View File

@@ -197,9 +197,10 @@ int main(int argc, char *argv[])
// Application identification (must be set before OptionsModel is initialized,
// as it is used to locate QSettings)
bool isaTestNet = TestNet() || RegTest();
QApplication::setOrganizationName("Bitcoin");
QApplication::setOrganizationDomain("bitcoin.org");
if (TestNet()) // Separate UI settings for testnet
if (isaTestNet) // Separate UI settings for testnets
QApplication::setApplicationName("Bitcoin-Qt-testnet");
else
QApplication::setApplicationName("Bitcoin-Qt");
@@ -230,7 +231,7 @@ int main(int argc, char *argv[])
PaymentServer* paymentServer = new PaymentServer(&app);
// User language is set up: pick a data directory
Intro::pickDataDirectory(TestNet());
Intro::pickDataDirectory(isaTestNet);
// Install global event filter that makes sure that long tooltips can be word-wrapped
app.installEventFilter(new GUIUtil::ToolTipToRichTextFilter(TOOLTIP_WRAP_THRESHOLD, &app));
@@ -258,7 +259,7 @@ int main(int argc, char *argv[])
return 1;
}
SplashScreen splash(QPixmap(), 0);
SplashScreen splash(QPixmap(), 0, isaTestNet);
if (GetBoolArg("-splash", true) && !GetBoolArg("-min", false))
{
splash.show();
@@ -280,7 +281,7 @@ int main(int argc, char *argv[])
boost::thread_group threadGroup;
BitcoinGUI window(TestNet(), 0);
BitcoinGUI window(isaTestNet, 0);
guiref = &window;
QTimer* pollShutdownTimer = new QTimer(guiref);