BIP70: Chainparams: DRY: Make qt/guiutil.cpp fit BIP70 chain name strings
As a side effect, the qt user will see "test" instead of "testnet"
This commit is contained in:
parent
c6de5cc886
commit
c53d48a6b3
1 changed files with 9 additions and 10 deletions
|
@ -581,12 +581,12 @@ TableViewLastColumnResizingFixer::TableViewLastColumnResizingFixer(QTableView* t
|
|||
#ifdef WIN32
|
||||
boost::filesystem::path static StartupShortcutPath()
|
||||
{
|
||||
if (GetBoolArg("-testnet", false))
|
||||
std::string chain = ChainNameFromCommandLine();
|
||||
if (chain == CBaseChainParams::MAIN)
|
||||
return GetSpecialFolderPath(CSIDL_STARTUP) / "Bitcoin.lnk";
|
||||
if (chain == CBaseChainParams::TESTNET) // Remove this special case when CBaseChainParams::TESTNET = "testnet4"
|
||||
return GetSpecialFolderPath(CSIDL_STARTUP) / "Bitcoin (testnet).lnk";
|
||||
else if (GetBoolArg("-regtest", false))
|
||||
return GetSpecialFolderPath(CSIDL_STARTUP) / "Bitcoin (regtest).lnk";
|
||||
|
||||
return GetSpecialFolderPath(CSIDL_STARTUP) / "Bitcoin.lnk";
|
||||
return GetSpecialFolderPath(CSIDL_STARTUP) / strprintf("Bitcoin (%s).lnk", chain);
|
||||
}
|
||||
|
||||
bool GetStartOnSystemStartup()
|
||||
|
@ -719,15 +719,14 @@ bool SetStartOnSystemStartup(bool fAutoStart)
|
|||
boost::filesystem::ofstream optionFile(GetAutostartFilePath(), std::ios_base::out|std::ios_base::trunc);
|
||||
if (!optionFile.good())
|
||||
return false;
|
||||
std::string chain = ChainNameFromCommandLine();
|
||||
// Write a bitcoin.desktop file to the autostart directory:
|
||||
optionFile << "[Desktop Entry]\n";
|
||||
optionFile << "Type=Application\n";
|
||||
if (GetBoolArg("-testnet", false))
|
||||
optionFile << "Name=Bitcoin (testnet)\n";
|
||||
else if (GetBoolArg("-regtest", false))
|
||||
optionFile << "Name=Bitcoin (regtest)\n";
|
||||
else
|
||||
if (chain == CBaseChainParams::MAIN)
|
||||
optionFile << "Name=Bitcoin\n";
|
||||
else
|
||||
optionFile << strprintf("Name=Bitcoin (%s)\n", chain);
|
||||
optionFile << "Exec=" << pszExePath << strprintf(" -min -testnet=%d -regtest=%d\n", GetBoolArg("-testnet", false), GetBoolArg("-regtest", false));
|
||||
optionFile << "Terminal=false\n";
|
||||
optionFile << "Hidden=false\n";
|
||||
|
|
Loading…
Reference in a new issue