- Timestamp:
- 07/06/08 09:58:41 (12 years ago)
- Location:
- trunk
- Files:
-
- 36 edited
-
res/Halite.rc (modified) (19 diffs)
-
res/resource.h (modified) (3 diffs)
-
sln/Halite/Halite.vcproj (modified) (1 diff)
-
sln/libtorrent/libtorrent.vcproj (modified) (8 diffs)
-
src/AddTorrentDialog.hpp (modified) (3 diffs)
-
src/AdvHaliteDialog.cpp (modified) (1 diff)
-
src/AdvHaliteDialog.hpp (modified) (2 diffs)
-
src/ConfigOptions.cpp (modified) (1 diff)
-
src/ConfigOptions.hpp (modified) (37 diffs)
-
src/DebugDialog.hpp (modified) (1 diff)
-
src/Halite.cpp (modified) (1 diff)
-
src/HaliteDialog.cpp (modified) (8 diffs)
-
src/HaliteDialog.hpp (modified) (2 diffs)
-
src/HaliteListView.hpp (modified) (1 diff)
-
src/HaliteListViewDlg.hpp (modified) (5 diffs)
-
src/HaliteWindow.cpp (modified) (3 diffs)
-
src/HaliteWindow.hpp (modified) (2 diffs)
-
src/NewTorrentDialog.cpp (modified) (6 diffs)
-
src/NewTorrentDialog.hpp (modified) (11 diffs)
-
src/NewTorrentPeersAD.hpp (modified) (2 diffs)
-
src/NewTorrentTrackerAD.hpp (modified) (2 diffs)
-
src/ProgressDialog.hpp (modified) (4 diffs)
-
src/SplashDialog.hpp (modified) (4 diffs)
-
src/advtabs/Debug.cpp (modified) (3 diffs)
-
src/advtabs/Debug.hpp (modified) (3 diffs)
-
src/advtabs/Files.cpp (modified) (3 diffs)
-
src/advtabs/Files.hpp (modified) (3 diffs)
-
src/advtabs/Peers.cpp (modified) (1 diff)
-
src/advtabs/Peers.hpp (modified) (2 diffs)
-
src/advtabs/ThemeTestDialog.hpp (modified) (2 diffs)
-
src/advtabs/Torrent.cpp (modified) (6 diffs)
-
src/advtabs/Torrent.hpp (modified) (2 diffs)
-
src/advtabs/Tracker.cpp (modified) (10 diffs)
-
src/advtabs/Tracker.hpp (modified) (3 diffs)
-
src/advtabs/TrackerAddDialog.hpp (modified) (4 diffs)
-
src/advtabs/TrackerListView.hpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/res/Halite.rc
r494 r495 92 92 END 93 93 94 IDR_ABOUT_TEXT HALITE_RTF_RES_TYPE "English.rtf"95 96 IDD_ADVOVERVIEW DIALOGEX 0, 0, 313, 12194 HAL_ABOUT_TEXT HALITE_RTF_RES_TYPE "English.rtf" 95 96 HAL_ADVOVERVIEW DIALOGEX 0, 0, 313, 121 97 97 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD 98 98 FONT 8, "MS Shell Dlg", 400, 0, 0x1 99 99 BEGIN 100 GROUPBOX "Torrent", IDC_GROUP_TORRENT,4,7,305,83101 GROUPBOX "Tracker", IDC_GROUP_TRACKER,4,92,305,25100 GROUPBOX "Torrent",HAL_GROUP_TORRENT,4,7,305,83 101 GROUPBOX "Tracker",HAL_GROUP_TRACKER,4,92,305,25 102 102 CONTROL "",TORRENTPROG,"msctls_progress32",WS_BORDER,10,77,291,8 103 103 104 EDITTEXT IDC_EDITTLD,210,46,34,12,ES_AUTOHSCROLL105 EDITTEXT IDC_EDITTLU,267,46,34,12,ES_AUTOHSCROLL106 EDITTEXT IDC_EDITNCD,210,22,34,12,ES_AUTOHSCROLL107 EDITTEXT IDC_EDITNCU,267,22,34,12,ES_AUTOHSCROLL108 LTEXT "Torrent connection limits:", IDC_NC,185,13,115,8,SS_WORDELLIPSIS|SS_CENTERIMAGE109 LTEXT "Torrent transfer rates (KB/s):", IDC_TL,185,37,115,8,SS_WORDELLIPSIS|SS_CENTERIMAGE110 RTEXT "Total", IDC_NCD,182,25,25,8,SS_WORDELLIPSIS|SS_CENTERIMAGE111 RTEXT "Up", IDC_NCU,245,25,20,8,SS_WORDELLIPSIS|SS_CENTERIMAGE112 RTEXT "Up", IDC_TLU,245,49,20,8,SS_WORDELLIPSIS|SS_CENTERIMAGE113 RTEXT "Down", IDC_TLD,182,49,25,8,SS_WORDELLIPSIS|SS_CENTERIMAGE114 115 LTEXT "N/A", IDC_TRACKER,10,103,170,8,SS_WORDELLIPSIS|SS_CENTERIMAGE116 117 RTEXT "Update in:", IDC_UPDATESTAT,185,103,40,8,SS_WORDELLIPSIS|SS_CENTERIMAGE118 LTEXT "N/A", IDC_UPDATE,228,103,71,8,SS_WORDELLIPSIS|SS_CENTERIMAGE119 EDITTEXT IDC_EDITRATIO,267,60,34,12,ES_AUTOHSCROLL120 LTEXT "Ratio (this session):", IDC_RATIOESTATIC,182,63,70,8,SS_WORDELLIPSIS|SS_CENTERIMAGE121 122 RTEXT "Torrent:", IDC_NAME_STATUS_LABEL,9,17,39,8,SS_WORDELLIPSIS|SS_CENTERIMAGE123 LTEXT "N/A", IDC_NAME_STATUS,53,17,127,8,SS_WORDELLIPSIS|SS_CENTERIMAGE124 125 RTEXT "Peers:", IDC_PEERS_LABEL,9,28,39,8,SS_WORDELLIPSIS|SS_CENTERIMAGE126 RTEXT "Transferred:", IDC_TRANSFERED_LABEL,9,40,39,8,SS_WORDELLIPSIS|SS_CENTERIMAGE127 RTEXT "Remaining:", IDC_REMAINING_LABEL,9,52,39,8,SS_WORDELLIPSIS|SS_CENTERIMAGE128 RTEXT "Rates:", IDC_RATE_LABEL,9,64,39,8,SS_WORDELLIPSIS|SS_CENTERIMAGE129 130 RTEXT "Seeds:", IDC_SEEDS_LABEL,97,28,39,8,SS_WORDELLIPSIS|SS_CENTERIMAGE131 RTEXT "Overhead:", IDC_OVERHEAD_LABEL,97,40,39,8,SS_WORDELLIPSIS|SS_CENTERIMAGE132 RTEXT "ETA:", IDC_ETA_LABEL,97,52,39,8,SS_WORDELLIPSIS|SS_CENTERIMAGE133 RTEXT "Ratio:", IDC_RATIO_LABEL,97,64,39,8,SS_WORDELLIPSIS|SS_CENTERIMAGE134 135 LTEXT "N/A", IDC_PEERS,53,28,39,8,SS_WORDELLIPSIS|SS_CENTERIMAGE136 LTEXT "N/A", IDC_TRANSFERED,53,40,39,8,SS_WORDELLIPSIS | SS_CENTERIMAGE137 LTEXT "N/A", IDC_REMAINING,53,52,39,8,SS_WORDELLIPSIS | SS_CENTERIMAGE138 LTEXT "N/A", IDC_RATE,53,64,39,8,SS_WORDELLIPSIS | SS_CENTERIMAGE139 140 LTEXT "N/A", IDC_SEEDS,141,28,39,8,SS_WORDELLIPSIS | SS_CENTERIMAGE141 LTEXT "N/A", IDC_OVERHEAD,141,40,39,8,SS_WORDELLIPSIS | SS_CENTERIMAGE142 LTEXT "N/A", IDC_ETA,141,52,39,8,SS_WORDELLIPSIS| SS_CENTERIMAGE143 LTEXT "N/A", IDC_RATIO,141,64,39,8,SS_WORDELLIPSIS | SS_CENTERIMAGE144 END 145 146 IDD_CONFIGBIT DIALOGEX 0, 0, 325, 155104 EDITTEXT HAL_EDITTLD,210,46,34,12,ES_AUTOHSCROLL 105 EDITTEXT HAL_EDITTLU,267,46,34,12,ES_AUTOHSCROLL 106 EDITTEXT HAL_EDITNCD,210,22,34,12,ES_AUTOHSCROLL 107 EDITTEXT HAL_EDITNCU,267,22,34,12,ES_AUTOHSCROLL 108 LTEXT "Torrent connection limits:",HAL_NC,185,13,115,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 109 LTEXT "Torrent transfer rates (KB/s):",HAL_TL,185,37,115,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 110 RTEXT "Total",HAL_NCD,182,25,25,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 111 RTEXT "Up",HAL_NCU,245,25,20,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 112 RTEXT "Up",HAL_TLU,245,49,20,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 113 RTEXT "Down",HAL_TLD,182,49,25,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 114 115 LTEXT "N/A",HAL_TRACKER,10,103,170,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 116 117 RTEXT "Update in:",HAL_UPDATESTAT,185,103,40,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 118 LTEXT "N/A",HAL_UPDATE,228,103,71,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 119 EDITTEXT HAL_EDITRATIO,267,60,34,12,ES_AUTOHSCROLL 120 LTEXT "Ratio (this session):",HAL_RATIOESTATIC,182,63,70,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 121 122 RTEXT "Torrent:",HAL_NAME_STATUS_LABEL,9,17,39,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 123 LTEXT "N/A",HAL_NAME_STATUS,53,17,127,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 124 125 RTEXT "Peers:",HAL_PEERS_LABEL,9,28,39,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 126 RTEXT "Transferred:",HAL_TRANSFERED_LABEL,9,40,39,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 127 RTEXT "Remaining:",HAL_REMAINING_LABEL,9,52,39,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 128 RTEXT "Rates:",HAL_RATE_LABEL,9,64,39,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 129 130 RTEXT "Seeds:",HAL_SEEDS_LABEL,97,28,39,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 131 RTEXT "Overhead:",HAL_OVERHEAD_LABEL,97,40,39,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 132 RTEXT "ETA:",HAL_ETA_LABEL,97,52,39,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 133 RTEXT "Ratio:",HAL_RATIO_LABEL,97,64,39,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 134 135 LTEXT "N/A",HAL_PEERS,53,28,39,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 136 LTEXT "N/A",HAL_TRANSFERED,53,40,39,8,SS_WORDELLIPSIS | SS_CENTERIMAGE 137 LTEXT "N/A",HAL_REMAINING,53,52,39,8,SS_WORDELLIPSIS | SS_CENTERIMAGE 138 LTEXT "N/A",HAL_RATE,53,64,39,8,SS_WORDELLIPSIS | SS_CENTERIMAGE 139 140 LTEXT "N/A",HAL_SEEDS,141,28,39,8,SS_WORDELLIPSIS | SS_CENTERIMAGE 141 LTEXT "N/A",HAL_OVERHEAD,141,40,39,8,SS_WORDELLIPSIS | SS_CENTERIMAGE 142 LTEXT "N/A",HAL_ETA,141,52,39,8,SS_WORDELLIPSIS| SS_CENTERIMAGE 143 LTEXT "N/A",HAL_RATIO,141,64,39,8,SS_WORDELLIPSIS | SS_CENTERIMAGE 144 END 145 146 HAL_CONFIGBIT DIALOGEX 0, 0, 325, 155 147 147 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU 148 148 CAPTION "BitTorrent" 149 149 FONT 8, "MS Shell Dlg", 400, 0, 0x1 150 150 BEGIN 151 RTEXT "Open a (single) port between : ", IDC_BITT_OPENPORT,12,31,120,12,SS_WORDELLIPSIS|SS_CENTERIMAGE152 EDITTEXT IDC_BC_PORTFROM,135,29,65,12,ES_AUTOHSCROLL153 EDITTEXT IDC_BC_PORTTO,250,29,65,12,ES_AUTOHSCROLL154 CONTROL "Enable DHT", IDC_BC_DHT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,120,90,10155 CONTROL "to", IDC_BC_PORTCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,205,29,40,12156 LTEXT "Select the (TCP) port (or range) on which to listen for incoming connections.", IDC_BITT_SELECT_TEXT,12,17,300,11,SS_WORDELLIPSIS | SS_CENTERIMAGE157 GROUPBOX "Distributed Hash Tables", IDC_BITT_GDHT,5,108,260,39158 EDITTEXT IDC_BC_DHTPORT,180,119,80,12,ES_AUTOHSCROLL159 RTEXT "Port (UDP) : ", IDC_BC_DHTPORT_S,110,121,70,8160 CTEXT "(DHT will not apply to private torrents)", IDC_BITT_DHT_NOTE,11,134,250,8,SS_WORDELLIPSIS | SS_CENTERIMAGE161 GROUPBOX "General Settings", IDC_BITT_GSETTINGS,5,6,315,54162 EDITTEXT IDC_BC_HALFCONN_NUM,205,44,65,12,ES_AUTOHSCROLL163 CONTROL "Limit the no. of half-open connections", IDC_BC_HALFCONN_CHECK,151 RTEXT "Open a (single) port between : ",HAL_BITT_OPENPORT,12,31,120,12,SS_WORDELLIPSIS|SS_CENTERIMAGE 152 EDITTEXT HAL_BC_PORTFROM,135,29,65,12,ES_AUTOHSCROLL 153 EDITTEXT HAL_BC_PORTTO,250,29,65,12,ES_AUTOHSCROLL 154 CONTROL "Enable DHT",HAL_BC_DHT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,120,90,10 155 CONTROL "to",HAL_BC_PORTCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,205,29,40,12 156 LTEXT "Select the (TCP) port (or range) on which to listen for incoming connections.",HAL_BITT_SELECT_TEXT,12,17,300,11,SS_WORDELLIPSIS | SS_CENTERIMAGE 157 GROUPBOX "Distributed Hash Tables",HAL_BITT_GDHT,5,108,260,39 158 EDITTEXT HAL_BC_DHTPORT,180,119,80,12,ES_AUTOHSCROLL 159 RTEXT "Port (UDP) : ",HAL_BC_DHTPORT_S,110,121,70,8 160 CTEXT "(DHT will not apply to private torrents)",HAL_BITT_DHT_NOTE,11,134,250,8,SS_WORDELLIPSIS | SS_CENTERIMAGE 161 GROUPBOX "General Settings",HAL_BITT_GSETTINGS,5,6,315,54 162 EDITTEXT HAL_BC_HALFCONN_NUM,205,44,65,12,ES_AUTOHSCROLL 163 CONTROL "Limit the no. of half-open connections",HAL_BC_HALFCONN_CHECK, 164 164 "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,45,190,12 165 GROUPBOX "Port Forwarding", IDC_BITT_GPORTFORWARDING,5,6,315,54166 CONTROL "None (Managed Externally)", IDC_BITT_GPORTFORWARD_NONE,"Button",BS_AUTORADIOBUTTON|WS_GROUP,284,73,16,10167 CONTROL "UnPlug and Play", IDC_BITT_GPORTFORWARD_UPNG,"Button",BS_AUTORADIOBUTTON,284,83,16,10168 CONTROL "NAT-PMG", IDC_BIT_GPORTFORWARD_NATPMP,"Button",BS_AUTORADIOBUTTON,284,93,16,10169 PUSHBUTTON "Test", IDC_BITT_GPORTFORWARD_TEST,207,46,51,12,NOT WS_VISIBLE170 171 LISTBOX IDC_BITT_GPORTFORWARD_LIST,165,24,149,7,LBS_SORT|LBS_NOINTEGRALHEIGHT|WS_VSCROLL|WS_TABSTOP|NOT WS_VISIBLE172 // RTEXT "Need Help?", IDC_BC_HELP_LINK,229,139,51,8173 // RTEXT "Why?", IDC_BC_CON_WHY,239,47,31,8174 END 175 176 IDD_CONFIGPROXY DIALOGEX 0, 0, 285, 155165 GROUPBOX "Port Forwarding",HAL_BITT_GPORTFORWARDING,5,6,315,54 166 CONTROL "None (Managed Externally)",HAL_BITT_GPORTFORWARD_NONE,"Button",BS_AUTORADIOBUTTON|WS_GROUP,284,73,16,10 167 CONTROL "UnPlug and Play",HAL_BITT_GPORTFORWARD_UPNG,"Button",BS_AUTORADIOBUTTON,284,83,16,10 168 CONTROL "NAT-PMG",HAL_BIT_GPORTFORWARD_NATPMP,"Button",BS_AUTORADIOBUTTON,284,93,16,10 169 PUSHBUTTON "Test",HAL_BITT_GPORTFORWARD_TEST,207,46,51,12,NOT WS_VISIBLE 170 171 LISTBOX HAL_BITT_GPORTFORWARD_LIST,165,24,149,7,LBS_SORT|LBS_NOINTEGRALHEIGHT|WS_VSCROLL|WS_TABSTOP|NOT WS_VISIBLE 172 // RTEXT "Need Help?",HAL_BC_HELP_LINK,229,139,51,8 173 // RTEXT "Why?",HAL_BC_CON_WHY,239,47,31,8 174 END 175 176 HAL_CONFIGPROXY DIALOGEX 0, 0, 285, 155 177 177 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU 178 178 CAPTION "Proxies" 179 179 FONT 8, "MS Shell Dlg", 400, 0, 0x1 180 180 BEGIN 181 EDITTEXT IDC_BC_PROXYIP,124,46,77,12,ES_AUTOHSCROLL182 RTEXT "Proxy Host/IP : ", IDC_BC_PROXYIP_S,68,48,55,12183 CONTROL "Use a proxy.", IDC_BC_PROXYCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,48,59,8184 RTEXT "Port : ", IDC_BC_PROXYPORT_S,204,48,24,12185 EDITTEXT IDC_BC_PROXYPORT,229,46,42,12,ES_AUTOHSCROLL | ES_NUMBER186 EDITTEXT IDC_BC_PROXYUSER,54,62,89,12,ES_AUTOHSCROLL187 RTEXT "Username : ", IDC_BC_PROXYUSER_S,8,64,44,12188 RTEXT "Password : ", IDC_BC_PROXYPASS_S,146,64,39,12189 EDITTEXT IDC_BC_PROXYPASS,188,62,83,12,ES_PASSWORD | ES_AUTOHSCROLL190 CONTROL "Peer", IDC_PEERPROXY,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE,16,19,57,15191 CONTROL "Web Seed", IDC_WEBPROXY,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE,81,19,57,15192 CONTROL "Tracker", IDC_TRACKERPROXY,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE,146,19,57,15193 CONTROL "DHT", IDC_DHTPROXY,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE | WS_DISABLED,211,19,57,15194 GROUPBOX "Proxy Settings", IDC_STATIC,6,7,271,108195 END 196 197 IDD_CONFIGSECURITY DIALOGEX 0, 0, 325, 155181 EDITTEXT HAL_BC_PROXYIP,124,46,77,12,ES_AUTOHSCROLL 182 RTEXT "Proxy Host/IP : ",HAL_BC_PROXYIP_S,68,48,55,12 183 CONTROL "Use a proxy.",HAL_BC_PROXYCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,48,59,8 184 RTEXT "Port : ",HAL_BC_PROXYPORT_S,204,48,24,12 185 EDITTEXT HAL_BC_PROXYPORT,229,46,42,12,ES_AUTOHSCROLL | ES_NUMBER 186 EDITTEXT HAL_BC_PROXYUSER,54,62,89,12,ES_AUTOHSCROLL 187 RTEXT "Username : ",HAL_BC_PROXYUSER_S,8,64,44,12 188 RTEXT "Password : ",HAL_BC_PROXYPASS_S,146,64,39,12 189 EDITTEXT HAL_BC_PROXYPASS,188,62,83,12,ES_PASSWORD | ES_AUTOHSCROLL 190 CONTROL "Peer",HAL_PEERPROXY,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE,16,19,57,15 191 CONTROL "Web Seed",HAL_WEBPROXY,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE,81,19,57,15 192 CONTROL "Tracker",HAL_TRACKERPROXY,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE,146,19,57,15 193 CONTROL "DHT",HAL_DHTPROXY,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE | WS_DISABLED,211,19,57,15 194 GROUPBOX "Proxy Settings",HAL_STATIC,6,7,271,108 195 END 196 197 HAL_CONFIGSECURITY DIALOGEX 0, 0, 325, 155 198 198 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD 199 199 CAPTION "Security" 200 200 FONT 8, "MS Shell Dlg", 400, 0, 0x1 201 201 BEGIN 202 GROUPBOX "IP Filtering", IDC_SECURITY_IPF_GB,5,6,315,30203 CONTROL "Enable IP filtering.", IDC_BC_FILTERCHECK,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,12,18,105,12204 PUSHBUTTON "Import ipfilter.dat", IDC_BC_FILTERLOAD,220,17,95,14,WS_DISABLED205 PUSHBUTTON "Clear IP database", IDC_BC_FILTERCLEAR,120,17,95,14,WS_DISABLED206 GROUPBOX "Protocol Encryption", IDC_SECURITY_PE_GB,5,39,315,75207 CONTROL "Enable Protocol Encryption.", IDC_SC_ENABLE_PE,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,12,50,175,10208 GROUPBOX "Connection Policies", IDC_SECURITY_CP_GB,194,49,120,58209 LTEXT "Incoming", IDC_SECURITY_INCOMING,200,61,50,9210 RTEXT "Outgoing", IDC_SECURITY_OUTGOING,255,61,50,9211 CONTROL "", IDC_SC_PE_CP_IN_FORCED,"Button",BS_AUTORADIOBUTTON|WS_GROUP,205,73,16,10212 CONTROL "", IDC_SC_PE_CP_IN_ENABLED,"Button",BS_AUTORADIOBUTTON,205,83,16,10213 CONTROL "", IDC_SC_PE_CP_IN_DISABLED,"Button",BS_AUTORADIOBUTTON,205,93,16,10214 CTEXT "Forced", IDC_SECURITY_FORCED,225,73,55,8215 CTEXT "Enabled", IDC_SECURITY_ENABLED,225,83,55,8216 CTEXT "Disabled", IDC_SECURITY_DISABLED,225,93,55,8217 CONTROL "", IDC_SC_PE_CP_OUT_FORCED,"Button",BS_AUTORADIOBUTTON|WS_GROUP,284,73,16,10,WS_EX_RIGHT218 CONTROL "", IDC_SC_PE_CP_OUT_ENABLED,"Button",BS_AUTORADIOBUTTON,284,83,16,10,WS_EX_RIGHT219 CONTROL "", IDC_SC_PE_CP_OUT_DISABLED,"Button",BS_AUTORADIOBUTTON,284,93,16,10,WS_EX_RIGHT220 GROUPBOX "Encoding Level", IDC_SECURITY_EL_GB,12,63,175,44221 CONTROL "Plaintext", IDC_SC_PE_ENC_PLAIN,"Button",BS_AUTORADIOBUTTON|WS_GROUP,18,73,160,10222 CONTROL "RC4", IDC_SC_PE_ENC_RC4,"Button",BS_AUTORADIOBUTTON,18,84,160,10223 CONTROL "Both", IDC_SC_PE_ENC_BOTH,"Button",BS_AUTORADIOBUTTON,18,95,75,10224 CONTROL "Prefer RC4", IDC_SC_PE_ENC_RC4_PERFER,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,100,95,80,10225 // LTEXT "Need Help?", IDC_SC_HELP_LINK,7,138,255,8226 END 227 228 IDD_CONFIGREMOTE DIALOGEX 0, 0, 283, 94202 GROUPBOX "IP Filtering",HAL_SECURITY_IPF_GB,5,6,315,30 203 CONTROL "Enable IP filtering.",HAL_BC_FILTERCHECK,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,12,18,105,12 204 PUSHBUTTON "Import ipfilter.dat",HAL_BC_FILTERLOAD,220,17,95,14,WS_DISABLED 205 PUSHBUTTON "Clear IP database",HAL_BC_FILTERCLEAR,120,17,95,14,WS_DISABLED 206 GROUPBOX "Protocol Encryption",HAL_SECURITY_PE_GB,5,39,315,75 207 CONTROL "Enable Protocol Encryption.",HAL_SC_ENABLE_PE,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,12,50,175,10 208 GROUPBOX "Connection Policies",HAL_SECURITY_CP_GB,194,49,120,58 209 LTEXT "Incoming",HAL_SECURITY_INCOMING,200,61,50,9 210 RTEXT "Outgoing",HAL_SECURITY_OUTGOING,255,61,50,9 211 CONTROL "",HAL_SC_PE_CP_IN_FORCED,"Button",BS_AUTORADIOBUTTON|WS_GROUP,205,73,16,10 212 CONTROL "",HAL_SC_PE_CP_IN_ENABLED,"Button",BS_AUTORADIOBUTTON,205,83,16,10 213 CONTROL "",HAL_SC_PE_CP_IN_DISABLED,"Button",BS_AUTORADIOBUTTON,205,93,16,10 214 CTEXT "Forced",HAL_SECURITY_FORCED,225,73,55,8 215 CTEXT "Enabled",HAL_SECURITY_ENABLED,225,83,55,8 216 CTEXT "Disabled",HAL_SECURITY_DISABLED,225,93,55,8 217 CONTROL "",HAL_SC_PE_CP_OUT_FORCED,"Button",BS_AUTORADIOBUTTON|WS_GROUP,284,73,16,10,WS_EX_RIGHT 218 CONTROL "",HAL_SC_PE_CP_OUT_ENABLED,"Button",BS_AUTORADIOBUTTON,284,83,16,10,WS_EX_RIGHT 219 CONTROL "",HAL_SC_PE_CP_OUT_DISABLED,"Button",BS_AUTORADIOBUTTON,284,93,16,10,WS_EX_RIGHT 220 GROUPBOX "Encoding Level",HAL_SECURITY_EL_GB,12,63,175,44 221 CONTROL "Plaintext",HAL_SC_PE_ENC_PLAIN,"Button",BS_AUTORADIOBUTTON|WS_GROUP,18,73,160,10 222 CONTROL "RC4",HAL_SC_PE_ENC_RC4,"Button",BS_AUTORADIOBUTTON,18,84,160,10 223 CONTROL "Both",HAL_SC_PE_ENC_BOTH,"Button",BS_AUTORADIOBUTTON,18,95,75,10 224 CONTROL "Prefer RC4",HAL_SC_PE_ENC_RC4_PERFER,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,100,95,80,10 225 // LTEXT "Need Help?",HAL_SC_HELP_LINK,7,138,255,8 226 END 227 228 HAL_CONFIGREMOTE DIALOGEX 0, 0, 283, 94 229 229 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU 230 230 CAPTION "Remote Control" 231 231 FONT 8, "MS Shell Dlg", 400, 0, 0x1 232 232 BEGIN 233 GROUPBOX "Remote Control Options", IDC_STATIC,6,6,271,30234 CONTROL "Enable Remote Control", IDC_REMOTECTRL,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,12,18,96,12235 RTEXT "Port to listen on : ", IDC_STATIC,159,19,66,11,WS_DISABLED236 EDITTEXT IDC_REMOTEPORT,229,18,42,12,ES_AUTOHSCROLL | WS_DISABLED237 CTEXT "*** Disabled ***", IDC_STATIC,32,44,217,11238 END 239 240 IDD_THEMETEST DIALOGEX 0,0,186,94233 GROUPBOX "Remote Control Options",HAL_STATIC,6,6,271,30 234 CONTROL "Enable Remote Control",HAL_REMOTECTRL,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,12,18,96,12 235 RTEXT "Port to listen on : ",HAL_STATIC,159,19,66,11,WS_DISABLED 236 EDITTEXT HAL_REMOTEPORT,229,18,42,12,ES_AUTOHSCROLL | WS_DISABLED 237 CTEXT "*** Disabled ***",HAL_STATIC,32,44,217,11 238 END 239 240 HAL_THEMETEST DIALOGEX 0,0,186,94 241 241 STYLE DS_CONTROL | DS_SETFONT | DS_FIXEDSYS | WS_VISIBLE | WS_CHILDWINDOW | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_SYSMENU 242 242 EXSTYLE WS_EX_TRANSPARENT | WS_EX_CONTROLPARENT 243 243 FONT 8,"MS Shell Dlg",400,0,1 244 244 BEGIN 245 AUTOCHECKBOX "Check1", IDC_CHECK1,7,7,44,10246 PUSHBUTTON "Button1", IDC_BUTTON1,69,7,51,14247 EDITTEXT IDC_EDIT1,134,7,45,15,ES_AUTOHSCROLL248 AUTORADIOBUTTON "Radio1", IDC_RADIO1,129,38,50,11,NOT WS_TABSTOP249 EDITTEXT IDC_EDIT2,14,62,45,15,WS_DISABLED | ES_AUTOHSCROLL250 LTEXT "Static", IDC_STATIC,85,59,68,10251 LTEXT "Static", IDC_STATIC,25,35,19,8252 GROUPBOX "Static", IDC_STATIC,10,25,98,25253 LTEXT "Static", IDC_STATIC,65,35,19,8254 END 255 256 IDD_DEBUGDIALOG DIALOGEX 0,0,252,105245 AUTOCHECKBOX "Check1",HAL_CHECK1,7,7,44,10 246 PUSHBUTTON "Button1",HAL_BUTTON1,69,7,51,14 247 EDITTEXT HAL_EDIT1,134,7,45,15,ES_AUTOHSCROLL 248 AUTORADIOBUTTON "Radio1",HAL_RADIO1,129,38,50,11,NOT WS_TABSTOP 249 EDITTEXT HAL_EDIT2,14,62,45,15,WS_DISABLED | ES_AUTOHSCROLL 250 LTEXT "Static",HAL_STATIC,85,59,68,10 251 LTEXT "Static",HAL_STATIC,25,35,19,8 252 GROUPBOX "Static",HAL_STATIC,10,25,98,25 253 LTEXT "Static",HAL_STATIC,65,35,19,8 254 END 255 256 HAL_DEBUGDIALOG DIALOGEX 0,0,252,105 257 257 STYLE DS_SETFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SIZEBOX | WS_SYSMENU 258 258 EXSTYLE WS_EX_WINDOWEDGE | WS_EX_TOOLWINDOW | WS_EX_TOPMOST … … 263 263 END 264 264 265 IDD_CONFIGTORRENT DIALOGEX 0, 0, 325, 165265 HAL_CONFIGTORRENT DIALOGEX 0, 0, 325, 165 266 266 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU 267 267 CAPTION "Torrents" 268 268 FONT 8, "MS Shell Dlg", 400, 0, 0x1 269 269 BEGIN 270 GROUPBOX "Global Limits", IDC_CONFIGT_GLOBALG,5,6,315,55271 EDITTEXT IDC_BC_MAXCONN,118,29,42,12,ES_AUTOHSCROLL272 RTEXT "Total max connections :", IDC_CONFIGT_TOTALMAX,12,31,100,11,SS_WORDELLIPSIS|SS_CENTERIMAGE273 RTEXT "Total upload slots :", IDC_CONFIGT_TOTALUP,12,44,100,10,SS_WORDELLIPSIS|SS_CENTERIMAGE274 EDITTEXT IDC_BC_MAXUP,118,42,42,12,ES_AUTOHSCROLL275 EDITTEXT IDC_BC_DOWNRATE,271,29,42,12,ES_AUTOHSCROLL276 RTEXT "Download Rate (KB/s) :", IDC_CONFIGT_DOWNRATE,165,31,100,11,SS_WORDELLIPSIS|SS_CENTERIMAGE277 RTEXT "Upload Rate (KB/s) :", IDC_CONFIGT_UPRATE,165,44,100,10,SS_WORDELLIPSIS|SS_CENTERIMAGE278 EDITTEXT IDC_BC_UPRATE,271,42,42,12,ES_AUTOHSCROLL279 EDITTEXT IDC_BC_TMAXCONN,118,88,42,12,ES_AUTOHSCROLL280 RTEXT "Total max connections :", IDC_CONFIGT_TORMAX,12,91,100,12,SS_WORDELLIPSIS|SS_CENTERIMAGE281 RTEXT "Total upload slots :", IDC_CONFIGT_TORUP,12,104,100,12,SS_WORDELLIPSIS|SS_CENTERIMAGE282 EDITTEXT IDC_BC_TMAXUP,118,101,42,12,ES_AUTOHSCROLL283 EDITTEXT IDC_BC_TDOWNRATE,271,88,42,12,ES_AUTOHSCROLL284 RTEXT "Download Rate (KB/s) :", IDC_CONFIGT_TDOWNRATE,165,91,100,12,SS_WORDELLIPSIS|SS_CENTERIMAGE285 RTEXT "Upload Rate (KB/s) :", IDC_CONFIGT_TORUPRATE,165,104,100,12,SS_WORDELLIPSIS|SS_CENTERIMAGE286 EDITTEXT IDC_BC_TUPRATE,271,101,42,12,ES_AUTOHSCROLL287 GROUPBOX "Torrent Defaults", IDC_CONFIGT_TORRENTG,5,66,315,82288 LTEXT "These options set global maximums which will always be honoured.", IDC_CONFIGT_GLOBAL_TEXT,12,16,300,11,SS_WORDELLIPSIS|SS_CENTERIMAGE289 LTEXT "These options specify the default limits applied to new torrents.", IDC_CONFIGT_TOR_TEXT,12,76,301,11,SS_WORDELLIPSIS|SS_CENTERIMAGE290 RTEXT "Default save folder :", IDC_CONFIGT_DEF_FOLDER,12,120,100,11,SS_WORDELLIPSIS|SS_CENTERIMAGE291 EDITTEXT IDC_BC_SAVEFOLDER,118,119,170,12,ES_AUTOHSCROLL292 PUSHBUTTON "...", IDC_BC_SAVEBROWSE,293,118,18,13293 AUTOCHECKBOX "", IDC_BC_MOVETO_CHECK,118,133,10,11294 RTEXT "Move finished torrents to :", IDC_BC_MOVETO_TEXT,12,120,100,11,SS_WORDELLIPSIS|SS_CENTERIMAGE295 EDITTEXT IDC_BC_MOVETO_FOLDER,118,119,170,12,ES_AUTOHSCROLL296 PUSHBUTTON "...", IDC_BC_MOVETO_BROWSE,293,118,18,13297 AUTOCHECKBOX "Review settings when adding torrent.", IDC_BC_PROMPTSAVE,118,133,195,11298 END 299 300 IDD_CLOSESPLASH DIALOGEX 0,0,191,74270 GROUPBOX "Global Limits",HAL_CONFIGT_GLOBALG,5,6,315,55 271 EDITTEXT HAL_BC_MAXCONN,118,29,42,12,ES_AUTOHSCROLL 272 RTEXT "Total max connections :",HAL_CONFIGT_TOTALMAX,12,31,100,11,SS_WORDELLIPSIS|SS_CENTERIMAGE 273 RTEXT "Total upload slots :",HAL_CONFIGT_TOTALUP,12,44,100,10,SS_WORDELLIPSIS|SS_CENTERIMAGE 274 EDITTEXT HAL_BC_MAXUP,118,42,42,12,ES_AUTOHSCROLL 275 EDITTEXT HAL_BC_DOWNRATE,271,29,42,12,ES_AUTOHSCROLL 276 RTEXT "Download Rate (KB/s) :",HAL_CONFIGT_DOWNRATE,165,31,100,11,SS_WORDELLIPSIS|SS_CENTERIMAGE 277 RTEXT "Upload Rate (KB/s) :",HAL_CONFIGT_UPRATE,165,44,100,10,SS_WORDELLIPSIS|SS_CENTERIMAGE 278 EDITTEXT HAL_BC_UPRATE,271,42,42,12,ES_AUTOHSCROLL 279 EDITTEXT HAL_BC_TMAXCONN,118,88,42,12,ES_AUTOHSCROLL 280 RTEXT "Total max connections :",HAL_CONFIGT_TORMAX,12,91,100,12,SS_WORDELLIPSIS|SS_CENTERIMAGE 281 RTEXT "Total upload slots :",HAL_CONFIGT_TORUP,12,104,100,12,SS_WORDELLIPSIS|SS_CENTERIMAGE 282 EDITTEXT HAL_BC_TMAXUP,118,101,42,12,ES_AUTOHSCROLL 283 EDITTEXT HAL_BC_TDOWNRATE,271,88,42,12,ES_AUTOHSCROLL 284 RTEXT "Download Rate (KB/s) :",HAL_CONFIGT_TDOWNRATE,165,91,100,12,SS_WORDELLIPSIS|SS_CENTERIMAGE 285 RTEXT "Upload Rate (KB/s) :",HAL_CONFIGT_TORUPRATE,165,104,100,12,SS_WORDELLIPSIS|SS_CENTERIMAGE 286 EDITTEXT HAL_BC_TUPRATE,271,101,42,12,ES_AUTOHSCROLL 287 GROUPBOX "Torrent Defaults",HAL_CONFIGT_TORRENTG,5,66,315,82 288 LTEXT "These options set global maximums which will always be honoured.",HAL_CONFIGT_GLOBAL_TEXT,12,16,300,11,SS_WORDELLIPSIS|SS_CENTERIMAGE 289 LTEXT "These options specify the default limits applied to new torrents.",HAL_CONFIGT_TOR_TEXT,12,76,301,11,SS_WORDELLIPSIS|SS_CENTERIMAGE 290 RTEXT "Default save folder :",HAL_CONFIGT_DEF_FOLDER,12,120,100,11,SS_WORDELLIPSIS|SS_CENTERIMAGE 291 EDITTEXT HAL_BC_SAVEFOLDER,118,119,170,12,ES_AUTOHSCROLL 292 PUSHBUTTON "...",HAL_BC_SAVEBROWSE,293,118,18,13 293 AUTOCHECKBOX "",HAL_BC_MOVETO_CHECK,118,133,10,11 294 RTEXT "Move finished torrents to :",HAL_BC_MOVETO_TEXT,12,120,100,11,SS_WORDELLIPSIS|SS_CENTERIMAGE 295 EDITTEXT HAL_BC_MOVETO_FOLDER,118,119,170,12,ES_AUTOHSCROLL 296 PUSHBUTTON "...",HAL_BC_MOVETO_BROWSE,293,118,18,13 297 AUTOCHECKBOX "Review settings when adding torrent.",HAL_BC_PROMPTSAVE,118,133,195,11 298 END 299 300 HAL_CLOSESPLASH DIALOGEX 0,0,191,74 301 301 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME 302 302 EXSTYLE WS_EX_TOOLWINDOW | WS_EX_STATICEDGE … … 304 304 FONT 8,"MS Shell Dlg",400,0,1 305 305 BEGIN 306 ICON IDR_APP_ICON,IDC_STATIC,7,10,21,20,SS_ICON306 ICON HAL_APP_ICON,HAL_STATIC,7,10,21,20,SS_ICON 307 307 LTEXT "It will take the BitTorrent session a moment to shutdown cleanly after which this message will disappear and the program will close.",HAL_CSPLASH_MSG,35,7,149,27 308 308 CTEXT "Stopping Torrents",HAL_CSPLASH_NUM_ACT,6,40,179,14 309 AUTOCHECKBOX "Show this message in future", IDC_SPLASH_MSG,7,58,107,12309 AUTOCHECKBOX "Show this message in future",HAL_SPLASH_MSG,7,58,107,12 310 310 PUSHBUTTON "Force Close",HAL_SPLASH_FORCE_CLOSE,121,57,65,13,BS_DEFPUSHBUTTON 311 311 END 312 312 313 IDD_HALITEDLG DIALOGEX 0,0,370,73313 HAL_HALITEDLG DIALOGEX 0,0,370,73 314 314 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILDWINDOW | WS_CLIPCHILDREN 315 315 FONT 8,"MS Shell Dlg",400,0,1 … … 319 319 PUSHBUTTON "Remove",BTNREMOVE,314,35,52,14 320 320 CONTROL "",LISTPEERS,"SysListView32",WS_TABSTOP | WS_BORDER | LVS_ALIGNLEFT | LVS_REPORT,4,64,362,6 321 EDITTEXT IDC_EDITTLU,277,36,34,12,ES_AUTOHSCROLL322 EDITTEXT IDC_EDITTLD,220,36,34,12,ES_AUTOHSCROLL323 EDITTEXT IDC_EDITNCD,220,12,34,12,ES_AUTOHSCROLL324 EDITTEXT IDC_EDITNCU,277,12,34,12,ES_AUTOHSCROLL321 EDITTEXT HAL_EDITTLU,277,36,34,12,ES_AUTOHSCROLL 322 EDITTEXT HAL_EDITTLD,220,36,34,12,ES_AUTOHSCROLL 323 EDITTEXT HAL_EDITNCD,220,12,34,12,ES_AUTOHSCROLL 324 EDITTEXT HAL_EDITNCU,277,12,34,12,ES_AUTOHSCROLL 325 325 CONTROL "",TORRENTPROG,"msctls_progress32",WS_BORDER,4,52,362,8 326 RTEXT "Name:", IDC_NAME_STATIC,4,3,40,8,SS_WORDELLIPSIS|SS_CENTERIMAGE327 RTEXT "Tracker:", IDC_TRACKER_STATIC,4,15,40,8,SS_WORDELLIPSIS|SS_CENTERIMAGE328 RTEXT "Status:", IDC_STATUS_STATIC,4,27,40,8,SS_WORDELLIPSIS|SS_CENTERIMAGE329 RTEXT "Time left:", IDC_TIME_STATIC,4,39,40,8,SS_WORDELLIPSIS|SS_CENTERIMAGE330 LTEXT "N/A", IDC_NAME,45,3,145,10,SS_WORDELLIPSIS|SS_CENTERIMAGE331 LTEXT "N/A", IDC_TRACKER,45,15,145,8,SS_WORDELLIPSIS|SS_CENTERIMAGE332 LTEXT "N/A", IDC_STATUS,45,27,145,8,SS_WORDELLIPSIS|SS_CENTERIMAGE333 LTEXT "N/A", IDC_AVAIL,45,39,36,8,SS_WORDELLIPSIS|SS_CENTERIMAGE334 LTEXT "Torrent connection limits:", IDC_NC,195,3,115,8,SS_WORDELLIPSIS|SS_CENTERIMAGE335 LTEXT "Torrent transfer rates (KB/s):", IDC_TL,195,27,115,8,SS_WORDELLIPSIS|SS_CENTERIMAGE336 RTEXT "Total", IDC_NCD,192,15,25,8,SS_WORDELLIPSIS|SS_CENTERIMAGE337 RTEXT "Up", IDC_NCU,255,15,20,8,SS_WORDELLIPSIS|SS_CENTERIMAGE338 RTEXT "Up", IDC_TLU,255,39,20,8,SS_WORDELLIPSIS|SS_CENTERIMAGE339 RTEXT "Down", IDC_TLD,192,39,25,8,SS_WORDELLIPSIS|SS_CENTERIMAGE340 RTEXT "Completed:", IDC_COMPLETED_STATIC,85,39,44,8,SS_WORDELLIPSIS|SS_CENTERIMAGE341 LTEXT "N/A", IDC_COMPLETE,132,39,58,8,SS_WORDELLIPSIS|SS_CENTERIMAGE342 GROUPBOX "", IDC_DETAILS_GROUP,1,-4,368,77,0,WS_EX_TRANSPARENT343 END 344 345 IDD_ABOUT DIALOGEX 0, 0, 325, 155326 RTEXT "Name:",HAL_NAME_STATIC,4,3,40,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 327 RTEXT "Tracker:",HAL_TRACKER_STATIC,4,15,40,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 328 RTEXT "Status:",HAL_STATUS_STATIC,4,27,40,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 329 RTEXT "Time left:",HAL_TIME_STATIC,4,39,40,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 330 LTEXT "N/A",HAL_NAME,45,3,145,10,SS_WORDELLIPSIS|SS_CENTERIMAGE 331 LTEXT "N/A",HAL_TRACKER,45,15,145,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 332 LTEXT "N/A",HAL_STATUS,45,27,145,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 333 LTEXT "N/A",HAL_AVAIL,45,39,36,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 334 LTEXT "Torrent connection limits:",HAL_NC,195,3,115,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 335 LTEXT "Torrent transfer rates (KB/s):",HAL_TL,195,27,115,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 336 RTEXT "Total",HAL_NCD,192,15,25,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 337 RTEXT "Up",HAL_NCU,255,15,20,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 338 RTEXT "Up",HAL_TLU,255,39,20,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 339 RTEXT "Down",HAL_TLD,192,39,25,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 340 RTEXT "Completed:",HAL_COMPLETED_STATIC,85,39,44,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 341 LTEXT "N/A",HAL_COMPLETE,132,39,58,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 342 GROUPBOX "",HAL_DETAILS_GROUP,1,-4,368,77,0,WS_EX_TRANSPARENT 343 END 344 345 HAL_ABOUT DIALOGEX 0, 0, 325, 155 346 346 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU 347 347 CAPTION "About" 348 348 FONT 8, "MS Shell Dlg", 400, 0, 0x1 349 349 BEGIN 350 // GROUPBOX "Program Information", IDC_ABOUT_GROUP,5,6,315,136,WS_EX_TRANSPARENT351 RTEXT HALITE_VERSION_STRING, IDC_ABOUT_VERSION,190,145,130,9,WS_TABSTOP352 LTEXT "", IDC_EDITABOUT,8,15,265,125,WS_TABSTOP353 CONTROL "", IDC_RICHEDITABOUT,"RichEdit20A",WS_CHILD|WS_BORDER|ES_MULTILINE|ES_READONLY|WS_VSCROLL|WS_TABSTOP,5,6,315,136354 END 355 356 IDD_ADVHALITEDLG DIALOGEX 0,0,317,72350 // GROUPBOX "Program Information",HAL_ABOUT_GROUP,5,6,315,136,WS_EX_TRANSPARENT 351 RTEXT HALITE_VERSION_STRING,HAL_ABOUT_VERSION,190,145,130,9,WS_TABSTOP 352 LTEXT "",HAL_EDITABOUT,8,15,265,125,WS_TABSTOP 353 CONTROL "",HAL_RICHEDITABOUT,"RichEdit20A",WS_CHILD|WS_BORDER|ES_MULTILINE|ES_READONLY|WS_VSCROLL|WS_TABSTOP,5,6,315,136 354 END 355 356 HAL_ADVHALITEDLG DIALOGEX 0,0,317,72 357 357 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILDWINDOW 358 358 FONT 8,"MS Shell Dlg",400,0,1 359 359 BEGIN 360 CONTROL "", IDC_TAB,"SysTabControl32",0,1,0,315,71361 RTEXT "Static", IDC_ADVDLG_VERSION,235,2,78,8,SS_CENTERIMAGE360 CONTROL "",HAL_TAB,"SysTabControl32",0,1,0,315,71 361 RTEXT "Static",HAL_ADVDLG_VERSION,235,2,78,8,SS_CENTERIMAGE 362 362 END 363 363 … … 376 376 FONT 8, "MS Shell Dlg", 400, 0, 0x1 377 377 BEGIN 378 LTEXT "Torrent save folder:", IDC_ADDT_DEFFLD_TEXT,0,0,215,8,SS_WORDELLIPSIS|SS_CENTERIMAGE379 EDITTEXT IDC_BC_SAVEFOLDER,5,5,195,13,ES_AUTOHSCROLL380 PUSHBUTTON "...", IDC_BC_SAVEBROWSE,205,5,18,13381 CONTROL "Move the completed torrent to:", IDC_ADDT_MOVETO_CHECK,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,5,38,220,8382 EDITTEXT IDC_ADDT_MOVETO_FOLDER,5,5,195,13,ES_AUTOHSCROLL383 PUSHBUTTON "...", IDC_ADDT_MOVETO_BROWSE,205,5,18,13384 END 385 386 387 IDD_ADD_TORRENT DIALOGEX 0, 0, 230, 124378 LTEXT "Torrent save folder:",HAL_ADDT_DEFFLD_TEXT,0,0,215,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 379 EDITTEXT HAL_BC_SAVEFOLDER,5,5,195,13,ES_AUTOHSCROLL 380 PUSHBUTTON "...",HAL_BC_SAVEBROWSE,205,5,18,13 381 CONTROL "Move the completed torrent to:",HAL_ADDT_MOVETO_CHECK,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,5,38,220,8 382 EDITTEXT HAL_ADDT_MOVETO_FOLDER,5,5,195,13,ES_AUTOHSCROLL 383 PUSHBUTTON "...",HAL_ADDT_MOVETO_BROWSE,205,5,18,13 384 END 385 386 387 HAL_ADD_TORRENT DIALOGEX 0, 0, 230, 124 388 388 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME 389 389 EXSTYLE WS_EX_STATICEDGE … … 394 394 PUSHBUTTON "Cancel",IDCANCEL,155,65,62,13 395 395 396 CONTROL "Use Compact Allocation.", IDC_CHECK_COMPACT,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,5,38,220,8397 CONTROL "Stopped initially (Allows changing advanced setting)", IDC_CHECK_PAUSED,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,5,25,220,8398 LTEXT "Note. Compact Allocation is incompatible with File Selection", IDC_ADDT_NOTE_TEXT,6,51,215,8,SS_WORDELLIPSIS|SS_CENTERIMAGE399 END 400 401 IDD_CONFIGGENERAL DIALOGEX 0, 0, 325, 90396 CONTROL "Use Compact Allocation.",HAL_CHECK_COMPACT,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,5,38,220,8 397 CONTROL "Stopped initially (Allows changing advanced setting)",HAL_CHECK_PAUSED,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,5,25,220,8 398 LTEXT "Note. Compact Allocation is incompatible with File Selection",HAL_ADDT_NOTE_TEXT,6,51,215,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 399 END 400 401 HAL_CONFIGGENERAL DIALOGEX 0, 0, 325, 90 402 402 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU 403 403 CAPTION "General" 404 404 FONT 8, "MS Shell Dlg", 400, 0, 0x1 405 405 BEGIN 406 CONTROL "Allow only one instance to run", IDC_GENERAL_ONEINST,406 CONTROL "Allow only one instance to run",HAL_GENERAL_ONEINST, 407 407 "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,16,150,11 408 GROUPBOX "General Settings", IDC_GENERAL_GROUP,5,6,315,77409 CONTROL "Advanced GUI", IDC_GENERAL_ADVGUI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,42,150,11410 CONTROL "Minimize to tray.", IDC_GENERAL_TRAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,29,150,11411 CONTROL "Close to tray", IDC_GENERAL_CLOSETRAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,42,150,11412 CONTROL "Confirm on close", IDC_GENERAL_CONFIRMCLOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,29,150,11413 LISTBOX IDC_LANGLIST,165,24,149,70,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP414 CTEXT "Language (requires restart)", IDC_GENERAL_LANG,165,13,150,8415 END 416 417 IDD_ADVTRACKER DIALOGEX 0,0,305,69408 GROUPBOX "General Settings",HAL_GENERAL_GROUP,5,6,315,77 409 CONTROL "Advanced GUI",HAL_GENERAL_ADVGUI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,42,150,11 410 CONTROL "Minimize to tray.",HAL_GENERAL_TRAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,29,150,11 411 CONTROL "Close to tray",HAL_GENERAL_CLOSETRAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,42,150,11 412 CONTROL "Confirm on close",HAL_GENERAL_CONFIRMCLOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,29,150,11 413 LISTBOX HAL_LANGLIST,165,24,149,70,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP 414 CTEXT "Language (requires restart)",HAL_GENERAL_LANG,165,13,150,8 415 END 416 417 HAL_ADVTRACKER DIALOGEX 0,0,305,69 418 418 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILDWINDOW 419 419 FONT 8,"MS Shell Dlg",400,0,1 420 420 BEGIN 421 LTEXT "List of Trackers.", IDC_TRACKER_LABEL,7,6,95,8,SS_WORDELLIPSIS|SS_CENTERIMAGE422 PUSHBUTTON "Apply", IDC_TRACKER_APPLY,126,3,32,14,WS_DISABLED423 PUSHBUTTON "Reset", IDC_TRACKER_RESET,92,3,32,14424 AUTOCHECKBOX "Send login info to trackers.", IDC_TRACKER_LOGINCHECK,166,4,101,12425 EDITTEXT IDC_TRACKER_USER,208,18,92,12,ES_AUTOHSCROLL426 EDITTEXT IDC_TRACKER_PASS,208,32,92,12,ES_AUTOHSCROLL | ES_PASSWORD427 RTEXT "Username : ", IDC_TRACKER_USER_S,164,20,42,8,SS_WORDELLIPSIS|SS_CENTERIMAGE428 RTEXT "Password : ", IDC_TRACKER_PASS_S,164,34,42,8,SS_WORDELLIPSIS|SS_CENTERIMAGE429 CONTROL "", IDC_TRACKERLIST,"SysListView32",WS_BORDER | LVS_ALIGNLEFT | LVS_REPORT,4,19,154,47430 PUSHBUTTON "Apply", IDC_LOGIN_APPLY,207,46,51,14,BS_DEFPUSHBUTTON431 PUSHBUTTON "Reannounce", IDC_REANNOUNCE,207,46,51,14432 END 433 434 IDD_ADVDEBUGLOG DIALOGEX 0,0,305,81421 LTEXT "List of Trackers.",HAL_TRACKER_LABEL,7,6,95,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 422 PUSHBUTTON "Apply",HAL_TRACKER_APPLY,126,3,32,14,WS_DISABLED 423 PUSHBUTTON "Reset",HAL_TRACKER_RESET,92,3,32,14 424 AUTOCHECKBOX "Send login info to trackers.",HAL_TRACKER_LOGINCHECK,166,4,101,12 425 EDITTEXT HAL_TRACKER_USER,208,18,92,12,ES_AUTOHSCROLL 426 EDITTEXT HAL_TRACKER_PASS,208,32,92,12,ES_AUTOHSCROLL | ES_PASSWORD 427 RTEXT "Username : ",HAL_TRACKER_USER_S,164,20,42,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 428 RTEXT "Password : ",HAL_TRACKER_PASS_S,164,34,42,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 429 CONTROL "",HAL_TRACKERLIST,"SysListView32",WS_BORDER | LVS_ALIGNLEFT | LVS_REPORT,4,19,154,47 430 PUSHBUTTON "Apply",HAL_LOGIN_APPLY,207,46,51,14,BS_DEFPUSHBUTTON 431 PUSHBUTTON "Reannounce",HAL_REANNOUNCE,207,46,51,14 432 END 433 434 HAL_ADVDEBUGLOG DIALOGEX 0,0,305,81 435 435 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILDWINDOW 436 436 FONT 8,"MS Shell Dlg",400,0,1 437 437 BEGIN 438 CONTROL "", IDC_DEBUGLISTVIEW,"SysListView32",WS_TABSTOP|WS_BORDER|LVS_ALIGNLEFT|LVS_REPORT,4,7,296,59439 AUTOCHECKBOX "Log to file.", IDC_DEBUGFILECHECK,4,69,44,9440 AUTOCHECKBOX "Log debug events.", IDC_DEBUGDEBUGCHECK,48,69,198,9441 END 442 443 IDD_NEWTORRENT DIALOGEX 0,0,229,132438 CONTROL "",HAL_DEBUGLISTVIEW,"SysListView32",WS_TABSTOP|WS_BORDER|LVS_ALIGNLEFT|LVS_REPORT,4,7,296,59 439 AUTOCHECKBOX "Log to file.",HAL_DEBUGFILECHECK,4,69,44,9 440 AUTOCHECKBOX "Log debug events.",HAL_DEBUGDEBUGCHECK,48,69,198,9 441 END 442 443 HAL_NEWTORRENT DIALOGEX 0,0,229,132 444 444 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILDWINDOW | WS_CLIPCHILDREN 445 445 CAPTION "Details" 446 446 FONT 8,"MS Shell Dlg",400,0,1 447 447 BEGIN 448 LTEXT "Enter the tracker URLs for the torrent.", IDC_NEWTORRENT_TRACKERS_TEXT,4,32,221,11,NOT WS_VISIBLE449 EDITTEXT IDC_NEWT_TRACKER,4,42,193,12,ES_AUTOHSCROLL|NOT WS_VISIBLE450 // AUTOCHECKBOX "Have Halite acts a DHT node.", IDC_NEWT_DHTNODE,4,116,118,8,WS_DISABLED451 AUTOCHECKBOX "Private", IDC_NEWTORRENT_PRIVATE,4,116,118,8452 LTEXT "Comment", IDC_NEWTORRENT_COMMENT_TEXT,4,4,50,11,SS_WORDELLIPSIS|SS_CENTERIMAGE453 EDITTEXT IDC_NEWTORRENT_COMMENT,4,15,203,12,ES_AUTOHSCROLL454 LTEXT "Creator", IDC_NEWTORRENT_CREATOR_TEXT,4,4,50,11,SS_WORDELLIPSIS|SS_CENTERIMAGE455 EDITTEXT IDC_NEWTORRENT_CREATOR,4,15,203,12,ES_AUTOHSCROLL448 LTEXT "Enter the tracker URLs for the torrent.",HAL_NEWTORRENT_TRACKERS_TEXT,4,32,221,11,NOT WS_VISIBLE 449 EDITTEXT HAL_NEWT_TRACKER,4,42,193,12,ES_AUTOHSCROLL|NOT WS_VISIBLE 450 // AUTOCHECKBOX "Have Halite acts a DHT node.",HAL_NEWT_DHTNODE,4,116,118,8,WS_DISABLED 451 AUTOCHECKBOX "Private",HAL_NEWTORRENT_PRIVATE,4,116,118,8 452 LTEXT "Comment",HAL_NEWTORRENT_COMMENT_TEXT,4,4,50,11,SS_WORDELLIPSIS|SS_CENTERIMAGE 453 EDITTEXT HAL_NEWTORRENT_COMMENT,4,15,203,12,ES_AUTOHSCROLL 454 LTEXT "Creator",HAL_NEWTORRENT_CREATOR_TEXT,4,4,50,11,SS_WORDELLIPSIS|SS_CENTERIMAGE 455 EDITTEXT HAL_NEWTORRENT_CREATOR,4,15,203,12,ES_AUTOHSCROLL 456 456 LTEXT "Piece Size (KBs)",HAL_NEWT_PIECESIZE_TEXT,4,4,50,11,SS_WORDELLIPSIS|SS_CENTERIMAGE 457 457 EDITTEXT HAL_NEWT_PIECESIZE,4,15,203,12,ES_AUTOHSCROLL|ES_NUMBER 458 LTEXT "Output File", IDC_NEWT_OUTFILE_TEXT,4,4,50,11,SS_WORDELLIPSIS|SS_CENTERIMAGE459 EDITTEXT IDC_NEWT_FILE,4,15,203,12,ES_AUTOHSCROLL460 PUSHBUTTON "...", IDC_NEWT_OUT_BROWSE,212,14,18,13461 END 462 463 IDD_NEWT_FILES DIALOGEX 0,0,186,50458 LTEXT "Output File",HAL_NEWT_OUTFILE_TEXT,4,4,50,11,SS_WORDELLIPSIS|SS_CENTERIMAGE 459 EDITTEXT HAL_NEWT_FILE,4,15,203,12,ES_AUTOHSCROLL 460 PUSHBUTTON "...",HAL_NEWT_OUT_BROWSE,212,14,18,13 461 END 462 463 HAL_NEWT_FILES DIALOGEX 0,0,186,50 464 464 STYLE DS_SETFONT | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME 465 465 EXSTYLE WS_EX_TOOLWINDOW … … 467 467 FONT 8,"MS Shell Dlg",400,0,1 468 468 BEGIN 469 LTEXT "Select a file or directory from which to construct the torrent.", IDC_NEWTORRENT_SELECT_TEXT,4,4,221,11,SS_WORDELLIPSIS|SS_CENTERIMAGE470 PUSHBUTTON "File", IDC_NEWT_FILE_BROWSE,212,14,40,13471 PUSHBUTTON "Dir.", IDC_NEWT_DIR_BROWSE,212,14,40,13472 CONTROL "", IDC_NEWT_LISTFILES,"SysListView32",WS_TABSTOP | WS_BORDER | LVS_ALIGNLEFT | LVS_REPORT,4,7,296,59469 LTEXT "Select a file or directory from which to construct the torrent.",HAL_NEWTORRENT_SELECT_TEXT,4,4,221,11,SS_WORDELLIPSIS|SS_CENTERIMAGE 470 PUSHBUTTON "File",HAL_NEWT_FILE_BROWSE,212,14,40,13 471 PUSHBUTTON "Dir.",HAL_NEWT_DIR_BROWSE,212,14,40,13 472 CONTROL "",HAL_NEWT_LISTFILES,"SysListView32",WS_TABSTOP | WS_BORDER | LVS_ALIGNLEFT | LVS_REPORT,4,7,296,59 473 473 LTEXT "Generated Torrent Name (Cannot change)",HAL_NEWT_FILE_NAME,4,4,221,11,SS_WORDELLIPSIS|SS_CENTERIMAGE 474 474 EDITTEXT HAL_NEWT_FILE_NAME_EDIT,4,15,203,12,ES_AUTOHSCROLL|ES_READONLY 475 475 END 476 476 477 IDD_NEWT_TRACKERS DIALOGEX 0,0,229,132477 HAL_NEWT_TRACKERS DIALOGEX 0,0,229,132 478 478 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILDWINDOW | WS_CLIPCHILDREN 479 479 CAPTION "Trackers" 480 480 FONT 8,"MS Shell Dlg",400,0,1 481 481 BEGIN 482 CONTROL "", IDC_NEWT_LISTTRACKERS,"SysListView32",WS_TABSTOP | WS_BORDER | LVS_ALIGNLEFT | LVS_REPORT,4,7,296,59483 // LISTBOX IDC_NEWT_LISTTRACKERS,4,57,221,52,WS_TABSTOP|WS_VSCROLL|LBS_NOINTEGRALHEIGHT|LBS_SORT484 LTEXT "Enter the tracker URLs for the torrent.", IDC_NEWTORRENT_TRACKERS_TEXT,4,32,221,11,SS_WORDELLIPSIS|SS_CENTERIMAGE485 EDITTEXT IDC_NEWT_TRACKER,4,42,160,12,ES_AUTOHSCROLL|NOT WS_VISIBLE486 EDITTEXT IDC_NEWT_TRACKERTIER,170,42,25,12,ES_AUTOHSCROLL|ES_NUMBER|NOT WS_VISIBLE487 PUSHBUTTON "Add", IDC_NEWT_ADDTRACKER,202,41,23,13,NOT WS_VISIBLE488 END 489 490 IDD_NEWT_PEERS DIALOGEX 0,0,229,132482 CONTROL "",HAL_NEWT_LISTTRACKERS,"SysListView32",WS_TABSTOP | WS_BORDER | LVS_ALIGNLEFT | LVS_REPORT,4,7,296,59 483 // LISTBOX HAL_NEWT_LISTTRACKERS,4,57,221,52,WS_TABSTOP|WS_VSCROLL|LBS_NOINTEGRALHEIGHT|LBS_SORT 484 LTEXT "Enter the tracker URLs for the torrent.",HAL_NEWTORRENT_TRACKERS_TEXT,4,32,221,11,SS_WORDELLIPSIS|SS_CENTERIMAGE 485 EDITTEXT HAL_NEWT_TRACKER,4,42,160,12,ES_AUTOHSCROLL|NOT WS_VISIBLE 486 EDITTEXT HAL_NEWT_TRACKERTIER,170,42,25,12,ES_AUTOHSCROLL|ES_NUMBER|NOT WS_VISIBLE 487 PUSHBUTTON "Add",HAL_NEWT_ADDTRACKER,202,41,23,13,NOT WS_VISIBLE 488 END 489 490 HAL_NEWT_PEERS DIALOGEX 0,0,229,132 491 491 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILDWINDOW | WS_CLIPCHILDREN 492 492 CAPTION "Web Seeds and DHT Nodes" 493 493 FONT 8,"MS Shell Dlg",400,0,1 494 494 BEGIN 495 CONTROL "", IDC_NEWT_LISTPEERS,"SysListView32",WS_TABSTOP | WS_BORDER | LVS_ALIGNLEFT | LVS_REPORT,4,7,296,59496 // LISTBOX IDC_NEWT_LISTTRACKERS,4,57,221,52,WS_TABSTOP|WS_VSCROLL|LBS_NOINTEGRALHEIGHT|LBS_SORT497 LTEXT "Enter any Web Seed URLs and DHT Nodes.", IDC_NEWTORRENT_PEERS_TEXT,4,32,221,11,SS_WORDELLIPSIS|SS_CENTERIMAGE498 END 499 500 IDD_TRACKEDIT DIALOGEX 0,0,186,50495 CONTROL "",HAL_NEWT_LISTPEERS,"SysListView32",WS_TABSTOP | WS_BORDER | LVS_ALIGNLEFT | LVS_REPORT,4,7,296,59 496 // LISTBOX HAL_NEWT_LISTTRACKERS,4,57,221,52,WS_TABSTOP|WS_VSCROLL|LBS_NOINTEGRALHEIGHT|LBS_SORT 497 LTEXT "Enter any Web Seed URLs and DHT Nodes.",HAL_NEWTORRENT_PEERS_TEXT,4,32,221,11,SS_WORDELLIPSIS|SS_CENTERIMAGE 498 END 499 500 HAL_TRACKEDIT DIALOGEX 0,0,186,50 501 501 STYLE DS_SETFONT | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME 502 502 EXSTYLE WS_EX_TOOLWINDOW … … 506 506 PUSHBUTTON "OK",IDOK,78,32,50,14,BS_DEFPUSHBUTTON 507 507 PUSHBUTTON "Cancel",IDCANCEL,132,32,50,14 508 LTEXT "URL", IDC_TRACKER_TEXT_URL,4,5,100,10509 EDITTEXT IDC_TRACKER_EDIT_URL,4,15,134,13,ES_AUTOHSCROLL510 EDITTEXT IDC_TRACKER_EDIT_TIER,142,15,40,13,ES_AUTOHSCROLL511 LTEXT "Tier", IDC_TRACKER_TEXT_TIER,142,5,40,10512 END 513 514 IDD_PEEREDIT DIALOGEX 0,0,240,50508 LTEXT "URL",HAL_TRACKER_TEXT_URL,4,5,100,10 509 EDITTEXT HAL_TRACKER_EDIT_URL,4,15,134,13,ES_AUTOHSCROLL 510 EDITTEXT HAL_TRACKER_EDIT_TIER,142,15,40,13,ES_AUTOHSCROLL 511 LTEXT "Tier",HAL_TRACKER_TEXT_TIER,142,5,40,10 512 END 513 514 HAL_PEEREDIT DIALOGEX 0,0,240,50 515 515 STYLE DS_SETFONT | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME 516 516 EXSTYLE WS_EX_TOOLWINDOW … … 528 528 END 529 529 530 IDD_ADVPEER DIALOGEX 0, 0, 305, 69530 HAL_ADVPEER DIALOGEX 0, 0, 305, 69 531 531 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD 532 532 FONT 8, "MS Shell Dlg", 400, 0, 0x1 533 533 BEGIN 534 CONTROL "", IDC_PEERLIST,"SysListView32",LVS_REPORT | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,4,7,297,59535 END 536 537 IDD_ADVFILES DIALOGEX 0, 0, 305, 81534 CONTROL "",HAL_PEERLIST,"SysListView32",LVS_REPORT | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,4,7,297,59 535 END 536 537 HAL_ADVFILES DIALOGEX 0, 0, 305, 81 538 538 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD 539 539 FONT 8, "MS Shell Dlg", 400, 0, 0x1 540 540 BEGIN 541 LTEXT "", IDC_CONTAINER,4,7,297,70,0542 END 543 544 IDD_PROGRESS DIALOGEX 0,0,191,60541 LTEXT "",HAL_CONTAINER,4,7,297,70,0 542 END 543 544 HAL_PROGRESS DIALOGEX 0,0,191,60 545 545 STYLE DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP 546 546 EXSTYLE WS_EX_TOOLWINDOW | WS_EX_STATICEDGE … … 548 548 FONT 8,"MS Shell Dlg",400,0,1 549 549 BEGIN 550 CTEXT "", IDC_PROG_DESCP,6,6,180,12551 CONTROL "", IDC_PROG_PROGRESS,"msctls_progress32",WS_BORDER,6,22,180,12552 PUSHBUTTON "Cancel", IDC_PROG_CANCEL,60,42,66,15553 END 554 555 IDR_TRAY_MENU MENU550 CTEXT "",HAL_PROG_DESCP,6,6,180,12 551 CONTROL "",HAL_PROG_PROGRESS,"msctls_progress32",WS_BORDER,6,22,180,12 552 PUSHBUTTON "Cancel",HAL_PROG_CANCEL,60,42,66,15 553 END 554 555 HAL_TRAY_MENU MENU 556 556 BEGIN 557 557 POPUP "_POPUP_" … … 566 566 END 567 567 568 IDR_LISTVIEW_MENU MENU568 HAL_LISTVIEW_MENU MENU 569 569 BEGIN 570 570 POPUP "_POPUP_" … … 587 587 END 588 588 589 IDR_TRACKERLV_MENU MENU589 HAL_TRACKERLV_MENU MENU 590 590 BEGIN 591 591 POPUP "_POPUP_" … … 757 757 END 758 758 759 IDR_FILESLISTVIEW_MENU MENU759 HAL_FILESLISTVIEW_MENU MENU 760 760 BEGIN 761 761 POPUP "_POPUP_" … … 775 775 END 776 776 777 IDR_MAINFRAME TOOLBAR 22,22777 HAL_MAINFRAME TOOLBAR 22,22 778 778 BEGIN 779 779 BUTTON ID_FILE_NEW … … 789 789 END 790 790 791 IDR_APP_ICON ICON "Halite.ico"792 IDR_MAINFRAME BITMAP "toolbar.bmp"791 HAL_APP_ICON ICON "Halite.ico" 792 HAL_MAINFRAME BITMAP "toolbar.bmp" 793 793 794 794 STRINGTABLE … … 834 834 #if 0 835 835 836 IDD_DIALOG1 DIALOGEX 0, 0, 186, 95836 HAL_DIALOG1 DIALOGEX 0, 0, 186, 95 837 837 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU 838 838 CAPTION "Dialog" … … 843 843 END 844 844 845 IDD_DIALOG2 DIALOGEX 0, 0, 186, 94845 HAL_DIALOG2 DIALOGEX 0, 0, 186, 94 846 846 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME 847 847 CAPTION "Dialog" … … 852 852 END 853 853 854 IDD_DIALOG3 DIALOGEX 0, 0, 186, 95854 HAL_DIALOG3 DIALOGEX 0, 0, 186, 95 855 855 STYLE DS_SETFONT | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME 856 856 EXSTYLE WS_EX_TOOLWINDOW … … 862 862 END 863 863 864 IDD_DIALOG4 DIALOGEX 0, 0, 186, 94864 HAL_DIALOG4 DIALOGEX 0, 0, 186, 94 865 865 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_SYSMENU 866 866 FONT 8, "MS Shell Dlg", 400, 0, 0x1 -
trunk/res/resource.h
r460 r495 5 5 // http://www.boost.org/LICENSE_1_0.txt) 6 6 7 #ifndef IDC_STATIC8 #define IDC_STATIC (-1)7 #ifndef HAL_STATIC 8 #define HAL_STATIC (-1) 9 9 #endif 10 10 11 11 #define HALITE_LANGUAGE 10 12 #define IDC_DEBUGLISTVIEW 113 #define IDR_LISTVIEW_MENU 10114 #define IDD_CONFIGBIT 10215 #define IDD_CONFIGREMOTE 10316 #define IDD_CONFIGSECURITY 10817 #define IDD_CONFIGPROXY 10918 #define IDD_ABOUT 10419 #define IDD_CLOSESPLASH 10520 #define IDD_HALITEDLG 10621 #define IDR_TRAY_MENU 10722 #define IDD_CONFIGGENERAL 11223 #define IDD_ADVHALITEDLG 11424 #define IDR_APP_ICON 11425 #define IDD_THEMETEST 11526 #define IDD_DEBUGDIALOG 11627 #define IDD_CONFIGTORRENT 11828 #define IDD_ADVOVERVIEW 11929 #define IDD_ADVTRACKER 12030 #define IDD_ADVDEBUGLOG 12131 #define IDR_MAINFRAME 12832 #define IDD_TRACKEDIT 13033 #define IDD_ADVPEER 13134 #define IDD_NEWTORRENT 13335 #define IDD_NEWT_TRACKERS 13436 #define IDD_NEWT_PEERS 13537 #define IDR_TRACKERLV_MENU 13212 #define HAL_DEBUGLISTVIEW 1 13 #define HAL_LISTVIEW_MENU 101 14 #define HAL_CONFIGBIT 102 15 #define HAL_CONFIGREMOTE 103 16 #define HAL_CONFIGSECURITY 108 17 #define HAL_CONFIGPROXY 109 18 #define HAL_ABOUT 104 19 #define HAL_CLOSESPLASH 105 20 #define HAL_HALITEDLG 106 21 #define HAL_TRAY_MENU 107 22 #define HAL_CONFIGGENERAL 112 23 #define HAL_ADVHALITEDLG 114 24 #define HAL_APP_ICON 114 25 #define HAL_THEMETEST 115 26 #define HAL_DEBUGDIALOG 116 27 #define HAL_CONFIGTORRENT 118 28 #define HAL_ADVOVERVIEW 119 29 #define HAL_ADVTRACKER 120 30 #define HAL_ADVDEBUGLOG 121 31 #define HAL_MAINFRAME 128 32 #define HAL_TRACKEDIT 130 33 #define HAL_ADVPEER 131 34 #define HAL_NEWTORRENT 133 35 #define HAL_NEWT_TRACKERS 134 36 #define HAL_NEWT_PEERS 135 37 #define HAL_TRACKERLV_MENU 132 38 38 #define HAL_GENERIC_ADD_LV_MENU 136 39 #define IDD_PEEREDIT 13740 #define IDD_NEWT_FILES 13841 #define IDC_TRANS_SES 100442 #define IDC_TRANS_ETA 100543 #define IDC_PEERPROXY 100044 #define IDC_WEBPROXY 100145 #define IDC_TRACKERPROXY 100246 #define IDC_DHTPROXY 100347 #define IDC_TRANS 100039 #define HAL_PEEREDIT 137 40 #define HAL_NEWT_FILES 138 41 #define HAL_TRANS_SES 1004 42 #define HAL_TRANS_ETA 1005 43 #define HAL_PEERPROXY 1000 44 #define HAL_WEBPROXY 1001 45 #define HAL_TRACKERPROXY 1002 46 #define HAL_DHTPROXY 1003 47 #define HAL_TRANS 1000 48 48 #define LISTPEERS 1000 49 #define IDC_PEERLIST 100050 #define IDC_RATIOSTAT 100151 #define IDC_PEER_EDIT_TYPE 100152 #define IDC_RATIOESTATIC 100253 #define IDC_PEER_EDIT_URL 100254 #define IDC_TRACKER_RESET 100255 #define IDC_BC_DHTPORT_S 100356 #define IDC_TRACKER_APPLY 100349 #define HAL_PEERLIST 1000 50 #define HAL_RATIOSTAT 1001 51 #define HAL_PEER_EDIT_TYPE 1001 52 #define HAL_RATIOESTATIC 1002 53 #define HAL_PEER_EDIT_URL 1002 54 #define HAL_TRACKER_RESET 1002 55 #define HAL_BC_DHTPORT_S 1003 56 #define HAL_TRACKER_APPLY 1003 57 57 #define TORRENTPROG 1003 58 #define IDC_BC_DHTPORT 100459 #define IDC_COMPLETE 100458 #define HAL_BC_DHTPORT 1004 59 #define HAL_COMPLETE 1004 60 60 #define ID_SETTINGS 1004 61 #define IDC_BC_PROMPTSAVE 100561 #define HAL_BC_PROMPTSAVE 1005 62 62 #define ID_RESUME 1005 63 63 #define ID_PAUSE 1006 64 #define IDC_SPLASH_MSG 100765 #define IDC_NAME 100866 #define IDC_TRACKER 100967 #define IDC_STATUS 101068 #define IDC_AVAIL 101169 #define IDC_EDITTLU 101470 #define IDC_EDITTLD 101571 #define IDC_EDITNCD 101672 #define IDC_EDITNCU 101773 #define IDC_EDITRATIO 101874 #define IDC_TLD 101964 #define HAL_SPLASH_MSG 1007 65 #define HAL_NAME 1008 66 #define HAL_TRACKER 1009 67 #define HAL_STATUS 1010 68 #define HAL_AVAIL 1011 69 #define HAL_EDITTLU 1014 70 #define HAL_EDITTLD 1015 71 #define HAL_EDITNCD 1016 72 #define HAL_EDITNCU 1017 73 #define HAL_EDITRATIO 1018 74 #define HAL_TLD 1019 75 75 #define BTNREMOVE 1012 76 76 #define BTNREANNOUNCE 1013 77 77 #define BTNPAUSE 1034 78 #define IDC_TLU 102079 #define IDC_TL 102180 #define IDC_NCU 102281 #define IDC_NCD 102382 #define IDC_DETAILS_GROUP 102483 #define IDC_BC_MAXCONN 102584 #define IDC_UPDATE 102585 #define IDC_BC_TMAXCONN 102686 #define IDC_REMOTECTRL 102687 #define IDC_BC_MAXUP 102788 #define IDC_RATIO 102789 #define IDC_BC_TMAXUP 102890 #define IDC_ETA 102891 #define IDC_REMOTEPORT 102892 #define IDC_BC_PORTFROM 102993 #define IDC_BC_SAVEFOLDER 102994 #define IDC_BC_PORTTO 103095 #define IDC_BC_DOWNRATE 103196 #define IDC_BC_TDOWNRATE 103297 #define IDC_BC_UPRATE 103378 #define HAL_TLU 1020 79 #define HAL_TL 1021 80 #define HAL_NCU 1022 81 #define HAL_NCD 1023 82 #define HAL_DETAILS_GROUP 1024 83 #define HAL_BC_MAXCONN 1025 84 #define HAL_UPDATE 1025 85 #define HAL_BC_TMAXCONN 1026 86 #define HAL_REMOTECTRL 1026 87 #define HAL_BC_MAXUP 1027 88 #define HAL_RATIO 1027 89 #define HAL_BC_TMAXUP 1028 90 #define HAL_ETA 1028 91 #define HAL_REMOTEPORT 1028 92 #define HAL_BC_PORTFROM 1029 93 #define HAL_BC_SAVEFOLDER 1029 94 #define HAL_BC_PORTTO 1030 95 #define HAL_BC_DOWNRATE 1031 96 #define HAL_BC_TDOWNRATE 1032 97 #define HAL_BC_UPRATE 1033 98 98 #define BTNPAUSE 1034 99 #define IDC_BC_TUPRATE 1034100 #define IDC_NEWT_BROWSE 1035101 #define IDC_NEWT_FILE 1036102 #define IDC_NEWT_TRACKER 1037103 #define IDC_NEWT_LISTTRACKERS 1038104 #define IDC_NEWT_DHTNODE 1039105 #define IDC_NEWT_ADDTRACKER 1040106 #define IDC_BUTTON1 1041107 #define IDC_EDIT1 1042108 #define IDC_EDIT2 1043109 #define IDC_GENERAL_ONEINST 1043110 #define IDC_GENERAL_ADVGUI 1044111 #define IDC_TAB 1044112 #define IDC_CHECK1 1045113 #define IDC_GENERAL_TRAY 1045114 #define IDC_RADIO1 1046115 #define IDC_BC_DHT 1048116 #define IDC_BC_FILTERCHECK 1049117 #define IDC_BC_FILTERLOAD 1052118 #define IDC_BC_FILTERCLEAR 1053119 #define IDC_BC_PROXYIP 1055120 #define IDC_BC_PROXYPORT 1056121 #define IDC_BC_PROXYIP_S 1057122 #define IDC_BC_PROXYPORT_S 1058123 #define IDC_BC_PROXYUSER 1059124 #define IDC_BC_PROXYUSER_S 1060125 #define IDC_BC_PROXYPASS_S 1061126 #define IDC_BC_PROXYPASS 1062127 #define IDC_BC_PROXYCHECK 1063128 #define IDC_BC_PORTCHECK 1064129 #define IDC_BC_SAVEBROWSE 106499 #define HAL_BC_TUPRATE 1034 100 #define HAL_NEWT_BROWSE 1035 101 #define HAL_NEWT_FILE 1036 102 #define HAL_NEWT_TRACKER 1037 103 #define HAL_NEWT_LISTTRACKERS 1038 104 #define HAL_NEWT_DHTNODE 1039 105 #define HAL_NEWT_ADDTRACKER 1040 106 #define HAL_BUTTON1 1041 107 #define HAL_EDIT1 1042 108 #define HAL_EDIT2 1043 109 #define HAL_GENERAL_ONEINST 1043 110 #define HAL_GENERAL_ADVGUI 1044 111 #define HAL_TAB 1044 112 #define HAL_CHECK1 1045 113 #define HAL_GENERAL_TRAY 1045 114 #define HAL_RADIO1 1046 115 #define HAL_BC_DHT 1048 116 #define HAL_BC_FILTERCHECK 1049 117 #define HAL_BC_FILTERLOAD 1052 118 #define HAL_BC_FILTERCLEAR 1053 119 #define HAL_BC_PROXYIP 1055 120 #define HAL_BC_PROXYPORT 1056 121 #define HAL_BC_PROXYIP_S 1057 122 #define HAL_BC_PROXYPORT_S 1058 123 #define HAL_BC_PROXYUSER 1059 124 #define HAL_BC_PROXYUSER_S 1060 125 #define HAL_BC_PROXYPASS_S 1061 126 #define HAL_BC_PROXYPASS 1062 127 #define HAL_BC_PROXYCHECK 1063 128 #define HAL_BC_PORTCHECK 1064 129 #define HAL_BC_SAVEBROWSE 1064 130 130 #define ID_ADVANCED 1064 131 #define IDC_TRACKERLIST 1066132 #define IDC_TRACKER_LOGINCHECK 1067133 #define IDC_TRACKER_USER_S 1068134 #define IDC_TRACKER_PASS_S 1069135 #define IDC_TRACKER_USER 1070136 #define IDC_TRACKER_PASS 1071137 #define IDC_DEBUGFILECHECK 1078138 #define IDC_DEBUGDEBUGCHECK 1079139 #define IDC_GROUP_TORRENT 1080140 #define IDC_GROUP_TRACKER 1081141 #define IDC_UPDATESTAT 1082142 #define IDC_NC 1083143 #define IDC_ADVDLG_VERSION 1084144 #define IDC_LANGLIST 1085145 #define IDC_EDITABOUT 1086146 #define IDC_SC_ENABLE_PE 1087147 #define IDC_SC_PE_ENC_PLAIN 1088148 #define IDC_SC_PE_ENC_RC4 1089149 #define IDC_SC_PE_ENC_BOTH 1090150 #define IDC_SC_PE_ENC_RC4_PERFER 1091151 #define IDC_SC_PE_CP_IN_FORCED 1092152 #define IDC_SC_PE_CP_IN_DISABLED 1093153 #define IDC_SC_PE_CP_IN_ENABLED 1094154 #define IDC_SC_PE_CP_OUT_DISABLED 1095155 #define IDC_SC_PE_CP_OUT_ENABLED 1096156 #define IDC_SC_PE_CP_OUT_FORCED 1097157 #define IDC_SC_HELP_LINK 1098158 #define IDC_BC_HELP_LINK 1098159 #define IDC_BC_CON_WHY 1099160 #define IDC_BC_HALFCONN_CHECK 1100161 #define IDC_BC_HALFCONN_NUM 1101131 #define HAL_TRACKERLIST 1066 132 #define HAL_TRACKER_LOGINCHECK 1067 133 #define HAL_TRACKER_USER_S 1068 134 #define HAL_TRACKER_PASS_S 1069 135 #define HAL_TRACKER_USER 1070 136 #define HAL_TRACKER_PASS 1071 137 #define HAL_DEBUGFILECHECK 1078 138 #define HAL_DEBUGDEBUGCHECK 1079 139 #define HAL_GROUP_TORRENT 1080 140 #define HAL_GROUP_TRACKER 1081 141 #define HAL_UPDATESTAT 1082 142 #define HAL_NC 1083 143 #define HAL_ADVDLG_VERSION 1084 144 #define HAL_LANGLIST 1085 145 #define HAL_EDITABOUT 1086 146 #define HAL_SC_ENABLE_PE 1087 147 #define HAL_SC_PE_ENC_PLAIN 1088 148 #define HAL_SC_PE_ENC_RC4 1089 149 #define HAL_SC_PE_ENC_BOTH 1090 150 #define HAL_SC_PE_ENC_RC4_PERFER 1091 151 #define HAL_SC_PE_CP_IN_FORCED 1092 152 #define HAL_SC_PE_CP_IN_DISABLED 1093 153 #define HAL_SC_PE_CP_IN_ENABLED 1094 154 #define HAL_SC_PE_CP_OUT_DISABLED 1095 155 #define HAL_SC_PE_CP_OUT_ENABLED 1096 156 #define HAL_SC_PE_CP_OUT_FORCED 1097 157 #define HAL_SC_HELP_LINK 1098 158 #define HAL_BC_HELP_LINK 1098 159 #define HAL_BC_CON_WHY 1099 160 #define HAL_BC_HALFCONN_CHECK 1100 161 #define HAL_BC_HALFCONN_NUM 1101 162 162 #define ED_CON 3000 163 163 #define IDPANE_STATUS 40000 … … 215 215 #define HAL_AUTOSORT 40095 216 216 #define ID_LVM_AUTOSORT 40096 217 #define IDR_BLANK_MENU 40097217 #define HAL_BLANK_MENU 40097 218 218 #define HAL_PAYLOAD_SUMMARY 40098 219 219 #define HAL_NAME_SUMMARY 40099 220 #define IDC_NAME_STATUS 40100 221 #define IDC_SECOND 40101 222 #define IDC_TRANSFERED 40102 223 #define IDC_REMAINING 40103 224 #define IDC_RATE 40104 225 #define HAL_NAME_STATUS 40105 226 #define HAL_SECOND 40106 227 #define HAL_TRANSFERED 40107 228 #define HAL_REMAINING 40108 229 #define HAL_RATE 40109 230 #define IDC_RICHEDITABOUT 40110 231 #define IDR_ABOUT_TEXT 40111 220 #define HAL_NAME_STATUS 40100 221 #define HAL_SECOND 40101 222 #define HAL_TRANSFERED 40102 223 #define HAL_REMAINING 40103 224 #define HAL_RATE 40104 225 #define HAL_RICHEDITABOUT 40110 226 #define HAL_ABOUT_TEXT 40111 232 227 #define HALITE_RTF_RES_TYPE 40112 233 228 234 #define IDC_NAME_STATUS_LABEL 40113235 #define IDC_PEERS_LABEL 40114236 #define IDC_TRANSFERED_LABEL 40115237 #define IDC_REMAINING_LABEL 40116238 #define IDC_RATE_LABEL 40117239 #define IDC_SEEDS_LABEL 40118240 #define IDC_OVERHEAD_LABEL 40119241 #define IDC_ETA_LABEL 40120242 #define IDC_RATIO_LABEL 40121229 #define HAL_NAME_STATUS_LABEL 40113 230 #define HAL_PEERS_LABEL 40114 231 #define HAL_TRANSFERED_LABEL 40115 232 #define HAL_REMAINING_LABEL 40116 233 #define HAL_RATE_LABEL 40117 234 #define HAL_SEEDS_LABEL 40118 235 #define HAL_OVERHEAD_LABEL 40119 236 #define HAL_ETA_LABEL 40120 237 #define HAL_RATIO_LABEL 40121 243 238 244 #define IDC_SEEDS 40122245 #define IDC_OVERHEAD 40123246 #define IDC_PEERS 40127247 #define IDD_ADVFILES 40129248 #define IDC_CONTAINER 40130239 #define HAL_SEEDS 40122 240 #define HAL_OVERHEAD 40123 241 #define HAL_PEERS 40127 242 #define HAL_ADVFILES 40129 243 #define HAL_CONTAINER 40130 249 244 #define HAL_FILES_TAB 40131 250 245 #define HAL_DIALOGFILE_LISTVIEW_ADV 40132 … … 268 263 #define ID_HAL_FILE_PRIORITY_6 40148 269 264 #define ID_HAL_FILE_PRIORITY_7 40149 270 #define IDR_FILESLISTVIEW_MENU 40150271 272 #define IDD_ADD_TORRENT 40200273 #define IDC_CHECK_COMPACT 40201274 #define IDC_CHECK_PAUSED 40202265 #define HAL_FILESLISTVIEW_MENU 40150 266 267 #define HAL_ADD_TORRENT 40200 268 #define HAL_CHECK_COMPACT 40201 269 #define HAL_CHECK_PAUSED 40202 275 270 #define HAL_INF 40203 276 271 #define HAL_HALITE 40204 277 #define IDR_NEWT_TRACKERLV_MENU 40300272 #define HAL_NEWT_TRACKERLV_MENU 40300 278 273 279 274 #ifndef HAL_NA -
trunk/sln/Halite/Halite.vcproj
r494 r495 1026 1026 </File> 1027 1027 <File 1028 RelativePath="..\..\src\NewTorrentTrackerAD.hpp" 1029 > 1030 </File> 1031 <File 1028 1032 RelativePath="..\..\src\NewTorrentTrackerLV.hpp" 1029 1033 > -
trunk/sln/libtorrent/libtorrent.vcproj
r491 r495 733 733 UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" 734 734 > 735 <File736 RelativePath="..\..\lib\libtorrent\include\libtorrent\bitfield.hpp"737 >738 </File>739 <File740 RelativePath="..\..\lib\libtorrent\include\libtorrent\create_torrent.hpp"741 >742 </File>743 <File744 RelativePath="..\..\lib\libtorrent\include\libtorrent\disk_buffer_holder.hpp"745 >746 </File>747 <File748 RelativePath="..\..\lib\libtorrent\include\libtorrent\file_storage.hpp"749 >750 </File>751 <File752 RelativePath="..\..\lib\libtorrent\include\libtorrent\GeoIP.h"753 >754 </File>755 <File756 RelativePath="..\..\lib\libtorrent\include\libtorrent\gzip.hpp"757 >758 </File>759 <File760 RelativePath="..\..\lib\libtorrent\include\libtorrent\http_parser.hpp"761 >762 </File>763 <File764 RelativePath="..\..\lib\libtorrent\include\libtorrent\lazy_entry.hpp"765 >766 </File>767 <File768 RelativePath="..\..\lib\libtorrent\include\libtorrent\magnet_uri.hpp"769 >770 </File>771 <File772 RelativePath="..\..\lib\libtorrent\include\libtorrent\parse_url.hpp"773 >774 </File>775 <File776 RelativePath="..\..\lib\libtorrent\include\libtorrent\ssl_stream.hpp"777 >778 </File>779 <File780 RelativePath="..\..\lib\libtorrent\include\libtorrent\udp_socket.hpp"781 >782 </File>783 735 <Filter 784 736 Name="libtorrent" … … 813 765 </File> 814 766 <File 767 RelativePath="..\..\lib\libtorrent\include\libtorrent\bitfield.hpp" 768 > 769 </File> 770 <File 815 771 RelativePath="..\..\lib\libtorrent\include\libtorrent\broadcast_socket.hpp" 816 772 > … … 837 793 </File> 838 794 <File 795 RelativePath="..\..\lib\libtorrent\include\libtorrent\create_torrent.hpp" 796 > 797 </File> 798 <File 839 799 RelativePath="..\..\lib\libtorrent\include\libtorrent\debug.hpp" 840 800 > 841 801 </File> 842 802 <File 803 RelativePath="..\..\lib\libtorrent\include\libtorrent\disk_buffer_holder.hpp" 804 > 805 </File> 806 <File 843 807 RelativePath="..\..\lib\libtorrent\include\libtorrent\disk_io_thread.hpp" 844 808 > … … 869 833 </File> 870 834 <File 835 RelativePath="..\..\lib\libtorrent\include\libtorrent\file_storage.hpp" 836 > 837 </File> 838 <File 871 839 RelativePath="..\..\lib\libtorrent\include\libtorrent\fingerprint.hpp" 872 840 > 873 841 </File> 874 842 <File 843 RelativePath="..\..\lib\libtorrent\include\libtorrent\GeoIP.h" 844 > 845 </File> 846 <File 847 RelativePath="..\..\lib\libtorrent\include\libtorrent\gzip.hpp" 848 > 849 </File> 850 <File 875 851 RelativePath="..\..\lib\libtorrent\include\libtorrent\hasher.hpp" 876 852 > … … 881 857 </File> 882 858 <File 859 RelativePath="..\..\lib\libtorrent\include\libtorrent\http_parser.hpp" 860 > 861 </File> 862 <File 883 863 RelativePath="..\..\lib\libtorrent\include\libtorrent\http_stream.hpp" 884 864 > … … 913 893 </File> 914 894 <File 895 RelativePath="..\..\lib\libtorrent\include\libtorrent\lazy_entry.hpp" 896 > 897 </File> 898 <File 915 899 RelativePath="..\..\lib\libtorrent\include\libtorrent\lsd.hpp" 916 900 > 917 901 </File> 918 902 <File 903 RelativePath="..\..\lib\libtorrent\include\libtorrent\magnet_uri.hpp" 904 > 905 </File> 906 <File 919 907 RelativePath="..\..\lib\libtorrent\include\libtorrent\natpmp.hpp" 920 908 > 921 909 </File> 922 910 <File 911 RelativePath="..\..\lib\libtorrent\include\libtorrent\parse_url.hpp" 912 > 913 </File> 914 <File 923 915 RelativePath="..\..\lib\libtorrent\include\libtorrent\pch.hpp" 924 916 > … … 1001 993 </File> 1002 994 <File 995 RelativePath="..\..\lib\libtorrent\include\libtorrent\ssl_stream.hpp" 996 > 997 </File> 998 <File 1003 999 RelativePath="..\..\lib\libtorrent\include\libtorrent\stat.hpp" 1004 1000 > … … 1026 1022 <File 1027 1023 RelativePath="..\..\lib\libtorrent\include\libtorrent\tracker_manager.hpp" 1024 > 1025 </File> 1026 <File 1027 RelativePath="..\..\lib\libtorrent\include\libtorrent\udp_socket.hpp" 1028 1028 > 1029 1029 </File> -
trunk/src/AddTorrentDialog.hpp
r493 r495 44 44 } 45 45 46 enum { IDD = IDD_ADD_TORRENT };46 enum { IDD = HAL_ADD_TORRENT }; 47 47 48 48 BEGIN_MSG_MAP_EX(thisClass) … … 56 56 57 57 BEGIN_DDX_MAP(thisClass) 58 DDX_CHECK( IDC_CHECK_COMPACT, compactStorage_)59 DDX_CHECK( IDC_CHECK_PAUSED, startPaused_)58 DDX_CHECK(HAL_CHECK_COMPACT, compactStorage_) 59 DDX_CHECK(HAL_CHECK_PAUSED, startPaused_) 60 60 END_DDX_MAP() 61 61 … … 69 69 WMB_ROW(_exp, HAL_ADJUST_DLG), 70 70 WMB_ROW(_gap, _d), 71 WMB_ROW(_auto, IDC_CHECK_COMPACT),72 WMB_ROW(_auto, IDC_CHECK_PAUSED),73 WMB_ROW(_auto, IDC_ADDT_NOTE_TEXT),71 WMB_ROW(_auto, HAL_CHECK_COMPACT), 72 WMB_ROW(_auto, HAL_CHECK_PAUSED), 73 WMB_ROW(_auto, HAL_ADDT_NOTE_TEXT), 74 74 WMB_ROW(_gap, _d), 75 75 WMB_ROW(_auto, ADD_BUTTONS_LAYOUT), -
trunk/src/AdvHaliteDialog.cpp
r492 r495 17 17 { 18 18 resizeClass::DlgResize_Init(false, true, WS_CLIPCHILDREN); 19 SetDlgItemText( IDC_ADVDLG_VERSION, hal::app().res_wstr(HAL_VERSION_STRING).c_str());19 SetDlgItemText(HAL_ADVDLG_VERSION, hal::app().res_wstr(HAL_VERSION_STRING).c_str()); 20 20 21 tabCtrl_.SubclassWindow(GetDlgItem( IDC_TAB));21 tabCtrl_.SubclassWindow(GetDlgItem(HAL_TAB)); 22 22 23 23 /* mp_dlg.reset(new ThemeTestDialog()); -
trunk/src/AdvHaliteDialog.hpp
r493 r495 33 33 34 34 public: 35 enum { IDD = IDD_ADVHALITEDLG };35 enum { IDD = HAL_ADVHALITEDLG }; 36 36 37 37 AdvHaliteDialog(HaliteWindow& halWindow) : … … 61 61 62 62 BEGIN_DLGRESIZE_MAP(thisClass) 63 DLGRESIZE_CONTROL( IDC_TAB, (DLSZ_SIZE_X | DLSZ_SIZE_Y))64 DLGRESIZE_CONTROL( IDC_ADVDLG_VERSION, (DLSZ_MOVE_X))63 DLGRESIZE_CONTROL(HAL_TAB, (DLSZ_SIZE_X | DLSZ_SIZE_Y)) 64 DLGRESIZE_CONTROL(HAL_ADVDLG_VERSION, (DLSZ_MOVE_X)) 65 65 66 66 END_DLGRESIZE_MAP() -
trunk/src/ConfigOptions.cpp
r438 r495 25 25 BOOL GeneralOptions::OnInitDialog(HWND hwndFocus, LPARAM lParam) 26 26 { 27 lang_list_.Attach(GetDlgItem( IDC_LANGLIST));27 lang_list_.Attach(GetDlgItem(HAL_LANGLIST)); 28 28 lang_list_.AddString(L"English"); 29 29 lang_list_.SetCurSel(0); -
trunk/src/ConfigOptions.hpp
r493 r495 8 8 9 9 #define ID_CONFIG_BEGIN 12000 10 #define IDC_SECURITY_IPF_GB ID_CONFIG_BEGIN + 111 #define IDC_SECURITY_PE_GB ID_CONFIG_BEGIN + 212 #define IDC_SECURITY_CP_GB ID_CONFIG_BEGIN + 313 #define IDC_SECURITY_EL_GB ID_CONFIG_BEGIN + 414 #define IDC_SECURITY_OUTGOING ID_CONFIG_BEGIN + 515 #define IDC_SECURITY_INCOMING ID_CONFIG_BEGIN + 616 #define IDC_SECURITY_ENABLED ID_CONFIG_BEGIN + 717 #define IDC_SECURITY_FORCED ID_CONFIG_BEGIN + 818 #define IDC_SECURITY_DISABLED ID_CONFIG_BEGIN + 919 #define IDC_BITT_OPENPORT ID_CONFIG_BEGIN + 1020 #define IDC_BITT_GDHT ID_CONFIG_BEGIN + 1121 #define IDC_BITT_DHT_NOTE ID_CONFIG_BEGIN + 1222 #define IDC_BITT_GSETTINGS ID_CONFIG_BEGIN + 1323 #define IDC_BITT_SELECT_TEXT ID_CONFIG_BEGIN + 1424 #define IDC_CONFIGT_TOTALMAX ID_CONFIG_BEGIN + 1525 #define IDC_CONFIGT_TOTALUP ID_CONFIG_BEGIN + 1626 #define IDC_CONFIGT_DOWNRATE ID_CONFIG_BEGIN + 1727 #define IDC_CONFIGT_UPRATE ID_CONFIG_BEGIN + 1828 #define IDC_CONFIGT_TORMAX ID_CONFIG_BEGIN + 1929 #define IDC_CONFIGT_TORUP ID_CONFIG_BEGIN + 2030 #define IDC_CONFIGT_TORDOWNRATE ID_CONFIG_BEGIN + 2131 #define IDC_CONFIGT_TORUPRATE ID_CONFIG_BEGIN + 2232 #define IDC_CONFIGT_GLOBAL_TEXT ID_CONFIG_BEGIN + 2333 #define IDC_CONFIGT_TOR_TEXT ID_CONFIG_BEGIN + 2434 #define IDC_CONFIGT_DEF_FOLDER ID_CONFIG_BEGIN + 2535 #define IDC_CONFIGT_GLOBALG ID_CONFIG_BEGIN + 2636 #define IDC_CONFIGT_TORRENTG ID_CONFIG_BEGIN + 2737 #define IDC_CONFIGT_TDOWNRATE ID_CONFIG_BEGIN + 2838 #define IDC_GENERAL_GROUP ID_CONFIG_BEGIN + 2939 #define IDC_GENERAL_LANG ID_CONFIG_BEGIN + 3040 #define IDC_GENERAL_CLOSETRAY ID_CONFIG_BEGIN + 3141 #define IDC_GENERAL_CONFIRMCLOSE ID_CONFIG_BEGIN + 3242 #define IDC_ABOUT_GROUP ID_CONFIG_BEGIN + 3343 #define IDC_ABOUT_VERSION ID_CONFIG_BEGIN + 3444 #define IDC_BITT_GPORTFORWARDING ID_CONFIG_BEGIN + 3545 #define IDC_BITT_GPORTFORWARD_NONE ID_CONFIG_BEGIN + 3646 #define IDC_BITT_GPORTFORWARD_UPNG ID_CONFIG_BEGIN + 3747 #define IDC_BIT_GPORTFORWARD_NATPMP ID_CONFIG_BEGIN + 3848 #define IDC_BITT_GPORTFORWARD_TEST ID_CONFIG_BEGIN + 3949 #define IDC_BITT_GPORTFORWARD_LIST ID_CONFIG_BEGIN + 4050 #define IDC_BC_MOVETO_FOLDER ID_CONFIG_BEGIN + 4151 #define IDC_BC_MOVETO_BROWSE ID_CONFIG_BEGIN + 4252 #define IDC_BC_MOVETO_TEXT ID_CONFIG_BEGIN + 4353 #define IDC_BC_MOVETO_CHECK ID_CONFIG_BEGIN + 4410 #define HAL_SECURITY_IPF_GB ID_CONFIG_BEGIN + 1 11 #define HAL_SECURITY_PE_GB ID_CONFIG_BEGIN + 2 12 #define HAL_SECURITY_CP_GB ID_CONFIG_BEGIN + 3 13 #define HAL_SECURITY_EL_GB ID_CONFIG_BEGIN + 4 14 #define HAL_SECURITY_OUTGOING ID_CONFIG_BEGIN + 5 15 #define HAL_SECURITY_INCOMING ID_CONFIG_BEGIN + 6 16 #define HAL_SECURITY_ENABLED ID_CONFIG_BEGIN + 7 17 #define HAL_SECURITY_FORCED ID_CONFIG_BEGIN + 8 18 #define HAL_SECURITY_DISABLED ID_CONFIG_BEGIN + 9 19 #define HAL_BITT_OPENPORT ID_CONFIG_BEGIN + 10 20 #define HAL_BITT_GDHT ID_CONFIG_BEGIN + 11 21 #define HAL_BITT_DHT_NOTE ID_CONFIG_BEGIN + 12 22 #define HAL_BITT_GSETTINGS ID_CONFIG_BEGIN + 13 23 #define HAL_BITT_SELECT_TEXT ID_CONFIG_BEGIN + 14 24 #define HAL_CONFIGT_TOTALMAX ID_CONFIG_BEGIN + 15 25 #define HAL_CONFIGT_TOTALUP ID_CONFIG_BEGIN + 16 26 #define HAL_CONFIGT_DOWNRATE ID_CONFIG_BEGIN + 17 27 #define HAL_CONFIGT_UPRATE ID_CONFIG_BEGIN + 18 28 #define HAL_CONFIGT_TORMAX ID_CONFIG_BEGIN + 19 29 #define HAL_CONFIGT_TORUP ID_CONFIG_BEGIN + 20 30 #define HAL_CONFIGT_TORDOWNRATE ID_CONFIG_BEGIN + 21 31 #define HAL_CONFIGT_TORUPRATE ID_CONFIG_BEGIN + 22 32 #define HAL_CONFIGT_GLOBAL_TEXT ID_CONFIG_BEGIN + 23 33 #define HAL_CONFIGT_TOR_TEXT ID_CONFIG_BEGIN + 24 34 #define HAL_CONFIGT_DEF_FOLDER ID_CONFIG_BEGIN + 25 35 #define HAL_CONFIGT_GLOBALG ID_CONFIG_BEGIN + 26 36 #define HAL_CONFIGT_TORRENTG ID_CONFIG_BEGIN + 27 37 #define HAL_CONFIGT_TDOWNRATE ID_CONFIG_BEGIN + 28 38 #define HAL_GENERAL_GROUP ID_CONFIG_BEGIN + 29 39 #define HAL_GENERAL_LANG ID_CONFIG_BEGIN + 30 40 #define HAL_GENERAL_CLOSETRAY ID_CONFIG_BEGIN + 31 41 #define HAL_GENERAL_CONFIRMCLOSE ID_CONFIG_BEGIN + 32 42 #define HAL_ABOUT_GROUP ID_CONFIG_BEGIN + 33 43 #define HAL_ABOUT_VERSION ID_CONFIG_BEGIN + 34 44 #define HAL_BITT_GPORTFORWARDING ID_CONFIG_BEGIN + 35 45 #define HAL_BITT_GPORTFORWARD_NONE ID_CONFIG_BEGIN + 36 46 #define HAL_BITT_GPORTFORWARD_UPNG ID_CONFIG_BEGIN + 37 47 #define HAL_BIT_GPORTFORWARD_NATPMP ID_CONFIG_BEGIN + 38 48 #define HAL_BITT_GPORTFORWARD_TEST ID_CONFIG_BEGIN + 39 49 #define HAL_BITT_GPORTFORWARD_LIST ID_CONFIG_BEGIN + 40 50 #define HAL_BC_MOVETO_FOLDER ID_CONFIG_BEGIN + 41 51 #define HAL_BC_MOVETO_BROWSE ID_CONFIG_BEGIN + 42 52 #define HAL_BC_MOVETO_TEXT ID_CONFIG_BEGIN + 43 53 #define HAL_BC_MOVETO_CHECK ID_CONFIG_BEGIN + 44 54 54 55 55 #ifndef RC_INVOKED … … 76 76 77 77 public: 78 enum { IDD = IDD_CONFIGGENERAL };78 enum { IDD = HAL_CONFIGGENERAL }; 79 79 80 80 GeneralOptions(HaliteWindow* haliteWindow) : … … 92 92 93 93 BEGIN_DDX_MAP(GeneralOptions) 94 DDX_CHECK( IDC_GENERAL_ONEINST, halite().oneInst)95 DDX_CHECK( IDC_GENERAL_TRAY, haliteWindow_->use_tray)96 DDX_CHECK( IDC_GENERAL_ADVGUI, haliteWindow_->advancedUI)97 DDX_CHECK( IDC_GENERAL_CLOSETRAY, haliteWindow_->closeToTray)98 DDX_CHECK( IDC_GENERAL_CONFIRMCLOSE, haliteWindow_->confirmClose)94 DDX_CHECK(HAL_GENERAL_ONEINST, halite().oneInst) 95 DDX_CHECK(HAL_GENERAL_TRAY, haliteWindow_->use_tray) 96 DDX_CHECK(HAL_GENERAL_ADVGUI, haliteWindow_->advancedUI) 97 DDX_CHECK(HAL_GENERAL_CLOSETRAY, haliteWindow_->closeToTray) 98 DDX_CHECK(HAL_GENERAL_CONFIRMCLOSE, haliteWindow_->confirmClose) 99 99 END_DDX_MAP() 100 100 … … 102 102 WMB_HEAD(WMB_COLNOMAX(_exp)), \ 103 103 WMB_ROW(_gap, _d), \ 104 WMB_ROW(_auto, IDC_GENERAL_ONEINST), \105 WMB_ROW(_auto, IDC_GENERAL_ADVGUI), \106 WMB_ROW(_auto, IDC_GENERAL_TRAY), \107 WMB_ROW(_auto, IDC_GENERAL_CLOSETRAY), \108 WMB_ROW(_auto, IDC_GENERAL_CONFIRMCLOSE), \104 WMB_ROW(_auto, HAL_GENERAL_ONEINST), \ 105 WMB_ROW(_auto, HAL_GENERAL_ADVGUI), \ 106 WMB_ROW(_auto, HAL_GENERAL_TRAY), \ 107 WMB_ROW(_auto, HAL_GENERAL_CLOSETRAY), \ 108 WMB_ROW(_auto, HAL_GENERAL_CONFIRMCLOSE), \ 109 109 WMB_END() 110 110 111 111 #define GENERAL_LANGUAGE_LAYOUT \ 112 112 WMB_HEAD(WMB_COLNOMAX(_exp)), \ 113 WMB_ROW(_auto, IDC_GENERAL_LANG), \114 WMB_ROW(_auto, IDC_LANGLIST), \113 WMB_ROW(_auto, HAL_GENERAL_LANG), \ 114 WMB_ROW(_auto, HAL_LANGLIST), \ 115 115 WMB_END() 116 116 117 117 BEGIN_WINDOW_MAP(thisClass, 6, 6, 3, 3) 118 118 WMB_HEAD(WMB_COL(_gap), WMB_COLNOMAX(_exp), WMB_COLNOMAX(_exp), WMB_COL(_gap)), 119 WMB_ROW(_gap|3, IDC_GENERAL_GROUP, _r, _r, _r),119 WMB_ROW(_gap|3, HAL_GENERAL_GROUP, _r, _r, _r), 120 120 WMB_ROW(_auto, _d, GENERAL_CONFIG_LAYOUT, GENERAL_LANGUAGE_LAYOUT), 121 121 WMB_ROW(_gap, _d), … … 165 165 166 166 public: 167 enum { IDD = IDD_CONFIGBIT };167 enum { IDD = HAL_CONFIGBIT }; 168 168 169 169 BitTorrentOptions() … … 175 175 BEGIN_MSG_MAP_EX(BitTorrentOptions) 176 176 MSG_WM_INITDIALOG(OnInitDialog) 177 COMMAND_ID_HANDLER_EX( IDC_BC_PORTCHECK, onPortCheck)178 COMMAND_ID_HANDLER_EX( IDC_BC_HALFCONN_CHECK, onHalfCheck)179 COMMAND_ID_HANDLER_EX( IDC_BC_DHT, onDHTCheck)177 COMMAND_ID_HANDLER_EX(HAL_BC_PORTCHECK, onPortCheck) 178 COMMAND_ID_HANDLER_EX(HAL_BC_HALFCONN_CHECK, onHalfCheck) 179 COMMAND_ID_HANDLER_EX(HAL_BC_DHT, onDHTCheck) 180 180 181 181 CHAIN_MSG_MAP(CPropertyPageImpl<BitTorrentOptions>) … … 184 184 185 185 BEGIN_DDX_MAP(BitTorrentOptions) 186 DDX_CHECK( IDC_BC_PORTCHECK, hal::config().portRange)187 DDX_INT( IDC_BC_PORTFROM, hal::config().portFrom)188 DDX_INT( IDC_BC_PORTTO, hal::config().portTo)189 DDX_CHECK( IDC_BC_HALFCONN_CHECK, hal::config().halfConn)190 DDX_EX_INT_POSITIVE( IDC_BC_HALFCONN_NUM, hal::config().halfConnLimit)191 DDX_CHECK( IDC_BC_DHT, hal::config().enableDHT)192 DDX_INT( IDC_BC_DHTPORT, hal::config().dhtServicePort)193 DDX_RADIO( IDC_BITT_GPORTFORWARD_NONE, hal::config().mappingType)186 DDX_CHECK(HAL_BC_PORTCHECK, hal::config().portRange) 187 DDX_INT(HAL_BC_PORTFROM, hal::config().portFrom) 188 DDX_INT(HAL_BC_PORTTO, hal::config().portTo) 189 DDX_CHECK(HAL_BC_HALFCONN_CHECK, hal::config().halfConn) 190 DDX_EX_INT_POSITIVE(HAL_BC_HALFCONN_NUM, hal::config().halfConnLimit) 191 DDX_CHECK(HAL_BC_DHT, hal::config().enableDHT) 192 DDX_INT(HAL_BC_DHTPORT, hal::config().dhtServicePort) 193 DDX_RADIO(HAL_BITT_GPORTFORWARD_NONE, hal::config().mappingType) 194 194 END_DDX_MAP() 195 195 196 196 #define BITT_GS_LAYOUT \ 197 197 WMB_HEAD(WMB_COLNOMAX(_exp|250), WMB_COLNOMAX(_exp), WMB_COLNOMAX(_exp), WMB_COLNOMAX(_exp)), \ 198 WMB_ROW(_auto, IDC_BITT_SELECT_TEXT, _r, _r, _r), \199 WMB_ROW(_auto, IDC_BITT_OPENPORT, IDC_BC_PORTFROM, IDC_BC_PORTCHECK, IDC_BC_PORTTO), \200 WMB_ROW(_auto, IDC_BC_HALFCONN_CHECK, _r, IDC_BC_HALFCONN_NUM), \198 WMB_ROW(_auto, HAL_BITT_SELECT_TEXT, _r, _r, _r), \ 199 WMB_ROW(_auto, HAL_BITT_OPENPORT, HAL_BC_PORTFROM, HAL_BC_PORTCHECK, HAL_BC_PORTTO), \ 200 WMB_ROW(_auto, HAL_BC_HALFCONN_CHECK, _r, HAL_BC_HALFCONN_NUM), \ 201 201 WMB_END() 202 202 203 203 #define BITT_DHT_LAYOUT \ 204 204 WMB_HEAD(WMB_COLNOMAX(_exp), WMB_COLNOMAX(_exp), WMB_COLNOMAX(_exp)), \ 205 WMB_ROW(_auto, IDC_BC_DHT, IDC_BC_DHTPORT_S, IDC_BC_DHTPORT), \206 WMB_ROW(_auto, IDC_BITT_DHT_NOTE, _r, _r), \205 WMB_ROW(_auto, HAL_BC_DHT, HAL_BC_DHTPORT_S, HAL_BC_DHTPORT), \ 206 WMB_ROW(_auto, HAL_BITT_DHT_NOTE, _r, _r), \ 207 207 WMB_END() 208 208 209 209 #define BITT_FOR_LAYOUT \ 210 210 WMB_HEAD(WMB_COLNOMAX(_exp), WMB_COLNOMAX(_exp), WMB_COLNOMAX(_exp|50)), \ 211 WMB_ROW(_auto, IDC_BITT_GPORTFORWARD_NONE, _r, IDC_BITT_GPORTFORWARD_TEST), \212 WMB_ROW(_auto, IDC_BITT_GPORTFORWARD_UPNG, IDC_BITT_GPORTFORWARD_LIST, _r), \213 WMB_ROW(_auto, IDC_BIT_GPORTFORWARD_NATPMP, _d), \211 WMB_ROW(_auto, HAL_BITT_GPORTFORWARD_NONE, _r, HAL_BITT_GPORTFORWARD_TEST), \ 212 WMB_ROW(_auto, HAL_BITT_GPORTFORWARD_UPNG, HAL_BITT_GPORTFORWARD_LIST, _r), \ 213 WMB_ROW(_auto, HAL_BIT_GPORTFORWARD_NATPMP, _d), \ 214 214 WMB_END() 215 215 216 216 BEGIN_WINDOW_MAP(thisClass, 6, 6, 3, 3) 217 217 WMB_HEAD(WMB_COL(_gap), WMB_COLNOMAX(_exp), WMB_COL(_gap)), 218 WMB_ROW(_gap|3, IDC_BITT_GSETTINGS, _r, _r),218 WMB_ROW(_gap|3, HAL_BITT_GSETTINGS, _r, _r), 219 219 WMB_ROW(_auto, _d, BITT_GS_LAYOUT), 220 220 WMB_ROW(_gap, _d), 221 WMB_ROW(_gap|3, IDC_BITT_GDHT, _r, _r),221 WMB_ROW(_gap|3, HAL_BITT_GDHT, _r, _r), 222 222 WMB_ROW(_auto, _d, BITT_DHT_LAYOUT), 223 223 WMB_ROW(_gap, _d), 224 WMB_ROW(_gap|3, IDC_BITT_GPORTFORWARDING, _r, _r),224 WMB_ROW(_gap|3, HAL_BITT_GPORTFORWARDING, _r, _r), 225 225 WMB_ROW(_auto, _d, BITT_FOR_LAYOUT), 226 226 WMB_ROW(_gap, _d), … … 230 230 BOOL OnInitDialog (HWND hwndFocus, LPARAM lParam) 231 231 { 232 // helpLink.SubclassWindow(GetDlgItem( IDC_BC_HELP_LINK));232 // helpLink.SubclassWindow(GetDlgItem(HAL_BC_HELP_LINK)); 233 233 // helpLink.SetHyperLink(L"http://www.binarynotions.com/"); 234 234 235 // whyHalfConn.SubclassWindow(GetDlgItem( IDC_BC_CON_WHY));235 // whyHalfConn.SubclassWindow(GetDlgItem(HAL_BC_CON_WHY)); 236 236 // whyHalfConn.SetHyperLink(L"http://www.binarynotions.com/"); 237 237 238 238 BOOL retval = DoDataExchange(false); 239 239 240 onHalfCheck(0, 0, GetDlgItem( IDC_BC_HALFCONN_CHECK));241 onPortCheck(0, 0, GetDlgItem( IDC_BC_PORTCHECK));242 onDHTCheck(0, 0, GetDlgItem( IDC_BC_DHT));240 onHalfCheck(0, 0, GetDlgItem(HAL_BC_HALFCONN_CHECK)); 241 onPortCheck(0, 0, GetDlgItem(HAL_BC_PORTCHECK)); 242 onDHTCheck(0, 0, GetDlgItem(HAL_BC_DHT)); 243 243 244 244 autosizeClass::CtrlsArrange(); … … 251 251 new hal::EventMsg(L"Applying bittorrent options.", hal::event_logger::info))); 252 252 253 onPortCheck(0, 0, GetDlgItem( IDC_BC_PORTCHECK));253 onPortCheck(0, 0, GetDlgItem(HAL_BC_PORTCHECK)); 254 254 255 255 return DoDataExchange(true); … … 262 262 if (result == BST_CHECKED) 263 263 { 264 ::EnableWindow(GetDlgItem( IDC_BC_DHTPORT), true);265 ::EnableWindow(GetDlgItem( IDC_BC_DHTPORT_S), true);264 ::EnableWindow(GetDlgItem(HAL_BC_DHTPORT), true); 265 ::EnableWindow(GetDlgItem(HAL_BC_DHTPORT_S), true); 266 266 } 267 267 else 268 268 { 269 ::EnableWindow(GetDlgItem( IDC_BC_DHTPORT), false);270 ::EnableWindow(GetDlgItem( IDC_BC_DHTPORT_S), false);269 ::EnableWindow(GetDlgItem(HAL_BC_DHTPORT), false); 270 ::EnableWindow(GetDlgItem(HAL_BC_DHTPORT_S), false); 271 271 } 272 272 } … … 278 278 if (result == BST_CHECKED) 279 279 { 280 ::EnableWindow(GetDlgItem( IDC_BC_PORTTO), true);280 ::EnableWindow(GetDlgItem(HAL_BC_PORTTO), true); 281 281 } 282 282 else 283 283 { 284 ::EnableWindow(GetDlgItem( IDC_BC_PORTTO), false);284 ::EnableWindow(GetDlgItem(HAL_BC_PORTTO), false); 285 285 boost::array<wchar_t, MAX_PATH> buffer; 286 GetDlgItemText( IDC_BC_PORTFROM, buffer.elems, MAX_PATH);287 SetDlgItemText( IDC_BC_PORTTO, buffer.elems);286 GetDlgItemText(HAL_BC_PORTFROM, buffer.elems, MAX_PATH); 287 SetDlgItemText(HAL_BC_PORTTO, buffer.elems); 288 288 } 289 289 } … … 295 295 if (result == BST_CHECKED) 296 296 { 297 ::EnableWindow(GetDlgItem( IDC_BC_HALFCONN_NUM), true);297 ::EnableWindow(GetDlgItem(HAL_BC_HALFCONN_NUM), true); 298 298 } 299 299 else 300 300 { 301 ::EnableWindow(GetDlgItem( IDC_BC_HALFCONN_NUM), false);302 SetDlgItemText( IDC_BC_HALFCONN_NUM, L"301 ::EnableWindow(GetDlgItem(HAL_BC_HALFCONN_NUM), false); 302 SetDlgItemText(HAL_BC_HALFCONN_NUM, L" 303 303 "); 304 304 } … … 314 314 { 315 315 public: 316 enum { IDD = IDD_CONFIGPROXY };316 enum { IDD = HAL_CONFIGPROXY }; 317 317 318 318 ProxyOptions() … … 324 324 BEGIN_MSG_MAP_EX(ProxyOptions) 325 325 MSG_WM_INITDIALOG(OnInitDialog) 326 COMMAND_ID_HANDLER_EX( IDC_BC_PROXYCHECK, onProxyCheck)326 COMMAND_ID_HANDLER_EX(HAL_BC_PROXYCHECK, onProxyCheck) 327 327 CHAIN_MSG_MAP(CPropertyPageImpl<ProxyOptions>) 328 328 END_MSG_MAP() … … 336 336 BOOL retval = DoDataExchange(false); 337 337 338 onProxyCheck(0, 0, GetDlgItem( IDC_BC_PROXYCHECK));338 onProxyCheck(0, 0, GetDlgItem(HAL_BC_PROXYCHECK)); 339 339 340 340 return retval; … … 355 355 if (result == BST_CHECKED) 356 356 { 357 ::EnableWindow(GetDlgItem( IDC_BC_PORTTO), true);357 ::EnableWindow(GetDlgItem(HAL_BC_PORTTO), true); 358 358 } 359 359 else 360 360 { 361 ::EnableWindow(GetDlgItem( IDC_BC_PORTTO), false);361 ::EnableWindow(GetDlgItem(HAL_BC_PORTTO), false); 362 362 boost::array<wchar_t, MAX_PATH> buffer; 363 GetDlgItemText( IDC_BC_PORTFROM, buffer.elems, MAX_PATH);364 SetDlgItemText( IDC_BC_PORTTO, buffer.elems);363 GetDlgItemText(HAL_BC_PORTFROM, buffer.elems, MAX_PATH); 364 SetDlgItemText(HAL_BC_PORTTO, buffer.elems); 365 365 } 366 366 } … … 372 372 if (result == BST_CHECKED) 373 373 { 374 ::EnableWindow(GetDlgItem( IDC_BC_PROXYIP), true);375 ::EnableWindow(GetDlgItem( IDC_BC_PROXYPORT), true);376 ::EnableWindow(GetDlgItem( IDC_BC_PROXYUSER), true);377 ::EnableWindow(GetDlgItem( IDC_BC_PROXYPASS), true);378 ::EnableWindow(GetDlgItem( IDC_BC_PROXYIP_S), true);379 ::EnableWindow(GetDlgItem( IDC_BC_PROXYPORT_S), true);380 ::EnableWindow(GetDlgItem( IDC_BC_PROXYUSER_S), true);381 ::EnableWindow(GetDlgItem( IDC_BC_PROXYPASS_S), true);374 ::EnableWindow(GetDlgItem(HAL_BC_PROXYIP), true); 375 ::EnableWindow(GetDlgItem(HAL_BC_PROXYPORT), true); 376 ::EnableWindow(GetDlgItem(HAL_BC_PROXYUSER), true); 377 ::EnableWindow(GetDlgItem(HAL_BC_PROXYPASS), true); 378 ::EnableWindow(GetDlgItem(HAL_BC_PROXYIP_S), true); 379 ::EnableWindow(GetDlgItem(HAL_BC_PROXYPORT_S), true); 380 ::EnableWindow(GetDlgItem(HAL_BC_PROXYUSER_S), true); 381 ::EnableWindow(GetDlgItem(HAL_BC_PROXYPASS_S), true); 382 382 } 383 383 else 384 384 { 385 ::EnableWindow(GetDlgItem( IDC_BC_PROXYIP), false);386 ::EnableWindow(GetDlgItem( IDC_BC_PROXYPORT), false);387 ::EnableWindow(GetDlgItem( IDC_BC_PROXYUSER), false);388 ::EnableWindow(GetDlgItem( IDC_BC_PROXYPASS), false);389 ::EnableWindow(GetDlgItem( IDC_BC_PROXYIP_S), false);390 ::EnableWindow(GetDlgItem( IDC_BC_PROXYPORT_S), false);391 ::EnableWindow(GetDlgItem( IDC_BC_PROXYUSER_S), false);392 ::EnableWindow(GetDlgItem( IDC_BC_PROXYPASS_S), false);385 ::EnableWindow(GetDlgItem(HAL_BC_PROXYIP), false); 386 ::EnableWindow(GetDlgItem(HAL_BC_PROXYPORT), false); 387 ::EnableWindow(GetDlgItem(HAL_BC_PROXYUSER), false); 388 ::EnableWindow(GetDlgItem(HAL_BC_PROXYPASS), false); 389 ::EnableWindow(GetDlgItem(HAL_BC_PROXYIP_S), false); 390 ::EnableWindow(GetDlgItem(HAL_BC_PROXYPORT_S), false); 391 ::EnableWindow(GetDlgItem(HAL_BC_PROXYUSER_S), false); 392 ::EnableWindow(GetDlgItem(HAL_BC_PROXYPASS_S), false); 393 393 } 394 394 } … … 404 404 405 405 public: 406 enum { IDD = IDD_CONFIGSECURITY };406 enum { IDD = HAL_CONFIGSECURITY }; 407 407 408 408 BEGIN_MSG_MAP_EX(thisClass) 409 409 MSG_WM_INITDIALOG(OnInitDialog) 410 410 411 COMMAND_ID_HANDLER_EX( IDC_BC_FILTERLOAD, onFilterImport)412 COMMAND_ID_HANDLER_EX( IDC_BC_FILTERCLEAR, onFilterClear)413 COMMAND_ID_HANDLER_EX( IDC_BC_FILTERCHECK, onFilterCheck)414 415 COMMAND_ID_HANDLER_EX( IDC_SC_ENABLE_PE, onPeCheck)411 COMMAND_ID_HANDLER_EX(HAL_BC_FILTERLOAD, onFilterImport) 412 COMMAND_ID_HANDLER_EX(HAL_BC_FILTERCLEAR, onFilterClear) 413 COMMAND_ID_HANDLER_EX(HAL_BC_FILTERCHECK, onFilterCheck) 414 415 COMMAND_ID_HANDLER_EX(HAL_SC_ENABLE_PE, onPeCheck) 416 416 417 417 CHAIN_MSG_MAP(autosizeClass) … … 421 421 422 422 BEGIN_DDX_MAP(thisClass) 423 DDX_CHECK( IDC_BC_FILTERCHECK, hal::config().enableIPFilter)424 DDX_CHECK( IDC_SC_ENABLE_PE, hal::config().enablePe)425 DDX_RADIO( IDC_SC_PE_ENC_PLAIN, hal::config().peEncLevel)426 DDX_CHECK( IDC_SC_PE_ENC_RC4_PERFER, hal::config().pePerferRc4)427 DDX_RADIO( IDC_SC_PE_CP_IN_FORCED, hal::config().peConInPolicy)428 DDX_RADIO( IDC_SC_PE_CP_OUT_FORCED, hal::config().peConOutPolicy)423 DDX_CHECK(HAL_BC_FILTERCHECK, hal::config().enableIPFilter) 424 DDX_CHECK(HAL_SC_ENABLE_PE, hal::config().enablePe) 425 DDX_RADIO(HAL_SC_PE_ENC_PLAIN, hal::config().peEncLevel) 426 DDX_CHECK(HAL_SC_PE_ENC_RC4_PERFER, hal::config().pePerferRc4) 427 DDX_RADIO(HAL_SC_PE_CP_IN_FORCED, hal::config().peConInPolicy) 428 DDX_RADIO(HAL_SC_PE_CP_OUT_FORCED, hal::config().peConOutPolicy) 429 429 END_DDX_MAP() 430 430 … … 437 437 #define SECURITY_IPF_LAYOUT \ 438 438 WMB_HEAD(WMB_COLNOMAX(_exp), WMB_COLNOMAX(_exp), WMB_COLNOMAX(_exp)), \ 439 WMB_ROW(_auto, IDC_BC_FILTERCHECK, IDC_BC_FILTERCLEAR, IDC_BC_FILTERLOAD), \439 WMB_ROW(_auto, HAL_BC_FILTERCHECK, HAL_BC_FILTERCLEAR, HAL_BC_FILTERLOAD), \ 440 440 WMB_END() 441 441 442 442 #define SECURITY_ENCODING_LAYOUT \ 443 443 WMB_HEAD(WMB_COL(_gap), WMB_COLNOMAX(_exp), WMB_COLNOMAX(_exp), WMB_COL(_gap)), \ 444 WMB_ROW(_auto, IDC_SC_ENABLE_PE, _r,_r,_r), \445 WMB_ROW(_gap|3, IDC_SECURITY_EL_GB, _r,_r,_r), \446 WMB_ROW(_auto, _d, IDC_SC_PE_ENC_PLAIN, _r), \447 WMB_ROW(_auto, _d, IDC_SC_PE_ENC_RC4, _r), \448 WMB_ROW(_auto, _d, IDC_SC_PE_ENC_BOTH, IDC_SC_PE_ENC_RC4_PERFER), \444 WMB_ROW(_auto, HAL_SC_ENABLE_PE, _r,_r,_r), \ 445 WMB_ROW(_gap|3, HAL_SECURITY_EL_GB, _r,_r,_r), \ 446 WMB_ROW(_auto, _d, HAL_SC_PE_ENC_PLAIN, _r), \ 447 WMB_ROW(_auto, _d, HAL_SC_PE_ENC_RC4, _r), \ 448 WMB_ROW(_auto, _d, HAL_SC_PE_ENC_BOTH, HAL_SC_PE_ENC_RC4_PERFER), \ 449 449 WMB_ROW(_gap, _d), \ 450 450 WMB_END() … … 452 452 #define SECURITY_CONNECTION_LAYOUT \ 453 453 WMB_HEAD(WMB_COL(_gap), WMB_COLNOMAX(_exp), WMB_COLNOMAX(_exp), WMB_COLNOMAX(_exp), WMB_COLNOMAX(_exp), WMB_COL(_gap)), \ 454 WMB_ROW(_gap|4, IDC_SECURITY_CP_GB, _r, _r, _r, _r, _r), \455 WMB_ROW(_auto, _d, IDC_SECURITY_INCOMING, _r, IDC_SECURITY_OUTGOING, _r), \456 WMB_ROW(_auto, _d, IDC_SC_PE_CP_IN_FORCED, IDC_SECURITY_FORCED, _r, IDC_SC_PE_CP_OUT_FORCED), \457 WMB_ROW(_auto, _d, IDC_SC_PE_CP_IN_ENABLED, IDC_SECURITY_ENABLED, _r, IDC_SC_PE_CP_OUT_ENABLED), \458 WMB_ROW(_auto, _d, IDC_SC_PE_CP_IN_DISABLED, IDC_SECURITY_DISABLED, _r, IDC_SC_PE_CP_OUT_DISABLED), \454 WMB_ROW(_gap|4, HAL_SECURITY_CP_GB, _r, _r, _r, _r, _r), \ 455 WMB_ROW(_auto, _d, HAL_SECURITY_INCOMING, _r, HAL_SECURITY_OUTGOING, _r), \ 456 WMB_ROW(_auto, _d, HAL_SC_PE_CP_IN_FORCED, HAL_SECURITY_FORCED, _r, HAL_SC_PE_CP_OUT_FORCED), \ 457 WMB_ROW(_auto, _d, HAL_SC_PE_CP_IN_ENABLED, HAL_SECURITY_ENABLED, _r, HAL_SC_PE_CP_OUT_ENABLED), \ 458 WMB_ROW(_auto, _d, HAL_SC_PE_CP_IN_DISABLED, HAL_SECURITY_DISABLED, _r, HAL_SC_PE_CP_OUT_DISABLED), \ 459 459 WMB_ROW(_gap, _d), \ 460 460 WMB_END() … … 467 467 BEGIN_WINDOW_MAP(thisClass, 6, 6, 3, 3) 468 468 WMB_HEAD(WMB_COL(_gap), WMB_COLNOMAX(_exp), WMB_COL(_gap)), 469 WMB_ROW(_gap|3, IDC_SECURITY_IPF_GB, _r, _r),469 WMB_ROW(_gap|3, HAL_SECURITY_IPF_GB, _r, _r), 470 470 WMB_ROW(_auto, _d, SECURITY_IPF_LAYOUT), 471 471 WMB_ROW(_gap, _d), 472 WMB_ROW(_gap|3, IDC_SECURITY_PE_GB, _r, _r),472 WMB_ROW(_gap|3, HAL_SECURITY_PE_GB, _r, _r), 473 473 WMB_ROW(_auto, _d, SECURITY_PE_LAYOUT), 474 474 WMB_ROW(_gap, _d), … … 478 478 BOOL OnInitDialog (HWND hwndFocus, LPARAM lParam) 479 479 { 480 // helpLink.SubclassWindow(GetDlgItem( IDC_SC_HELP_LINK));480 // helpLink.SubclassWindow(GetDlgItem(HAL_SC_HELP_LINK)); 481 481 // helpLink.SetHyperLink(L"http://www.binarynotions.com/"); 482 482 483 483 BOOL retval = DoDataExchange(false); 484 484 485 onFilterCheck(0, 0, GetDlgItem( IDC_BC_FILTERCHECK));486 onPeCheck(0, 0, GetDlgItem( IDC_SC_ENABLE_PE));485 onFilterCheck(0, 0, GetDlgItem(HAL_BC_FILTERCHECK)); 486 onPeCheck(0, 0, GetDlgItem(HAL_SC_ENABLE_PE)); 487 487 488 488 autosizeClass::CtrlsArrange(); … … 504 504 if (result == BST_CHECKED) 505 505 { 506 ::EnableWindow(GetDlgItem( IDC_BC_FILTERCLEAR), true);507 ::EnableWindow(GetDlgItem( IDC_BC_FILTERLOAD), true);506 ::EnableWindow(GetDlgItem(HAL_BC_FILTERCLEAR), true); 507 ::EnableWindow(GetDlgItem(HAL_BC_FILTERLOAD), true); 508 508 } 509 509 else 510 510 { 511 ::EnableWindow(GetDlgItem( IDC_BC_FILTERCLEAR), false);512 ::EnableWindow(GetDlgItem( IDC_BC_FILTERLOAD), false);511 ::EnableWindow(GetDlgItem(HAL_BC_FILTERCLEAR), false); 512 ::EnableWindow(GetDlgItem(HAL_BC_FILTERLOAD), false); 513 513 } 514 514 } … … 520 520 if (result == BST_CHECKED) 521 521 { 522 ::EnableWindow(GetDlgItem( IDC_SC_PE_ENC_BOTH), true);523 ::EnableWindow(GetDlgItem( IDC_SC_PE_ENC_RC4), true);524 ::EnableWindow(GetDlgItem( IDC_SC_PE_ENC_PLAIN), true);525 ::EnableWindow(GetDlgItem( IDC_SC_PE_ENC_RC4_PERFER), true);526 ::EnableWindow(GetDlgItem( IDC_SC_PE_CP_IN_FORCED), true);527 ::EnableWindow(GetDlgItem( IDC_SC_PE_CP_IN_DISABLED), true);528 ::EnableWindow(GetDlgItem( IDC_SC_PE_CP_IN_ENABLED), true);529 ::EnableWindow(GetDlgItem( IDC_SC_PE_CP_OUT_DISABLED), true);530 ::EnableWindow(GetDlgItem( IDC_SC_PE_CP_OUT_ENABLED), true);531 ::EnableWindow(GetDlgItem( IDC_SC_PE_CP_OUT_FORCED), true);522 ::EnableWindow(GetDlgItem(HAL_SC_PE_ENC_BOTH), true); 523 ::EnableWindow(GetDlgItem(HAL_SC_PE_ENC_RC4), true); 524 ::EnableWindow(GetDlgItem(HAL_SC_PE_ENC_PLAIN), true); 525 ::EnableWindow(GetDlgItem(HAL_SC_PE_ENC_RC4_PERFER), true); 526 ::EnableWindow(GetDlgItem(HAL_SC_PE_CP_IN_FORCED), true); 527 ::EnableWindow(GetDlgItem(HAL_SC_PE_CP_IN_DISABLED), true); 528 ::EnableWindow(GetDlgItem(HAL_SC_PE_CP_IN_ENABLED), true); 529 ::EnableWindow(GetDlgItem(HAL_SC_PE_CP_OUT_DISABLED), true); 530 ::EnableWindow(GetDlgItem(HAL_SC_PE_CP_OUT_ENABLED), true); 531 ::EnableWindow(GetDlgItem(HAL_SC_PE_CP_OUT_FORCED), true); 532 532 } 533 533 else 534 534 { 535 ::EnableWindow(GetDlgItem( IDC_SC_PE_ENC_BOTH), false);536 ::EnableWindow(GetDlgItem( IDC_SC_PE_ENC_RC4), false);537 ::EnableWindow(GetDlgItem( IDC_SC_PE_ENC_PLAIN), false);538 ::EnableWindow(GetDlgItem( IDC_SC_PE_ENC_RC4_PERFER), false);539 ::EnableWindow(GetDlgItem( IDC_SC_PE_CP_IN_FORCED), false);540 ::EnableWindow(GetDlgItem( IDC_SC_PE_CP_IN_DISABLED), false);541 ::EnableWindow(GetDlgItem( IDC_SC_PE_CP_IN_ENABLED), false);542 ::EnableWindow(GetDlgItem( IDC_SC_PE_CP_OUT_DISABLED), false);543 ::EnableWindow(GetDlgItem( IDC_SC_PE_CP_OUT_ENABLED), false);544 ::EnableWindow(GetDlgItem( IDC_SC_PE_CP_OUT_FORCED), false);535 ::EnableWindow(GetDlgItem(HAL_SC_PE_ENC_BOTH), false); 536 ::EnableWindow(GetDlgItem(HAL_SC_PE_ENC_RC4), false); 537 ::EnableWindow(GetDlgItem(HAL_SC_PE_ENC_PLAIN), false); 538 ::EnableWindow(GetDlgItem(HAL_SC_PE_ENC_RC4_PERFER), false); 539 ::EnableWindow(GetDlgItem(HAL_SC_PE_CP_IN_FORCED), false); 540 ::EnableWindow(GetDlgItem(HAL_SC_PE_CP_IN_DISABLED), false); 541 ::EnableWindow(GetDlgItem(HAL_SC_PE_CP_IN_ENABLED), false); 542 ::EnableWindow(GetDlgItem(HAL_SC_PE_CP_OUT_DISABLED), false); 543 ::EnableWindow(GetDlgItem(HAL_SC_PE_CP_OUT_ENABLED), false); 544 ::EnableWindow(GetDlgItem(HAL_SC_PE_CP_OUT_FORCED), false); 545 545 } 546 546 } … … 565 565 typedef ATL::CAutoSizeWindow<thisClass, false> autosizeClass; 566 566 public: 567 enum { IDD = IDD_CONFIGTORRENT };567 enum { IDD = HAL_CONFIGTORRENT }; 568 568 569 569 TorrentsOptions() : … … 581 581 MSG_WM_INITDIALOG(OnInitDialog) 582 582 583 COMMAND_ID_HANDLER_EX( IDC_BC_SAVEBROWSE, onFolderBrowse)584 COMMAND_ID_HANDLER_EX( IDC_BC_MOVETO_BROWSE, onMoveToFolderBrowse)585 COMMAND_ID_HANDLER_EX( IDC_BC_MOVETO_CHECK, onMoveToCheck)583 COMMAND_ID_HANDLER_EX(HAL_BC_SAVEBROWSE, onFolderBrowse) 584 COMMAND_ID_HANDLER_EX(HAL_BC_MOVETO_BROWSE, onMoveToFolderBrowse) 585 COMMAND_ID_HANDLER_EX(HAL_BC_MOVETO_CHECK, onMoveToCheck) 586 586 587 587 CHAIN_MSG_MAP(CPropertyPageImpl<TorrentsOptions>) … … 592 592 #define CONFIGT_GLOBAL_LAYOUT \ 593 593 WMB_HEAD(WMB_COLNOMAX(_exp), WMB_COLNOMAX(_exp|30), WMB_COLNOMAX(_eq|0), WMB_COLNOMAX(_eq|1)), \ 594 WMB_ROW(_auto, IDC_CONFIGT_GLOBAL_TEXT, _r, _r, _r), \595 WMB_ROW(_auto, IDC_CONFIGT_TOTALMAX, IDC_BC_MAXCONN, IDC_CONFIGT_DOWNRATE, IDC_BC_DOWNRATE), \596 WMB_ROW(_auto, IDC_CONFIGT_TOTALUP, IDC_BC_MAXUP, IDC_CONFIGT_UPRATE, IDC_BC_UPRATE), \594 WMB_ROW(_auto, HAL_CONFIGT_GLOBAL_TEXT, _r, _r, _r), \ 595 WMB_ROW(_auto, HAL_CONFIGT_TOTALMAX, HAL_BC_MAXCONN, HAL_CONFIGT_DOWNRATE, HAL_BC_DOWNRATE), \ 596 WMB_ROW(_auto, HAL_CONFIGT_TOTALUP, HAL_BC_MAXUP, HAL_CONFIGT_UPRATE, HAL_BC_UPRATE), \ 597 597 WMB_END() 598 598 599 599 #define CONFIGT_TORRENT_LAYOUT \ 600 600 WMB_HEAD(WMB_COLNOMAX(_exp), WMB_COLNOMAX(_exp|30), WMB_COLNOMAX(_eq|0), WMB_COLNOMAX(_eq|1)), \ 601 WMB_ROW(_auto, IDC_CONFIGT_TOR_TEXT, _r, _r, _r), \602 WMB_ROW(_auto, IDC_CONFIGT_TORMAX, IDC_BC_TMAXCONN, IDC_CONFIGT_TDOWNRATE, IDC_BC_TDOWNRATE), \603 WMB_ROW(_auto, IDC_CONFIGT_TORUP, IDC_BC_TMAXUP, IDC_CONFIGT_TORUPRATE, IDC_BC_TUPRATE), \601 WMB_ROW(_auto, HAL_CONFIGT_TOR_TEXT, _r, _r, _r), \ 602 WMB_ROW(_auto, HAL_CONFIGT_TORMAX, HAL_BC_TMAXCONN, HAL_CONFIGT_TDOWNRATE, HAL_BC_TDOWNRATE), \ 603 WMB_ROW(_auto, HAL_CONFIGT_TORUP, HAL_BC_TMAXUP, HAL_CONFIGT_TORUPRATE, HAL_BC_TUPRATE), \ 604 604 WMB_END() 605 605 606 606 #define CONFIGT_TORRENT_FOLDER_MOVETO_LAYOUT \ 607 607 WMB_HEAD(WMB_COL(_auto), WMB_COLNOMAX(_exp|50)), \ 608 WMB_ROW(_auto, IDC_BC_MOVETO_CHECK, IDC_BC_MOVETO_TEXT), \608 WMB_ROW(_auto, HAL_BC_MOVETO_CHECK, HAL_BC_MOVETO_TEXT), \ 609 609 WMB_END() 610 610 611 611 #define CONFIGT_TORRENT_FOLDER_LAYOUT \ 612 612 WMB_HEAD( WMB_COLNOMAX(_exp|50), WMB_COLNOMAX(_exp), WMB_COLNOMAX(_auto)), \ 613 WMB_ROW(_auto, IDC_CONFIGT_DEF_FOLDER, IDC_BC_SAVEFOLDER, IDC_BC_SAVEBROWSE), \614 WMB_ROW(_auto, CONFIGT_TORRENT_FOLDER_MOVETO_LAYOUT, IDC_BC_MOVETO_FOLDER, IDC_BC_MOVETO_BROWSE), \615 WMB_ROW(_auto, 0, IDC_BC_PROMPTSAVE, _r), \613 WMB_ROW(_auto, HAL_CONFIGT_DEF_FOLDER, HAL_BC_SAVEFOLDER, HAL_BC_SAVEBROWSE), \ 614 WMB_ROW(_auto, CONFIGT_TORRENT_FOLDER_MOVETO_LAYOUT, HAL_BC_MOVETO_FOLDER, HAL_BC_MOVETO_BROWSE), \ 615 WMB_ROW(_auto, 0, HAL_BC_PROMPTSAVE, _r), \ 616 616 WMB_END() 617 617 618 618 BEGIN_WINDOW_MAP(thisClass, 6, 6, 3, 3) 619 619 WMB_HEAD(WMB_COL(_gap), WMB_COLNOMAX(_exp), WMB_COL(_gap)), 620 WMB_ROW(_gap|3, IDC_CONFIGT_GLOBALG, _r, _r),620 WMB_ROW(_gap|3, HAL_CONFIGT_GLOBALG, _r, _r), 621 621 WMB_ROW(_auto, _d, CONFIGT_GLOBAL_LAYOUT), 622 622 WMB_ROW(_gap, _d), 623 WMB_ROW(_gap|3, IDC_CONFIGT_TORRENTG, _r, _r),623 WMB_ROW(_gap|3, HAL_CONFIGT_TORRENTG, _r, _r), 624 624 WMB_ROW(_auto, _d, CONFIGT_TORRENT_LAYOUT), 625 625 WMB_ROW(_auto, _d, CONFIGT_TORRENT_FOLDER_LAYOUT), … … 629 629 630 630 BEGIN_DDX_MAP(TorrentsOptions) 631 /* DDX_EX_INT_POSITIVE_LIMIT( IDC_BC_MAXCONN, hal::config().maxConnections, 2, true)632 DDX_EX_INT_POSITIVE_LIMIT( IDC_BC_MAXUP, hal::config().maxUploads, 2, true)633 DDX_EX_FLOAT_POSITIVE( IDC_BC_DOWNRATE, hal::config().downRate)634 DDX_EX_FLOAT_POSITIVE( IDC_BC_UPRATE, hal::config().upRate)635 636 DDX_EX_INT_POSITIVE_LIMIT( IDC_BC_TMAXCONN, hal::config().torrentMaxConnections, 2, true)637 DDX_EX_INT_POSITIVE_LIMIT( IDC_BC_TMAXUP, hal::config().torrentMaxUploads, 2, true)638 DDX_EX_FLOAT_POSITIVE( IDC_BC_TDOWNRATE, hal::config().torrentDownRate)639 DDX_EX_FLOAT_POSITIVE( IDC_BC_TUPRATE, hal::config().torrentUpRate)631 /* DDX_EX_INT_POSITIVE_LIMIT(HAL_BC_MAXCONN, hal::config().maxConnections, 2, true) 632 DDX_EX_INT_POSITIVE_LIMIT(HAL_BC_MAXUP, hal::config().maxUploads, 2, true) 633 DDX_EX_FLOAT_POSITIVE(HAL_BC_DOWNRATE, hal::config().downRate) 634 DDX_EX_FLOAT_POSITIVE(HAL_BC_UPRATE, hal::config().upRate) 635 636 DDX_EX_INT_POSITIVE_LIMIT(HAL_BC_TMAXCONN, hal::config().torrentMaxConnections, 2, true) 637 DDX_EX_INT_POSITIVE_LIMIT(HAL_BC_TMAXUP, hal::config().torrentMaxUploads, 2, true) 638 DDX_EX_FLOAT_POSITIVE(HAL_BC_TDOWNRATE, hal::config().torrentDownRate) 639 DDX_EX_FLOAT_POSITIVE(HAL_BC_TUPRATE, hal::config().torrentUpRate) 640 640 */ 641 DDX_EX_STDWSTRING( IDC_BC_SAVEFOLDER, hal::config().defaultSaveFolder);642 DDX_EX_STDWSTRING( IDC_BC_MOVETO_FOLDER, hal::config().defaultMoveToFolder);643 DDX_CHECK( IDC_BC_MOVETO_CHECK, hal::config().useMoveTo);644 DDX_CHECK( IDC_BC_PROMPTSAVE, hal::config().savePrompt);641 DDX_EX_STDWSTRING(HAL_BC_SAVEFOLDER, hal::config().defaultSaveFolder); 642 DDX_EX_STDWSTRING(HAL_BC_MOVETO_FOLDER, hal::config().defaultMoveToFolder); 643 DDX_CHECK(HAL_BC_MOVETO_CHECK, hal::config().useMoveTo); 644 DDX_CHECK(HAL_BC_PROMPTSAVE, hal::config().savePrompt); 645 645 END_DDX_MAP() 646 646 647 647 BOOL OnInitDialog(HWND hwndFocus, LPARAM lParam) 648 648 { 649 gTotalConnections_.Attach(GetDlgItem( IDC_BC_MAXCONN));650 gUploadConnections_.Attach(GetDlgItem( IDC_BC_MAXUP));651 gDownloadRate_.Attach(GetDlgItem( IDC_BC_DOWNRATE));652 gUploadRate_.Attach(GetDlgItem( IDC_BC_UPRATE));653 654 tTotalConnections_.Attach(GetDlgItem( IDC_BC_TMAXCONN));655 tUploadConnections_.Attach(GetDlgItem( IDC_BC_TMAXUP));656 tDownloadRate_.Attach(GetDlgItem( IDC_BC_TDOWNRATE));657 tUploadRate_.Attach(GetDlgItem( IDC_BC_TUPRATE));649 gTotalConnections_.Attach(GetDlgItem(HAL_BC_MAXCONN)); 650 gUploadConnections_.Attach(GetDlgItem(HAL_BC_MAXUP)); 651 gDownloadRate_.Attach(GetDlgItem(HAL_BC_DOWNRATE)); 652 gUploadRate_.Attach(GetDlgItem(HAL_BC_UPRATE)); 653 654 tTotalConnections_.Attach(GetDlgItem(HAL_BC_TMAXCONN)); 655 tUploadConnections_.Attach(GetDlgItem(HAL_BC_TMAXUP)); 656 tDownloadRate_.Attach(GetDlgItem(HAL_BC_TDOWNRATE)); 657 tUploadRate_.Attach(GetDlgItem(HAL_BC_TUPRATE)); 658 658 659 659 gTotalConnections_ = hal::config().maxConnections; … … 668 668 669 669 BOOL retval = DoDataExchange(false); 670 onMoveToCheck(0, 0, GetDlgItem( IDC_BC_MOVETO_CHECK));670 onMoveToCheck(0, 0, GetDlgItem(HAL_BC_MOVETO_CHECK)); 671 671 672 672 autosizeClass::CtrlsArrange(); … … 682 682 683 683 if (IDOK == fldDlg.DoModal()) 684 SetDlgItemText( IDC_BC_SAVEFOLDER, fldDlg.m_szFolderPath);684 SetDlgItemText(HAL_BC_SAVEFOLDER, fldDlg.m_szFolderPath); 685 685 } 686 686 … … 693 693 694 694 if (IDOK == fldDlg.DoModal()) 695 SetDlgItemText( IDC_BC_MOVETO_FOLDER, fldDlg.m_szFolderPath);695 SetDlgItemText(HAL_BC_MOVETO_FOLDER, fldDlg.m_szFolderPath); 696 696 } 697 697 … … 702 702 if (result == BST_CHECKED) 703 703 { 704 ::EnableWindow(GetDlgItem( IDC_BC_MOVETO_FOLDER), true);705 ::EnableWindow(GetDlgItem( IDC_BC_MOVETO_BROWSE), true);704 ::EnableWindow(GetDlgItem(HAL_BC_MOVETO_FOLDER), true); 705 ::EnableWindow(GetDlgItem(HAL_BC_MOVETO_BROWSE), true); 706 706 } 707 707 else 708 708 { 709 ::EnableWindow(GetDlgItem( IDC_BC_MOVETO_FOLDER), false);710 ::EnableWindow(GetDlgItem( IDC_BC_MOVETO_BROWSE), false);709 ::EnableWindow(GetDlgItem(HAL_BC_MOVETO_FOLDER), false); 710 ::EnableWindow(GetDlgItem(HAL_BC_MOVETO_BROWSE), false); 711 711 } 712 712 } … … 747 747 { 748 748 public: 749 enum { IDD = IDD_CONFIGREMOTE };749 enum { IDD = HAL_CONFIGREMOTE }; 750 750 751 751 RemoteOptions() … … 761 761 762 762 BEGIN_DDX_MAP(RemoteOptions) 763 // DDX_CHECK( IDC_REMOTECTRL, INI().remoteConfig().isEnabled)764 // DDX_INT( IDC_REMOTEPORT, INI().remoteConfig().port)763 // DDX_CHECK(HAL_REMOTECTRL, INI().remoteConfig().isEnabled) 764 // DDX_INT(HAL_REMOTEPORT, INI().remoteConfig().port) 765 765 END_DDX_MAP() 766 766 … … 787 787 788 788 public: 789 enum { IDD = IDD_ABOUT };789 enum { IDD = HAL_ABOUT }; 790 790 791 791 BEGIN_MSG_MAP_EX(thisClass) … … 796 796 797 797 BEGIN_DLGRESIZE_MAP(thisClass) 798 DLGRESIZE_CONTROL( IDC_RICHEDITABOUT, DLSZ_SIZE_X|DLSZ_SIZE_Y)799 DLGRESIZE_CONTROL( IDC_ABOUT_VERSION, DLSZ_MOVE_X|DLSZ_MOVE_Y)798 DLGRESIZE_CONTROL(HAL_RICHEDITABOUT, DLSZ_SIZE_X|DLSZ_SIZE_Y) 799 DLGRESIZE_CONTROL(HAL_ABOUT_VERSION, DLSZ_MOVE_X|DLSZ_MOVE_Y) 800 800 END_DLGRESIZE_MAP() 801 801 802 802 BOOL OnInitDialog (HWND hwndFocus, LPARAM lParam) 803 803 { 804 richEdit_.Attach(GetDlgItem( IDC_RICHEDITABOUT));805 806 std::pair<void*, size_t> res = hal::app().res_find_lock( IDR_ABOUT_TEXT, HALITE_RTF_RES_TYPE);804 richEdit_.Attach(GetDlgItem(HAL_RICHEDITABOUT)); 805 806 std::pair<void*, size_t> res = hal::app().res_find_lock(HAL_ABOUT_TEXT, HALITE_RTF_RES_TYPE); 807 807 808 808 string rtf(static_cast<char*>(res.first), res.second); -
trunk/src/DebugDialog.hpp
r370 r495 42 42 43 43 public: 44 enum { IDD = IDD_DEBUGDIALOG };44 enum { IDD = HAL_DEBUGDIALOG }; 45 45 46 46 BOOL PreTranslateMessage(MSG* pMsg) -
trunk/src/Halite.cpp
r491 r495 164 164 wndMain.ProcessFile(hal::app().command_args().front().c_str()); 165 165 166 wndMain.SetIcon(LoadIcon(hInstance, MAKEINTRESOURCE( IDR_APP_ICON)), false);166 wndMain.SetIcon(LoadIcon(hInstance, MAKEINTRESOURCE(HAL_APP_ICON)), false); 167 167 wndMain.ShowWindow(nCmdShow); 168 168 -
trunk/src/HaliteDialog.cpp
r482 r495 26 26 m_list.SubclassWindow(GetDlgItem(LISTPEERS)); 27 27 28 totalConnections_.Attach(GetDlgItem( IDC_EDITNCD));29 uploadConnections_.Attach(GetDlgItem( IDC_EDITNCU));30 downloadRate_.Attach(GetDlgItem( IDC_EDITTLD));31 uploadRate_.Attach(GetDlgItem( IDC_EDITTLU));28 totalConnections_.Attach(GetDlgItem(HAL_EDITNCD)); 29 uploadConnections_.Attach(GetDlgItem(HAL_EDITNCU)); 30 downloadRate_.Attach(GetDlgItem(HAL_EDITTLD)); 31 uploadRate_.Attach(GetDlgItem(HAL_EDITTLU)); 32 32 33 33 totalConnections_ = -1; … … 45 45 #define TORRENT_LIMITS_LAYOUT \ 46 46 WMB_HEAD(WMB_COL(_exp|20), WMB_COL(_exp|30), WMB_COL(_exp|20), WMB_COL(_exp|30)), \ 47 WMB_ROW(10, IDC_TL, _r, _r, _r), \48 WMB_ROW(11, IDC_TLD, IDC_EDITTLD, IDC_TLU, IDC_EDITTLU), \49 WMB_ROW(10, IDC_NC, _r, _r, _r), \50 WMB_ROW(11, IDC_NCD, IDC_EDITNCD, IDC_NCU, IDC_EDITNCU), \47 WMB_ROW(10, HAL_TL, _r, _r, _r), \ 48 WMB_ROW(11, HAL_TLD, HAL_EDITTLD, HAL_TLU, HAL_EDITTLU), \ 49 WMB_ROW(10, HAL_NC, _r, _r, _r), \ 50 WMB_ROW(11, HAL_NCD, HAL_EDITNCD, HAL_NCU, HAL_EDITNCU), \ 51 51 WMB_END() 52 52 … … 54 54 WMB_HEAD(WMB_COL(45), WMB_COLNOMIN(_exp|100), WMB_COL(_eq|0), WMB_COL(_exp|200)), \ 55 55 WMB_ROW(_gap), \ 56 WMB_ROW(_auto, IDC_NAME_STATIC, IDC_NAME, _r, _r), \57 WMB_ROW(_auto, IDC_TRACKER_STATIC, IDC_TRACKER, _r, _r), \58 WMB_ROW(_auto, IDC_STATUS_STATIC, IDC_STATUS, _r, _r), \59 WMB_ROW(_auto, IDC_TIME_STATIC, IDC_AVAIL, IDC_COMPLETED_STATIC, IDC_COMPLETE), \56 WMB_ROW(_auto, HAL_NAME_STATIC, HAL_NAME, _r, _r), \ 57 WMB_ROW(_auto, HAL_TRACKER_STATIC, HAL_TRACKER, _r, _r), \ 58 WMB_ROW(_auto, HAL_STATUS_STATIC, HAL_STATUS, _r, _r), \ 59 WMB_ROW(_auto, HAL_TIME_STATIC, HAL_AVAIL, HAL_COMPLETED_STATIC, HAL_COMPLETE), \ 60 60 WMB_END() 61 61 … … 70 70 BEGIN_WINDOW_MAP_INLINE(HaliteDialog, 6, 0, 3, 3) 71 71 WMB_HEAD(WMB_COL(_gap), WMB_COL(_exp), WMB_COL(120), WMB_COL(60), WMB_COL(_gap)), 72 WMB_ROW(_gap, IDC_DETAILS_GROUP, _r, _r, _r, _r),72 WMB_ROW(_gap, HAL_DETAILS_GROUP, _r, _r, _r, _r), 73 73 WMB_ROW(_auto, _d, TORRENT_STATUS_LAYOUT, TORRENT_LIMITS_LAYOUT, TORRENT_BUTTON_LAYOUT), 74 74 WMB_ROW(_gap, _d), … … 232 232 ::EnableWindow(GetDlgItem(BTNREMOVE), true); 233 233 234 ::EnableWindow(GetDlgItem( IDC_EDITTLD), true);235 ::EnableWindow(GetDlgItem( IDC_EDITTLU), true);236 ::EnableWindow(GetDlgItem( IDC_EDITNCD), true);237 ::EnableWindow(GetDlgItem( IDC_EDITNCU), true);234 ::EnableWindow(GetDlgItem(HAL_EDITTLD), true); 235 ::EnableWindow(GetDlgItem(HAL_EDITTLU), true); 236 ::EnableWindow(GetDlgItem(HAL_EDITNCD), true); 237 ::EnableWindow(GetDlgItem(HAL_EDITNCU), true); 238 238 } 239 239 else 240 240 { 241 SetDlgItemText( IDC_NAME, hal::app().res_wstr(HAL_NA).c_str());242 SetDlgItemText( IDC_TRACKER, hal::app().res_wstr(HAL_NA).c_str());243 SetDlgItemText( IDC_STATUS, hal::app().res_wstr(HAL_NA).c_str());244 SetDlgItemText( IDC_AVAIL, hal::app().res_wstr(HAL_NA).c_str());245 SetDlgItemText( IDC_COMPLETE, hal::app().res_wstr(HAL_NA).c_str());241 SetDlgItemText(HAL_NAME, hal::app().res_wstr(HAL_NA).c_str()); 242 SetDlgItemText(HAL_TRACKER, hal::app().res_wstr(HAL_NA).c_str()); 243 SetDlgItemText(HAL_STATUS, hal::app().res_wstr(HAL_NA).c_str()); 244 SetDlgItemText(HAL_AVAIL, hal::app().res_wstr(HAL_NA).c_str()); 245 SetDlgItemText(HAL_COMPLETE, hal::app().res_wstr(HAL_NA).c_str()); 246 246 247 247 SetDlgItemText(BTNPAUSE, L"Pause"); … … 252 252 ::EnableWindow(GetDlgItem(BTNREMOVE), false); 253 253 254 ::EnableWindow(GetDlgItem( IDC_EDITTLD), false);255 ::EnableWindow(GetDlgItem( IDC_EDITTLU), false);256 ::EnableWindow(GetDlgItem( IDC_EDITNCD), false);257 ::EnableWindow(GetDlgItem( IDC_EDITNCU), false);254 ::EnableWindow(GetDlgItem(HAL_EDITTLD), false); 255 ::EnableWindow(GetDlgItem(HAL_EDITTLU), false); 256 ::EnableWindow(GetDlgItem(HAL_EDITNCD), false); 257 ::EnableWindow(GetDlgItem(HAL_EDITNCU), false); 258 258 } 259 259 … … 277 277 string torrent_name = hal::to_utf8(torrent->name()); 278 278 279 SetDlgItemText( IDC_NAME, torrent->name().c_str());280 SetDlgItemText( IDC_TRACKER, torrent->currentTracker().c_str());281 SetDlgItemText( IDC_STATUS, torrent->state().c_str());279 SetDlgItemText(HAL_NAME, torrent->name().c_str()); 280 SetDlgItemText(HAL_TRACKER, torrent->currentTracker().c_str()); 281 SetDlgItemText(HAL_STATUS, torrent->state().c_str()); 282 282 m_prog.SetPos(static_cast<int>(torrent->completion()*100)); 283 283 284 284 if (!torrent->estimatedTimeLeft().is_special()) 285 285 { 286 SetDlgItemText( IDC_AVAIL,286 SetDlgItemText(HAL_AVAIL, 287 287 (hal::from_utf8(boost::posix_time::to_simple_string( 288 288 torrent->estimatedTimeLeft())).c_str())); … … 290 290 else 291 291 { 292 SetDlgItemText( IDC_AVAIL, hal::app().res_wstr(HAL_INF).c_str());293 } 294 295 SetDlgItemText( IDC_COMPLETE,292 SetDlgItemText(HAL_AVAIL, hal::app().res_wstr(HAL_INF).c_str()); 293 } 294 295 SetDlgItemText(HAL_COMPLETE, 296 296 (wformat(L"%1$.2fmb of %2$.2fmb") 297 297 % (static_cast<float>(torrent->totalWantedDone())/(1024*1024)) -
trunk/src/HaliteDialog.hpp
r493 r495 7 7 #pragma once 8 8 9 #define IDC_NAME_STATIC 1501210 #define IDC_TRACKER_STATIC 1501311 #define IDC_STATUS_STATIC 1501412 #define IDC_TIME_STATIC 1501513 #define IDC_COMPLETED_STATIC 150169 #define HAL_NAME_STATIC 15012 10 #define HAL_TRACKER_STATIC 15013 11 #define HAL_STATUS_STATIC 15014 12 #define HAL_TIME_STATIC 15015 13 #define HAL_COMPLETED_STATIC 15016 14 14 15 15 #ifndef RC_INVOKED … … 154 154 155 155 public: 156 enum { IDD = IDD_HALITEDLG };156 enum { IDD = HAL_HALITEDLG }; 157 157 158 158 HaliteDialog(HaliteWindow& HalWindow); -
trunk/src/HaliteListView.hpp
r459 r495 330 330 public: 331 331 enum { 332 LISTVIEW_ID_MENU = IDR_LISTVIEW_MENU,332 LISTVIEW_ID_MENU = HAL_LISTVIEW_MENU, 333 333 LISTVIEW_ID_COLUMNNAMES = HAL_LISTVIEW_COLUMNS, 334 334 LISTVIEW_ID_COLUMNWIDTHS = HAL_LISTVIEW_DEFAULTS -
trunk/src/HaliteListViewDlg.hpp
r493 r495 11 11 12 12 #define HAL_ADJUST_DLG_BEGIN 30101 13 #define IDC_ADDT_MOVETO_FOLDER HAL_ADJUST_DLG_BEGIN + 114 #define IDC_ADDT_MOVETO_BROWSE HAL_ADJUST_DLG_BEGIN + 215 #define IDC_ADDT_MOVETO_CHECK HAL_ADJUST_DLG_BEGIN + 316 #define IDC_ADDT_DEFFLD_TEXT HAL_ADJUST_DLG_BEGIN + 417 #define IDC_ADDT_NOTE_TEXT HAL_ADJUST_DLG_BEGIN + 513 #define HAL_ADDT_MOVETO_FOLDER HAL_ADJUST_DLG_BEGIN + 1 14 #define HAL_ADDT_MOVETO_BROWSE HAL_ADJUST_DLG_BEGIN + 2 15 #define HAL_ADDT_MOVETO_CHECK HAL_ADJUST_DLG_BEGIN + 3 16 #define HAL_ADDT_DEFFLD_TEXT HAL_ADJUST_DLG_BEGIN + 4 17 #define HAL_ADDT_NOTE_TEXT HAL_ADJUST_DLG_BEGIN + 5 18 18 #define HAL_ADDT_TITLE HAL_ADJUST_DLG_BEGIN + 6 19 19 … … 43 43 BEGIN_MSG_MAP_EX(thisClass) 44 44 MSG_WM_INITDIALOG(onInitDialog) 45 COMMAND_ID_HANDLER_EX( IDC_ADDT_MOVETO_CHECK, OnMoveTo)46 COMMAND_ID_HANDLER_EX( IDC_BC_SAVEBROWSE, OnBrowse)47 COMMAND_ID_HANDLER_EX( IDC_ADDT_MOVETO_BROWSE, OnMoveBrowse)45 COMMAND_ID_HANDLER_EX(HAL_ADDT_MOVETO_CHECK, OnMoveTo) 46 COMMAND_ID_HANDLER_EX(HAL_BC_SAVEBROWSE, OnBrowse) 47 COMMAND_ID_HANDLER_EX(HAL_ADDT_MOVETO_BROWSE, OnMoveBrowse) 48 48 49 49 CHAIN_MSG_MAP(autosizeClass) … … 51 51 52 52 BEGIN_DDX_MAP(thisClass) 53 DDX_CHECK( IDC_ADDT_MOVETO_CHECK, useMove_)54 DDX_EX_STDWSTRING( IDC_BC_SAVEFOLDER, saveDirectory_)55 DDX_EX_STDWSTRING( IDC_ADDT_MOVETO_FOLDER, moveToDirectory_)53 DDX_CHECK(HAL_ADDT_MOVETO_CHECK, useMove_) 54 DDX_EX_STDWSTRING(HAL_BC_SAVEFOLDER, saveDirectory_) 55 DDX_EX_STDWSTRING(HAL_ADDT_MOVETO_FOLDER, moveToDirectory_) 56 56 END_DDX_MAP() 57 57 58 58 #define ADD_FOLDERS_LAYOUT \ 59 59 WMB_HEAD(WMB_COLNOMAX(_exp), WMB_COL(_auto)), \ 60 WMB_ROW(_auto, IDC_ADDT_DEFFLD_TEXT, _r), \61 WMB_ROW(_auto, IDC_BC_SAVEFOLDER, IDC_BC_SAVEBROWSE), \62 WMB_ROW(_auto, IDC_ADDT_MOVETO_CHECK, _r), \63 WMB_ROW(_auto, IDC_ADDT_MOVETO_FOLDER, IDC_ADDT_MOVETO_BROWSE), \60 WMB_ROW(_auto, HAL_ADDT_DEFFLD_TEXT, _r), \ 61 WMB_ROW(_auto, HAL_BC_SAVEFOLDER, HAL_BC_SAVEBROWSE), \ 62 WMB_ROW(_auto, HAL_ADDT_MOVETO_CHECK, _r), \ 63 WMB_ROW(_auto, HAL_ADDT_MOVETO_FOLDER, HAL_ADDT_MOVETO_BROWSE), \ 64 64 WMB_END() 65 65 … … 76 76 if (disableSaveDir_) 77 77 { 78 ::EnableWindow(GetDlgItem( IDC_BC_SAVEFOLDER), false);79 ::EnableWindow(GetDlgItem( IDC_BC_SAVEBROWSE), false);78 ::EnableWindow(GetDlgItem(HAL_BC_SAVEFOLDER), false); 79 ::EnableWindow(GetDlgItem(HAL_BC_SAVEBROWSE), false); 80 80 } 81 81 82 OnMoveTo(0, 0, GetDlgItem( IDC_ADDT_MOVETO_CHECK));82 OnMoveTo(0, 0, GetDlgItem(HAL_ADDT_MOVETO_CHECK)); 83 83 84 84 SetMsgHandled(false); … … 92 92 if (result == BST_CHECKED) 93 93 { 94 ::EnableWindow(GetDlgItem( IDC_ADDT_MOVETO_FOLDER), true);95 ::EnableWindow(GetDlgItem( IDC_ADDT_MOVETO_BROWSE), true);94 ::EnableWindow(GetDlgItem(HAL_ADDT_MOVETO_FOLDER), true); 95 ::EnableWindow(GetDlgItem(HAL_ADDT_MOVETO_BROWSE), true); 96 96 } 97 97 else 98 98 { 99 ::EnableWindow(GetDlgItem( IDC_ADDT_MOVETO_FOLDER), false);100 ::EnableWindow(GetDlgItem( IDC_ADDT_MOVETO_BROWSE), false);99 ::EnableWindow(GetDlgItem(HAL_ADDT_MOVETO_FOLDER), false); 100 ::EnableWindow(GetDlgItem(HAL_ADDT_MOVETO_BROWSE), false); 101 101 } 102 102 } -
trunk/src/HaliteWindow.cpp
r492 r495 95 95 96 96 //Init ToolBar 97 HWND hWndToolBar = CreateSimpleToolBarCtrl(m_hWnd, IDR_MAINFRAME, FALSE, ATL_SIMPLE_TOOLBAR_PANE_STYLE);97 HWND hWndToolBar = CreateSimpleToolBarCtrl(m_hWnd, HAL_MAINFRAME, FALSE, ATL_SIMPLE_TOOLBAR_PANE_STYLE); 98 98 99 99 // Init ReBar … … 141 141 new hal::EventMsg(L"Creating tray icon..."))); 142 142 // Create the tray icon. 143 trayIcon_.Create(this, IDR_TRAY_MENU, L"Halite",144 CTrayNotifyIcon::LoadIconResource( IDR_APP_ICON), WM_TRAYNOTIFY, IDR_TRAY_MENU);143 trayIcon_.Create(this, HAL_TRAY_MENU, L"Halite", 144 CTrayNotifyIcon::LoadIconResource(HAL_APP_ICON), WM_TRAYNOTIFY, HAL_TRAY_MENU); 145 145 trayIcon_.Hide(); 146 146 … … 149 149 UISetCheck(ID_VIEW_TOOLBAR, 1); 150 150 UISetCheck(ID_VIEW_STATUS_BAR, 1); 151 UISetCheck( IDR_TRAY_MENU, 1);151 UISetCheck(HAL_TRAY_MENU, 1); 152 152 153 153 // TBBUTTONINFO tbinfo = { sizeof(TBBUTTONINFO) }; -
trunk/src/HaliteWindow.hpp
r459 r495 52 52 ~HaliteWindow(); 53 53 54 DECLARE_FRAME_WND_CLASS(NULL, IDR_MAINFRAME);54 DECLARE_FRAME_WND_CLASS(NULL, HAL_MAINFRAME); 55 55 56 56 ui_signal& ui() { return ui_; } … … 95 95 BEGIN_UPDATE_UI_MAP(HaliteWindow) 96 96 UPDATE_ELEMENT(ID_VIEW_TOOLBAR, UPDUI_MENUPOPUP) 97 UPDATE_ELEMENT( IDR_TRAY_MENU, UPDUI_MENUPOPUP)97 UPDATE_ELEMENT(HAL_TRAY_MENU, UPDUI_MENUPOPUP) 98 98 99 99 UPDATE_ELEMENT(ID_VIEW_STATUS_BAR, UPDUI_MENUPOPUP) -
trunk/src/NewTorrentDialog.cpp
r492 r495 20 20 if (dlgOpen.DoModal() == IDOK) 21 21 { 22 SetDlgItemText( IDC_NEWT_FILE, dlgOpen.m_ofn.lpstrFile);22 SetDlgItemText(HAL_NEWT_FILE, dlgOpen.m_ofn.lpstrFile); 23 23 EnableSave_(true); 24 24 } … … 267 267 #define NEWTORRENT_SELECT_LAYOUT \ 268 268 WMB_HEAD(WMB_COLNOMIN(_exp|150), WMB_COL(_auto), WMB_COL(_auto)), \ 269 WMB_ROW(_auto, IDC_NEWTORRENT_SELECT_TEXT, IDC_NEWT_FILE_BROWSE, IDC_NEWT_DIR_BROWSE), \270 WMB_ROWNOMAX(_exp|50, IDC_NEWT_LISTFILES, _r, _r), \269 WMB_ROW(_auto, HAL_NEWTORRENT_SELECT_TEXT, HAL_NEWT_FILE_BROWSE, HAL_NEWT_DIR_BROWSE), \ 270 WMB_ROWNOMAX(_exp|50, HAL_NEWT_LISTFILES, _r, _r), \ 271 271 WMB_END() 272 272 273 273 #define NEWTORRENT_BUTTONS_LAYOUT \ 274 274 WMB_HEAD(WMB_COLNOMIN(_exp), WMB_COL(_auto), WMB_COL(_auto)), \ 275 WMB_ROW(_auto, IDC_NEWTORRENT_PRIVATE, IDOK, IDCANCEL), \275 WMB_ROW(_auto, HAL_NEWTORRENT_PRIVATE, IDOK, IDCANCEL), \ 276 276 WMB_END() 277 277 278 278 #define NEWTORRENT_COMMENT_LAYOUT \ 279 279 WMB_HEAD(WMB_COLNOMIN(_exp)), \ 280 WMB_ROW(_auto, IDC_NEWTORRENT_COMMENT_TEXT), \281 WMB_ROW(_exp, IDC_NEWTORRENT_COMMENT), \280 WMB_ROW(_auto, HAL_NEWTORRENT_COMMENT_TEXT), \ 281 WMB_ROW(_exp, HAL_NEWTORRENT_COMMENT), \ 282 282 WMB_END() 283 283 284 284 #define NEWTORRENT_CREATOR_LAYOUT \ 285 285 WMB_HEAD(WMB_COL(_auto), WMB_COLNOMIN(_exp)), \ 286 WMB_ROW(_auto, IDC_NEWTORRENT_CREATOR_TEXT, IDC_NEWTORRENT_CREATOR), \286 WMB_ROW(_auto, HAL_NEWTORRENT_CREATOR_TEXT, HAL_NEWTORRENT_CREATOR), \ 287 287 WMB_END() 288 288 … … 294 294 #define NEWTORRENT_OUTPUT_LAYOUT \ 295 295 WMB_HEAD(WMB_COL(_auto), WMB_COLNOMIN(_exp), WMB_COL(_auto)), \ 296 WMB_ROW(_auto, IDC_NEWT_OUTFILE_TEXT, IDC_NEWT_FILE, IDC_NEWT_OUT_BROWSE), \296 WMB_ROW(_auto, HAL_NEWT_OUTFILE_TEXT, HAL_NEWT_FILE, HAL_NEWT_OUT_BROWSE), \ 297 297 WMB_END() 298 298 … … 305 305 WMB_ROW(_auto, NEWTORRENT_PIECESIZE_LAYOUT), 306 306 WMB_ROW(_auto, NEWTORRENT_OUTPUT_LAYOUT), 307 WMB_ROW(_auto, IDC_NEWTORRENT_PRIVATE),307 WMB_ROW(_auto, HAL_NEWTORRENT_PRIVATE), 308 308 WMB_END() 309 309 END_WINDOW_MAP_INLINE() … … 328 328 #define NEWTORRENT_TRACKERS_LAYOUT \ 329 329 WMB_HEAD(WMB_COLNOMIN(_exp), WMB_COL(_auto), WMB_COL(_auto)), \ 330 WMB_ROW(_auto, IDC_NEWTORRENT_TRACKERS_TEXT, _r, _r), \331 WMB_ROWNOMAX(_exp|50, IDC_NEWT_LISTTRACKERS, _r, _r), \330 WMB_ROW(_auto, HAL_NEWTORRENT_TRACKERS_TEXT, _r, _r), \ 331 WMB_ROWNOMAX(_exp|50, HAL_NEWT_LISTTRACKERS, _r, _r), \ 332 332 WMB_END() 333 333 … … 343 343 #define NEWTORRENT_PEERS_LAYOUT \ 344 344 WMB_HEAD(WMB_COLNOMIN(_exp), WMB_COL(_auto), WMB_COL(_auto)), \ 345 WMB_ROW(_auto, IDC_NEWTORRENT_PEERS_TEXT, _r, _r), \346 WMB_ROWNOMAX(_exp|50, IDC_NEWT_LISTPEERS, _r, _r), \345 WMB_ROW(_auto, HAL_NEWTORRENT_PEERS_TEXT, _r, _r), \ 346 WMB_ROWNOMAX(_exp|50, HAL_NEWT_LISTPEERS, _r, _r), \ 347 347 WMB_END() 348 348 -
trunk/src/NewTorrentDialog.hpp
r493 r495 8 8 9 9 #define ID_NEWTORRENT_BEGIN 14000 10 #define IDC_NEWTORRENT_SELECT_TEXT ID_NEWTORRENT_BEGIN+111 #define IDC_NEWTORRENT_TRACKERS_TEXT ID_NEWTORRENT_BEGIN+212 #define IDC_NEWTORRENT_CREATOR_TEXT ID_NEWTORRENT_BEGIN+313 #define IDC_NEWTORRENT_CREATOR ID_NEWTORRENT_BEGIN+414 #define IDC_NEWTORRENT_COMMENT_TEXT ID_NEWTORRENT_BEGIN+515 #define IDC_NEWTORRENT_COMMENT ID_NEWTORRENT_BEGIN+616 #define IDC_NEWTORRENT_PRIVATE ID_NEWTORRENT_BEGIN+717 #define IDC_NEWT_FILE_BROWSE ID_NEWTORRENT_BEGIN+818 #define IDC_NEWT_DIR_BROWSE ID_NEWTORRENT_BEGIN+919 #define IDC_NEWT_LISTFILES ID_NEWTORRENT_BEGIN+1010 #define HAL_NEWTORRENT_SELECT_TEXT ID_NEWTORRENT_BEGIN+1 11 #define HAL_NEWTORRENT_TRACKERS_TEXT ID_NEWTORRENT_BEGIN+2 12 #define HAL_NEWTORRENT_CREATOR_TEXT ID_NEWTORRENT_BEGIN+3 13 #define HAL_NEWTORRENT_CREATOR ID_NEWTORRENT_BEGIN+4 14 #define HAL_NEWTORRENT_COMMENT_TEXT ID_NEWTORRENT_BEGIN+5 15 #define HAL_NEWTORRENT_COMMENT ID_NEWTORRENT_BEGIN+6 16 #define HAL_NEWTORRENT_PRIVATE ID_NEWTORRENT_BEGIN+7 17 #define HAL_NEWT_FILE_BROWSE ID_NEWTORRENT_BEGIN+8 18 #define HAL_NEWT_DIR_BROWSE ID_NEWTORRENT_BEGIN+9 19 #define HAL_NEWT_LISTFILES ID_NEWTORRENT_BEGIN+10 20 20 #define HAL_FILES_LISTVIEW_ADV ID_NEWTORRENT_BEGIN+11 21 21 #define HAL_NEW_PANE_DLG ID_NEWTORRENT_BEGIN+12 22 #define IDC_NEWT_TRACKERTIER ID_NEWTORRENT_BEGIN+1323 #define IDC_NEWTORRENT_PEERS_TEXT ID_NEWTORRENT_BEGIN+1424 #define IDC_NEWT_LISTPEERS ID_NEWTORRENT_BEGIN+1522 #define HAL_NEWT_TRACKERTIER ID_NEWTORRENT_BEGIN+13 23 #define HAL_NEWTORRENT_PEERS_TEXT ID_NEWTORRENT_BEGIN+14 24 #define HAL_NEWT_LISTPEERS ID_NEWTORRENT_BEGIN+15 25 25 #define HAL_SAVE_TEXT ID_NEWTORRENT_BEGIN+16 26 #define IDC_NEWT_OUT_BROWSE ID_NEWTORRENT_BEGIN+1727 #define IDC_NEWT_OUTFILE_TEXT ID_NEWTORRENT_BEGIN+1826 #define HAL_NEWT_OUT_BROWSE ID_NEWTORRENT_BEGIN+17 27 #define HAL_NEWT_OUTFILE_TEXT ID_NEWTORRENT_BEGIN+18 28 28 #define HAL_NEWT_SAVING_TORRENT ID_NEWTORRENT_BEGIN+19 29 29 #define HAL_NEWT_DIALOG_TITLE ID_NEWTORRENT_BEGIN+20 … … 124 124 {} 125 125 126 enum { IDD = IDD_NEWTORRENT };126 enum { IDD = HAL_NEWTORRENT }; 127 127 128 128 BEGIN_MSG_MAP_EX(thisClass) … … 130 130 MSG_WM_DESTROY(OnDestroy) 131 131 132 COMMAND_ID_HANDLER_EX( IDC_NEWT_OUT_BROWSE, OnOutBrowse)132 COMMAND_ID_HANDLER_EX(HAL_NEWT_OUT_BROWSE, OnOutBrowse) 133 133 134 134 CHAIN_MSG_MAP(autosizeClass) … … 138 138 139 139 BEGIN_DDX_MAP(thisClass) 140 DDX_EX_STDWSTRING( IDC_NEWTORRENT_CREATOR, creator_);141 DDX_EX_STDWSTRING( IDC_NEWTORRENT_COMMENT, comment_);142 DDX_EX_STDWSTRING( IDC_NEWT_FILE, outFile_);140 DDX_EX_STDWSTRING(HAL_NEWTORRENT_CREATOR, creator_); 141 DDX_EX_STDWSTRING(HAL_NEWTORRENT_COMMENT, comment_); 142 DDX_EX_STDWSTRING(HAL_NEWT_FILE, outFile_); 143 143 DDX_INT(HAL_NEWT_PIECESIZE, pieceSize_); 144 DDX_CHECK( IDC_NEWTORRENT_PRIVATE, private_)144 DDX_CHECK(HAL_NEWTORRENT_PRIVATE, private_) 145 145 END_DDX_MAP() 146 146 … … 183 183 184 184 public: 185 enum { IDD = IDD_NEWT_FILES };185 enum { IDD = HAL_NEWT_FILES }; 186 186 187 187 BEGIN_MSG_MAP_EX(thisClass) … … 189 189 MSG_WM_DESTROY(OnDestroy) 190 190 191 COMMAND_ID_HANDLER_EX( IDC_NEWT_FILE_BROWSE, OnFileBrowse)192 COMMAND_ID_HANDLER_EX( IDC_NEWT_DIR_BROWSE, OnDirBrowse)191 COMMAND_ID_HANDLER_EX(HAL_NEWT_FILE_BROWSE, OnFileBrowse) 192 COMMAND_ID_HANDLER_EX(HAL_NEWT_DIR_BROWSE, OnDirBrowse) 193 193 194 194 CHAIN_MSG_MAP(autosizeClass) … … 199 199 LRESULT onInitDialog(HWND, LPARAM) 200 200 { 201 filesList_.Attach(GetDlgItem( IDC_NEWT_LISTFILES));201 filesList_.Attach(GetDlgItem(HAL_NEWT_LISTFILES)); 202 202 203 203 return 0; … … 238 238 239 239 public: 240 enum { IDD = IDD_NEWT_TRACKERS };240 enum { IDD = HAL_NEWT_TRACKERS }; 241 241 242 242 BEGIN_MSG_MAP_EX(thisClass) … … 258 258 LRESULT onInitDialog(HWND, LPARAM) 259 259 { 260 trackerList_.Attach(GetDlgItem( IDC_NEWT_LISTTRACKERS));260 trackerList_.Attach(GetDlgItem(HAL_NEWT_LISTTRACKERS)); 261 261 262 262 return 0; … … 281 281 282 282 public: 283 enum { IDD = IDD_NEWT_PEERS };283 enum { IDD = HAL_NEWT_PEERS }; 284 284 285 285 BEGIN_MSG_MAP_EX(thisClass) … … 301 301 LRESULT onInitDialog(HWND, LPARAM) 302 302 { 303 peersList_.Attach(GetDlgItem( IDC_NEWT_LISTPEERS));303 peersList_.Attach(GetDlgItem(HAL_NEWT_LISTPEERS)); 304 304 305 305 return 0; -
trunk/src/NewTorrentPeersAD.hpp
r493 r495 26 26 class NewTorrent_PeersAddDialog : 27 27 public ATL::CDialogImpl<NewTorrent_PeersAddDialog>, 28 public WTLx::GenericAddDialog<NewTorrent_PeersAddDialog, IDD_PEEREDIT>,28 public WTLx::GenericAddDialog<NewTorrent_PeersAddDialog, HAL_PEEREDIT>, 29 29 public WTL::CDialogResize<NewTorrent_PeersAddDialog>, 30 30 public CWinDataExchangeEx<NewTorrent_PeersAddDialog> … … 32 32 public: 33 33 typedef NewTorrent_PeersAddDialog thisClass; 34 typedef WTLx::GenericAddDialog<thisClass, IDD_PEEREDIT> genericBaseClass;34 typedef WTLx::GenericAddDialog<thisClass, HAL_PEEREDIT> genericBaseClass; 35 35 typedef WTL::CDialogResize<thisClass> resizeClass; 36 36 -
trunk/src/NewTorrentTrackerAD.hpp
r493 r495 17 17 class NewTorrent_TrackerAddDialog : 18 18 public ATL::CDialogImpl<NewTorrent_TrackerAddDialog>, 19 public WTLx::GenericAddDialog<NewTorrent_TrackerAddDialog, IDD_TRACKEDIT>,19 public WTLx::GenericAddDialog<NewTorrent_TrackerAddDialog, HAL_TRACKEDIT>, 20 20 public WTL::CDialogResize<NewTorrent_TrackerAddDialog>, 21 21 public CWinDataExchangeEx<NewTorrent_TrackerAddDialog> … … 23 23 public: 24 24 typedef NewTorrent_TrackerAddDialog thisClass; 25 typedef WTLx::GenericAddDialog<thisClass, IDD_TRACKEDIT> genericBaseClass;25 typedef WTLx::GenericAddDialog<thisClass, HAL_TRACKEDIT> genericBaseClass; 26 26 typedef WTL::CDialogResize<thisClass> resizeClass; 27 27 -
trunk/src/ProgressDialog.hpp
r493 r495 7 7 #pragma once 8 8 9 #define IDD_PROGRESS 150009 #define HAL_PROGRESS 15000 10 10 #define ID_PROGRESS_BEGIN 15001 11 11 12 #define IDC_PROG_DESCP ID_PROGRESS_BEGIN + 113 #define IDC_PROG_CANCEL ID_PROGRESS_BEGIN + 214 #define IDC_PROG_PROGRESS ID_PROGRESS_BEGIN + 312 #define HAL_PROG_DESCP ID_PROGRESS_BEGIN + 1 13 #define HAL_PROG_CANCEL ID_PROGRESS_BEGIN + 2 14 #define HAL_PROG_PROGRESS ID_PROGRESS_BEGIN + 3 15 15 16 16 #ifndef RC_INVOKED … … 37 37 {} 38 38 39 enum { IDD = IDD_PROGRESS };39 enum { IDD = HAL_PROGRESS }; 40 40 41 41 BEGIN_MSG_MAP_EX(ProgressDialog) 42 42 MSG_WM_INITDIALOG(onInitDialog) 43 43 44 COMMAND_ID_HANDLER_EX( IDC_PROG_CANCEL, onCancel)44 COMMAND_ID_HANDLER_EX(HAL_PROG_CANCEL, onCancel) 45 45 END_MSG_MAP() 46 46 … … 49 49 CenterWindow(); 50 50 SetWindowText(windowText_.c_str()); 51 prog_.Attach(GetDlgItem( IDC_PROG_PROGRESS));51 prog_.Attach(GetDlgItem(HAL_PROG_PROGRESS)); 52 52 prog_.SetRange(0, 100); 53 53 … … 66 66 bool Callback(size_t progress, wstring description) 67 67 { 68 SetDlgItemText( IDC_PROG_DESCP, description.c_str());68 SetDlgItemText(HAL_PROG_DESCP, description.c_str()); 69 69 prog_.SetPos(progress); 70 70 -
trunk/src/SplashDialog.hpp
r493 r495 14 14 #define HAL_SPLASH_FORCE_CLOSE HAL_SPLASHDIALOG_BEGIN+5 15 15 16 //#define IDC_NEWTORRENT_CREATOR_TEXT HAL_SPLASHDIALOG_BEGIN+317 //#define IDC_NEWTORRENT_CREATOR HAL_SPLASHDIALOG_BEGIN+416 //#define HAL_NEWTORRENT_CREATOR_TEXT HAL_SPLASHDIALOG_BEGIN+3 17 //#define HAL_NEWTORRENT_CREATOR HAL_SPLASHDIALOG_BEGIN+4 18 18 19 19 #ifndef RC_INVOKED … … 40 40 41 41 public: 42 enum { IDD = IDD_CLOSESPLASH };42 enum { IDD = HAL_CLOSESPLASH }; 43 43 44 44 SplashDialog() : … … 57 57 58 58 BEGIN_DDX_MAP(CMainDlg) 59 DDX_CHECK( IDC_SPLASH_MSG, halite().showMessage_)59 DDX_CHECK(HAL_SPLASH_MSG, halite().showMessage_) 60 60 END_DDX_MAP() 61 61 … … 63 63 DLGRESIZE_CONTROL(HAL_CSPLASH_MSG, DLSZ_SIZE_X|DLSZ_SIZE_Y) 64 64 DLGRESIZE_CONTROL(HAL_CSPLASH_NUM_ACT, DLSZ_MOVE_Y|DLSZ_SIZE_X) 65 DLGRESIZE_CONTROL( IDC_SPLASH_MSG, DLSZ_MOVE_Y|DLSZ_SIZE_X)65 DLGRESIZE_CONTROL(HAL_SPLASH_MSG, DLSZ_MOVE_Y|DLSZ_SIZE_X) 66 66 DLGRESIZE_CONTROL(HAL_SPLASH_FORCE_CLOSE, DLSZ_MOVE_Y|DLSZ_MOVE_X) 67 67 END_DLGRESIZE_MAP() -
trunk/src/advtabs/Debug.cpp
r410 r495 18 18 if (result == BST_CHECKED) 19 19 { 20 ::EnableWindow(GetDlgItem( IDC_TRACKER_USER), true);21 ::EnableWindow(GetDlgItem( IDC_TRACKER_PASS), true);20 ::EnableWindow(GetDlgItem(HAL_TRACKER_USER), true); 21 ::EnableWindow(GetDlgItem(HAL_TRACKER_PASS), true); 22 22 } 23 23 else 24 24 { 25 ::EnableWindow(GetDlgItem( IDC_TRACKER_USER), false);26 ::EnableWindow(GetDlgItem( IDC_TRACKER_PASS), false);25 ::EnableWindow(GetDlgItem(HAL_TRACKER_USER), false); 26 ::EnableWindow(GetDlgItem(HAL_TRACKER_PASS), false); 27 27 } 28 28 } … … 30 30 LRESULT AdvDebugDialog::onInitDialog(HWND, LPARAM) 31 31 { 32 logList.Attach(GetDlgItem( IDC_DEBUGLISTVIEW));32 logList.Attach(GetDlgItem(HAL_DEBUGLISTVIEW)); 33 33 34 34 resizeClass::DlgResize_Init(false, true, WS_CLIPCHILDREN); … … 40 40 BOOL AdvDebugDialog::DoDataExchange(BOOL bSaveAndValidate, UINT nCtlID) 41 41 { 42 DDX_CHECK( IDC_DEBUGFILECHECK, halite().logToFile_)43 DDX_CHECK( IDC_DEBUGDEBUGCHECK, halite().logDebug_)42 DDX_CHECK(HAL_DEBUGFILECHECK, halite().logToFile_) 43 DDX_CHECK(HAL_DEBUGDEBUGCHECK, halite().logDebug_) 44 44 45 45 return TRUE; -
trunk/src/advtabs/Debug.hpp
r493 r495 215 215 216 216 public: 217 enum { IDD = IDD_ADVDEBUGLOG };217 enum { IDD = HAL_ADVDEBUGLOG }; 218 218 219 219 AdvDebugDialog(HaliteWindow& halWindow) : … … 230 230 MSG_WM_CLOSE(onClose) 231 231 232 COMMAND_ID_HANDLER_EX( IDC_DEBUGFILECHECK, onFileCheck)233 COMMAND_ID_HANDLER_EX( IDC_DEBUGDEBUGCHECK, onDebugCheck)232 COMMAND_ID_HANDLER_EX(HAL_DEBUGFILECHECK, onFileCheck) 233 COMMAND_ID_HANDLER_EX(HAL_DEBUGDEBUGCHECK, onDebugCheck) 234 234 235 235 if (uMsg == WM_FORWARDMSG) … … 245 245 246 246 BEGIN_DLGRESIZE_MAP(thisClass) 247 DLGRESIZE_CONTROL( IDC_DEBUGLISTVIEW, DLSZ_SIZE_X|DLSZ_SIZE_Y)248 DLGRESIZE_CONTROL( IDC_DEBUGFILECHECK, DLSZ_SIZE_X|DLSZ_MOVE_Y)249 DLGRESIZE_CONTROL( IDC_DEBUGDEBUGCHECK, DLSZ_MOVE_X|DLSZ_MOVE_Y)247 DLGRESIZE_CONTROL(HAL_DEBUGLISTVIEW, DLSZ_SIZE_X|DLSZ_SIZE_Y) 248 DLGRESIZE_CONTROL(HAL_DEBUGFILECHECK, DLSZ_SIZE_X|DLSZ_MOVE_Y) 249 DLGRESIZE_CONTROL(HAL_DEBUGDEBUGCHECK, DLSZ_MOVE_X|DLSZ_MOVE_Y) 250 250 END_DLGRESIZE_MAP() 251 251 -
trunk/src/advtabs/Files.cpp
r492 r495 75 75 76 76 WTL::CMenuHandle menu; 77 BOOL menu_created = menu.LoadMenu( IDR_FILESLISTVIEW_MENU);77 BOOL menu_created = menu.LoadMenu(HAL_FILESLISTVIEW_MENU); 78 78 assert(menu_created); 79 79 … … 185 185 WTL::CRect rc; GetClientRect(&rc); 186 186 187 static_.SubclassWindow(GetDlgItem( IDC_CONTAINER));188 189 splitter_.Create(GetDlgItem( IDC_CONTAINER), rc, NULL, WS_CHILD|WS_VISIBLE|WS_CLIPSIBLINGS|WS_CLIPCHILDREN);187 static_.SubclassWindow(GetDlgItem(HAL_CONTAINER)); 188 189 splitter_.Create(GetDlgItem(HAL_CONTAINER), rc, NULL, WS_CHILD|WS_VISIBLE|WS_CLIPSIBLINGS|WS_CLIPCHILDREN); 190 190 splitter_.SetSplitterExtendedStyle(!SPLIT_PROPORTIONAL, SPLIT_PROPORTIONAL); 191 191 … … 215 215 resizeClass::DlgResize_UpdateLayout(cxWidth, cyHeight); 216 216 217 WTL::CRect rect; ::GetClientRect(GetDlgItem( IDC_CONTAINER), &rect);217 WTL::CRect rect; ::GetClientRect(GetDlgItem(HAL_CONTAINER), &rect); 218 218 219 219 splitter_.SetWindowPos(NULL, rect.left, rect.top, -
trunk/src/advtabs/Files.hpp
r493 r495 150 150 public: 151 151 enum { 152 LISTVIEW_ID_MENU = IDR_FILESLISTVIEW_MENU,152 LISTVIEW_ID_MENU = HAL_FILESLISTVIEW_MENU, 153 153 LISTVIEW_ID_COLUMNNAMES = HAL_DIALOGFILE_LISTVIEW_ADV, 154 154 LISTVIEW_ID_COLUMNWIDTHS = 0 … … 392 392 393 393 public: 394 enum { IDD = IDD_ADVFILES };394 enum { IDD = HAL_ADVFILES }; 395 395 396 396 AdvFilesDialog(HaliteWindow& halWindow) : … … 426 426 427 427 BEGIN_DLGRESIZE_MAP(thisClass) 428 DLGRESIZE_CONTROL( IDC_CONTAINER, DLSZ_SIZE_X|DLSZ_SIZE_Y|DLSZ_REPAINT)428 DLGRESIZE_CONTROL(HAL_CONTAINER, DLSZ_SIZE_X|DLSZ_SIZE_Y|DLSZ_REPAINT) 429 429 END_DLGRESIZE_MAP() 430 430 -
trunk/src/advtabs/Peers.cpp
r423 r495 89 89 LRESULT AdvPeerDialog::OnInitDialog(HWND, LPARAM) 90 90 { 91 peerList_.SubclassWindow(GetDlgItem( IDC_PEERLIST));91 peerList_.SubclassWindow(GetDlgItem(HAL_PEERLIST)); 92 92 93 93 resizeClass::DlgResize_Init(false, true, WS_CLIPCHILDREN); -
trunk/src/advtabs/Peers.hpp
r492 r495 141 141 142 142 public: 143 enum { IDD = IDD_ADVPEER };143 enum { IDD = HAL_ADVPEER }; 144 144 145 145 AdvPeerDialog(HaliteWindow& halWindow) : … … 166 166 167 167 BEGIN_DLGRESIZE_MAP(thisClass) 168 DLGRESIZE_CONTROL( IDC_PEERLIST, DLSZ_SIZE_X|DLSZ_SIZE_Y)168 DLGRESIZE_CONTROL(HAL_PEERLIST, DLSZ_SIZE_X|DLSZ_SIZE_Y) 169 169 END_DLGRESIZE_MAP() 170 170 -
trunk/src/advtabs/ThemeTestDialog.hpp
r492 r495 26 26 typedef WTL::CDialogResize<ThemeTestDialog> resizeClass; 27 27 public: 28 enum { IDD = IDD_THEMETEST };28 enum { IDD = HAL_THEMETEST }; 29 29 30 30 ThemeTestDialog() … … 52 52 LRESULT onInitDialog(HWND, LPARAM) 53 53 { 54 ::SetWindowText(GetDlgItem( IDC_EDIT2), L"Eoin");54 ::SetWindowText(GetDlgItem(HAL_EDIT2), L"Eoin"); 55 55 return 0; 56 56 } -
trunk/src/advtabs/Torrent.cpp
r455 r495 23 23 m_prog.SetRange(0, 100); 24 24 25 totalConnections_.Attach(GetDlgItem( IDC_EDITNCD));26 uploadConnections_.Attach(GetDlgItem( IDC_EDITNCU));27 downloadRate_.Attach(GetDlgItem( IDC_EDITTLD));28 uploadRate_.Attach(GetDlgItem( IDC_EDITTLU));29 ratio_.Attach(GetDlgItem( IDC_EDITRATIO));25 totalConnections_.Attach(GetDlgItem(HAL_EDITNCD)); 26 uploadConnections_.Attach(GetDlgItem(HAL_EDITNCU)); 27 downloadRate_.Attach(GetDlgItem(HAL_EDITTLD)); 28 uploadRate_.Attach(GetDlgItem(HAL_EDITTLU)); 29 ratio_.Attach(GetDlgItem(HAL_EDITRATIO)); 30 30 31 31 totalConnections_ = -1; … … 43 43 #define TORRENT_LIMITS_LAYOUT \ 44 44 WMB_HEAD(WMB_COL(_exp|20), WMB_COL(_exp|30), WMB_COL(_exp|20), WMB_COL(_exp|30)), \ 45 WMB_ROW(10, IDC_TL, _r, _r, _r), \46 WMB_ROW(11, IDC_TLD, IDC_EDITTLD, IDC_TLU, IDC_EDITTLU), \47 WMB_ROW(10, IDC_NC, _r, _r, _r), \48 WMB_ROW(11, IDC_NCD, IDC_EDITNCD, IDC_NCU, IDC_EDITNCU), \49 WMB_ROW(11, IDC_RATIOESTATIC, _r, _r, IDC_EDITRATIO), \45 WMB_ROW(10, HAL_TL, _r, _r, _r), \ 46 WMB_ROW(11, HAL_TLD, HAL_EDITTLD, HAL_TLU, HAL_EDITTLU), \ 47 WMB_ROW(10, HAL_NC, _r, _r, _r), \ 48 WMB_ROW(11, HAL_NCD, HAL_EDITNCD, HAL_NCU, HAL_EDITNCU), \ 49 WMB_ROW(11, HAL_RATIOESTATIC, _r, _r, HAL_EDITRATIO), \ 50 50 WMB_END() 51 51 52 52 #define TORRENT_STATUS_LAYOUT \ 53 53 WMB_HEAD(WMB_COL(45), WMB_COLNOMIN(_exp|150), WMB_COL(_eq|0), WMB_COL(_exp|100)), \ 54 WMB_ROW(10, IDC_NAME_STATUS_LABEL, IDC_NAME_STATUS, _r, _r), \55 WMB_ROW(10, IDC_PEERS_LABEL, IDC_PEERS, IDC_SEEDS_LABEL, IDC_SEEDS), \56 WMB_ROW(10, IDC_TRANSFERED_LABEL, IDC_TRANSFERED, IDC_OVERHEAD_LABEL, IDC_OVERHEAD), \57 WMB_ROW(10, IDC_REMAINING_LABEL, IDC_REMAINING, IDC_ETA_LABEL, IDC_ETA), \58 WMB_ROW(10, IDC_RATE_LABEL, IDC_RATE, IDC_RATIO_LABEL, IDC_RATIO), \54 WMB_ROW(10, HAL_NAME_STATUS_LABEL, HAL_NAME_STATUS, _r, _r), \ 55 WMB_ROW(10, HAL_PEERS_LABEL, HAL_PEERS, HAL_SEEDS_LABEL, HAL_SEEDS), \ 56 WMB_ROW(10, HAL_TRANSFERED_LABEL, HAL_TRANSFERED, HAL_OVERHEAD_LABEL, HAL_OVERHEAD), \ 57 WMB_ROW(10, HAL_REMAINING_LABEL, HAL_REMAINING, HAL_ETA_LABEL, HAL_ETA), \ 58 WMB_ROW(10, HAL_RATE_LABEL, HAL_RATE, HAL_RATIO_LABEL, HAL_RATIO), \ 59 59 WMB_END() 60 60 61 61 #define TORRENT_REANNOUNCE_LAYOUT \ 62 62 WMB_HEAD(WMB_COL(50), WMB_COLNOMIN(_exp)), \ 63 WMB_ROW(10, IDC_UPDATESTAT, IDC_UPDATE), \63 WMB_ROW(10, HAL_UPDATESTAT, HAL_UPDATE), \ 64 64 WMB_END() 65 65 66 66 BEGIN_WINDOW_MAP_INLINE(AdvTorrentDialog, 6, 6, 3, 3) 67 67 WMB_HEAD(WMB_COL(_gap), WMB_COL(_exp), WMB_COL(120), WMB_COL(_gap)), 68 WMB_ROW(_gap|3, IDC_GROUP_TORRENT, _r, _r, _r),68 WMB_ROW(_gap|3, HAL_GROUP_TORRENT, _r, _r, _r), 69 69 WMB_ROW(_auto, _d, TORRENT_STATUS_LAYOUT, TORRENT_LIMITS_LAYOUT), 70 70 WMB_ROW(_auto, _d, TORRENTPROG, _r), 71 71 WMB_ROW(_gap, _d), 72 WMB_ROW(_gap|3, IDC_GROUP_TRACKER, _r, _r, _r),73 WMB_ROW(_auto, _d, IDC_TRACKER, TORRENT_REANNOUNCE_LAYOUT),72 WMB_ROW(_gap|3, HAL_GROUP_TRACKER, _r, _r, _r), 73 WMB_ROW(_auto, _d, HAL_TRACKER, TORRENT_REANNOUNCE_LAYOUT), 74 74 WMB_ROW(_gap, _d), 75 75 WMB_END() … … 110 110 ratio = t.ratio; 111 111 112 ::EnableWindow(GetDlgItem( IDC_EDITTLD), true);113 ::EnableWindow(GetDlgItem( IDC_EDITTLU), true);114 ::EnableWindow(GetDlgItem( IDC_EDITNCD), true);115 ::EnableWindow(GetDlgItem( IDC_EDITNCU), true);116 ::EnableWindow(GetDlgItem( IDC_EDITRATIO), true);112 ::EnableWindow(GetDlgItem(HAL_EDITTLD), true); 113 ::EnableWindow(GetDlgItem(HAL_EDITTLU), true); 114 ::EnableWindow(GetDlgItem(HAL_EDITNCD), true); 115 ::EnableWindow(GetDlgItem(HAL_EDITNCU), true); 116 ::EnableWindow(GetDlgItem(HAL_EDITRATIO), true); 117 117 } 118 118 else 119 119 { 120 SetDlgItemText( IDC_NAME_STATUS, hal::app().res_wstr(HAL_NA).c_str());121 SetDlgItemText( IDC_PEERS, hal::app().res_wstr(HAL_NA).c_str());122 SetDlgItemText( IDC_SEEDS, hal::app().res_wstr(HAL_NA).c_str());123 SetDlgItemText( IDC_TRANSFERED, hal::app().res_wstr(HAL_NA).c_str());124 SetDlgItemText( IDC_OVERHEAD, hal::app().res_wstr(HAL_NA).c_str());125 SetDlgItemText( IDC_REMAINING, hal::app().res_wstr(HAL_NA).c_str());126 SetDlgItemText( IDC_ETA, hal::app().res_wstr(HAL_NA).c_str());127 SetDlgItemText( IDC_RATE, hal::app().res_wstr(HAL_NA).c_str());128 SetDlgItemText( IDC_RATIO, hal::app().res_wstr(HAL_NA).c_str());129 SetDlgItemText( IDC_TRACKER, hal::app().res_wstr(HAL_NA).c_str());130 SetDlgItemText( IDC_UPDATE, hal::app().res_wstr(HAL_NA).c_str());120 SetDlgItemText(HAL_NAME_STATUS, hal::app().res_wstr(HAL_NA).c_str()); 121 SetDlgItemText(HAL_PEERS, hal::app().res_wstr(HAL_NA).c_str()); 122 SetDlgItemText(HAL_SEEDS, hal::app().res_wstr(HAL_NA).c_str()); 123 SetDlgItemText(HAL_TRANSFERED, hal::app().res_wstr(HAL_NA).c_str()); 124 SetDlgItemText(HAL_OVERHEAD, hal::app().res_wstr(HAL_NA).c_str()); 125 SetDlgItemText(HAL_REMAINING, hal::app().res_wstr(HAL_NA).c_str()); 126 SetDlgItemText(HAL_ETA, hal::app().res_wstr(HAL_NA).c_str()); 127 SetDlgItemText(HAL_RATE, hal::app().res_wstr(HAL_NA).c_str()); 128 SetDlgItemText(HAL_RATIO, hal::app().res_wstr(HAL_NA).c_str()); 129 SetDlgItemText(HAL_TRACKER, hal::app().res_wstr(HAL_NA).c_str()); 130 SetDlgItemText(HAL_UPDATE, hal::app().res_wstr(HAL_NA).c_str()); 131 131 132 132 m_prog.SetPos(0); 133 133 134 ::EnableWindow(GetDlgItem( IDC_EDITTLD), false);135 ::EnableWindow(GetDlgItem( IDC_EDITTLU), false);136 ::EnableWindow(GetDlgItem( IDC_EDITNCD), false);137 ::EnableWindow(GetDlgItem( IDC_EDITNCU), false);138 ::EnableWindow(GetDlgItem( IDC_EDITRATIO), false);134 ::EnableWindow(GetDlgItem(HAL_EDITTLD), false); 135 ::EnableWindow(GetDlgItem(HAL_EDITTLU), false); 136 ::EnableWindow(GetDlgItem(HAL_EDITNCD), false); 137 ::EnableWindow(GetDlgItem(HAL_EDITNCU), false); 138 ::EnableWindow(GetDlgItem(HAL_EDITRATIO), false); 139 139 } 140 140 … … 166 166 HAL_RATE "Downloading at %1$.2fkb/s, Uploading at %2$.2fkb/s, Ratio %3$.2f." 167 167 */ 168 SetDlgItemInfo( IDC_NAME_STATUS,168 SetDlgItemInfo(HAL_NAME_STATUS, 169 169 wformat(hal::app().res_wstr(HAL_NAME_STATUS)) 170 170 % torrent->name() 171 171 % torrent->state()); 172 172 173 SetDlgItemInfo( IDC_PEERS,173 SetDlgItemInfo(HAL_PEERS, 174 174 wformat(L"%1% (%2%)") 175 175 % torrent->peersConnected() 176 176 % torrent->peers()); 177 177 178 SetDlgItemInfo( IDC_SEEDS,178 SetDlgItemInfo(HAL_SEEDS, 179 179 wformat(L"%1% (%2%)") 180 180 % torrent->seedsConnected() 181 181 % torrent->seeds()); 182 182 183 SetDlgItemInfo( IDC_TRANSFERED,183 SetDlgItemInfo(HAL_TRANSFERED, 184 184 wformat(hal::app().res_wstr(HAL_TRANSFERED)) 185 185 % (static_cast<float>(torrent->totalPayloadDownloaded())/(1024*1024)) 186 186 % (static_cast<float>(torrent->totalPayloadUploaded())/(1024*1024))); 187 187 188 SetDlgItemInfo( IDC_OVERHEAD,188 SetDlgItemInfo(HAL_OVERHEAD, 189 189 wformat(L"%1$.2fMB - %2$.2fMB") 190 190 % (static_cast<float>(torrent->totalDownloaded() - torrent->totalPayloadDownloaded())/(1024*1024)) 191 191 % (static_cast<float>(torrent->totalUploaded() - torrent->totalPayloadUploaded())/(1024*1024))); 192 192 193 SetDlgItemInfo( IDC_REMAINING,193 SetDlgItemInfo(HAL_REMAINING, 194 194 wformat(hal::app().res_wstr(HAL_REMAINING)) 195 195 % (static_cast<float>(torrent->totalWanted()-torrent->totalWantedDone())/(1024*1024)) … … 200 200 eta = hal::from_utf8(boost::posix_time::to_simple_string(torrent->estimatedTimeLeft())); 201 201 202 SetDlgItemInfo( IDC_ETA, eta);202 SetDlgItemInfo(HAL_ETA, eta); 203 203 204 SetDlgItemInfo( IDC_RATE,204 SetDlgItemInfo(HAL_RATE, 205 205 wformat(hal::app().res_wstr(HAL_RATE)) 206 206 % (torrent->speed().first/1024) … … 212 212 : 0; 213 213 214 SetDlgItemInfo( IDC_RATIO,214 SetDlgItemInfo(HAL_RATIO, 215 215 wformat(L"%1$.2f") % ratio); 216 216 217 217 m_prog.SetPos(static_cast<int>(torrent->completion()*100)); 218 218 219 SetDlgItemText( IDC_TRACKER, torrent->currentTracker().c_str());219 SetDlgItemText(HAL_TRACKER, torrent->currentTracker().c_str()); 220 220 221 221 if (!torrent->updateTrackerIn().is_special()) 222 222 { 223 SetDlgItemText( IDC_UPDATE,223 SetDlgItemText(HAL_UPDATE, 224 224 (hal::from_utf8(boost::posix_time::to_simple_string(torrent->updateTrackerIn())).c_str())); 225 225 } 226 else SetDlgItemText( IDC_UPDATE, hal::app().res_wstr(HAL_NA).c_str());226 else SetDlgItemText(HAL_UPDATE, hal::app().res_wstr(HAL_NA).c_str()); 227 227 } 228 228 } -
trunk/src/advtabs/Torrent.hpp
r493 r495 56 56 57 57 public: 58 enum { IDD = IDD_ADVOVERVIEW };58 enum { IDD = HAL_ADVOVERVIEW }; 59 59 60 60 AdvTorrentDialog(HaliteWindow& HalWindow) : … … 84 84 END_DDX_MAP() 85 85 86 TRANSPARENT_LIST(thisClass, IDC_GROUP_TORRENT, IDC_GROUP_TRACKER, IDC_TL, IDC_NAME_STATUS_LABEL)86 TRANSPARENT_LIST(thisClass, HAL_GROUP_TORRENT, HAL_GROUP_TRACKER, HAL_TL, HAL_NAME_STATUS_LABEL) 87 87 88 88 static CWindowMapStruct* GetWindowMap(); -
trunk/src/advtabs/Tracker.cpp
r456 r495 17 17 dialogBaseClass::InitializeHalDialogBase(); 18 18 19 m_list.Attach(GetDlgItem( IDC_TRACKERLIST));19 m_list.Attach(GetDlgItem(HAL_TRACKERLIST)); 20 20 m_list.attachEditedConnection(bind(&AdvTrackerDialog::trackerListEdited, this)); 21 21 22 ::EnableWindow(GetDlgItem( IDC_TRACKER_LOGINCHECK), false);23 ::EnableWindow(GetDlgItem( IDC_TRACKERLIST), false);22 ::EnableWindow(GetDlgItem(HAL_TRACKER_LOGINCHECK), false); 23 ::EnableWindow(GetDlgItem(HAL_TRACKERLIST), false); 24 24 25 25 username_ = L""; 26 26 password_ = L""; 27 27 28 userEdit_.SubclassWindow(GetDlgItem( IDC_TRACKER_USER));29 passEdit_.SubclassWindow(GetDlgItem( IDC_TRACKER_PASS));28 userEdit_.SubclassWindow(GetDlgItem(HAL_TRACKER_USER)); 29 passEdit_.SubclassWindow(GetDlgItem(HAL_TRACKER_PASS)); 30 30 31 31 DoDataExchange(false); … … 37 37 if (username_ == L"") 38 38 { 39 ::SendMessage(GetDlgItem( IDC_TRACKER_LOGINCHECK), BM_SETCHECK, BST_UNCHECKED, 0);39 ::SendMessage(GetDlgItem(HAL_TRACKER_LOGINCHECK), BM_SETCHECK, BST_UNCHECKED, 0); 40 40 password_ = L""; 41 41 } 42 42 else 43 43 { 44 ::SendMessage(GetDlgItem( IDC_TRACKER_LOGINCHECK), BM_SETCHECK, BST_CHECKED, 0);45 } 46 47 onLoginCheck(0, 0, GetDlgItem( IDC_TRACKER_LOGINCHECK));44 ::SendMessage(GetDlgItem(HAL_TRACKER_LOGINCHECK), BM_SETCHECK, BST_CHECKED, 0); 45 } 46 47 onLoginCheck(0, 0, GetDlgItem(HAL_TRACKER_LOGINCHECK)); 48 48 } 49 49 … … 72 72 if (pT) 73 73 { 74 ::EnableWindow(GetDlgItem( IDC_TRACKER_LOGINCHECK), true);75 ::EnableWindow(GetDlgItem( IDC_TRACKERLIST), true);74 ::EnableWindow(GetDlgItem(HAL_TRACKER_LOGINCHECK), true); 75 ::EnableWindow(GetDlgItem(HAL_TRACKERLIST), true); 76 76 77 77 std::pair<wstring, wstring> details = hal::bittorrent().get(pT).tracker_login; … … 82 82 else 83 83 { 84 ::EnableWindow(GetDlgItem( IDC_TRACKER_LOGINCHECK), false);85 ::EnableWindow(GetDlgItem( IDC_TRACKERLIST), false);84 ::EnableWindow(GetDlgItem(HAL_TRACKER_LOGINCHECK), false); 85 ::EnableWindow(GetDlgItem(HAL_TRACKERLIST), false); 86 86 87 87 username_ = L""; … … 91 91 m_list.uiUpdate(pT); 92 92 93 ::EnableWindow(GetDlgItem( IDC_TRACKER_APPLY), false);93 ::EnableWindow(GetDlgItem(HAL_TRACKER_APPLY), false); 94 94 setLoginUiState(); 95 95 … … 104 104 #define TRACKER_LOGIN_LAYOUT \ 105 105 WMB_HEAD(WMB_COL(_exp|50), WMB_COL(_exp|66), WMB_COL(_exp|33)), \ 106 WMB_ROW(_auto, IDC_TRACKER_LOGINCHECK, _r, _r), \107 WMB_ROW(_auto, IDC_TRACKER_USER_S, IDC_TRACKER_USER, _r), \108 WMB_ROW(_auto, IDC_TRACKER_PASS_S, IDC_TRACKER_PASS, _r), \109 WMB_ROW(_auto, _, IDC_LOGIN_APPLY), \110 WMB_ROW(_auto, _, IDC_REANNOUNCE), \106 WMB_ROW(_auto, HAL_TRACKER_LOGINCHECK, _r, _r), \ 107 WMB_ROW(_auto, HAL_TRACKER_USER_S, HAL_TRACKER_USER, _r), \ 108 WMB_ROW(_auto, HAL_TRACKER_PASS_S, HAL_TRACKER_PASS, _r), \ 109 WMB_ROW(_auto, _, HAL_LOGIN_APPLY), \ 110 WMB_ROW(_auto, _, HAL_REANNOUNCE), \ 111 111 WMB_END() 112 112 113 113 #define TRACKER_LIST_LAYOUT \ 114 114 WMB_HEAD(WMB_COL(_exp), WMB_COLNOMIN(_exp|25), WMB_COL(_exp|25)), \ 115 WMB_ROW(_auto, IDC_TRACKER_LABEL, IDC_TRACKER_RESET, IDC_TRACKER_APPLY), \116 WMB_ROW(_exp, IDC_TRACKERLIST, _r, _r), \115 WMB_ROW(_auto, HAL_TRACKER_LABEL, HAL_TRACKER_RESET, HAL_TRACKER_APPLY), \ 116 WMB_ROW(_exp, HAL_TRACKERLIST, _r, _r), \ 117 117 WMB_END() 118 118 … … 130 130 if (result == BST_CHECKED) 131 131 { 132 ::EnableWindow(GetDlgItem( IDC_TRACKER_USER), true);133 ::EnableWindow(GetDlgItem( IDC_TRACKER_PASS), true);132 ::EnableWindow(GetDlgItem(HAL_TRACKER_USER), true); 133 ::EnableWindow(GetDlgItem(HAL_TRACKER_PASS), true); 134 134 } 135 135 else 136 136 { 137 ::EnableWindow(GetDlgItem( IDC_TRACKER_USER), false);138 ::EnableWindow(GetDlgItem( IDC_TRACKER_PASS), false);137 ::EnableWindow(GetDlgItem(HAL_TRACKER_USER), false); 138 ::EnableWindow(GetDlgItem(HAL_TRACKER_PASS), false); 139 139 140 140 username_ = L""; … … 175 175 void AdvTrackerDialog::trackerListEdited() 176 176 { 177 ::EnableWindow(GetDlgItem( IDC_TRACKER_APPLY), true);177 ::EnableWindow(GetDlgItem(HAL_TRACKER_APPLY), true); 178 178 } 179 179 … … 193 193 } 194 194 } 195 ::EnableWindow(GetDlgItem( IDC_TRACKER_APPLY), false);195 ::EnableWindow(GetDlgItem(HAL_TRACKER_APPLY), false); 196 196 } 197 197 … … 217 217 t.trackers = trackers; 218 218 219 ::EnableWindow(GetDlgItem( IDC_TRACKER_APPLY), false);220 } 219 ::EnableWindow(GetDlgItem(HAL_TRACKER_APPLY), false); 220 } -
trunk/src/advtabs/Tracker.hpp
r493 r495 6 6 7 7 #define ID_TRACKER_BEGIN 16000 8 #define IDC_TRACKER_LABEL ID_TRACKER_BEGIN + 19 #define IDC_LOGIN_APPLY ID_TRACKER_BEGIN + 210 #define IDC_REANNOUNCE ID_TRACKER_BEGIN + 38 #define HAL_TRACKER_LABEL ID_TRACKER_BEGIN + 1 9 #define HAL_LOGIN_APPLY ID_TRACKER_BEGIN + 2 10 #define HAL_REANNOUNCE ID_TRACKER_BEGIN + 3 11 11 12 12 #ifndef RC_INVOKED … … 39 39 40 40 public: 41 enum { IDD = IDD_ADVTRACKER };41 enum { IDD = HAL_ADVTRACKER }; 42 42 43 43 AdvTrackerDialog(HaliteWindow& HalWindow) : … … 55 55 MSG_WM_CLOSE(onClose) 56 56 57 COMMAND_ID_HANDLER_EX( IDC_LOGIN_APPLY, onLoginApply)58 COMMAND_ID_HANDLER_EX( IDC_REANNOUNCE, onReannounce)59 COMMAND_ID_HANDLER_EX( IDC_TRACKER_LOGINCHECK, onLoginCheck)60 COMMAND_ID_HANDLER_EX( IDC_TRACKER_RESET, onReset)61 COMMAND_ID_HANDLER_EX( IDC_TRACKER_APPLY, onApply)57 COMMAND_ID_HANDLER_EX(HAL_LOGIN_APPLY, onLoginApply) 58 COMMAND_ID_HANDLER_EX(HAL_REANNOUNCE, onReannounce) 59 COMMAND_ID_HANDLER_EX(HAL_TRACKER_LOGINCHECK, onLoginCheck) 60 COMMAND_ID_HANDLER_EX(HAL_TRACKER_RESET, onReset) 61 COMMAND_ID_HANDLER_EX(HAL_TRACKER_APPLY, onApply) 62 62 63 // COMMAND_RANGE_CODE_HANDLER_EX( IDC_TRACKER_USER, IDC_TRACKER_PASS, EN_KILLFOCUS, OnEditKillFocus)63 // COMMAND_RANGE_CODE_HANDLER_EX(HAL_TRACKER_USER, HAL_TRACKER_PASS, EN_KILLFOCUS, OnEditKillFocus) 64 64 65 65 if (uMsg == WM_FORWARDMSG) -
trunk/src/advtabs/TrackerAddDialog.hpp
r493 r495 8 8 9 9 #define HAL_TRACKER_ADD_BEGIN 15500 10 #define IDC_TRACKER_EDIT_URL HAL_TRACKER_ADD_BEGIN + 111 #define IDC_TRACKER_EDIT_TIER HAL_TRACKER_ADD_BEGIN + 212 #define IDC_TRACKER_TEXT_URL HAL_TRACKER_ADD_BEGIN + 313 #define IDC_TRACKER_TEXT_TIER HAL_TRACKER_ADD_BEGIN + 410 #define HAL_TRACKER_EDIT_URL HAL_TRACKER_ADD_BEGIN + 1 11 #define HAL_TRACKER_EDIT_TIER HAL_TRACKER_ADD_BEGIN + 2 12 #define HAL_TRACKER_TEXT_URL HAL_TRACKER_ADD_BEGIN + 3 13 #define HAL_TRACKER_TEXT_TIER HAL_TRACKER_ADD_BEGIN + 4 14 14 15 15 #ifndef RC_INVOKED … … 19 19 class TrackerAddDialog : 20 20 public ATL::CDialogImpl<TrackerAddDialog>, 21 public WTLx::GenericAddDialog<TrackerAddDialog, IDD_TRACKEDIT>,21 public WTLx::GenericAddDialog<TrackerAddDialog, HAL_TRACKEDIT>, 22 22 public WTL::CDialogResize<TrackerAddDialog>, 23 23 public CWinDataExchangeEx<TrackerAddDialog> … … 25 25 public: 26 26 typedef TrackerAddDialog thisClass; 27 typedef WTLx::GenericAddDialog<thisClass, IDD_TRACKEDIT> genericBaseClass;27 typedef WTLx::GenericAddDialog<thisClass, HAL_TRACKEDIT> genericBaseClass; 28 28 typedef WTL::CDialogResize<thisClass> resizeClass; 29 29 … … 40 40 41 41 BEGIN_DDX_MAP(TrackerAddDialog) 42 DDX_EX_STDWSTRING( IDC_TRACKER_EDIT_URL, tracker_.url);43 DDX_INT( IDC_TRACKER_EDIT_TIER, tracker_.tier)42 DDX_EX_STDWSTRING(HAL_TRACKER_EDIT_URL, tracker_.url); 43 DDX_INT(HAL_TRACKER_EDIT_TIER, tracker_.tier) 44 44 END_DDX_MAP() 45 45 46 46 BEGIN_DLGRESIZE_MAP(thisClass) 47 DLGRESIZE_CONTROL( IDC_TRACKER_EDIT_URL, DLSZ_SIZE_X)48 DLGRESIZE_CONTROL( IDC_TRACKER_EDIT_TIER, DLSZ_MOVE_X)49 DLGRESIZE_CONTROL( IDC_TRACKER_TEXT_URL, DLSZ_SIZE_X)50 DLGRESIZE_CONTROL( IDC_TRACKER_TEXT_TIER, DLSZ_MOVE_X)47 DLGRESIZE_CONTROL(HAL_TRACKER_EDIT_URL, DLSZ_SIZE_X) 48 DLGRESIZE_CONTROL(HAL_TRACKER_EDIT_TIER, DLSZ_MOVE_X) 49 DLGRESIZE_CONTROL(HAL_TRACKER_TEXT_URL, DLSZ_SIZE_X) 50 DLGRESIZE_CONTROL(HAL_TRACKER_TEXT_TIER, DLSZ_MOVE_X) 51 51 DLGRESIZE_CONTROL(IDOK, DLSZ_MOVE_X|DLSZ_MOVE_Y) 52 52 DLGRESIZE_CONTROL(IDCANCEL, DLSZ_MOVE_X|DLSZ_MOVE_Y) -
trunk/src/advtabs/TrackerListView.hpp
r491 r495 37 37 public: 38 38 enum { 39 LISTVIEW_ID_MENU = IDR_TRACKERLV_MENU,39 LISTVIEW_ID_MENU = HAL_TRACKERLV_MENU, 40 40 LISTVIEW_ID_COLUMNNAMES = HAL_TRACKER_LISTVIEW_COLUMNS, 41 41 LISTVIEW_ID_COLUMNWIDTHS = HAL_TRACKER_LISTVIEW_DEFAULTS
Note: See TracChangeset
for help on using the changeset viewer.
