Changeset 108
- Timestamp:
- 12/23/06 16:34:56 (14 years ago)
- Files:
-
- 1 added
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
Halite.iss
r107 r108 31 31 Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked 32 32 Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked 33 Name: associate_torrent; Description: {cm:AssocFileExtension, Halite,.torrent}; GroupDescription: Other tasks:; Flags: unchecked33 Name: associate_torrent; Description: {cm:AssocFileExtension,Halite,.torrent}; GroupDescription: Other tasks:; Flags: unchecked 34 34 35 35 [Files] … … 44 44 Name: {group}\{cm:ProgramOnTheWeb,{#MyAppName}}; Filename: {app}\{#MyAppUrlName} 45 45 Name: {group}\{cm:UninstallProgram,{#MyAppName}}; Filename: {uninstallexe} 46 Name: {userdesktop}\{#MyAppName}; Filename: {app}\{#MyAppExeName}; Tasks: desktopicon47 Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}; Filename: {app}\{#MyAppExeName}; Tasks: quicklaunchicon46 Name: {userdesktop}\{#MyAppName}; Filename: {app}\{#MyAppExeName}; WorkingDir: {app}; Tasks: desktopicon 47 Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}; Filename: {app}\{#MyAppExeName}; WorkingDir: {app}; Tasks: quicklaunchicon 48 48 49 49 [Run] -
Halite.pnproj
r107 r108 1 <Project name="Halite"><MagicFolder excludeFolders="CVS;.svn" filter="*.*" name="res" path="res\"><File path=" Golem.ico"></File><File path="Halite.aps"></File><File path="Halite.bak.ico"></File><File path="halite.ico"></File><File path="Halite.rc"></File><File path="Manifest.xml"></File><File path="Oc.ico"></File><File path="resource.h"></File><File path="toolbar.bmp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*.*" name="src" path="src\"><MagicFolder excludeFolders="CVS;.svn" filter="*.*" name="ini" path="ini\"><File path="BitTConfig.hpp"></File><File path="Dialog.hpp"></File><File path="General.hpp"></File><File path="Remote.hpp"></File><File path="Splash.hpp"></File><File path="Torrent.hpp"></File><File path="Window.hpp"></File></MagicFolder><File path="AdvHaliteDialog.cpp"></File><File path="AdvHaliteDialog.hpp"></File><File path="ConfigOptions.cpp"></File><File path="ConfigOptions.hpp"></File><File path="CSSFileDialog.hpp"></File><File path="DdxEx.hpp"></File><File path="DropFileTarget.h"></File><File path="GlobalIni.cpp"></File><File path="GlobalIni.hpp"></File><File path="Halite.cpp"></File><File path="Halite.hpp"></File><File path="HaliteDialog.cpp"></File><File path="HaliteDialog.hpp"></File><File path="HaliteListViewCtrl.cpp"></File><File path="HaliteListViewCtrl.hpp"></File><File path="HaliteWindow.cpp"></File><File path="HaliteWindow.hpp"></File><File path="HalTabCtrl.hpp"></File><File path="halTorrent.cpp"></File><File path="halTorrent.hpp"></File><File path="halXmlRpc.cpp"></File><File path="halXmlRpc.hpp"></File><File path="NTray.cpp"></File><File path="NTray.hpp"></File><File path="SimpleHtml.h"></File><File path="SplashDialog.hpp"></File><File path="SSFileDialog.hpp"></File><File path="stdAfx.cpp"></File><File path="stdAfx.hpp"></File><File path="ThemeTestDialog.hpp"></File><File path="WinAPIMutex.hpp"></File></MagicFolder><File path="Jamfile"></File></Project>1 <Project name="Halite"><MagicFolder excludeFolders="CVS;.svn" filter="*.*" name="res" path="res\"><File path="Halite.aps"></File><File path="Halite.ico"></File><File path="Halite.rc"></File><File path="Manifest.xml"></File><File path="resource.h"></File><File path="toolbar.bmp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*.*" name="src" path="src\"><MagicFolder excludeFolders="CVS;.svn" filter="*.*" name="ini" path="ini\"><File path="BitTConfig.hpp"></File><File path="Dialog.hpp"></File><File path="General.hpp"></File><File path="Remote.hpp"></File><File path="Splash.hpp"></File><File path="Torrent.hpp"></File><File path="Window.hpp"></File></MagicFolder><File path="AdvHaliteDialog.cpp"></File><File path="AdvHaliteDialog.hpp"></File><File path="ConfigOptions.cpp"></File><File path="ConfigOptions.hpp"></File><File path="CSSFileDialog.hpp"></File><File path="DdxEx.hpp"></File><File path="debugDialog.hpp"></File><File path="DropFileTarget.h"></File><File path="GlobalIni.cpp"></File><File path="GlobalIni.hpp"></File><File path="Halite.cpp"></File><File path="Halite.hpp"></File><File path="HaliteDialog.cpp"></File><File path="HaliteDialog.hpp"></File><File path="HaliteListViewCtrl.cpp"></File><File path="HaliteListViewCtrl.hpp"></File><File path="HaliteWindow.cpp"></File><File path="HaliteWindow.hpp"></File><File path="HalTabCtrl.hpp"></File><File path="halTorrent.cpp"></File><File path="halTorrent.hpp"></File><File path="halXmlRpc.cpp"></File><File path="halXmlRpc.hpp"></File><File path="NTray.cpp"></File><File path="NTray.hpp"></File><File path="SimpleHtml.h"></File><File path="SplashDialog.hpp"></File><File path="SSFileDialog.hpp"></File><File path="stdAfx.cpp"></File><File path="stdAfx.hpp"></File><File path="ThemeTestDialog.hpp"></File><File path="WinAPIMutex.hpp"></File></MagicFolder><File path="Jamfile"></File></Project> -
Jamfile
r107 r108 5 5 use-project /WTL : $(/WTL) ; 6 6 use-project /osLibs : $(/osLibs) ; 7 use-project /global_log : $(/global_log) ; 7 8 8 9 SOURCES = … … 31 32 advapi32 32 33 gdi32 33 UxTheme.lib34 uxtheme 34 35 ; 35 36 … … 43 44 <library>/libtorrent//torrent/<link>static 44 45 46 <library>/global_log//global_log/<link>static 45 47 <library>/WTL 46 48 <library>/osLibs//$(LIBS) … … 51 53 <toolset>msvc:<define>WIN32 52 54 <toolset>msvc:<define>_WINDOWS 55 56 <toolset>msvc:<define>_CRT_SECURE_NO_DEPRECATE 57 <toolset>msvc:<define>_SCL_SECURE_NO_DEPRECATE 58 <toolset>msvc:<define>_CRT_SECURE_NO_WARNINGS 53 59 54 60 <runtime-link>static -
res/Halite.rc
r107 r108 194 194 IDD_CLOSESPLASH DIALOGEX 0, 0, 191, 54 195 195 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION 196 EXSTYLE WS_EX_ STATICEDGE197 CAPTION "Halite Shutting down..."198 FONT 8, "MS Shell Dlg", 400, 0, 0x1 199 BEGIN 200 ICON IDR_APP_ICON,IDC_STATIC,7,10,2 0,20196 EXSTYLE WS_EX_PALETTEWINDOW | WS_EX_STATICEDGE 197 CAPTION "Halite shutting down..." 198 FONT 8, "MS Shell Dlg", 400, 0, 0x1 199 BEGIN 200 ICON IDR_APP_ICON,IDC_STATIC,7,10,21,20 201 201 LTEXT "It will take the BitTorrent session a moment to shutdown cleanly after which this message will disappear and the program will close.",IDC_STATIC,35,7,149,27 202 202 CONTROL "Show this message in future.",IDC_SPLASH_MSG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,77,35,107,12 … … 253 253 END 254 254 255 IDD_DEBUGDIALOG DIALOGEX 150, 50, 252, 105 256 STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME 257 EXSTYLE WS_EX_PALETTEWINDOW 258 CAPTION "Halite Debug Dialog" 259 FONT 8, "MS Sans Serif", 0, 0, 0x0 260 BEGIN 261 EDITTEXT ED_CON,3,3,246,99,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL 262 END 263 255 264 256 265 #ifdef APSTUDIO_INVOKED … … 349 358 TOPMARGIN, 7 350 359 BOTTOMMARGIN, 86 360 END 361 362 IDD_DEBUGDIALOG, DIALOG 363 BEGIN 364 LEFTMARGIN, 3 365 RIGHTMARGIN, 249 366 TOPMARGIN, 3 367 BOTTOMMARGIN, 102 351 368 END 352 369 END -
res/resource.h
r107 r108 3 3 // Used by Halite.rc 4 4 // 5 #define IDD_DEBUGDIALOG 116 5 6 #define IDD_CONFIGBIT 102 6 7 #define IDD_CONFIGREMOTE 103 … … 70 71 #define IDC_CHECK1 1045 71 72 #define IDC_RADIO1 1046 73 #define ED_CON 3000 72 74 #define ID_ABOUT_OPENHALITE 40001 73 75 #define ID_ABOUT_PAUSEALL 40002 … … 83 85 #ifndef APSTUDIO_READONLY_SYMBOLS 84 86 #define _APS_NO_MFC 1 85 #define _APS_NEXT_RESOURCE_VALUE 11 687 #define _APS_NEXT_RESOURCE_VALUE 117 86 88 #define _APS_NEXT_COMMAND_VALUE 40010 87 89 #define _APS_NEXT_CONTROL_VALUE 1048 -
src/Halite.cpp
r107 r108 9 9 #include "HaliteWindow.hpp" 10 10 #include "SplashDialog.hpp" 11 12 #ifndef NDEBUG 13 # include <global_log.hpp> 14 using glb::wlog; 15 # include "DebugDialog.hpp" 16 17 static DebugDialog global_debugDialog_; 18 19 static class global_log_file 20 { 21 public: 22 global_log_file(); 23 24 void operator()(const wstring& text) 25 { 26 if (!wofs.is_open()) wofs.open("Log.txt"); 27 wofs << text; 28 } 29 30 private: 31 std::wofstream wofs; 32 boost::signals::scoped_connection conn_; 33 34 } global_log_file_; 35 36 global_log_file::global_log_file() : 37 conn_(wlog().attach(bind(global_log_file::operator(), &global_log_file_, _1))) 38 {} 39 40 #endif 11 41 12 42 static const unsigned WMU_ARE_YOU_ME = ::RegisterWindowMessage(WMU_ARE_YOU_ME_STRING); … … 41 71 HRESULT hRes = _Module.Init(NULL, hInstance); 42 72 assert (SUCCEEDED(hRes)); 43 {44 WinAPIMutex oneInstance(HALITE_GUID);73 74 { WinAPIMutex oneInstance(HALITE_GUID); 45 75 46 76 if (!oneInstance.owner() && INI().generalConfig().oneInst) … … 92 122 INI().windowConfig().rect.bottom-INI().windowConfig().rect.top, 93 123 false); 124 125 wndMain.SetIcon(LoadIcon(hInstance, MAKEINTRESOURCE(IDR_APP_ICON)), false); 94 126 wndMain.ShowWindow(nCmdShow); 127 128 #ifndef NDEBUG 129 global_debugDialog_.Create(wndMain); 130 global_debugDialog_.ShowWindow(true); 131 #endif 95 132 96 133 nRet = theLoop.Run(); -
src/HaliteDialog.cpp
r107 r108 152 152 153 153 return 0; 154 } 155 156 LRESULT HaliteDialog::OnCltColor(HDC hDC, HWND hWnd) 157 { 158 ::SetTextColor(hDC, RGB(255, 0, 255)); 159 160 return (LRESULT)::GetStockObject(DC_BRUSH); 154 161 } 155 162 -
src/HaliteDialog.hpp
r104 r108 41 41 COMMAND_ID_HANDLER_EX(BTNREANNOUNCE, onReannounce) 42 42 COMMAND_ID_HANDLER_EX(BTNREMOVE, onRemove) 43 44 // MSG_WM_CTLCOLORSTATIC(OnCltColor) 43 45 44 46 CHAIN_MSG_MAP(resizeClass) … … 87 89 void onRemove(UINT, int, HWND); 88 90 89 LRESULT OnEditKillFocus(UINT uCode, int nCtrlID, HWND hwndCtrl ); 91 LRESULT OnEditKillFocus(UINT uCode, int nCtrlID, HWND hwndCtrl); 92 LRESULT OnCltColor(HDC hDC, HWND hWnd); 90 93 91 94 void selectionChanged(); -
src/ThemeTestDialog.hpp
r107 r108 4 4 #include "stdAfx.hpp" 5 5 #include "DdxEx.hpp" 6 7 #ifndef NDEBUG 8 # include <global_log.hpp> 9 using glb::wlog; 10 #endif 6 11 7 12 class ThemeTestDialog : … … 31 36 MSG_WM_CTLCOLORBTN(OnCltColor) 32 37 MSG_WM_CTLCOLORSTATIC(OnCltColor) 33 MSG_WM_CTLCOLOREDIT(OnCltColor)34 38 35 39 if (uMsg == WM_FORWARDMSG) … … 43 47 END_DLGRESIZE_MAP() 44 48 49 LRESULT onInitDialog(HWND, LPARAM) 50 { 51 ::SetWindowText(GetDlgItem(IDC_EDIT2), L"Eoin"); 52 return 0; 53 } 54 45 55 LRESULT OnCltColorDlg(HDC pDC, HWND pWnd) 46 56 { … … 49 59 DrawThemeParentBackground(pWnd, pDC, &rect); 50 60 51 return 61 return (LRESULT)::GetStockObject(HOLLOW_BRUSH); 52 62 } 53 63 54 LRESULT OnCltColor(HDC pDC, HWND pWnd)55 { 64 LRESULT OnCltColor(HDC hDC, HWND hWnd) 65 { 56 66 RECT rect; 57 ::GetClientRect(pWnd, &rect); 58 DrawThemeParentBackground(pWnd, pDC, &rect); 67 ::GetClientRect(hWnd, &rect); 68 ::SetBkMode(hDC, TRANSPARENT); 69 DrawThemeParentBackground(hWnd, hDC, &rect); 59 70 60 return 61 } 71 return (LRESULT)::GetStockObject(HOLLOW_BRUSH); 72 } 62 73 63 LRESULT onInitDialog(HWND, LPARAM) { return 0; }64 74 65 75 // void OnSize(UINT, CSize);
Note: See TracChangeset
for help on using the changeset viewer.