Changeset 311
- Timestamp:
- 10/06/07 09:23:39 (13 years ago)
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
Halite.pnproj
r310 r311 1 <Project name="Halite"><MagicFolder excludeFolders="CVS;.svn" filter="*.*" name="res" path="res\"><File path="About.rtf"></File><File path="afxres.h"></File><File path="English.rtf"></File><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="advtabs" path="advtabs\"><File path="Debug.cpp"></File><File path="Debug.hpp"></File><File path="Files.cpp"></File><File path="Files.hpp"></File><File path="Peers.cpp"></File><File path="Peers.hpp"></File><File path="ThemeTestDialog.hpp"></File><File path="Torrent.cpp"></File><File path="Torrent.hpp"></File><File path="Tracker.cpp"></File><File path="Tracker.hpp"></File><File path="TrackerAddDialog.hpp"></File><File path="TrackerListView.cpp"></File><File path="TrackerListView.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*.*" name="global" path="global\"><File path="InheritEnum.hpp"></File><File path="ini.cpp"></File><File path="ini.hpp"></File><File path="ini_adapter.cpp"></File><File path="ini_adapter.hpp"></File><File path="logger.cpp"></File><File path="logger.hpp"></File><File path="string_conv.cpp"></File><File path="string_conv.hpp"></File><File path="tinyxml.cpp"></File><File path="tinyxml.hpp"></File><File path="tinyxmlerror.cpp"></File><File path="tinyxmlparser.cpp"></File><File path="unicode.hpp"></File><File path="utf8.hpp"></File><File path="wtl_app.cpp"></File><File path="wtl_app.hpp"></File></MagicFolder><File path="AddTorrentDialog.hpp"></File><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="halConfig.cpp"></File><File path="halConfig.hpp"></File><File path="halEvent.cpp"></File><File path="halEvent.hpp"></File><File path="Halite.cpp"></File><File path="Halite.hpp"></File><File path="HaliteDialog.cpp"></File><File path="HaliteDialog.hpp"></File><File path="HaliteDialogBase.hpp"></File><File path="HaliteEditCtrl.hpp"></File><File path="HaliteIni.hpp"></File><File path="HaliteListManager.hpp"></File><File path="HaliteListView.cpp"></File><File path="HaliteListView.hpp"></File><File path="HaliteListViewCtrl.hpp"></File><File path="HaliteSortListViewCtrl.hpp"></File><File path="HaliteTabCtrl.hpp"></File><File path="HaliteTabPage.hpp"></File><File path="HaliteUpdateLock.hpp"></File><File path="HaliteWindow.cpp"></File><File path="HaliteWindow.hpp"></File><File path="halTorrent.cpp"></File><File path="halTorrent.hpp"></File><File path="halTorrentInternal.hpp"></File><File path="halXmlRpc.cpp"></File><File path="halXmlRpc.hpp"></File><File path="NTray.cpp"></File><File path="NTray.hpp"></File><File path="ProgressDialog.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="UxthemeWrapper.cpp"></File><File path="UxthemeWrapper.hpp"></File><File path="WinAPIMutex.hpp"></File><File path="WinAPIWaitableTimer.hpp"></File></MagicFolder><File path="Jamfile.v2"></File></Project>1 <Project name="Halite"><MagicFolder excludeFolders="CVS;.svn" filter="*.*" name="res" path="res\"><File path="About.rtf"></File><File path="afxres.h"></File><File path="English.rtf"></File><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="advtabs" path="advtabs\"><File path="Debug.cpp"></File><File path="Debug.hpp"></File><File path="Files.cpp"></File><File path="Files.hpp"></File><File path="Peers.cpp"></File><File path="Peers.hpp"></File><File path="ThemeTestDialog.hpp"></File><File path="Torrent.cpp"></File><File path="Torrent.hpp"></File><File path="Tracker.cpp"></File><File path="Tracker.hpp"></File><File path="TrackerAddDialog.hpp"></File><File path="TrackerListView.cpp"></File><File path="TrackerListView.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*.*" name="global" path="global\"><File path="InheritEnum.hpp"></File><File path="ini.cpp"></File><File path="ini.hpp"></File><File path="ini_adapter.cpp"></File><File path="ini_adapter.hpp"></File><File path="logger.cpp"></File><File path="logger.hpp"></File><File path="string_conv.cpp"></File><File path="string_conv.hpp"></File><File path="tinyxml.cpp"></File><File path="tinyxml.hpp"></File><File path="tinyxmlerror.cpp"></File><File path="tinyxmlparser.cpp"></File><File path="unicode.hpp"></File><File path="utf8.hpp"></File><File path="wtl_app.cpp"></File><File path="wtl_app.hpp"></File></MagicFolder><File path="AddTorrentDialog.hpp"></File><File path="AdvHaliteDialog.cpp"></File><File path="AdvHaliteDialog.hpp"></File><File path="AtlAutosizeDlg.h"></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="halConfig.cpp"></File><File path="halConfig.hpp"></File><File path="halEvent.cpp"></File><File path="halEvent.hpp"></File><File path="Halite.cpp"></File><File path="Halite.hpp"></File><File path="HaliteDialog.cpp"></File><File path="HaliteDialog.hpp"></File><File path="HaliteDialogBase.hpp"></File><File path="HaliteEditCtrl.hpp"></File><File path="HaliteIni.hpp"></File><File path="HaliteListManager.hpp"></File><File path="HaliteListView.cpp"></File><File path="HaliteListView.hpp"></File><File path="HaliteListViewCtrl.hpp"></File><File path="HaliteSortListViewCtrl.hpp"></File><File path="HaliteTabCtrl.hpp"></File><File path="HaliteTabPage.hpp"></File><File path="HaliteUpdateLock.hpp"></File><File path="HaliteWindow.cpp"></File><File path="HaliteWindow.hpp"></File><File path="halTorrent.cpp"></File><File path="halTorrent.hpp"></File><File path="halTorrentInternal.hpp"></File><File path="halXmlRpc.cpp"></File><File path="halXmlRpc.hpp"></File><File path="NTray.cpp"></File><File path="NTray.hpp"></File><File path="ProgressDialog.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="UxthemeWrapper.cpp"></File><File path="UxthemeWrapper.hpp"></File><File path="WinAPIMutex.hpp"></File><File path="WinAPIWaitableTimer.hpp"></File></MagicFolder><File path="Jamfile.v2"></File></Project> -
Halite.pnps
r310 r311 1 <pd><ViewState><e p="Halite\src\advtabs" x="true"></e><e p="Halite" x="true"></e><e p="Halite\res" x="true"></e><e p="Halite\src" x="true"></e><e p="Halite\src\global" x=" true"></e></ViewState></pd>1 <pd><ViewState><e p="Halite\src\advtabs" x="true"></e><e p="Halite" x="true"></e><e p="Halite\res" x="true"></e><e p="Halite\src" x="true"></e><e p="Halite\src\global" x="false"></e></ViewState></pd> -
Jamfile.v2
r291 r311 80 80 <threading>multi 81 81 <asynch-exceptions>on 82 <warnings>off83 82 83 <variant>release:<linkflags>/OPT:ICF=5 84 <variant>release:<linkflags>/OPT:REF 85 <variant>release:<warnings>off 84 86 <variant>release:<define>NDEBUG 85 87 -
res/Halite.rc
r310 r311 25 25 EDITTEXT IDC_EDITNCD,210,22,34,12,ES_AUTOHSCROLL 26 26 EDITTEXT IDC_EDITNCU,267,22,34,12,ES_AUTOHSCROLL 27 LTEXT "Torrent connection limits:",IDC_NC,185,13,115,8 28 LTEXT "Torrent transfer rates (KB/s):",IDC_TL,185,37,115,8 29 RTEXT "Total",IDC_NCD,182,25,25,8 30 RTEXT "Up",IDC_NCU,245,25,20,8 31 RTEXT "Up",IDC_TLU,245,49,20,8 32 RTEXT "Down",IDC_TLD,182,49,25,8 33 34 LTEXT "N/A",IDC_TRACKER,10,103,170,8,SS_WORDELLIPSIS //| WS_BORDER35 36 RTEXT "Update in:",IDC_UPDATESTAT,185,103,40,8 37 LTEXT "N/A",IDC_UPDATE,228,103,71,8,SS_WORDELLIPSIS //| WS_BORDER27 LTEXT "Torrent connection limits:",IDC_NC,185,13,115,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 28 LTEXT "Torrent transfer rates (KB/s):",IDC_TL,185,37,115,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 29 RTEXT "Total",IDC_NCD,182,25,25,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 30 RTEXT "Up",IDC_NCU,245,25,20,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 31 RTEXT "Up",IDC_TLU,245,49,20,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 32 RTEXT "Down",IDC_TLD,182,49,25,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 33 34 LTEXT "N/A",IDC_TRACKER,10,103,170,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 35 36 RTEXT "Update in:",IDC_UPDATESTAT,185,103,40,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 37 LTEXT "N/A",IDC_UPDATE,228,103,71,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 38 38 EDITTEXT IDC_EDITRATIO,267,60,34,12,ES_AUTOHSCROLL 39 LTEXT "Ratio (this session):",IDC_RATIOESTATIC,182,63,70,8,SS_WORDELLIPSIS 40 41 RTEXT "Torrent:",IDC_NAME_STATUS_LABEL,9,17,39,8,SS_WORDELLIPSIS 42 LTEXT "N/A",IDC_NAME_STATUS,53,17,127,8,SS_WORDELLIPSIS // | WS_BORDER43 44 RTEXT "Peers:",IDC_PEERS_LABEL,9,28,39,8,SS_WORDELLIPSIS 45 RTEXT "Transferred:",IDC_TRANSFERED_LABEL,9,40,39,8,SS_WORDELLIPSIS 46 RTEXT "Remaining:",IDC_REMAINING_LABEL,9,52,39,8,SS_WORDELLIPSIS 47 RTEXT "Rates:",IDC_RATE_LABEL,9,64,39,8,SS_WORDELLIPSIS 48 49 RTEXT "Seeds:",IDC_SEEDS_LABEL,97,28,39,8,SS_WORDELLIPSIS 50 RTEXT "Overhead:",IDC_OVERHEAD_LABEL,97,40,39,8,SS_WORDELLIPSIS 51 RTEXT "ETA:",IDC_ETA_LABEL,97,52,39,8,SS_WORDELLIPSIS 52 RTEXT "Ratio:",IDC_RATIO_LABEL,97,64,39,8,SS_WORDELLIPSIS 53 54 LTEXT "N/A",IDC_PEERS,53,28,39,8,SS_WORDELLIPSIS //| WS_BORDER55 LTEXT "N/A",IDC_TRANSFERED,53,40,39,8,SS_WORDELLIPSIS //| WS_BORDER56 LTEXT "N/A",IDC_REMAINING,53,52,39,8,SS_WORDELLIPSIS //| WS_BORDER57 LTEXT "N/A",IDC_RATE,53,64,39,8,SS_WORDELLIPSIS // | WS_BORDER58 59 LTEXT "N/A",IDC_SEEDS,141,28,39,8,SS_WORDELLIPSIS //| WS_BORDER60 LTEXT "N/A",IDC_OVERHEAD,141,40,39,8,SS_WORDELLIPSIS //| WS_BORDER61 LTEXT "N/A",IDC_ETA,141,52,39,8,SS_WORDELLIPSIS //| WS_BORDER62 LTEXT "N/A",IDC_RATIO,141,64,39,8,SS_WORDELLIPSIS //| WS_BORDER39 LTEXT "Ratio (this session):",IDC_RATIOESTATIC,182,63,70,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 40 41 RTEXT "Torrent:",IDC_NAME_STATUS_LABEL,9,17,39,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 42 LTEXT "N/A",IDC_NAME_STATUS,53,17,127,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 43 44 RTEXT "Peers:",IDC_PEERS_LABEL,9,28,39,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 45 RTEXT "Transferred:",IDC_TRANSFERED_LABEL,9,40,39,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 46 RTEXT "Remaining:",IDC_REMAINING_LABEL,9,52,39,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 47 RTEXT "Rates:",IDC_RATE_LABEL,9,64,39,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 48 49 RTEXT "Seeds:",IDC_SEEDS_LABEL,97,28,39,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 50 RTEXT "Overhead:",IDC_OVERHEAD_LABEL,97,40,39,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 51 RTEXT "ETA:",IDC_ETA_LABEL,97,52,39,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 52 RTEXT "Ratio:",IDC_RATIO_LABEL,97,64,39,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 53 54 LTEXT "N/A",IDC_PEERS,53,28,39,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 55 LTEXT "N/A",IDC_TRANSFERED,53,40,39,8,SS_WORDELLIPSIS | SS_CENTERIMAGE 56 LTEXT "N/A",IDC_REMAINING,53,52,39,8,SS_WORDELLIPSIS | SS_CENTERIMAGE 57 LTEXT "N/A",IDC_RATE,53,64,39,8,SS_WORDELLIPSIS | SS_CENTERIMAGE 58 59 LTEXT "N/A",IDC_SEEDS,141,28,39,8,SS_WORDELLIPSIS | SS_CENTERIMAGE 60 LTEXT "N/A",IDC_OVERHEAD,141,40,39,8,SS_WORDELLIPSIS | SS_CENTERIMAGE 61 LTEXT "N/A",IDC_ETA,141,52,39,8,SS_WORDELLIPSIS| SS_CENTERIMAGE 62 LTEXT "N/A",IDC_RATIO,141,64,39,8,SS_WORDELLIPSIS | SS_CENTERIMAGE 63 63 END 64 64 -
src/AtlAutosizeDlg.h
r310 r311 2214 2214 2215 2215 ::ShowWindow(hWnd, SW_HIDE); 2216 WNDPROC wpOld = (WNDPROC)::SetWindowLongPtr(hWnd, GWL _WNDPROC, (LONG_PTR)wp);2217 ATLVERIFY(::SetWindowLongPtr(hWnd, GWL _USERDATA, (LONG_PTR)wpOld) == 0);2216 WNDPROC wpOld = (WNDPROC)::SetWindowLongPtr(hWnd, GWLP_WNDPROC, (LONG_PTR)wp); 2217 ATLVERIFY(::SetWindowLongPtr(hWnd, GWLP_USERDATA, (LONG_PTR)wpOld) == 0); 2218 2218 } 2219 2219 … … 2370 2370 } 2371 2371 2372 WNDPROC wp = (WNDPROC)(LONG_PTR)::GetWindowLongPtr(hWnd, GWL _USERDATA);2372 WNDPROC wp = (WNDPROC)(LONG_PTR)::GetWindowLongPtr(hWnd, GWLP_USERDATA); 2373 2373 return ::CallWindowProc(wp, hWnd, uMsg, wParam, lParam); 2374 2374 } -
src/advtabs/Torrent.cpp
r306 r311 18 18 { 19 19 dialogBaseClass::InitializeHalDialogBase(); 20 resizeClass::DlgResize_Init(false, true, WS_CLIPCHILDREN);20 // resizeClass::DlgResize_Init(false, true, WS_CLIPCHILDREN); 21 21 22 22 { m_prog.Attach(GetDlgItem(TORRENTPROG)); -
src/advtabs/Torrent.hpp
r306 r311 19 19 class AdvTorrentDialog : 20 20 public CHalTabPageImpl<AdvTorrentDialog>, 21 public C DialogResize<AdvTorrentDialog>,21 public CAutoSizeWindow<AdvTorrentDialog, false>, 22 22 public CHaliteDialogBase<AdvTorrentDialog>, 23 23 public CWinDataExchangeEx<AdvTorrentDialog> … … 26 26 typedef AdvTorrentDialog thisClass; 27 27 typedef CHalTabPageImpl<AdvTorrentDialog> baseClass; 28 typedef C DialogResize<AdvTorrentDialog> resizeClass;28 typedef CAutoSizeWindow<AdvTorrentDialog, false> autosizeClass; 29 29 typedef CHaliteDialogBase<AdvTorrentDialog> dialogBaseClass; 30 30 … … 35 35 dialogBaseClass(HalWindow) 36 36 {} 37 38 BOOL PreTranslateMessage(MSG* pMsg)37 38 virtual BOOL PreTranslateMessage(MSG* pMsg) 39 39 { 40 return this->IsDialogMessage(pMsg);40 return CWindow::IsDialogMessage(pMsg); 41 41 } 42 42 43 43 BEGIN_MSG_MAP_EX(thisClass) 44 44 MSG_WM_INITDIALOG(onInitDialog) … … 49 49 if (PreTranslateMessage((LPMSG)lParam)) return TRUE; 50 50 51 CHAIN_MSG_MAP( resizeClass)51 CHAIN_MSG_MAP(autosizeClass) 52 52 CHAIN_MSG_MAP(baseClass) 53 53 END_MSG_MAP() … … 60 60 DDX_EX_INT_FLOAT_LIMIT(IDC_EDITRATIO, Ratio, 1, false) 61 61 END_DDX_MAP() 62 63 TRANSPARENT_LIST(thisClass, IDC_GROUP_TORRENT, IDC_GROUP_TRACKER) 62 64 63 BEGIN_DLGRESIZE_MAP(thisClass) 65 #define TORRENT_LIMITS_LAYOUT \ 66 WMB_HEAD(WMB_COL(_exp|20), WMB_COL(_exp|30), WMB_COL(_exp|20), WMB_COL(_exp|30)), \ 67 WMB_ROW(10, IDC_TL, _r, _r, _r), \ 68 WMB_ROW(11, IDC_TLD, IDC_EDITTLD, IDC_TLU, IDC_EDITTLU), \ 69 WMB_ROW(10, IDC_NC, _r, _r, _r), \ 70 WMB_ROW(11, IDC_NCD, IDC_EDITNCD, IDC_NCU, IDC_EDITNCU), \ 71 WMB_ROW(11, IDC_RATIOESTATIC, _r, _r, IDC_EDITRATIO), \ 72 WMB_END() 73 74 #define TORRENT_STATUS_LAYOUT \ 75 WMB_HEAD(WMB_COL(50), WMB_COLNOMIN(_exp|150), WMB_COL(_eq|0), WMB_COL(_exp|100)), \ 76 WMB_ROW(10, IDC_NAME_STATUS_LABEL, IDC_NAME_STATUS, _r, _r), \ 77 WMB_ROW(10, IDC_PEERS_LABEL, IDC_PEERS, IDC_SEEDS_LABEL, IDC_SEEDS), \ 78 WMB_ROW(10, IDC_TRANSFERED_LABEL, IDC_TRANSFERED, IDC_OVERHEAD_LABEL, IDC_OVERHEAD), \ 79 WMB_ROW(10, IDC_REMAINING_LABEL, IDC_REMAINING, IDC_ETA_LABEL, IDC_ETA), \ 80 WMB_ROW(10, IDC_RATE_LABEL, IDC_RATE, IDC_RATIO_LABEL, IDC_RATIO), \ 81 WMB_END() 82 83 #define TORRENT_REANNOUNCE_LAYOUT \ 84 WMB_HEAD(WMB_COL(50), WMB_COLNOMIN(_exp)), \ 85 WMB_ROW(10, IDC_UPDATESTAT, IDC_UPDATE), \ 86 WMB_END() 87 88 BEGIN_WINDOW_MAP(thisClass, 6, 6, 3, 3) 89 WMB_HEAD(WMB_COL(_gap), WMB_COL(_exp), WMB_COL(120), WMB_COL(_gap)), 90 WMB_ROW(_gap|3, IDC_GROUP_TORRENT, _r, _r, _r), 91 WMB_ROW(_auto, _d, TORRENT_STATUS_LAYOUT, TORRENT_LIMITS_LAYOUT), 92 WMB_ROWMIN(_exp, 8, _d, TORRENTPROG, _r), 93 WMB_ROW(_gap, _d), 94 WMB_ROW(_gap|3, IDC_GROUP_TRACKER, _r, _r, _r), 95 WMB_ROW(_auto, _d, IDC_TRACKER, TORRENT_REANNOUNCE_LAYOUT), 96 WMB_ROW(_gap, _d), 97 WMB_END() 98 END_WINDOW_MAP() 99 100 /* BEGIN_DLGRESIZE_MAP(thisClass) 64 101 // BEGIN_DLGRESIZE_GROUP() 65 102 DLGRESIZE_CONTROL(IDC_TL, (DLSZ_MOVE_X)) … … 125 162 DLGRESIZE_CONTROL(IDC_TRACKER, (DLSZ_SIZE_X)) 126 163 END_DLGRESIZE_MAP() 127 164 */ 128 165 LRESULT onInitDialog(HWND, LPARAM); 129 166 void onClose(); -
src/halTorrent.cpp
r304 r311 6 6 7 7 8 #define HALITE_VERSION 0,2,9,3 049 #define HALITE_VERSION_STRING "v 0.2.9 dev 3 04"8 #define HALITE_VERSION 0,2,9,310 9 #define HALITE_VERSION_STRING "v 0.2.9 dev 310" 10 10 11 11 #define LBT_EVENT_TORRENT_FINISHED 80001
Note: See TracChangeset
for help on using the changeset viewer.