boxtec
/
bitcoin
mirror of https://github.com/bitcoin/bitcoin
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed the installer script and made the autostart registry based.

Browse Source
pull/1934/head
sirius-m 15 years ago
parent f13dff6977
commit c199b8499d
6 changed files with 63 additions and 71 deletions
Show Stats Download Patch File Download Diff File

5
changelog.txt
Unescape View File

@ -2,5 +2,6 @@ Changes after 0.1.5:
-------------------- --------------------
+ Options dialog layout changed - added the UI options panel + Options dialog layout changed - added the UI options panel
+ Minimize to tray feature + Minimize to tray feature
+ Startup on system boot feature (adds a shortcut to the Startup folder) + Startup on system boot feature
+ Ask before closing + Ask before closing
+ NSIS installer

1
headers.h
Unescape View File

@ -37,7 +37,6 @@
#include <assert.h> #include <assert.h>
#include <process.h> #include <process.h>
#include <malloc.h> #include <malloc.h>
#include <shlobj.h>
#include <memory> #include <memory>
#define BOUNDSCHECK 1 #define BOUNDSCHECK 1
#include <sstream> #include <sstream>

43
setup.nsi
Unescape View File

@ -53,7 +53,7 @@ VIAddVersionKey CompanyWebsite "${URL}"
VIAddVersionKey FileVersion "${VERSION}" VIAddVersionKey FileVersion "${VERSION}"
VIAddVersionKey FileDescription "" VIAddVersionKey FileDescription ""
VIAddVersionKey LegalCopyright "" VIAddVersionKey LegalCopyright ""
InstallDirRegKey HKLM "${REGKEY}" Path InstallDirRegKey HKCU "${REGKEY}" Path
ShowUninstDetails show ShowUninstDetails show
# Installer sections # Installer sections
@ -63,32 +63,33 @@ Section -Main SEC0000
File bitcoin.exe File bitcoin.exe
File libeay32.dll File libeay32.dll
File mingwm10.dll File mingwm10.dll
WriteRegStr HKLM "${REGKEY}\Components" Main 1 WriteRegStr HKCU "${REGKEY}\Components" Main 1
WriteRegStr HKCU SOFTWARE\Microsoft\Windows\CurrentVersion\Run Bitcoin "$INSTDIR\bitcoin.exe /min"
SectionEnd SectionEnd
Section -post SEC0001 Section -post SEC0001
WriteRegStr HKLM "${REGKEY}" Path $INSTDIR WriteRegStr HKCU "${REGKEY}" Path $INSTDIR
SetOutPath $INSTDIR SetOutPath $INSTDIR
WriteUninstaller $INSTDIR\uninstall.exe WriteUninstaller $INSTDIR\uninstall.exe
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
SetOutPath $SMPROGRAMS\$StartMenuGroup CreateDirectory $SMPROGRAMS\$StartMenuGroup
CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Bitcoin.lnk" $INSTDIR\bitcoin.exe CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Bitcoin.lnk" $INSTDIR\bitcoin.exe
CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Uninstall Bitcoin.lnk" $INSTDIR\uninstall.exe CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Uninstall Bitcoin.lnk" $INSTDIR\uninstall.exe
!insertmacro MUI_STARTMENU_WRITE_END !insertmacro MUI_STARTMENU_WRITE_END
WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayName "$(^Name)" WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayName "$(^Name)"
WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayVersion "${VERSION}" WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayVersion "${VERSION}"
WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" Publisher "${COMPANY}" WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" Publisher "${COMPANY}"
WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" URLInfoAbout "${URL}" WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" URLInfoAbout "${URL}"
WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayIcon $INSTDIR\uninstall.exe WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayIcon $INSTDIR\uninstall.exe
WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" UninstallString $INSTDIR\uninstall.exe WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" UninstallString $INSTDIR\uninstall.exe
WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoModify 1 WriteRegDWORD HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoModify 1
WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoRepair 1 WriteRegDWORD HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoRepair 1
SectionEnd SectionEnd
# Macro for selecting uninstaller sections # Macro for selecting uninstaller sections
!macro SELECT_UNSECTION SECTION_NAME UNSECTION_ID !macro SELECT_UNSECTION SECTION_NAME UNSECTION_ID
Push $R0 Push $R0
ReadRegStr $R0 HKLM "${REGKEY}\Components" "${SECTION_NAME}" ReadRegStr $R0 HKCU "${REGKEY}\Components" "${SECTION_NAME}"
StrCmp $R0 1 0 next${UNSECTION_ID} StrCmp $R0 1 0 next${UNSECTION_ID}
!insertmacro SelectSection "${UNSECTION_ID}" !insertmacro SelectSection "${UNSECTION_ID}"
GoTo done${UNSECTION_ID} GoTo done${UNSECTION_ID}
@ -103,18 +104,20 @@ Section /o -un.Main UNSEC0000
Delete /REBOOTOK $INSTDIR\mingwm10.dll Delete /REBOOTOK $INSTDIR\mingwm10.dll
Delete /REBOOTOK $INSTDIR\libeay32.dll Delete /REBOOTOK $INSTDIR\libeay32.dll
Delete /REBOOTOK $INSTDIR\bitcoin.exe Delete /REBOOTOK $INSTDIR\bitcoin.exe
DeleteRegValue HKLM "${REGKEY}\Components" Main DeleteRegValue HKCU "${REGKEY}\Components" Main
DeleteRegValue HKCU SOFTWARE\Microsoft\Windows\CurrentVersion\Run Bitcoin
SectionEnd SectionEnd
Section -un.post UNSEC0001 Section -un.post UNSEC0001
DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DeleteRegKey HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)"
Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Uninstall Bitcoin.lnk" Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Uninstall Bitcoin.lnk"
Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Bitcoin.lnk" Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Bitcoin.lnk"
Delete /REBOOTOK $INSTDIR\uninstall.exe Delete /REBOOTOK $INSTDIR\uninstall.exe
DeleteRegValue HKLM "${REGKEY}" StartMenuGroup Delete /REBOOTOK $INSTDIR\db.log
DeleteRegValue HKLM "${REGKEY}" Path DeleteRegValue HKCU "${REGKEY}" StartMenuGroup
DeleteRegKey /IfEmpty HKLM "${REGKEY}\Components" DeleteRegValue HKCU "${REGKEY}" Path
DeleteRegKey /IfEmpty HKLM "${REGKEY}" DeleteRegKey /IfEmpty HKCU "${REGKEY}\Components"
DeleteRegKey /IfEmpty HKCU "${REGKEY}"
RmDir /REBOOTOK $SMPROGRAMS\$StartMenuGroup RmDir /REBOOTOK $SMPROGRAMS\$StartMenuGroup
RmDir /REBOOTOK $INSTDIR RmDir /REBOOTOK $INSTDIR
Push $R0 Push $R0
@ -131,7 +134,7 @@ FunctionEnd
# Uninstaller functions # Uninstaller functions
Function un.onInit Function un.onInit
ReadRegStr $INSTDIR HKLM "${REGKEY}" Path ReadRegStr $INSTDIR HKCU "${REGKEY}" Path
!insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuGroup !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuGroup
!insertmacro SELECT_UNSECTION Main ${UNSEC0000} !insertmacro SELECT_UNSECTION Main ${UNSEC0000}
FunctionEnd FunctionEnd

77
ui.cpp
Unescape View File

@ -3016,8 +3016,9 @@ void CBitcoinTBIcon::UpdateTooltip() {
wxMenu *CBitcoinTBIcon::CreatePopupMenu() wxMenu *CBitcoinTBIcon::CreatePopupMenu()
{ {
wxMenu *menu = new wxMenu; wxMenu *menu = new wxMenu;
wxMenuItem* generateCheck = menu->AppendCheckItem(PU_GENERATE, _T("Generate Coins"));
menu->Append(PU_RESTORE, _T("Open Bitcoin")); menu->Append(PU_RESTORE, _T("Open Bitcoin"));
wxMenuItem* generateCheck = menu->AppendCheckItem(PU_GENERATE, _T("Generate Coins"));
menu->InsertSeparator(2);
menu->Append(PU_EXIT, _T("Exit")); menu->Append(PU_EXIT, _T("Exit"));
generateCheck->Check(fGenerateBitcoins); generateCheck->Check(fGenerateBitcoins);
@ -3386,51 +3387,39 @@ void ApplyUISettings() {
taskBarIcon->Hide(); taskBarIcon->Hide();
// Autostart on system startup? // Autostart on system startup?
// Get the startup folder shortcut path // Open the startup registry key
char linkPath[ MAX_PATH ]; HKEY hKey;
SHGetSpecialFolderPath(0, linkPath, CSIDL_STARTUP, 0); LONG lnRes = RegOpenKeyEx(
strcat(linkPath, "\\Bitcoin.lnk"); HKEY_CURRENT_USER,
"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run",
// If the shortcut exists already, remove it for updating 0,
remove(linkPath); KEY_ALL_ACCESS,
&hKey
if (startOnSysBoot) { );
CoInitialize(NULL);
// Get the current executable path if ( ERROR_SUCCESS == lnRes )
char exePath[ MAX_PATH ]; {
GetModuleFileName(NULL, exePath, _MAX_PATH + 1); if (startOnSysBoot) {
// Get the current executable path
HRESULT hres = NULL; char exePath[ MAX_PATH ];
IShellLink* psl = NULL; GetModuleFileName(NULL, exePath, _MAX_PATH + 1);
// Get a pointer to the IShellLink interface. char runCmd[ MAX_PATH + 5 ];
hres = CoCreateInstance(CLSID_ShellLink, NULL, strcat(runCmd, exePath);
CLSCTX_INPROC_SERVER, IID_IShellLink, strcat(runCmd," /min");
reinterpret_cast<void**>(&psl));
RegSetValueEx(hKey,
if (SUCCEEDED(hres)) "Bitcoin",
{ 0,
IPersistFile* ppf = NULL; REG_SZ,
// Set the path to the shortcut target (BYTE*)runCmd,
psl->SetPath(exePath); sizeof(runCmd)
psl->SetArguments("/min"); );
// Query IShellLink for the IPersistFile interface for }
// saving the shortcut in persistent storage. else {
hres = psl->QueryInterface(IID_IPersistFile, RegDeleteValue(hKey, "Bitcoin");
reinterpret_cast<void**>(&ppf));
if (SUCCEEDED(hres))
{
WCHAR wsz[MAX_PATH];
// Ensure that the string is ANSI.
MultiByteToWideChar(CP_ACP, 0, linkPath, -1,
wsz, MAX_PATH);
// Save the link by calling IPersistFile::Save.
hres = ppf->Save(wsz, TRUE);
ppf->Release();
}
psl->Release();
} }
CoUninitialize();
} }
RegCloseKey(hKey);
} }

2
uibase.cpp
Unescape View File

@ -1870,7 +1870,7 @@ COptionsPanelUIBase::COptionsPanelUIBase( wxWindow* parent, wxWindowID id, const
bSizer57->Add( m_checkCloseToTray, 0, wxALL, 5 ); bSizer57->Add( m_checkCloseToTray, 0, wxALL, 5 );
m_checkStartOnSysBoot = new wxCheckBox( this, wxID_ANY, wxT("Start on system boot"), wxDefaultPosition, wxDefaultSize, 0 ); m_checkStartOnSysBoot = new wxCheckBox( this, wxID_ANY, wxT("Start with Windows"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer57->Add( m_checkStartOnSysBoot, 0, wxALL, 5 ); bSizer57->Add( m_checkStartOnSysBoot, 0, wxALL, 5 );

6
uiproject.fbp
Unescape View File

@ -11849,7 +11849,7 @@
</object> </object>
</object> </object>
</object> </object>
<object class="Panel" expanded="1"> <object class="Panel" expanded="0">
<property name="bg"></property> <property name="bg"></property>
<property name="context_help"></property> <property name="context_help"></property>
<property name="enabled">1</property> <property name="enabled">1</property>
@ -12076,7 +12076,7 @@
</object> </object>
</object> </object>
</object> </object>
<object class="Panel" expanded="1"> <object class="Panel" expanded="0">
<property name="bg"></property> <property name="bg"></property>
<property name="context_help"></property> <property name="context_help"></property>
<property name="enabled">1</property> <property name="enabled">1</property>
@ -12250,7 +12250,7 @@
<property name="font"></property> <property name="font"></property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label">Start on system boot</property> <property name="label">Start with Windows</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">m_checkStartOnSysBoot</property> <property name="name">m_checkStartOnSysBoot</property>

Write Preview
Loading…
Cancel
Save