From: <arn...@us...> - 2008-04-14 19:57:36
|
Revision: 1134 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1134&view=rev Author: arnetheduck Date: 2008-04-14 12:57:33 -0700 (Mon, 14 Apr 2008) Log Message: ----------- help updates by eMTee Modified Paths: -------------- dcplusplus/trunk/changelog.txt dcplusplus/trunk/help/credits.html dcplusplus/trunk/help/window_connections.html dcplusplus/trunk/help/window_downloads.html Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-04 16:54:45.630000114 +0200 committer: poy <po...@12...> properties: branch-nick: bzr + timestamp: 2008-04-05 01:14:17.598999977 +0200 committer: poy <po...@12...> properties: branch-nick: bzr Name: bzr:revision-id:v3-trunk1 - 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 + 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc Modified: dcplusplus/trunk/changelog.txt =================================================================== --- dcplusplus/trunk/changelog.txt 2008-04-14 19:56:47 UTC (rev 1133) +++ dcplusplus/trunk/changelog.txt 2008-04-14 19:57:33 UTC (rev 1134) @@ -4,7 +4,7 @@ * Fixed out of focus window when restoring from icon (poy) * [L#203865] Fixed multiple instances (poy) * Context-sensitive help (poy) -* Updated help files (poy, mikejj) +* Updated help files (poy, mikejj, emtee) * Fixed toolbar separators (poy) * Upgraded to bzip2 1.0.5 (thanks mikejj) * Fixed background color of drop-down controls Modified: dcplusplus/trunk/help/credits.html =================================================================== --- dcplusplus/trunk/help/credits.html 2008-04-14 19:56:47 UTC (rev 1133) +++ dcplusplus/trunk/help/credits.html 2008-04-14 19:57:33 UTC (rev 1134) @@ -26,6 +26,7 @@ <li>BSOD2600</li> <li>poy</li> <li>MikeJJ</li> + <li>eMTee</li> </ul> </body> </html> Modified: dcplusplus/trunk/help/window_connections.html =================================================================== --- dcplusplus/trunk/help/window_connections.html 2008-04-14 19:56:47 UTC (rev 1133) +++ dcplusplus/trunk/help/window_connections.html 2008-04-14 19:57:33 UTC (rev 1134) @@ -7,11 +7,33 @@ </head> <body> <h1>Connections</h1> -This lists your current connections, uploads (from you to the other peer) and downloads (from the other peer to you) with other peers in the network. +This lists your current connections to other peers in the network, uploads (from you to the other peer) and downloads (from the other peer to you). <h2>Columns</h2> <dl style="margin-left: 40px;"> - <dt>...</dt> - <dd>...</dd> + <dt>User</dt> + <dd>The nick of the connected user</dd> + <dt>Hub</dt> + <dd>Displays the hub which the user connected through</dd> + <dt>Status</dt> + <dd>Shows the current status of the connection which includes Connecting, Downloading, Uploading, No slots available, Idle, Disconnected or Terminated. During data transfer you can see here the name of the file, the actual chunk of the file beeing downloaded from the connected peer and may one or more letters in [box brackets] as well. These letters specify the properties of the transfer : + <br> + <li style="margin-left: 10px;">[T] - TTH Checked</li> + <li style="margin-left: 10px;">[Z] - ZLib Compressed transfer</li> + <li style="margin-left: 10px;">[S] - Trusted secure connection</li> + <li style="margin-left: 10px;">[U] - Untrusted secure connection</li> + </dd> + <dt>Speed</dt> + <dd>The actual up or download speed</dd> + <dt>Chunk</dt> + <dd>Remaining and total size of the actual chunk beeing downloaded</dd> + <dt>Transferred (Ratio)</dt> + <dd>Shows the total number of data bytes transferred since the connection's estabilished. The compression ratio (in case of compressed transfers) added in parentheses</dd> + <dt>Queued</dt> + <dd>During download this column displays the total size of files in the queue available from this connection</dd> + <dt>Cipher</dt> + <dd>In case of a secure connection it shows the encoding method</dd> + <dt>IP</dt> + <dd>IP address and country code (if available) of the connected peer</dd> </dl> </body> </html> Modified: dcplusplus/trunk/help/window_downloads.html =================================================================== --- dcplusplus/trunk/help/window_downloads.html 2008-04-14 19:56:47 UTC (rev 1133) +++ dcplusplus/trunk/help/window_downloads.html 2008-04-14 19:57:33 UTC (rev 1134) @@ -10,8 +10,20 @@ This list shows you the status of your current downloads (from other peers to you). <h2>Columns</h2> <dl style="margin-left: 40px;"> - <dt>...</dt> - <dd>...</dd> + <dt>Filename</dt> + <dd>The name of the file beeing downloaded</dd> + <dt>Path</dt> + <dd>Shows where the current download will be saved when finished</dd> + <dt>Status</dt> + <dd>Shows the current status of the download which can be downloading from one or more user or wating for a free slot</dd> + <dt>Time Left</dt> + <dd>Displays the current estimated time left</dd> + <dt>Speed</dt> + <dd>The actual download speed</dd> + <dt>Done</dt> + <dd>Total number of downloaded bytes so far</dd> + <dt>Size</dt> + <dd>Size of the file beeing downloaded</dd> </dl> </body> </html> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arn...@us...> - 2008-04-14 19:57:58
|
Revision: 1135 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1135&view=rev Author: arnetheduck Date: 2008-04-14 12:57:56 -0700 (Mon, 14 Apr 2008) Log Message: ----------- no exception when ::BitBlt fails Modified Paths: -------------- dcplusplus/trunk/changelog.txt dcplusplus/trunk/dwt/include/dwt/CanvasClasses.h Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-05 01:14:17.598999977 +0200 committer: poy <po...@12...> properties: branch-nick: bzr + timestamp: 2008-04-05 02:11:07.880000114 +0200 committer: poy <po...@12...> properties: branch-nick: bzr Name: bzr:revision-id:v3-trunk1 - 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc + 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 Modified: dcplusplus/trunk/changelog.txt =================================================================== --- dcplusplus/trunk/changelog.txt 2008-04-14 19:57:33 UTC (rev 1134) +++ dcplusplus/trunk/changelog.txt 2008-04-14 19:57:56 UTC (rev 1135) @@ -24,6 +24,7 @@ * [L#211164] Fixed bug when a new tab row is created while DC++ is minimized (poy) * [L#211480] Fixed duplicated settings pages on bad translations (poy) * Added the title of the currently selected page in settings (poy) +* [L#206785] Fixed a crash when a menu is owner-drawn while the desktop isn't visible (poy) -- 0.705 2008-03-14 -- * Several patches for better *nix compatibility of the core (thanks steven sheehy et al) Modified: dcplusplus/trunk/dwt/include/dwt/CanvasClasses.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/CanvasClasses.h 2008-04-14 19:57:33 UTC (rev 1134) +++ dcplusplus/trunk/dwt/include/dwt/CanvasClasses.h 2008-04-14 19:57:56 UTC (rev 1135) @@ -165,8 +165,8 @@ /// BitBlasts buffer into specified rectangle of source void blast( const Rectangle & rectangle ) { - if ( ::BitBlt( itsSource, rectangle.x(), rectangle.y(), rectangle.width(), rectangle.height(), this->CanvasType::itsHdc, rectangle.x(), rectangle.y(), SRCCOPY ) == FALSE ) - throw xCeption( _T( "Couldn't bit blast in blast()" ) ); + // note; ::BitBlt might fail with ERROR_INVALID_HANDLE when the desktop isn't visible + ::BitBlt( itsSource, rectangle.x(), rectangle.y(), rectangle.width(), rectangle.height(), this->CanvasType::itsHdc, rectangle.x(), rectangle.y(), SRCCOPY ); } /// Transparently draws bitmap This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arn...@us...> - 2008-04-14 20:04:21
|
Revision: 1136 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1136&view=rev Author: arnetheduck Date: 2008-04-14 13:03:42 -0700 (Mon, 14 Apr 2008) Log Message: ----------- prefix dwt include guards Modified Paths: -------------- dcplusplus/trunk/dwt/include/dwt/Anchors.h dcplusplus/trunk/dwt/include/dwt/Application.h dcplusplus/trunk/dwt/include/dwt/ApplicationPlatform.h dcplusplus/trunk/dwt/include/dwt/ApplicationPlatformCommon.h dcplusplus/trunk/dwt/include/dwt/ApplicationPlatformDesktop.h dcplusplus/trunk/dwt/include/dwt/ApplicationPlatformWinCE.h dcplusplus/trunk/dwt/include/dwt/Atom.h dcplusplus/trunk/dwt/include/dwt/CanvasClasses.h dcplusplus/trunk/dwt/include/dwt/ClipBoard.h dcplusplus/trunk/dwt/include/dwt/CommandLine.h dcplusplus/trunk/dwt/include/dwt/Cursor.h dcplusplus/trunk/dwt/include/dwt/Dispatchers.h dcplusplus/trunk/dwt/include/dwt/Events.h dcplusplus/trunk/dwt/include/dwt/GCCHeaders.h dcplusplus/trunk/dwt/include/dwt/LibraryLoader.h dcplusplus/trunk/dwt/include/dwt/Message.h dcplusplus/trunk/dwt/include/dwt/Place.h dcplusplus/trunk/dwt/include/dwt/Point.h dcplusplus/trunk/dwt/include/dwt/Policies.h dcplusplus/trunk/dwt/include/dwt/Rectangle.h dcplusplus/trunk/dwt/include/dwt/Resource.h dcplusplus/trunk/dwt/include/dwt/Threads.h dcplusplus/trunk/dwt/include/dwt/VCDesktopHeaders.h dcplusplus/trunk/dwt/include/dwt/VCPocketPCHeaders.h dcplusplus/trunk/dwt/include/dwt/Widget.h dcplusplus/trunk/dwt/include/dwt/WidgetCreator.h dcplusplus/trunk/dwt/include/dwt/WidgetFactory.h dcplusplus/trunk/dwt/include/dwt/WidgetFactoryPlatformCommon.h dcplusplus/trunk/dwt/include/dwt/WidgetFactoryPlatformImplementation.h dcplusplus/trunk/dwt/include/dwt/WidgetFactoryPlatformSmartWinCE.h dcplusplus/trunk/dwt/include/dwt/WidgetFactoryPlatformSmartWinDesktop.h dcplusplus/trunk/dwt/include/dwt/WindowClass.h dcplusplus/trunk/dwt/include/dwt/WindowsHeaders.h dcplusplus/trunk/dwt/include/dwt/aspects/AspectActivate.h dcplusplus/trunk/dwt/include/dwt/aspects/AspectBorder.h dcplusplus/trunk/dwt/include/dwt/aspects/AspectClickable.h dcplusplus/trunk/dwt/include/dwt/aspects/AspectCloseable.h dcplusplus/trunk/dwt/include/dwt/aspects/AspectCollection.h dcplusplus/trunk/dwt/include/dwt/aspects/AspectColor.h dcplusplus/trunk/dwt/include/dwt/aspects/AspectCommand.h dcplusplus/trunk/dwt/include/dwt/aspects/AspectContextMenu.h dcplusplus/trunk/dwt/include/dwt/aspects/AspectData.h dcplusplus/trunk/dwt/include/dwt/aspects/AspectDblClickable.h dcplusplus/trunk/dwt/include/dwt/aspects/AspectDialog.h dcplusplus/trunk/dwt/include/dwt/aspects/AspectDragDrop.h dcplusplus/trunk/dwt/include/dwt/aspects/AspectEnabled.h dcplusplus/trunk/dwt/include/dwt/aspects/AspectEraseBackground.h dcplusplus/trunk/dwt/include/dwt/aspects/AspectFileFilter.h dcplusplus/trunk/dwt/include/dwt/aspects/AspectFocus.h dcplusplus/trunk/dwt/include/dwt/aspects/AspectFont.h dcplusplus/trunk/dwt/include/dwt/aspects/AspectHelp.h dcplusplus/trunk/dwt/include/dwt/aspects/AspectKeyboard.h dcplusplus/trunk/dwt/include/dwt/aspects/AspectMinMax.h dcplusplus/trunk/dwt/include/dwt/aspects/AspectMouse.h dcplusplus/trunk/dwt/include/dwt/aspects/AspectPainting.h dcplusplus/trunk/dwt/include/dwt/aspects/AspectRaw.h dcplusplus/trunk/dwt/include/dwt/aspects/AspectScrollable.h dcplusplus/trunk/dwt/include/dwt/aspects/AspectSelection.h dcplusplus/trunk/dwt/include/dwt/aspects/AspectSizable.h dcplusplus/trunk/dwt/include/dwt/aspects/AspectText.h dcplusplus/trunk/dwt/include/dwt/aspects/AspectTimer.h dcplusplus/trunk/dwt/include/dwt/aspects/AspectUpdate.h dcplusplus/trunk/dwt/include/dwt/aspects/AspectVisible.h dcplusplus/trunk/dwt/include/dwt/dwt.hpp dcplusplus/trunk/dwt/include/dwt/forward.h dcplusplus/trunk/dwt/include/dwt/resources/Accelerator.h dcplusplus/trunk/dwt/include/dwt/resources/Bitmap.h dcplusplus/trunk/dwt/include/dwt/resources/Brush.h dcplusplus/trunk/dwt/include/dwt/resources/Font.h dcplusplus/trunk/dwt/include/dwt/resources/Handle.h dcplusplus/trunk/dwt/include/dwt/resources/Icon.h dcplusplus/trunk/dwt/include/dwt/resources/ImageList.h dcplusplus/trunk/dwt/include/dwt/resources/Pen.h dcplusplus/trunk/dwt/include/dwt/util/DateTime.h dcplusplus/trunk/dwt/include/dwt/util/RegKey.h dcplusplus/trunk/dwt/include/dwt/util/StringConversion.h dcplusplus/trunk/dwt/include/dwt/util/StringUtils.h dcplusplus/trunk/dwt/include/dwt/util/TimeSpan.h dcplusplus/trunk/dwt/include/dwt/util/tstring.h dcplusplus/trunk/dwt/include/dwt/util/xCeptionSmartUtilities.h dcplusplus/trunk/dwt/include/dwt/widgets/Button.h dcplusplus/trunk/dwt/include/dwt/widgets/CheckBox.h dcplusplus/trunk/dwt/include/dwt/widgets/ColorDialog.h dcplusplus/trunk/dwt/include/dwt/widgets/ComboBox.h dcplusplus/trunk/dwt/include/dwt/widgets/Composite.h dcplusplus/trunk/dwt/include/dwt/widgets/Container.h dcplusplus/trunk/dwt/include/dwt/widgets/Control.h dcplusplus/trunk/dwt/include/dwt/widgets/CoolBar.h dcplusplus/trunk/dwt/include/dwt/widgets/DateTime.h dcplusplus/trunk/dwt/include/dwt/widgets/FolderDialog.h dcplusplus/trunk/dwt/include/dwt/widgets/FontDialog.h dcplusplus/trunk/dwt/include/dwt/widgets/Frame.h dcplusplus/trunk/dwt/include/dwt/widgets/GroupBox.h dcplusplus/trunk/dwt/include/dwt/widgets/Label.h dcplusplus/trunk/dwt/include/dwt/widgets/LoadDialog.h dcplusplus/trunk/dwt/include/dwt/widgets/MDIChild.h dcplusplus/trunk/dwt/include/dwt/widgets/MDIFrame.h dcplusplus/trunk/dwt/include/dwt/widgets/MDIParent.h dcplusplus/trunk/dwt/include/dwt/widgets/MessageBox.h dcplusplus/trunk/dwt/include/dwt/widgets/ModalDialog.h dcplusplus/trunk/dwt/include/dwt/widgets/ModelessDialog.h dcplusplus/trunk/dwt/include/dwt/widgets/ProgressBar.h dcplusplus/trunk/dwt/include/dwt/widgets/RadioButton.h dcplusplus/trunk/dwt/include/dwt/widgets/RichTextBox.h dcplusplus/trunk/dwt/include/dwt/widgets/SaveDialog.h dcplusplus/trunk/dwt/include/dwt/widgets/Slider.h dcplusplus/trunk/dwt/include/dwt/widgets/Spinner.h dcplusplus/trunk/dwt/include/dwt/widgets/StatusBar.h dcplusplus/trunk/dwt/include/dwt/widgets/TabSheet.h dcplusplus/trunk/dwt/include/dwt/widgets/TabView.h dcplusplus/trunk/dwt/include/dwt/widgets/Table.h dcplusplus/trunk/dwt/include/dwt/widgets/TextBox.h dcplusplus/trunk/dwt/include/dwt/widgets/ToolBar.h dcplusplus/trunk/dwt/include/dwt/widgets/ToolTip.h dcplusplus/trunk/dwt/include/dwt/widgets/Tree.h dcplusplus/trunk/dwt/include/dwt/widgets/WidgetListViewEditBox.h dcplusplus/trunk/dwt/include/dwt/widgets/WidgetMenu.h dcplusplus/trunk/dwt/include/dwt/widgets/Window.h dcplusplus/trunk/dwt/include/dwt/xCeption.h Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-05 02:11:07.880000114 +0200 committer: poy <po...@12...> properties: branch-nick: bzr + timestamp: 2008-04-05 09:19:29.723999977 +0200 committer: Jacek Sieka <arn...@gm...> properties: branch-nick: dcplusplus Name: bzr:revision-id:v3-trunk1 - 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 + 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky Modified: dcplusplus/trunk/dwt/include/dwt/Anchors.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/Anchors.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/Anchors.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -3,8 +3,8 @@ * Permission to use under the BSD license */ -#ifndef ANCHORS_H -#define ANCHORS_H +#ifndef DWT_ANCHORS_H +#define DWT_ANCHORS_H #include "Widget.h" #include <stdexcept> Modified: dcplusplus/trunk/dwt/include/dwt/Application.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/Application.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/Application.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef Application_h -#define Application_h +#ifndef DWT_Application_h +#define DWT_Application_h #include "WindowsHeaders.h" #include "util/tstring.h" Modified: dcplusplus/trunk/dwt/include/dwt/ApplicationPlatform.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/ApplicationPlatform.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/ApplicationPlatform.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ApplicationPlatform_h -#define ApplicationPlatform_h +#ifndef DWT_ApplicationPlatform_h +#define DWT_ApplicationPlatform_h #include "ApplicationPlatformCommon.h" #include "ApplicationPlatformDesktop.h" Modified: dcplusplus/trunk/dwt/include/dwt/ApplicationPlatformCommon.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/ApplicationPlatformCommon.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/ApplicationPlatformCommon.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ApplicationPlatformCommon_h -#define ApplicationPlatformCommon_h +#ifndef DWT_ApplicationPlatformCommon_h +#define DWT_ApplicationPlatformCommon_h namespace dwt { Modified: dcplusplus/trunk/dwt/include/dwt/ApplicationPlatformDesktop.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/ApplicationPlatformDesktop.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/ApplicationPlatformDesktop.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -34,8 +34,8 @@ */ #ifndef WINCE -#ifndef ApplicationPlatformDesktop_h -#define ApplicationPlatformDesktop_h +#ifndef DWT_ApplicationPlatformDesktop_h +#define DWT_ApplicationPlatformDesktop_h namespace dwt { Modified: dcplusplus/trunk/dwt/include/dwt/ApplicationPlatformWinCE.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/ApplicationPlatformWinCE.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/ApplicationPlatformWinCE.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -34,8 +34,8 @@ */ #ifdef WINCE -#ifndef ApplicationPlatformWinCE_h -#define ApplicationPlatformWinCE_h +#ifndef DWT_ApplicationPlatformWinCE_h +#define DWT_ApplicationPlatformWinCE_h #include "Widget.h" Modified: dcplusplus/trunk/dwt/include/dwt/Atom.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/Atom.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/Atom.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ATOM_H_ -#define ATOM_H_ +#ifndef DWT_ATOM_H_ +#define DWT_ATOM_H_ #include "WindowsHeaders.h" Modified: dcplusplus/trunk/dwt/include/dwt/CanvasClasses.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/CanvasClasses.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/CanvasClasses.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef CanvasClasses_h -#define CanvasClasses_h +#ifndef DWT_CanvasClasses_h +#define DWT_CanvasClasses_h #include "Widget.h" #include "resources/Bitmap.h" Modified: dcplusplus/trunk/dwt/include/dwt/ClipBoard.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/ClipBoard.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/ClipBoard.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ClipBoard_h -#define ClipBoard_h +#ifndef DWT_ClipBoard_h +#define DWT_ClipBoard_h #include "WindowsHeaders.h" #include "util/tstring.h" Modified: dcplusplus/trunk/dwt/include/dwt/CommandLine.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/CommandLine.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/CommandLine.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef CommandLine_h -#define CommandLine_h +#ifndef DWT_CommandLine_h +#define DWT_CommandLine_h #include <boost/noncopyable.hpp> #include <vector> Modified: dcplusplus/trunk/dwt/include/dwt/Cursor.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/Cursor.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/Cursor.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef Cursor_h -#define Cursor_h +#ifndef DWT_Cursor_h +#define DWT_Cursor_h #include "WindowsHeaders.h" Modified: dcplusplus/trunk/dwt/include/dwt/Dispatchers.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/Dispatchers.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/Dispatchers.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef DISPATCHERS_H_ -#define DISPATCHERS_H_ +#ifndef DWT_DISPATCHERS_H_ +#define DWT_DISPATCHERS_H_ #include "WindowsHeaders.h" #include <functional> Modified: dcplusplus/trunk/dwt/include/dwt/Events.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/Events.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/Events.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef EVENTS_H_ -#define EVENTS_H_ +#ifndef DWT_EVENTS_H_ +#define DWT_EVENTS_H_ #include "WindowsHeaders.h" #include "Point.h" Modified: dcplusplus/trunk/dwt/include/dwt/GCCHeaders.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/GCCHeaders.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/GCCHeaders.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef GCCHeaders_h -#define GCCHeaders_h +#ifndef DWT_GCCHeaders_h +#define DWT_GCCHeaders_h #ifdef __GNUC__ Modified: dcplusplus/trunk/dwt/include/dwt/LibraryLoader.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/LibraryLoader.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/LibraryLoader.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef LibraryLoader_h -#define LibraryLoader_h +#ifndef DWT_LibraryLoader_h +#define DWT_LibraryLoader_h #include "WindowsHeaders.h" #include "util/tstring.h" Modified: dcplusplus/trunk/dwt/include/dwt/Message.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/Message.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/Message.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef Message_h -#define Message_h +#ifndef DWT_Message_h +#define DWT_Message_h #include "WindowsHeaders.h" Modified: dcplusplus/trunk/dwt/include/dwt/Place.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/Place.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/Place.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SMARTWIN_Place_h -#define SMARTWIN_Place_h +#ifndef DWT_SMARTWIN_Place_h +#define DWT_SMARTWIN_Place_h #include "Point.h" #include "Rectangle.h" Modified: dcplusplus/trunk/dwt/include/dwt/Point.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/Point.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/Point.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef BasicTypes_h -#define BasicTypes_h +#ifndef DWT_BasicTypes_h +#define DWT_BasicTypes_h #include "WindowsHeaders.h" Modified: dcplusplus/trunk/dwt/include/dwt/Policies.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/Policies.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/Policies.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef Policies_h -#define Policies_h +#ifndef DWT_Policies_h +#define DWT_Policies_h #include "Widget.h" Modified: dcplusplus/trunk/dwt/include/dwt/Rectangle.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/Rectangle.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/Rectangle.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SMARTWIN_RECTANGLE_H_ -#define SMARTWIN_RECTANGLE_H_ +#ifndef DWT_SMARTWIN_RECTANGLE_H_ +#define DWT_SMARTWIN_RECTANGLE_H_ #include "Point.h" Modified: dcplusplus/trunk/dwt/include/dwt/Resource.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/Resource.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/Resource.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef Resources_h -#define Resources_h +#ifndef DWT_Resources_h +#define DWT_Resources_h #include "WindowsHeaders.h" #include "util/tstring.h" Modified: dcplusplus/trunk/dwt/include/dwt/Threads.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/Threads.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/Threads.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef Threads_h -#define Threads_h +#ifndef DWT_Threads_h +#define DWT_Threads_h #include "WindowsHeaders.h" #include <vector> Modified: dcplusplus/trunk/dwt/include/dwt/VCDesktopHeaders.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/VCDesktopHeaders.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/VCDesktopHeaders.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef VCDesktopHeaders_h -#define VCDesktopHeaders_h +#ifndef DWT_VCDesktopHeaders_h +#define DWT_VCDesktopHeaders_h #ifndef __GNUC__ #ifndef WINCE Modified: dcplusplus/trunk/dwt/include/dwt/VCPocketPCHeaders.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/VCPocketPCHeaders.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/VCPocketPCHeaders.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef VCDesktopHeaders_h -#define VCDesktopHeaders_h +#ifndef DWT_VCDesktopHeaders_h +#define DWT_VCDesktopHeaders_h #ifndef __GNUC__ #ifdef WINCE Modified: dcplusplus/trunk/dwt/include/dwt/Widget.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/Widget.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/Widget.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef Widget_h -#define Widget_h +#ifndef DWT_Widget_h +#define DWT_Widget_h #include "forward.h" #include "Atom.h" Modified: dcplusplus/trunk/dwt/include/dwt/WidgetCreator.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/WidgetCreator.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/WidgetCreator.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef WidgetCreator_h -#define WidgetCreator_h +#ifndef DWT_WidgetCreator_h +#define DWT_WidgetCreator_h #include "Widget.h" Modified: dcplusplus/trunk/dwt/include/dwt/WidgetFactory.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/WidgetFactory.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/WidgetFactory.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef WidgetFactory_h -#define WidgetFactory_h +#ifndef DWT_WidgetFactory_h +#define DWT_WidgetFactory_h #include "widgets/ColorDialog.h" #include "widgets/FolderDialog.h" Modified: dcplusplus/trunk/dwt/include/dwt/WidgetFactoryPlatformCommon.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/WidgetFactoryPlatformCommon.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/WidgetFactoryPlatformCommon.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef WidgetFactoryPlatformCommon_h -#define WidgetFactoryPlatformCommon_h +#ifndef DWT_WidgetFactoryPlatformCommon_h +#define DWT_WidgetFactoryPlatformCommon_h namespace dwt { Modified: dcplusplus/trunk/dwt/include/dwt/WidgetFactoryPlatformImplementation.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/WidgetFactoryPlatformImplementation.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/WidgetFactoryPlatformImplementation.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef WidgetFactoryPlatformImplementation_h -#define WidgetFactoryPlatformImplementation_h +#ifndef DWT_WidgetFactoryPlatformImplementation_h +#define DWT_WidgetFactoryPlatformImplementation_h #include "WidgetFactoryPlatformCommon.h" #include "WidgetFactoryPlatformSmartWinDesktop.h" Modified: dcplusplus/trunk/dwt/include/dwt/WidgetFactoryPlatformSmartWinCE.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/WidgetFactoryPlatformSmartWinCE.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/WidgetFactoryPlatformSmartWinCE.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -34,8 +34,8 @@ */ #ifdef WINCE -#ifndef WidgetFactoryPlatformSmartWinDesktop_h -#define WidgetFactoryPlatformSmartWinDesktop_h +#ifndef DWT_WidgetFactoryPlatformSmartWinDesktop_h +#define DWT_WidgetFactoryPlatformSmartWinDesktop_h #include "WidgetFactoryPlatformCommon.h" Modified: dcplusplus/trunk/dwt/include/dwt/WidgetFactoryPlatformSmartWinDesktop.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/WidgetFactoryPlatformSmartWinDesktop.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/WidgetFactoryPlatformSmartWinDesktop.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -34,8 +34,8 @@ */ #ifndef WINCE -#ifndef WidgetFactoryPlatformSmartWinDesktop_h -#define WidgetFactoryPlatformSmartWinDesktop_h +#ifndef DWT_WidgetFactoryPlatformSmartWinDesktop_h +#define DWT_WidgetFactoryPlatformSmartWinDesktop_h #include "WidgetFactoryPlatformCommon.h" #include "widgets/FontDialog.h" Modified: dcplusplus/trunk/dwt/include/dwt/WindowClass.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/WindowClass.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/WindowClass.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef WINDOWCLASS_H_ -#define WINDOWCLASS_H_ +#ifndef DWT_WINDOWCLASS_H_ +#define DWT_WINDOWCLASS_H_ #include "WindowsHeaders.h" #include "resources/Icon.h" Modified: dcplusplus/trunk/dwt/include/dwt/WindowsHeaders.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/WindowsHeaders.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/WindowsHeaders.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef WindowsHeaders_h -#define WindowsHeaders_h +#ifndef DWT_WindowsHeaders_h +#define DWT_WindowsHeaders_h // This file is supposed to contain (most at least) of the platform specific // defines and so on Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectActivate.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/aspects/AspectActivate.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectActivate.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef AspectActivate_h -#define AspectActivate_h +#ifndef DWT_AspectActivate_h +#define DWT_AspectActivate_h #include "../Message.h" #include "../Dispatchers.h" Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectBorder.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/aspects/AspectBorder.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectBorder.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef AspectBorder_h -#define AspectBorder_h +#ifndef DWT_AspectBorder_h +#define DWT_AspectBorder_h namespace dwt { Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectClickable.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/aspects/AspectClickable.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectClickable.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef AspectClickable_h -#define AspectClickable_h +#ifndef DWT_AspectClickable_h +#define DWT_AspectClickable_h #include "../Dispatchers.h" Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectCloseable.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/aspects/AspectCloseable.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectCloseable.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ASPECTCLOSE_H_ -#define ASPECTCLOSE_H_ +#ifndef DWT_ASPECTCLOSE_H_ +#define DWT_ASPECTCLOSE_H_ #include "../Message.h" Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectCollection.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/aspects/AspectCollection.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectCollection.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ASPECTCOLLECTION_H_ -#define ASPECTCOLLECTION_H_ +#ifndef DWT_ASPECTCOLLECTION_H_ +#define DWT_ASPECTCOLLECTION_H_ /** A control that holds a collection of items, such as a list or tree */ template<typename WidgetType, typename IndexType> Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectColor.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/aspects/AspectColor.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectColor.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef AspectColor_h -#define AspectColor_h +#ifndef DWT_AspectColor_h +#define DWT_AspectColor_h #include "../Message.h" #include "../resources/Brush.h" Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectCommand.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/aspects/AspectCommand.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectCommand.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ASPECTCOMMAND_ -#define ASPECTCOMMAND_ +#ifndef DWT_ASPECTCOMMAND_ +#define DWT_ASPECTCOMMAND_ #include "../Message.h" #include "../Dispatchers.h" Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectContextMenu.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/aspects/AspectContextMenu.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectContextMenu.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ASPECTCONTEXTMENU_H_ -#define ASPECTCONTEXTMENU_H_ +#ifndef DWT_ASPECTCONTEXTMENU_H_ +#define DWT_ASPECTCONTEXTMENU_H_ #include "../Point.h" #include "../Dispatchers.h" Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectData.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/aspects/AspectData.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectData.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ASPECTDATA_H_ -#define ASPECTDATA_H_ +#ifndef DWT_ASPECTDATA_H_ +#define DWT_ASPECTDATA_H_ /** A Widget that associates some sort of data with each item */ template<typename WidgetType, typename IndexType> Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectDblClickable.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/aspects/AspectDblClickable.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectDblClickable.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef AspectDblClickable_h -#define AspectDblClickable_h +#ifndef DWT_AspectDblClickable_h +#define DWT_AspectDblClickable_h #include "../Dispatchers.h" Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectDialog.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/aspects/AspectDialog.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectDialog.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ASPECTDIALOG_H_ -#define ASPECTDIALOG_H_ +#ifndef DWT_ASPECTDIALOG_H_ +#define DWT_ASPECTDIALOG_H_ #include "../util/tstring.h" #include "../WidgetCreator.h" Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectDragDrop.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/aspects/AspectDragDrop.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectDragDrop.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef AspectDragDrop_h -#define AspectDragDrop_h +#ifndef DWT_AspectDragDrop_h +#define DWT_AspectDragDrop_h #ifndef WINCE // Not supported on WINCE platform Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectEnabled.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/aspects/AspectEnabled.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectEnabled.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef AspectEnabled_h -#define AspectEnabled_h +#ifndef DWT_AspectEnabled_h +#define DWT_AspectEnabled_h #include "../Message.h" #include "../Dispatchers.h" Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectEraseBackground.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/aspects/AspectEraseBackground.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectEraseBackground.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef AspectEraseBackground_h -#define AspectEraseBackground_h +#ifndef DWT_AspectEraseBackground_h +#define DWT_AspectEraseBackground_h #include "../Message.h" #include "../CanvasClasses.h" Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectFileFilter.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/aspects/AspectFileFilter.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectFileFilter.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef AspectFileFilter_h -#define AspectFileFilter_h +#ifndef DWT_AspectFileFilter_h +#define DWT_AspectFileFilter_h #include "../WindowsHeaders.h" #include "../util/tstring.h" Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectFocus.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/aspects/AspectFocus.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectFocus.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef AspectFocus_h -#define AspectFocus_h +#ifndef DWT_AspectFocus_h +#define DWT_AspectFocus_h #include "../Message.h" #include "../Dispatchers.h" Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectFont.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/aspects/AspectFont.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectFont.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef AspectFont_h -#define AspectFont_h +#ifndef DWT_AspectFont_h +#define DWT_AspectFont_h #include "../resources/Font.h" Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectHelp.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/aspects/AspectHelp.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectHelp.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ASPECTHELP_H_ -#define ASPECTHELP_H_ +#ifndef DWT_ASPECTHELP_H_ +#define DWT_ASPECTHELP_H_ #include "../Message.h" #include <functional> Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectKeyboard.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/aspects/AspectKeyboard.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectKeyboard.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef AspectKeyboard_h -#define AspectKeyboard_h +#ifndef DWT_AspectKeyboard_h +#define DWT_AspectKeyboard_h #include "../Message.h" Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectMinMax.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/aspects/AspectMinMax.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectMinMax.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef AspectMinMax_h -#define AspectMinMax_h +#ifndef DWT_AspectMinMax_h +#define DWT_AspectMinMax_h #include "../WindowsHeaders.h" Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectMouse.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/aspects/AspectMouse.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectMouse.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef AspectMouse_h -#define AspectMouse_h +#ifndef DWT_AspectMouse_h +#define DWT_AspectMouse_h #include "../Events.h" #include "../Message.h" Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectPainting.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/aspects/AspectPainting.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectPainting.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef AspectPainting_h -#define AspectPainting_h +#ifndef DWT_AspectPainting_h +#define DWT_AspectPainting_h #include "../CanvasClasses.h" Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectRaw.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/aspects/AspectRaw.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectRaw.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef AspectRaw_h -#define AspectRaw_h +#ifndef DWT_AspectRaw_h +#define DWT_AspectRaw_h #include "../Message.h" Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectScrollable.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/aspects/AspectScrollable.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectScrollable.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef AspectScrollable_h -#define AspectScrollable_h +#ifndef DWT_AspectScrollable_h +#define DWT_AspectScrollable_h #include "../Dispatchers.h" #include "../Message.h" Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectSelection.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/aspects/AspectSelection.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectSelection.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef AspectSelection_h -#define AspectSelection_h +#ifndef DWT_AspectSelection_h +#define DWT_AspectSelection_h #include "../Dispatchers.h" Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectSizable.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/aspects/AspectSizable.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectSizable.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef AspectSizable_h -#define AspectSizable_h +#ifndef DWT_AspectSizable_h +#define DWT_AspectSizable_h #include "../Widget.h" #include "../Place.h" Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectText.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/aspects/AspectText.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectText.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef AspectText_h -#define AspectText_h +#ifndef DWT_AspectText_h +#define DWT_AspectText_h #include "../util/tstring.h" #include "../Dispatchers.h" Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectTimer.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/aspects/AspectTimer.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectTimer.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ASPECTTIMER_H_ -#define ASPECTTIMER_H_ +#ifndef DWT_ASPECTTIMER_H_ +#define DWT_ASPECTTIMER_H_ #include "../Message.h" Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectUpdate.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/aspects/AspectUpdate.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectUpdate.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef AspectUpdate_h -#define AspectUpdate_h +#ifndef DWT_AspectUpdate_h +#define DWT_AspectUpdate_h #include "../Dispatchers.h" Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectVisible.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/aspects/AspectVisible.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectVisible.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef AspectVisible_h -#define AspectVisible_h +#ifndef DWT_AspectVisible_h +#define DWT_AspectVisible_h #include "../Dispatchers.h" Modified: dcplusplus/trunk/dwt/include/dwt/dwt.hpp =================================================================== --- dcplusplus/trunk/dwt/include/dwt/dwt.hpp 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/dwt.hpp 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SmartWin_h -#define SmartWin_h +#ifndef DWT_SmartWin_h +#define DWT_SmartWin_h #ifdef _MSC_VER // We don't want the stupid "pointer trunctation" to 64 bit architecture warning. Modified: dcplusplus/trunk/dwt/include/dwt/forward.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/forward.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/forward.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef FORWARD_H_ -#define FORWARD_H_ +#ifndef DWT_FORWARD_H_ +#define DWT_FORWARD_H_ namespace dwt { Modified: dcplusplus/trunk/dwt/include/dwt/resources/Accelerator.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/resources/Accelerator.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/resources/Accelerator.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ACCELERATOR_H_ -#define ACCELERATOR_H_ +#ifndef DWT_ACCELERATOR_H_ +#define DWT_ACCELERATOR_H_ #include "../Application.h" #include "Handle.h" Modified: dcplusplus/trunk/dwt/include/dwt/resources/Bitmap.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/resources/Bitmap.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/resources/Bitmap.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef Bitmap_h -#define Bitmap_h +#ifndef DWT_Bitmap_h +#define DWT_Bitmap_h #include "../WindowsHeaders.h" #include "../util/tstring.h" Modified: dcplusplus/trunk/dwt/include/dwt/resources/Brush.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/resources/Brush.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/resources/Brush.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef BRUSH_H_ -#define BRUSH_H_ +#ifndef DWT_BRUSH_H_ +#define DWT_BRUSH_H_ #include "../WindowsHeaders.h" #include "Handle.h" Modified: dcplusplus/trunk/dwt/include/dwt/resources/Font.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/resources/Font.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/resources/Font.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef Font_h -#define Font_h +#ifndef DWT_Font_h +#define DWT_Font_h #include "../WindowsHeaders.h" #include "../util/tstring.h" Modified: dcplusplus/trunk/dwt/include/dwt/resources/Handle.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/resources/Handle.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/resources/Handle.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef RESOURCE_H_ -#define RESOURCE_H_ +#ifndef DWT_RESOURCE_H_ +#define DWT_RESOURCE_H_ #include <boost/intrusive_ptr.hpp> #include <boost/noncopyable.hpp> Modified: dcplusplus/trunk/dwt/include/dwt/resources/Icon.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/resources/Icon.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/resources/Icon.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef Icon_h -#define Icon_h +#ifndef DWT_Icon_h +#define DWT_Icon_h #include "../WindowsHeaders.h" #include "../util/tstring.h" Modified: dcplusplus/trunk/dwt/include/dwt/resources/ImageList.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/resources/ImageList.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/resources/ImageList.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ImageList_h -#define ImageList_h +#ifndef DWT_ImageList_h +#define DWT_ImageList_h #include "../WindowsHeaders.h" #include "../util/tstring.h" Modified: dcplusplus/trunk/dwt/include/dwt/resources/Pen.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/resources/Pen.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/resources/Pen.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef PEN_H_ -#define PEN_H_ +#ifndef DWT_PEN_H_ +#define DWT_PEN_H_ #include "../WindowsHeaders.h" #include "Handle.h" Modified: dcplusplus/trunk/dwt/include/dwt/util/DateTime.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/util/DateTime.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/util/DateTime.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef DateTime_H -#define DateTime_H +#ifndef DWT_DateTime_H +#define DWT_DateTime_H #include <string.h> #include "../WindowsHeaders.h" Modified: dcplusplus/trunk/dwt/include/dwt/util/RegKey.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/util/RegKey.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/util/RegKey.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef RegKey_H -#define RegKey_H +#ifndef DWT_RegKey_H +#define DWT_RegKey_H #include "../WindowsHeaders.h" #include "tstring.h" Modified: dcplusplus/trunk/dwt/include/dwt/util/StringConversion.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/util/StringConversion.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/util/StringConversion.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef StringConversion_h -#define StringConversion_h +#ifndef DWT_StringConversion_h +#define DWT_StringConversion_h #include <string> #include <boost/scoped_array.hpp> Modified: dcplusplus/trunk/dwt/include/dwt/util/StringUtils.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/util/StringUtils.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcplusplus/trunk/dwt/include/dwt/util/StringUtils.h 2008-04-14 20:03:42 UTC (rev 1136) @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef STRINGUTILS_H_ -#define STRINGUTILS_H_ +#ifndef DWT_STRINGUTILS_H_ +#define DWT_STRINGUTILS_H_ #include "tstring.h" Modified: dcplusplus/trunk/dwt/include/dwt/util/TimeSpan.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/util/TimeSpan.h 2008-04-14 19:57:56 UTC (rev 1135) +++ dcp... [truncated message content] |
From: <arn...@us...> - 2008-04-14 20:05:36
|
Revision: 1137 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1137&view=rev Author: arnetheduck Date: 2008-04-14 13:05:09 -0700 (Mon, 14 Apr 2008) Log Message: ----------- fix bad vname Modified Paths: -------------- dcplusplus/trunk/changelog.txt dcplusplus/trunk/dcpp/ShareManager.cpp dcplusplus/trunk/dcpp/ShareManager.h dcplusplus/trunk/win32/AboutDlg.cpp Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-05 09:19:29.723999977 +0200 committer: Jacek Sieka <arn...@gm...> properties: branch-nick: dcplusplus + timestamp: 2008-04-05 10:01:05.903000116 +0200 committer: Jacek Sieka <arn...@gm...> properties: branch-nick: dcplusplus Name: bzr:revision-id:v3-trunk1 - 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky + 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky 1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai Modified: dcplusplus/trunk/changelog.txt =================================================================== --- dcplusplus/trunk/changelog.txt 2008-04-14 20:03:42 UTC (rev 1136) +++ dcplusplus/trunk/changelog.txt 2008-04-14 20:05:09 UTC (rev 1137) @@ -25,6 +25,7 @@ * [L#211480] Fixed duplicated settings pages on bad translations (poy) * Added the title of the currently selected page in settings (poy) * [L#206785] Fixed a crash when a menu is owner-drawn while the desktop isn't visible (poy) +* [L#211313] Fixed bad virtual name being loaded (thanks kulmegil) -- 0.705 2008-03-14 -- * Several patches for better *nix compatibility of the core (thanks steven sheehy et al) Modified: dcplusplus/trunk/dcpp/ShareManager.cpp =================================================================== --- dcplusplus/trunk/dcpp/ShareManager.cpp 2008-04-14 20:03:42 UTC (rev 1136) +++ dcplusplus/trunk/dcpp/ShareManager.cpp 2008-04-14 20:05:09 UTC (rev 1137) @@ -75,6 +75,13 @@ } } +ShareManager::Directory::Directory(const string& aName, Directory* aParent) : + name(aName), + parent(aParent), + fileTypes(SearchManager::TYPE_DIRECTORY) +{ +} + ShareManager::Directory::~Directory() { for(MapIter i = directories.begin(); i != directories.end(); ++i) delete i->second; @@ -288,14 +295,13 @@ // add only unique directories if(!hasVirtual(vName)) { - directories[realPath] = new Directory(virtualName, 0); + directories[realPath] = new Directory(vName, 0); } } aXml.stepOut(); } } - static const string SDIRECTORY = "Directory"; static const string SFILE = "File"; static const string SNAME = "Name"; @@ -317,7 +323,6 @@ } } else if(cur) { cur = new ShareManager::Directory(name, cur); - cur->addType(SearchManager::TYPE_DIRECTORY); // needed since we match our own name in directory searches cur->getParent()->directories[cur->getName()] = cur; } } @@ -658,7 +663,6 @@ ShareManager::Directory* ShareManager::buildTree(const string& aName, Directory* aParent) { Directory* dir = new Directory(Util::getLastDir(aName), aParent); - dir->addType(SearchManager::TYPE_DIRECTORY); // needed since we match our own name in directory searches Directory::File::Set::iterator lastFileIter = dir->files.begin(); Modified: dcplusplus/trunk/dcpp/ShareManager.h =================================================================== --- dcplusplus/trunk/dcpp/ShareManager.h 2008-04-14 20:03:42 UTC (rev 1136) +++ dcplusplus/trunk/dcpp/ShareManager.h 2008-04-14 20:05:09 UTC (rev 1137) @@ -155,9 +155,7 @@ Map directories; File::Set files; - Directory(const string& aName = Util::emptyString, Directory* aParent = NULL) : - name(aName), parent(aParent), fileTypes(0) { - } + Directory(const string& aName, Directory* aParent); ~Directory(); Modified: dcplusplus/trunk/win32/AboutDlg.cpp =================================================================== --- dcplusplus/trunk/win32/AboutDlg.cpp 2008-04-14 20:03:42 UTC (rev 1136) +++ dcplusplus/trunk/win32/AboutDlg.cpp 2008-04-14 20:05:09 UTC (rev 1137) @@ -41,7 +41,7 @@ "bsod, sulan, jonathan stone, tim burton, izzzo, guitarm, paka, nils maier, jens oknelid, yoji, " "krzysztof tyszecki, poison, mikejj, pur, bigmuscle, martin, jove, bart vullings, " "steven sheehy, tobias nygren, poy, dorian, stephan hohe, mafa_45, mikael eman, james ross," -"stanislav maslovski, david grundberg, pavel andreev, yakov suraev. " +"stanislav maslovski, david grundberg, pavel andreev, yakov suraev, kulmegil. " "Keep it coming!"; AboutDlg::AboutDlg(dwt::Widget* parent) : WidgetFactory<dwt::ModalDialog>(parent) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arn...@us...> - 2008-04-14 20:06:20
|
Revision: 1138 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1138&view=rev Author: arnetheduck Date: 2008-04-14 13:06:06 -0700 (Mon, 14 Apr 2008) Log Message: ----------- obsolete definitions Modified Paths: -------------- dcplusplus/trunk/win32/SettingsDialog.cpp Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-05 10:01:05.903000116 +0200 committer: Jacek Sieka <arn...@gm...> properties: branch-nick: dcplusplus + timestamp: 2008-04-05 17:45:55.848999977 +0200 committer: poy <po...@12...> properties: branch-nick: bzr Name: bzr:revision-id:v3-trunk1 - 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky 1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai + 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky 1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai 1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf Modified: dcplusplus/trunk/win32/SettingsDialog.cpp =================================================================== --- dcplusplus/trunk/win32/SettingsDialog.cpp 2008-04-14 20:05:09 UTC (rev 1137) +++ dcplusplus/trunk/win32/SettingsDialog.cpp 2008-04-14 20:06:06 UTC (rev 1138) @@ -47,9 +47,6 @@ { 0, 0 } }; -static const TCHAR SEPARATOR = _T('\\'); -static const size_t MAX_NAME_LENGTH = 256; - SettingsDialog::SettingsDialog(dwt::Widget* parent) : WidgetFactory<dwt::ModalDialog>(parent), currentPage(0) { onInitDialog(std::tr1::bind(&SettingsDialog::initDialog, this)); onHelp(std::tr1::bind(&SettingsDialog::handleHelp, this, _1, _2)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arn...@us...> - 2008-04-14 20:07:29
|
Revision: 1139 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1139&view=rev Author: arnetheduck Date: 2008-04-14 13:06:46 -0700 (Mon, 14 Apr 2008) Log Message: ----------- help updates by eMTee Modified Paths: -------------- dcplusplus/trunk/help/window_public_hubs.html Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-05 17:45:55.848999977 +0200 committer: poy <po...@12...> properties: branch-nick: bzr + timestamp: 2008-04-06 00:02:50.959000111 +0200 committer: poy <po...@12...> properties: branch-nick: bzr Name: bzr:revision-id:v3-trunk1 - 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky 1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai 1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf + 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky 1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai 1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf 1114 po...@12...-20080405220250-8y09d0samsj8ja94 Modified: dcplusplus/trunk/help/window_public_hubs.html =================================================================== --- dcplusplus/trunk/help/window_public_hubs.html 2008-04-14 20:06:06 UTC (rev 1138) +++ dcplusplus/trunk/help/window_public_hubs.html 2008-04-14 20:06:46 UTC (rev 1139) @@ -1,54 +1,58 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> - <title>Public hubs</title> - <meta content="text/html; charset=us-ascii" http-equiv="content-type"> - <link type="text/css" rel="stylesheet" href="office11.css"> -</head> -<body> -<h1>Public hubs</h1> -<h2>Columns</h2> -<dl style="margin-left: 40px;"> - <dt>Name</dt> - <dd>The name of the hub</dd> - <dt>Description</dt> - <dd>The hub's description</dd> - <dt>Users</dt> - <dd>Amount of users in the hub when the hub was checked by a hublist bot</dd> - <dt>Address</dt> - <dd>The hub's address</dd> - <dt>Country</dt> - <dd>Which country the hub resides in</dd> - <dt>Shared</dt> - <dd>Amount of bytes shared in the hub when the hub was checked by a hublist bot</dd> - <dt>Min share</dt> - <dd>A restriction in the hub, where Min Share in the minimum amount of bytes you have to share to be let in</dd> - <dt>Min Slots</dt> - <dd>A restriction in the hub, where Min Slots in the minimum amount of slots you have to have open to be let in</dd> - <dt>Max hubs</dt> - <dd>A restriction in the hub, where Max Hubs in the maximum amount of hubs you are allowed to be in to be let in</dd> - <dt>Max Users</dt> - <dd>A restriction in the hub, where Max Users in the maximum amount of users the hub will let in</dd> - <dt>Reliability</dt> - <dd>How often the hub has been online, in per centage</dd> - <dt>Rating</dt> - <dd>If the hublist allowed users to vote on a hub, this will appear as the hub's rating. The more stars, the better.</dd> -</dl> -<h2>Filter</h2> -<span cshelp=IDH_PUBLIC_HUBS_FILTER> -Here, you can filter the hublist so you will only see specific hubs in the hublist. Eg, selecting 'address' in the drop down, and writing "foo" in the filter, will only display hubs that have "foo" in their address. -</span> -<h2>Configured Public Hub lists</h2> -<span cshelp=IDH_PUBLIC_HUBS_LISTS> -In the dropdown, you may select different hublists you want to see. -<br> -If you click on 'Configure', you will be able to change, add and remove hublists. The order in <a href="dialog_public_hub_lists.html">Configured Public Hub Lists</a> determines the order hublists are displayed in the dropdown mentioned above. -</span> -<a href="http://dcpp.net/hublist" target="_blank" class="external">List of alternative hublists.</a> -<img title="External Link" src="external.png" border="0" height="10" width="10" alt="External Link"> -<h2>Refresh</h2> -<span cshelp=IDH_PUBLIC_HUBS_REFRESH> -Download a fresh version of the hublist. -</span> -</body> -</html> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> +<head> + <title>Public hubs</title> + <meta content="text/html; charset=us-ascii" http-equiv="content-type"> + <link type="text/css" rel="stylesheet" href="office11.css"> +</head> +<body> +<h1>Public hubs</h1> +<h2>Columns</h2> +<dl style="margin-left: 40px;"> + <dt>Name</dt> + <dd>The name of the hub</dd> + <dt>Description</dt> + <dd>The hub's description</dd> + <dt>Users</dt> + <dd>Amount of users in the hub when the hub was checked by a hublist bot</dd> + <dt>Address</dt> + <dd>The hub's address</dd> + <dt>Country</dt> + <dd>Which country the hub resides in</dd> + <dt>Shared</dt> + <dd>Amount of bytes shared in the hub when the hub was checked by a hublist bot</dd> + <dt>Min share</dt> + <dd>A restriction in the hub, where Min Share in the minimum amount of bytes you have to share to be let in</dd> + <dt>Min Slots</dt> + <dd>A restriction in the hub, where Min Slots in the minimum amount of slots you have to have open to be let in</dd> + <dt>Max hubs</dt> + <dd>A restriction in the hub, where Max Hubs in the maximum amount of hubs you are allowed to be in to be let in</dd> + <dt>Max Users</dt> + <dd>A restriction in the hub, where Max Users in the maximum amount of users the hub will let in</dd> + <dt>Reliability</dt> + <dd>How often the hub has been online, in per centage</dd> + <dt>Rating</dt> + <dd>If the hublist allowed users to vote on a hub, this will appear as the hub's rating. The more stars, the better.</dd> +</dl> +<h2>Filter</h2> +<span cshelp=IDH_PUBLIC_HUBS_FILTER> +Here, you can filter the hublist so you will only see specific hubs in the hublist. Eg, selecting 'address' in the drop down, and writing "foo" in the filter, will only display hubs that have "foo" in their address. +</span> +<h2>Configured Public Hub lists</h2> +<span cshelp=IDH_PUBLIC_HUBS_LISTS> +In the dropdown, you may select different hublists you want to see. If the hublist was downloaded before you will have the cached version displayed. Click Refresh to get the fresh version of the hublist. +<br> +If you click on 'Configure', you will be able to change, add and remove hublists. The order in <a href="dialog_public_hub_lists.html">Configured Public Hub Lists</a> determines the order hublists are displayed in the dropdown mentioned above. +</span> +<a href="http://www.dslreports.com/faq/8189" target="_blank" class="external">List of alternative hublists.</a> +<img title="External Link" src="external.png" border="0" height="10" width="10" alt="External Link"> +<br> +<h2>Refresh</h2> +<span cshelp=IDH_PUBLIC_HUBS_REFRESH> +Download a fresh version of the hublist. If the download fails click Refresh again to get the next available hublist in the dropdown. +DC++ uses <a href="http://www.coralcdn.org">The Coral Content Distribution Network</a> +<img title="External Link" src="external.png" border="0" height="10" width="10" alt="External Link"> +to get hublists by default. This improves reliability and makes it possible to download hublists even when the original hublist server is out of service. +</span> +</body> +</html> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arn...@us...> - 2008-04-14 20:08:14
|
Revision: 1140 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1140&view=rev Author: arnetheduck Date: 2008-04-14 13:07:53 -0700 (Mon, 14 Apr 2008) Log Message: ----------- Fixed downloading multiple file lists with the enter key Modified Paths: -------------- dcplusplus/trunk/changelog.txt dcplusplus/trunk/win32/HubFrame.cpp Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-06 00:02:50.959000111 +0200 committer: poy <po...@12...> properties: branch-nick: bzr + timestamp: 2008-04-06 15:41:01.052000046 +0200 committer: poy <po...@12...> properties: branch-nick: bzr Name: bzr:revision-id:v3-trunk1 - 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky 1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai 1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf 1114 po...@12...-20080405220250-8y09d0samsj8ja94 + 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky 1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai 1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf 1114 po...@12...-20080405220250-8y09d0samsj8ja94 1115 po...@12...-20080406134101-4860ytb61sbu3yhg Modified: dcplusplus/trunk/changelog.txt =================================================================== --- dcplusplus/trunk/changelog.txt 2008-04-14 20:06:46 UTC (rev 1139) +++ dcplusplus/trunk/changelog.txt 2008-04-14 20:07:53 UTC (rev 1140) @@ -26,6 +26,7 @@ * Added the title of the currently selected page in settings (poy) * [L#206785] Fixed a crash when a menu is owner-drawn while the desktop isn't visible (poy) * [L#211313] Fixed bad virtual name being loaded (thanks kulmegil) +* Fixed downloading multiple file lists with the enter key (poy) -- 0.705 2008-03-14 -- * Several patches for better *nix compatibility of the core (thanks steven sheehy et al) Modified: dcplusplus/trunk/win32/HubFrame.cpp =================================================================== --- dcplusplus/trunk/win32/HubFrame.cpp 2008-04-14 20:06:46 UTC (rev 1139) +++ dcplusplus/trunk/win32/HubFrame.cpp 2008-04-14 20:07:53 UTC (rev 1140) @@ -669,11 +669,8 @@ } bool HubFrame::handleUsersKeyDown(int c) { - if(c == VK_RETURN) { - int item = users->getNext(-1, LVNI_FOCUSED); - if(item != -1) { - users->getData(item)->getList(); - } + if(c == VK_RETURN && users->hasSelected()) { + handleGetList(); return true; } return false; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arn...@us...> - 2008-04-14 20:09:36
|
Revision: 1141 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1141&view=rev Author: arnetheduck Date: 2008-04-14 13:09:08 -0700 (Mon, 14 Apr 2008) Log Message: ----------- menus: fix colors and use the font Modified Paths: -------------- dcplusplus/trunk/dwt/include/dwt/widgets/WidgetMenu.h dcplusplus/trunk/dwt/src/widgets/WidgetMenu.cpp dcplusplus/trunk/win32/WinUtil.cpp dcplusplus/trunk/win32/WinUtil.h Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-06 15:41:01.052000046 +0200 committer: poy <po...@12...> properties: branch-nick: bzr + timestamp: 2008-04-06 17:58:49.723999977 +0200 committer: poy <po...@12...> properties: branch-nick: bzr Name: bzr:revision-id:v3-trunk1 - 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky 1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai 1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf 1114 po...@12...-20080405220250-8y09d0samsj8ja94 1115 po...@12...-20080406134101-4860ytb61sbu3yhg + 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky 1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai 1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf 1114 po...@12...-20080405220250-8y09d0samsj8ja94 1115 po...@12...-20080406134101-4860ytb61sbu3yhg 1116 po...@12...-20080406155849-2wzxzuzs5m8zpk0g Modified: dcplusplus/trunk/dwt/include/dwt/widgets/WidgetMenu.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/WidgetMenu.h 2008-04-14 20:07:53 UTC (rev 1140) +++ dcplusplus/trunk/dwt/include/dwt/widgets/WidgetMenu.h 2008-04-14 20:09:08 UTC (rev 1141) @@ -53,19 +53,14 @@ /// Menu item text color COLORREF TextColor; - /// Menu item font - FontPtr Font; - /// Menu item image BitmapPtr Image; /// Creates new menu item with specified data MenuItemData( - FontPtr font = FontPtr( new dwt::Font( ( HFONT )::GetStockObject( DEFAULT_GUI_FONT ), false ) ), BitmapPtr image = BitmapPtr( new Bitmap( ( HBITMAP ) NULL ) ), // defaults to empty bitmap COLORREF textColor = ::GetSysColor( COLOR_MENUTEXT ) ) : TextColor( textColor ), - Font( font ), Image( image ) {} }; @@ -138,10 +133,11 @@ typedef std::tr1::shared_ptr<WidgetMenu> ObjectType; struct Seed { - Seed(bool ownerDrawn_ = true, const MenuColorInfo& colorInfo_ = MenuColorInfo()) : popup(true), ownerDrawn(ownerDrawn_), colorInfo(colorInfo_) { } + Seed(bool ownerDrawn_ = true, const MenuColorInfo& colorInfo_ = MenuColorInfo(), FontPtr font_ = 0); bool popup; bool ownerDrawn; MenuColorInfo colorInfo; + FontPtr font; }; struct IdDispatcher @@ -491,6 +487,8 @@ // Contains information about menu colors MenuColorInfo itsColorInfo; + FontPtr font; + // Menu title SmartUtil::tstring itsTitle; Modified: dcplusplus/trunk/dwt/src/widgets/WidgetMenu.cpp =================================================================== --- dcplusplus/trunk/dwt/src/widgets/WidgetMenu.cpp 2008-04-14 20:07:53 UTC (rev 1140) +++ dcplusplus/trunk/dwt/src/widgets/WidgetMenu.cpp 2008-04-14 20:09:08 UTC (rev 1141) @@ -50,6 +50,14 @@ const int WidgetMenu::minSysMenuItemWidth = 130; Point WidgetMenu::defaultImageSize = Point( 16, 16 ); +WidgetMenu::Seed::Seed(bool ownerDrawn_, const MenuColorInfo& colorInfo_, FontPtr font_) : +popup(true), +ownerDrawn(ownerDrawn_), +colorInfo(colorInfo_), +font(font_) +{ +} + WidgetMenu::WidgetMenu( dwt::Widget* parent ) : isSysMenu(false), itsChildrenRef(itsChildren), @@ -66,11 +74,16 @@ itsColorInfo = cs.colorInfo; if(ownerDrawn) { + if(cs.font) + font = cs.font; + else + font = new Font(DefaultGuiFont); + { LOGFONT lf; - ::GetObject((HFONT)GetStockObject(DEFAULT_GUI_FONT), sizeof(lf), &lf); + ::GetObject(font->handle(), sizeof(lf), &lf); lf.lfWeight = FW_BOLD; - itsTitleFont = dwt::FontPtr(new dwt::Font(::CreateFontIndirect(&lf), true)); + itsTitleFont = FontPtr(new Font(::CreateFontIndirect(&lf), true)); } // set default drawing @@ -139,7 +152,7 @@ { // create popup menu pointer ObjectType retVal ( new WidgetMenu(itsParent) ); - retVal->create( Seed(ownerDrawn, itsColorInfo) ); + retVal->create( Seed(ownerDrawn, itsColorInfo, font) ); // init structure for new item MENUITEMINFO info; @@ -365,8 +378,7 @@ info.dwTypeData = const_cast< LPTSTR >( title.c_str() ); // created info for title item - MenuItemDataPtr data( new MenuItemData( itsTitleFont ) ); - ItemDataWrapper * wrapper = new ItemDataWrapper( this, 0, data, true ); + ItemDataWrapper * wrapper = new ItemDataWrapper( this, 0, MenuItemDataPtr( new MenuItemData() ), true ); // set item data info.dwItemData = reinterpret_cast< ULONG_PTR >( wrapper ); @@ -449,14 +461,9 @@ // setup buffered canvas BufferedCanvas< FreeCanvas > canvas( reinterpret_cast<HWND>(wrapper->menu->handle()), drawInfo->hDC ); - // this will conain adjusted sidebar width + // this will contain adjusted sidebar width int sidebarWidth = 0; - // this will contain logical information - // about title font - LOGFONT lf; - memset( & lf, 0, sizeof( LOGFONT ) ); - // this will contain adjusted(rotated) title font for sidebar HFONT titleFont = NULL; @@ -467,7 +474,8 @@ FontPtr font = wrapper->menu->itsTitleFont; // get logical info for title font - ::GetObject( font->handle(), sizeof( LOGFONT ), & lf ); + LOGFONT lf; + ::GetObject(font->handle(), sizeof(lf), &lf); // 90 degree rotation and bold lf.lfOrientation = lf.lfEscapement = 900; @@ -511,9 +519,11 @@ // set title rectangle Rectangle textRectangle( 0, 0, sidebarWidth, rect.bottom - rect.top ); - // draw background - Brush brush ( colorInfo.colorStrip ); - canvas.fillRectangle( textRectangle, brush ); + { + // draw background + Brush brush(colorInfo.colorStrip); + canvas.fillRectangle(textRectangle, brush); + } // draw title textRectangle.pos.y += 10; @@ -530,41 +540,24 @@ // destroy title font ::DeleteObject( titleFont ); - // set item background + bool highlight = (isSelected || isHighlighted) && !isDisabled; + { - Brush brush((wrapper->isMenuTitleItem || isMenuBar) ? colorInfo.colorStrip : colorInfo.colorMenu); + // set item background + Brush brush(highlight ? colorInfo.colorHighlight : (wrapper->isMenuTitleItem || isMenuBar) ? colorInfo.colorStrip : colorInfo.colorMenu); canvas.fillRectangle(itemRectangle, brush); } - if ( isMenuBar && isSelected ) // draw selected menu bar item + if(!highlight && !isMenuBar && !wrapper->isMenuTitleItem) // strip bar (on the left, where bitmaps go) { - // TODO: Simulate shadow - - // select pen for drawing broder - // and brush for filling item - COLORREF colorBorder = 0; - Canvas::Selector select_pen(canvas, *PenPtr(new Pen(colorBorder))); - canvas.rectangle( itemRectangle ); - } // end if - else if ( ( isSelected || isHighlighted ) && !isDisabled ) // draw selected or highlighted menu item (if not inactive) - { - // select pen for drawing broder - // and brush for filling item - Canvas::Selector select_pen(canvas, *PenPtr(new Pen(colorInfo.colorHighlight))); - Canvas::Selector select_brush(canvas, *BrushPtr(new Brush(ColorUtilities::lightenColor( colorInfo.colorHighlight, 0.7 )))); - - canvas.rectangle( itemRectangle ); - } // end if - else if ( !isMenuBar && !wrapper->isMenuTitleItem ) // draw strip bar for menu items (except menu title item) - { // create rectangle for strip bar Rectangle stripRectangle ( itemRectangle ); stripRectangle.size.x = stripWidth; // draw strip bar - Brush brush ( colorInfo.colorStrip ); - canvas.fillRectangle( stripRectangle, brush ); - } // end if + Brush brush(colorInfo.colorStrip); + canvas.fillRectangle(stripRectangle, brush); + } if ( !isMenuBar && info.fType & MFT_SEPARATOR ) // draw separator { @@ -609,7 +602,10 @@ canvas.setTextColor( isGrayed ? ::GetSysColor( COLOR_GRAYTEXT ) : wrapper->isMenuTitleItem ? colorInfo.colorTitleText : data->TextColor ); // Select item font - FontPtr font((static_cast<int>(::GetMenuDefaultItem(wrapper->menu->handle(), TRUE, GMDI_USEDISABLED)) == wrapper->index) ? wrapper->menu->itsTitleFont : data->Font); + FontPtr font = + (wrapper->isMenuTitleItem || (static_cast<int>(::GetMenuDefaultItem(wrapper->menu->handle(), TRUE, GMDI_USEDISABLED)) == wrapper->index)) + ? wrapper->menu->itsTitleFont + : wrapper->menu->font; HGDIOBJ oldFont = ::SelectObject( canvas.handle(), font->handle() ); @@ -782,7 +778,7 @@ SIZE textSize; memset( & textSize, 0, sizeof( SIZE ) ); - HGDIOBJ oldFont = ::SelectObject( hdc, data->Font->handle() ); + HGDIOBJ oldFont = ::SelectObject( hdc, wrapper->menu->font->handle() ); ::GetTextExtentPoint32( hdc, itemText.c_str(), ( int ) itemText.size(), & textSize ); ::SelectObject( hdc, oldFont ); Modified: dcplusplus/trunk/win32/WinUtil.cpp =================================================================== --- dcplusplus/trunk/win32/WinUtil.cpp 2008-04-14 20:07:53 UTC (rev 1140) +++ dcplusplus/trunk/win32/WinUtil.cpp 2008-04-14 20:09:08 UTC (rev 1141) @@ -61,8 +61,8 @@ const dwt::Button::Seed WinUtil::Seeds::button; const ComboBox::Seed WinUtil::Seeds::comboBoxStatic; const ComboBox::Seed WinUtil::Seeds::comboBoxEdit; +const dwt::WidgetMenu::Seed WinUtil::Seeds::menu; const dwt::Table::Seed WinUtil::Seeds::Table; -const dwt::WidgetMenu::Seed WinUtil::Seeds::menu; const TextBox::Seed WinUtil::Seeds::textBox; const dwt::Tree::Seed WinUtil::Seeds::treeView; @@ -123,8 +123,8 @@ dwt::Button::Seed& xbutton = const_cast<dwt::Button::Seed&>(Seeds::button); ComboBox::Seed& xcomboBoxEdit = const_cast<ComboBox::Seed&>(Seeds::comboBoxEdit); ComboBox::Seed& xcomboBoxStatic = const_cast<ComboBox::Seed&>(Seeds::comboBoxStatic); + dwt::WidgetMenu::Seed& xmenu = const_cast<dwt::WidgetMenu::Seed&>(Seeds::menu); dwt::Table::Seed& xTable = const_cast<dwt::Table::Seed&>(Seeds::Table); - dwt::WidgetMenu::Seed& xmenu = const_cast<dwt::WidgetMenu::Seed&>(Seeds::menu); TextBox::Seed& xtextBox = const_cast<TextBox::Seed&>(Seeds::textBox); dwt::Tree::Seed& xtreeView = const_cast<dwt::Tree::Seed&>(Seeds::treeView); @@ -135,17 +135,18 @@ xcomboBoxEdit.style |= CBS_DROPDOWN | CBS_AUTOHSCROLL; xcomboBoxEdit.font = font; - + + if(BOOLSETTING(OWNER_DRAWN_MENUS)) { + xmenu.colorInfo.colorImageBackground = RGB(255, 0, 255); // DC++ bitmaps use RGB(255, 0, 255) as their background (transparent) color + xmenu.font = font; + } else + xmenu.ownerDrawn = false; + xTable.style |= WS_HSCROLL | WS_VSCROLL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS; xTable.exStyle = WS_EX_CLIENTEDGE; xTable.lvStyle = LVS_EX_HEADERDRAGDROP | LVS_EX_FULLROWSELECT | LVS_EX_LABELTIP | LVS_EX_DOUBLEBUFFER; xTable.font = font; - if(BOOLSETTING(OWNER_DRAWN_MENUS)) - xmenu.colorInfo.colorImageBackground = RGB(255, 0, 255); // DC++ bitmaps use RGB(255, 0, 255) as their background (transparent) color - else - xmenu.ownerDrawn = false; - xtextBox.exStyle = WS_EX_CLIENTEDGE; xtextBox.font = font; Modified: dcplusplus/trunk/win32/WinUtil.h =================================================================== --- dcplusplus/trunk/win32/WinUtil.h 2008-04-14 20:07:53 UTC (rev 1140) +++ dcplusplus/trunk/win32/WinUtil.h 2008-04-14 20:09:08 UTC (rev 1141) @@ -71,8 +71,8 @@ static const dwt::Button::Seed button; static const ComboBox::Seed comboBoxStatic; static const ComboBox::Seed comboBoxEdit; + static const dwt::WidgetMenu::Seed menu; static const dwt::Table::Seed Table; - static const dwt::WidgetMenu::Seed menu; static const TextBox::Seed textBox; static const dwt::Tree::Seed treeView; }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arn...@us...> - 2008-04-14 20:10:12
|
Revision: 1142 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1142&view=rev Author: arnetheduck Date: 2008-04-14 13:10:03 -0700 (Mon, 14 Apr 2008) Log Message: ----------- more descriptive text for the "What's This?" button Modified Paths: -------------- dcplusplus/trunk/win32/MainWindow.cpp dcplusplus/trunk/win32/WinUtil.cpp Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-06 17:58:49.723999977 +0200 committer: poy <po...@12...> properties: branch-nick: bzr + timestamp: 2008-04-06 18:48:35.145999908 +0200 committer: poy <po...@12...> properties: branch-nick: bzr Name: bzr:revision-id:v3-trunk1 - 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky 1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai 1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf 1114 po...@12...-20080405220250-8y09d0samsj8ja94 1115 po...@12...-20080406134101-4860ytb61sbu3yhg 1116 po...@12...-20080406155849-2wzxzuzs5m8zpk0g + 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky 1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai 1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf 1114 po...@12...-20080405220250-8y09d0samsj8ja94 1115 po...@12...-20080406134101-4860ytb61sbu3yhg 1116 po...@12...-20080406155849-2wzxzuzs5m8zpk0g 1117 po...@12...-20080406164835-bv5dydhm3qqydsty Modified: dcplusplus/trunk/win32/MainWindow.cpp =================================================================== --- dcplusplus/trunk/win32/MainWindow.cpp 2008-04-14 20:09:08 UTC (rev 1141) +++ dcplusplus/trunk/win32/MainWindow.cpp 2008-04-14 20:10:03 UTC (rev 1142) @@ -303,7 +303,11 @@ toolbar->appendItem(image++, T_("Settings"), std::tr1::bind(&MainWindow::handleSettings, this)); toolbar->appendItem(image++, T_("Notepad"), std::tr1::bind(&MainWindow::handleOpenWindow, this, IDC_NOTEPAD)); toolbar->appendSeparator(); - toolbar->appendItem(image++, T_("\"What's this?\""), std::tr1::bind(&MainWindow::handleWhatsThis, this)); + toolbar->appendItem(image++, T_( + "\"What's This?\" help button\n\n" + "Get help on specific parts of DC++\n\n" + "Click this button once and your mouse cursor will change into a help cursor; then click on the control for which you wish to get help for." + ), std::tr1::bind(&MainWindow::handleWhatsThis, this)); } void MainWindow::initStatusBar() { Modified: dcplusplus/trunk/win32/WinUtil.cpp =================================================================== --- dcplusplus/trunk/win32/WinUtil.cpp 2008-04-14 20:09:08 UTC (rev 1141) +++ dcplusplus/trunk/win32/WinUtil.cpp 2008-04-14 20:10:03 UTC (rev 1142) @@ -545,8 +545,7 @@ if(id >= IDH_CSHELP_BEGIN && id <= IDH_CSHELP_END) { // context-sensitive help; display a tooltip - HH_POPUP popup = { 0 }; - popup.cbStruct = sizeof(HH_POPUP); + HH_POPUP popup = { sizeof(HH_POPUP) }; popup.idString = id; RECT rect; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arn...@us...> - 2008-04-14 20:10:55
|
Revision: 1143 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1143&view=rev Author: arnetheduck Date: 2008-04-14 13:10:48 -0700 (Mon, 14 Apr 2008) Log Message: ----------- multiple shares with same name Modified Paths: -------------- dcplusplus/trunk/changelog.txt dcplusplus/trunk/dcpp/ShareManager.cpp dcplusplus/trunk/dcpp/ShareManager.h dcplusplus/trunk/win32/UploadPage.cpp Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-06 18:48:35.145999908 +0200 committer: poy <po...@12...> properties: branch-nick: bzr + timestamp: 2008-04-06 23:02:37.905999899 +0200 committer: Jacek Sieka <arn...@gm...> properties: branch-nick: dcplusplus Name: bzr:revision-id:v3-trunk1 - 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky 1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai 1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf 1114 po...@12...-20080405220250-8y09d0samsj8ja94 1115 po...@12...-20080406134101-4860ytb61sbu3yhg 1116 po...@12...-20080406155849-2wzxzuzs5m8zpk0g 1117 po...@12...-20080406164835-bv5dydhm3qqydsty + 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky 1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai 1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf 1114 po...@12...-20080405220250-8y09d0samsj8ja94 1115 po...@12...-20080406134101-4860ytb61sbu3yhg 1116 po...@12...-20080406155849-2wzxzuzs5m8zpk0g 1117 po...@12...-20080406164835-bv5dydhm3qqydsty 1118 arn...@gm...-20080406210237-c7tyfgiz2sjgv044 Modified: dcplusplus/trunk/changelog.txt =================================================================== --- dcplusplus/trunk/changelog.txt 2008-04-14 20:10:03 UTC (rev 1142) +++ dcplusplus/trunk/changelog.txt 2008-04-14 20:10:48 UTC (rev 1143) @@ -26,6 +26,8 @@ * Added the title of the currently selected page in settings (poy) * [L#206785] Fixed a crash when a menu is owner-drawn while the desktop isn't visible (poy) * [L#211313] Fixed bad virtual name being loaded (thanks kulmegil) +* [L#202801] Allow virtual folders to have the same name +* Allow more characters in virtual names * Fixed downloading multiple file lists with the enter key (poy) -- 0.705 2008-03-14 -- Modified: dcplusplus/trunk/dcpp/ShareManager.cpp =================================================================== --- dcplusplus/trunk/dcpp/ShareManager.cpp 2008-04-14 20:10:03 UTC (rev 1142) +++ dcplusplus/trunk/dcpp/ShareManager.cpp 2008-04-14 20:10:48 UTC (rev 1143) @@ -70,9 +70,7 @@ StringList lists = File::findFiles(Util::getConfigPath(), "files?*.xml.bz2"); for_each(lists.begin(), lists.end(), File::deleteFile); - for(Directory::MapIter j = directories.begin(); j != directories.end(); ++j) { - delete j->second; - } + for_each(directories.begin(), directories.end(), DeleteFunction()); } ShareManager::Directory::Directory(const string& aName, Directory* aParent) : @@ -107,15 +105,27 @@ } } -string ShareManager::Directory::getRealPath() const throw() { +string ShareManager::Directory::getRealPath(const std::string& path) const throw(ShareException) { if(getParent()) { - return getParent()->getRealPath() + getName() + PATH_SEPARATOR_STR; + return getParent()->getRealPath(getName() + PATH_SEPARATOR_STR + path); } else { - dcassert(ShareManager::getInstance()->getByVirtual(getName()) != ShareManager::getInstance()->directories.end()); - return ShareManager::getInstance()->getByVirtual(getName())->first; + return ShareManager::getInstance()->findRealRoot(getName(), path); } } +string ShareManager::findRealRoot(const string& virtualRoot, const string& virtualPath) const throw(ShareException) { + for(StringMap::const_iterator i = shares.begin(); i != shares.end(); ++i) { + if(Util::stricmp(i->second, virtualRoot)) { + std::string name = i->first + PATH_SEPARATOR_STR + virtualPath; + if(File::getSize(name) != -1) { + return name; + } + } + } + + throw ShareException(UserConnection::FILE_NOT_AVAILABLE); +} + int64_t ShareManager::Directory::getSize() const throw() { int64_t tmp = size; for(Map::const_iterator i = directories.begin(); i != directories.end(); ++i) @@ -123,21 +133,14 @@ return tmp; } -size_t ShareManager::Directory::countFiles() const throw() { - size_t tmp = files.size(); - for(Map::const_iterator i = directories.begin(); i != directories.end(); ++i) - tmp+=i->second->countFiles(); - return tmp; -} - string ShareManager::toVirtual(const TTHValue& tth) const throw(ShareException) { - Lock l(cs); if(tth == bzXmlRoot) { return Transfer::USER_LIST_NAME_BZ; } else if(tth == xmlRoot) { return Transfer::USER_LIST_NAME; } + Lock l(cs); HashFileMap::const_iterator i = tthIndex.find(tth); if(i != tthIndex.end()) { return i->second->getADCPath(); @@ -147,17 +150,15 @@ } string ShareManager::toReal(const string& virtualFile) throw(ShareException) { + Lock l(cs); if(virtualFile == "MyList.DcLst") { throw ShareException("NMDC-style lists no longer supported, please upgrade your client"); } else if(virtualFile == Transfer::USER_LIST_NAME_BZ || virtualFile == Transfer::USER_LIST_NAME) { generateXmlList(); return getBZXmlFile(); - } else { - string realFile; - Lock l(cs); + } - return findFile(virtualFile)->getRealPath(); - } + return findFile(virtualFile)->getRealPath(); } TTHValue ShareManager::getTTH(const string& virtualFile) const throw(ShareException) { @@ -210,8 +211,8 @@ if(aFile.compare(0, 4, "TTH/") != 0) throw ShareException(UserConnection::FILE_NOT_AVAILABLE); + TTHValue val(aFile.substr(4)); Lock l(cs); - TTHValue val(aFile.substr(4)); HashFileIter i = tthIndex.find(val); if(i == tthIndex.end()) { throw ShareException(UserConnection::FILE_NOT_AVAILABLE); @@ -242,24 +243,22 @@ } string virtualName = virtualFile.substr(1, i-1); - Directory::Map::const_iterator dmi = getByVirtual(virtualName); + DirList::const_iterator dmi = getByVirtual(virtualName); if(dmi == directories.end()) { throw ShareException(UserConnection::FILE_NOT_AVAILABLE); } - Directory* d = dmi->second; + Directory* d = *dmi; - string file = virtualFile.substr(i + 1); - - string::size_type j = 0; - while( (i = file.find('/', j)) != string::npos) { - Directory::MapIter mi = d->directories.find(file.substr(j, i-j)); + string::size_type j = i + 1; + while( (i = virtualName.find('/', j)) != string::npos) { + Directory::MapIter mi = d->directories.find(virtualName.substr(j, i-j)); j = i + 1; if(mi == d->directories.end()) throw ShareException(UserConnection::FILE_NOT_AVAILABLE); d = mi->second; } - Directory::File::Set::const_iterator it = find_if(d->files.begin(), d->files.end(), Directory::File::StringComp(file.substr(j))); + Directory::File::Set::const_iterator it = find_if(d->files.begin(), d->files.end(), Directory::File::StringComp(virtualName.substr(j))); if(it == d->files.end()) throw ShareException(UserConnection::FILE_NOT_AVAILABLE); return it; @@ -269,13 +268,14 @@ string tmp = aVirt; string::size_type idx = 0; - while( (idx = tmp.find_first_of("$|:\\/"), idx) != string::npos) { + while( (idx = tmp.find_first_of("\\/"), idx) != string::npos) { tmp[idx] = '_'; } return tmp; } bool ShareManager::hasVirtual(const string& virtualName) const throw() { + Lock l(cs); return getByVirtual(virtualName) != directories.end(); } @@ -292,11 +292,7 @@ const string& virtualName = aXml.getChildAttrib("Virtual"); string vName = validateVirtual(virtualName.empty() ? Util::getLastDir(realPath) : virtualName); - - // add only unique directories - if(!hasVirtual(vName)) { - directories[realPath] = new Directory(vName, 0); - } + shares.insert(std::make_pair(realPath, virtualName)); } aXml.stepOut(); } @@ -309,15 +305,15 @@ static const string STTH = "TTH"; struct ShareLoader : public SimpleXMLReader::CallBack { - ShareLoader(ShareManager::Directory::Map& aDirs) : dirs(aDirs), cur(0), depth(0) { } + ShareLoader(ShareManager::DirList& aDirs) : dirs(aDirs), cur(0), depth(0) { } virtual void startTag(const string& name, StringPairList& attribs, bool simple) { if(name == SDIRECTORY) { const string& name = getAttrib(attribs, SNAME, 0); if(!name.empty()) { if(depth == 0) { - for(ShareManager::Directory::MapIter i = dirs.begin(); i != dirs.end(); ++i) { - if(Util::stricmp(i->second->getName(), name) == 0) { - cur = i->second; + for(ShareManager::DirList::iterator i = dirs.begin(); i != dirs.end(); ++i) { + if(Util::stricmp((*i)->getName(), name) == 0) { + cur = *i; break; } } @@ -355,7 +351,7 @@ } private: - ShareManager::Directory::Map& dirs; + ShareManager::DirList& dirs; ShareManager::Directory* cur; size_t depth; @@ -380,8 +376,8 @@ SimpleXMLReader(&loader).fromXML(txt); - for(Directory::MapIter i = directories.begin(); i != directories.end(); ++i) { - addTree(*i->second); + for(DirList::const_iterator i = directories.begin(); i != directories.end(); ++i) { + updateIndices(**i); } return true; @@ -396,9 +392,9 @@ aXml.addTag("Share"); aXml.stepIn(); - for(Directory::MapIter i = directories.begin(); i != directories.end(); ++i) { + for(StringMapIter i = shares.begin(); i != shares.end(); ++i) { aXml.addTag("Directory", i->first); - aXml.addChildAttrib("Virtual", i->second->getName()); + aXml.addChildAttrib("Virtual", i->second); } aXml.stepOut(); } @@ -412,12 +408,10 @@ throw ShareException(_("The temporary download directory cannot be shared")); } - string vName = validateVirtual(virtualName); - { Lock l(cs); - for(Directory::MapIter i = directories.begin(); i != directories.end(); ++i) { + for(StringMapIter i = shares.begin(); i != shares.end(); ++i) { if(Util::strnicmp(realPath, i->first, i->first.length()) == 0) { // Trying to share an already shared directory throw ShareException(_("Directory already shared")); @@ -426,63 +420,110 @@ throw ShareException(_("Remove all subdirectories before adding this one")); } } - - if(hasVirtual(vName)) { - throw ShareException(_("Virtual directory name already exists")); - } } Directory* dp = buildTree(realPath, 0); + + string vName = validateVirtual(virtualName); dp->setName(vName); { Lock l(cs); - addTree(*dp); - directories[realPath] = dp; + shares.insert(std::make_pair(realPath, vName)); + updateIndices(*merge(dp)); + setDirty(); } } +ShareManager::Directory* ShareManager::merge(Directory* directory) { + for(DirList::iterator i = directories.begin(); i != directories.end(); ++i) { + if(Util::stricmp((*i)->getName(), directory->getName()) == 0) { + dcdebug("Merging directory %s\n", directory->getName().c_str()); + (*i)->merge(directory); + return *i; + } + } + + dcdebug("Adding new directory %s\n", directory->getName().c_str()); + + directories.push_back(directory); + return directory; +} + +void ShareManager::Directory::merge(Directory* source) { + for(MapIter i = source->directories.begin(); i != source->directories.end(); ++i) { + Directory* subSource = i->second; + + MapIter ti = directories.find(subSource->getName()); + if(ti == directories.end()) { + if(findFile(subSource->getName()) != files.end()) { + dcdebug("File named the same as directory"); + delete subSource; + } else { + directories.insert(std::make_pair(subSource->getName(), subSource)); + } + } else { + Directory* subTarget = ti->second; + subTarget->merge(subSource); + delete subSource; + } + } + + // All subdirs either deleted or moved to target... + source->directories.clear(); + + for(File::Set::iterator i = source->files.begin(); i != source->files.end(); ++i) { + File::Set::iterator j = findFile(i->getName()); + + if(j == files.end()) { + if(directories.find(i->getName()) != directories.end()) { + dcdebug("Directory named the same as file"); + } else { + files.insert(*i); + } + } + } +} + void ShareManager::removeDirectory(const string& realPath) { if(realPath.empty()) return; - { - Lock l(cs); + HashManager::getInstance()->stopHashing(realPath); - Directory::MapIter i = directories.find(realPath); - if(i != directories.end()) { - delete i->second; - directories.erase(i); + Lock l(cs); + + StringMapIter i = shares.find(realPath); + if(i == shares.end()) { + return; + } + + const std::string& vName = i->second; + for(DirList::iterator j = directories.begin(); j != directories.end(); ) { + if(Util::stricmp((*j)->getName(), vName) == 0) { + delete *j; + directories.erase(j++); + } else { + ++j; } - - rebuildIndices(); - setDirty(); } + + shares.erase(i); - HashManager::getInstance()->stopHashing(realPath); + rebuildIndices(); + setDirty(); } void ShareManager::renameDirectory(const string& realPath, const string& virtualName) throw(ShareException) { - string vName = validateVirtual(virtualName); - - Lock l(cs); - //Find the virtual name - if (hasVirtual(vName)) { - throw ShareException(_("Virtual directory name already exists")); - } - - Directory::MapIter j = directories.find(realPath); - if(j == directories.end()) - return; - - j->second->setName(vName); + removeDirectory(realPath); + addDirectory(realPath, virtualName); } -ShareManager::Directory::Map::const_iterator ShareManager::getByVirtual(const string& virtualName) const throw() { - for(Directory::Map::const_iterator i = directories.begin(); i != directories.end(); ++i) { - if(Util::stricmp(i->second->getName(), virtualName) == 0) { +ShareManager::DirList::const_iterator ShareManager::getByVirtual(const string& virtualName) const throw() { + for(DirList::const_iterator i = directories.begin(); i != directories.end(); ++i) { + if(Util::stricmp((*i)->getName(), virtualName) == 0) { return i; } } @@ -491,20 +532,21 @@ int64_t ShareManager::getShareSize(const string& realPath) const throw() { Lock l(cs); - dcassert(realPath.size()>0); +#ifdef PORT_ME + dcassert(realPath.size()>0); Directory::Map::const_iterator i = directories.find(realPath); if(i != directories.end()) { return i->second->getSize(); } - +#endif return -1; } int64_t ShareManager::getShareSize() const throw() { Lock l(cs); int64_t tmp = 0; - for(Directory::Map::const_iterator i = directories.begin(); i != directories.end(); ++i) { + for(HashFileMap::const_iterator i = tthIndex.begin(); i != tthIndex.end(); ++i) { tmp += i->second->getSize(); } return tmp; @@ -711,17 +753,17 @@ return dir; } -void ShareManager::addTree(Directory& dir) { +void ShareManager::updateIndices(Directory& dir) { bloom.add(Text::toLower(dir.getName())); for(Directory::MapIter i = dir.directories.begin(); i != dir.directories.end(); ++i) { - addTree(*i->second); + updateIndices(*i->second); } dir.size = 0; for(Directory::File::Set::iterator i = dir.files.begin(); i != dir.files.end(); ) { - addFile(dir, i++); + updateIndices(dir, i++); } } @@ -729,12 +771,12 @@ tthIndex.clear(); bloom.clear(); - for(Directory::Map::const_iterator i = directories.begin(); i != directories.end(); ++i) { - addTree(*i->second); + for(DirList::const_iterator i = directories.begin(); i != directories.end(); ++i) { + updateIndices(**i); } } -void ShareManager::addFile(Directory& dir, const Directory::File::Set::iterator& i) { +void ShareManager::updateIndices(Directory& dir, const Directory::File::Set::iterator& i) { const Directory::File& f = *i; HashFileIter j = tthIndex.find(f.getTTH()); @@ -784,8 +826,8 @@ StringPairList ShareManager::getDirectories() const throw() { Lock l(cs); StringPairList ret; - for(Directory::Map::const_iterator i = directories.begin(); i != directories.end(); ++i) { - ret.push_back(make_pair(i->second->getName(), i->first)); + for(StringMap::const_iterator i = shares.begin(); i != shares.end(); ++i) { + ret.push_back(make_pair(i->second, i->first)); } return ret; } @@ -794,35 +836,35 @@ StringPairList dirs = getDirectories(); // Don't need to refresh if no directories are shared - if(dirs.begin() == dirs.end()) + if(dirs.empty()) refreshDirs = false; - { - if(refreshDirs) { - LogManager::getInstance()->message(_("File list refresh initiated")); + if(refreshDirs) { + LogManager::getInstance()->message(_("File list refresh initiated")); + + lastFullUpdate = GET_TICK(); + + DirList newDirs; + for(StringPairIter i = dirs.begin(); i != dirs.end(); ++i) { + Directory* dp = buildTree(i->second, 0); + dp->setName(i->first); + newDirs.push_back(dp); + } + + { + Lock l(cs); + for_each(directories.begin(), directories.end(), DeleteFunction()); + directories.clear(); - lastFullUpdate = GET_TICK(); - - Directory::Map newDirs; - for(StringPairIter i = dirs.begin(); i != dirs.end(); ++i) { - Directory* dp = buildTree(i->second, 0); - dp->setName(i->first); - newDirs.insert(make_pair(i->second, dp)); + for(DirList::iterator i = newDirs.begin(); i != newDirs.end(); ++i) { + merge(*i); } - { - Lock l(cs); - for(Directory::MapIter i = directories.begin(); i != directories.end(); ++i) { - delete i->second; - } - directories = newDirs; - - rebuildIndices(); - } - refreshDirs = false; - - LogManager::getInstance()->message(_("File list refresh finished")); + rebuildIndices(); } + refreshDirs = false; + + LogManager::getInstance()->message(_("File list refresh finished")); } if(update) { @@ -864,8 +906,8 @@ newXmlFile.write(SimpleXML::utf8Header); newXmlFile.write("<FileListing Version=\"1\" CID=\"" + ClientManager::getInstance()->getMe()->getCID().toBase32() + "\" Base=\"/\" Generator=\"" APPNAME " " VERSIONSTRING "\">\r\n"); - for(Directory::MapIter i = directories.begin(); i != directories.end(); ++i) { - i->second->toXml(newXmlFile, indent, tmp2, true); + for(DirList::const_iterator i = directories.begin(); i != directories.end(); ++i) { + (*i)->toXml(newXmlFile, indent, tmp2, true); } newXmlFile.write("</FileListing>"); newXmlFile.flush(); @@ -914,13 +956,15 @@ Lock l(cs); if(dir == "/") { - for(Directory::Map::const_iterator i = directories.begin(); i != directories.end(); ++i) { + for(DirList::const_iterator i = directories.begin(); i != directories.end(); ++i) { tmp.clear(); - i->second->toXml(sos, indent, tmp, recurse); + (*i)->toXml(sos, indent, tmp, recurse); } } else { string::size_type i = 1, j = 1; - Directory::Map::const_iterator it = directories.end(); + + Directory* root = NULL; + bool first = true; while( (i = dir.find('/', j)) != string::npos) { if(i == j) { @@ -930,23 +974,25 @@ if(first) { first = false; - it = getByVirtual(dir.substr(j, i-j)); + DirList::const_iterator it = getByVirtual(dir.substr(j, i-j)); if(it == directories.end()) return 0; + root = *it; + } else { - Directory::Map::const_iterator it2 = it->second->directories.find(dir.substr(j, i-j)); - if(it2 == it->second->directories.end()) { + Directory::Map::const_iterator it2 = root->directories.find(dir.substr(j, i-j)); + if(it2 == root->directories.end()) { return 0; } - it = it2; + root = it2->second; } j = i + 1; } - for(Directory::Map::const_iterator it2 = it->second->directories.begin(); it2 != it->second->directories.end(); ++it2) { + for(Directory::Map::const_iterator it2 = root->directories.begin(); it2 != root->directories.end(); ++it2) { it2->second->toXml(sos, indent, tmp, recurse); } - it->second->filesToXml(sos, indent, tmp); + root->filesToXml(sos, indent, tmp); } xml += "</FileListing>"; @@ -1207,8 +1253,8 @@ if(ssl.empty()) return; - for(Directory::Map::const_iterator j = directories.begin(); (j != directories.end()) && (results.size() < maxResults); ++j) { - j->second->search(results, ssl, aSearchType, aSize, aFileType, aClient, maxResults); + for(DirList::const_iterator j = directories.begin(); (j != directories.end()) && (results.size() < maxResults); ++j) { + (*j)->search(results, ssl, aSearchType, aSize, aFileType, aClient, maxResults); } } @@ -1336,24 +1382,33 @@ return; } - for(Directory::Map::const_iterator j = directories.begin(); (j != directories.end()) && (results.size() < maxResults); ++j) { - j->second->search(results, srch, maxResults); + for(DirList::const_iterator j = directories.begin(); (j != directories.end()) && (results.size() < maxResults); ++j) { + (*j)->search(results, srch, maxResults); } } ShareManager::Directory* ShareManager::getDirectory(const string& fname) { - for(Directory::MapIter mi = directories.begin(); mi != directories.end(); ++mi) { + for(StringMapIter mi = shares.begin(); mi != shares.end(); ++mi) { if(Util::strnicmp(fname, mi->first, mi->first.length()) == 0) { - Directory* d = mi->second; - + Directory* d = NULL; + for(DirList::iterator i = directories.begin(); i != directories.end(); ++i) { + if(Util::stricmp((*i)->getName(), mi->second) == 0) { + d = *i; + } + } + + if(!d) { + return NULL; + } + string::size_type i; string::size_type j = mi->first.length(); while( (i = fname.find(PATH_SEPARATOR, j)) != string::npos) { - mi = d->directories.find(fname.substr(j, i-j)); + Directory::MapIter dmi = d->directories.find(fname.substr(j, i-j)); j = i + 1; - if(mi == d->directories.end()) + if(dmi == d->directories.end()) return NULL; - d = mi->second; + d = dmi->second; } return d; } @@ -1366,7 +1421,7 @@ // Check if finished download is supposed to be shared Lock l(cs); const string& n = d->getPath(); - for(Directory::MapIter i = directories.begin(); i != directories.end(); i++) { + for(StringMapIter i = shares.begin(); i != shares.end(); i++) { if(Util::strnicmp(i->first, n, i->first.size()) == 0 && n[i->first.size()] == PATH_SEPARATOR) { string s = n.substr(i->first.size()+1); try { @@ -1397,7 +1452,7 @@ string name = Util::getFileName(fname); int64_t size = File::getSize(fname); Directory::File::Set::iterator it = d->files.insert(Directory::File(name, size, d, root)).first; - addFile(*d, it); + updateIndices(*d, it); } setDirty(); } Modified: dcplusplus/trunk/dcpp/ShareManager.h =================================================================== --- dcplusplus/trunk/dcpp/ShareManager.h 2008-04-14 20:10:03 UTC (rev 1142) +++ dcplusplus/trunk/dcpp/ShareManager.h 2008-04-14 20:10:48 UTC (rev 1143) @@ -86,6 +86,7 @@ SearchManager::TypeModes getType(const string& fileName) const throw(); string validateVirtual(const string& /*aVirt*/) const throw(); + bool hasVirtual(const string& name) const throw(); void addHits(uint32_t aHits) { hits += aHits; @@ -139,7 +140,7 @@ string getADCPath() const { return parent->getADCPath() + name; } string getFullName() const { return parent->getFullName() + name; } - string getRealPath() const { return parent->getRealPath() + name; } + string getRealPath() const { return parent->getRealPath(name); } GETSET(string, name, Name); GETSET(TTHValue, tth, TTH); @@ -166,10 +167,9 @@ string getADCPath() const throw(); string getFullName() const throw(); - string getRealPath() const throw(); + string getRealPath(const std::string& path) const throw(ShareException); int64_t getSize() const throw(); - size_t countFiles() const throw(); void search(SearchResult::List& aResults, StringSearch::List& aStrings, int aSearchType, int64_t aSize, int aFileType, Client* aClient, StringList::size_type maxResults) const throw(); void search(SearchResult::List& aResults, AdcSearch& aStrings, StringList::size_type maxResults) const throw(); @@ -179,6 +179,8 @@ File::Set::const_iterator findFile(const string& aFile) const { return find_if(files.begin(), files.end(), Directory::File::StringComp(aFile)); } + void merge(Directory* source); + GETSET(string, name, Name); GETSET(Directory*, parent, Parent); private: @@ -253,9 +255,13 @@ mutable CriticalSection cs; - // Map real name to directory structure - Directory::Map directories; + // List of root directory items + typedef std::list<Directory*> DirList; + DirList directories; + /** Map real name to virtual name - multiple real names may be mapped to a single virtual one */ + StringMap shares; + typedef unordered_map<TTHValue, Directory::File::Set::const_iterator> HashFileMap; typedef HashFileMap::iterator HashFileIter; @@ -269,12 +275,16 @@ void rebuildIndices(); - void addTree(Directory& aDirectory); - void addFile(Directory& dir, const Directory::File::Set::iterator& i); + void updateIndices(Directory& aDirectory); + void updateIndices(Directory& dir, const Directory::File::Set::iterator& i); + + Directory* merge(Directory* directory); + void generateXmlList(); bool loadCache() throw(); - bool hasVirtual(const string& name) const throw(); - Directory::Map::const_iterator getByVirtual(const string& virtualName) const throw(); + DirList::const_iterator getByVirtual(const string& virtualName) const throw(); + + string findRealRoot(const string& virtualRoot, const string& virtualLeaf) const throw(ShareException); Directory* getDirectory(const string& fname); Modified: dcplusplus/trunk/win32/UploadPage.cpp =================================================================== --- dcplusplus/trunk/win32/UploadPage.cpp 2008-04-14 20:10:03 UTC (rev 1142) +++ dcplusplus/trunk/win32/UploadPage.cpp 2008-04-14 20:10:48 UTC (rev 1143) @@ -256,17 +256,27 @@ if( path[ path.length() -1 ] != _T('\\') ) path += _T('\\'); + ShareManager* sm = ShareManager::getInstance(); try { - LineDlg dlg(this, T_("Virtual name"), T_("Name under which the others see the directory"), Text::toT(ShareManager::getInstance()->validateVirtual(Util::getLastDir(Text::fromT(path))))); - if(dlg.run() == IDOK) { - tstring line = dlg.getLine(); - ShareManager::getInstance()->addDirectory(Text::fromT(path), Text::fromT(line)); - TStringList row; - row.push_back(line); - row.push_back(path); - row.push_back(Text::toT(Util::formatBytes(ShareManager::getInstance()->getShareSize(Text::fromT(path))))); - directories->insert(row); - total->setText(Text::toT(Util::formatBytes(ShareManager::getInstance()->getShareSize()))); + while(true) { + LineDlg dlg(this, T_("Virtual name"), T_("Name under which the others see the directory"), Text::toT(sm->validateVirtual(Util::getLastDir(Text::fromT(path))))); + if(dlg.run() == IDOK) { + tstring line = dlg.getLine(); + if(sm->hasVirtual(sm->validateVirtual(Text::fromT(line)))) { + if(createMessageBox().show(str(TF_("A virtual directory named %1% already exists, do you wish to merge the contents?") % line), + _T(APPNAME) _T(" ") _T(VERSIONSTRING), MessageBox::BOX_YESNO, MessageBox::BOX_ICONQUESTION) == IDNO) { + continue; + } + } + ShareManager::getInstance()->addDirectory(Text::fromT(path), Text::fromT(line)); + TStringList row; + row.push_back(line); + row.push_back(path); + row.push_back(Text::toT(Util::formatBytes(ShareManager::getInstance()->getShareSize(Text::fromT(path))))); + directories->insert(row); + total->setText(Text::toT(Util::formatBytes(ShareManager::getInstance()->getShareSize()))); + } + break; } } catch(const ShareException& e) { createMessageBox().show(Text::toT(e.getError()), _T(APPNAME) _T(" ") _T(VERSIONSTRING), MessageBox::BOX_OK, MessageBox::BOX_ICONSTOP); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arn...@us...> - 2008-04-14 20:11:35
|
Revision: 1144 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1144&view=rev Author: arnetheduck Date: 2008-04-14 13:11:28 -0700 (Mon, 14 Apr 2008) Log Message: ----------- references to vectors hack not needed anymore Modified Paths: -------------- dcplusplus/trunk/dwt/include/dwt/widgets/WidgetMenu.h dcplusplus/trunk/dwt/src/widgets/WidgetMenu.cpp Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-06 23:02:37.905999899 +0200 committer: Jacek Sieka <arn...@gm...> properties: branch-nick: dcplusplus + timestamp: 2008-04-07 13:44:23.698999882 +0200 committer: poy <po...@12...> properties: branch-nick: bzr Name: bzr:revision-id:v3-trunk1 - 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky 1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai 1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf 1114 po...@12...-20080405220250-8y09d0samsj8ja94 1115 po...@12...-20080406134101-4860ytb61sbu3yhg 1116 po...@12...-20080406155849-2wzxzuzs5m8zpk0g 1117 po...@12...-20080406164835-bv5dydhm3qqydsty 1118 arn...@gm...-20080406210237-c7tyfgiz2sjgv044 + 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky 1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai 1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf 1114 po...@12...-20080405220250-8y09d0samsj8ja94 1115 po...@12...-20080406134101-4860ytb61sbu3yhg 1116 po...@12...-20080406155849-2wzxzuzs5m8zpk0g 1117 po...@12...-20080406164835-bv5dydhm3qqydsty 1118 arn...@gm...-20080406210237-c7tyfgiz2sjgv044 1119 po...@12...-20080407114423-4yajg1rffidq76bj Modified: dcplusplus/trunk/dwt/include/dwt/widgets/WidgetMenu.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/WidgetMenu.h 2008-04-14 20:10:48 UTC (rev 1143) +++ dcplusplus/trunk/dwt/include/dwt/widgets/WidgetMenu.h 2008-04-14 20:11:28 UTC (rev 1144) @@ -470,13 +470,9 @@ // its sub menus std::vector< ObjectType > itsChildren; - // work around for gcc - std::vector< ObjectType > & itsChildrenRef; // its item data std::vector < ItemDataWrapper * > itsItemData; - // work around for gcc - std::vector < ItemDataWrapper * > & itsItemDataRef; HMENU itsHandle; Modified: dcplusplus/trunk/dwt/src/widgets/WidgetMenu.cpp =================================================================== --- dcplusplus/trunk/dwt/src/widgets/WidgetMenu.cpp 2008-04-14 20:10:48 UTC (rev 1143) +++ dcplusplus/trunk/dwt/src/widgets/WidgetMenu.cpp 2008-04-14 20:11:28 UTC (rev 1144) @@ -60,8 +60,6 @@ WidgetMenu::WidgetMenu( dwt::Widget* parent ) : isSysMenu(false), -itsChildrenRef(itsChildren), -itsItemDataRef(itsItemData), itsParent(parent), drawSidebar(false) { @@ -133,7 +131,7 @@ info.dwItemData = reinterpret_cast< ULONG_PTR >( wrapper ); if(::SetMenuItemInfo(itsHandle, i, TRUE, &info)) - itsItemDataRef.push_back( wrapper ); + itsItemData.push_back( wrapper ); else throw xCeption( _T( "SetMenuItemInfo in WidgetMenu::attach fizzled..." ) ); } else @@ -236,12 +234,10 @@ MenuItemDataPtr WidgetMenu::getData( int itemIndex ) { - size_t i = 0; + for(size_t i = 0; i < itsItemData.size(); ++i) + if(itsItemData[i]->index == itemIndex) + return itsItemData[i]->data; - for ( i = 0; i < itsItemDataRef.size(); ++i ) - if ( itsItemDataRef[i]->index == itemIndex ) - return itsItemDataRef[i]->data; - return MenuItemDataPtr(); } @@ -249,7 +245,7 @@ { // Destroy this menu ::DestroyMenu( handle() ); - std::for_each( itsItemDataRef.begin(), itsItemDataRef.end(), destroyItemDataWrapper ); + std::for_each( itsItemData.begin(), itsItemData.end(), destroyItemDataWrapper ); } void WidgetMenu::destroyItemDataWrapper( ItemDataWrapper * wrapper ) @@ -386,15 +382,13 @@ if ( ( !hasTitle && ::InsertMenuItem( itsHandle, 0, TRUE, & info ) ) || ( hasTitle && ::SetMenuItemInfo( itsHandle, 0, TRUE, & info ) ) ) { - size_t i = 0; - // adjust item data wrappers for all existing items - for ( i = 0; i < itsItemDataRef.size(); ++i ) - if ( itsItemDataRef[i] ) - ++itsItemDataRef[i]->index; + for(size_t i = 0; i < itsItemData.size(); ++i) + if(itsItemData[i]) + ++itsItemData[i]->index; // push back title - itsItemDataRef.push_back( wrapper ); + itsItemData.push_back( wrapper ); } } } @@ -875,7 +869,7 @@ } if ( ::InsertMenuItem( itsHandle, position, TRUE, & itemInfo ) && ownerDrawn ) - itsItemDataRef.push_back( wrapper ); + itsItemData.push_back( wrapper ); } void WidgetMenu::removeItem( unsigned itemIndex ) @@ -886,39 +880,33 @@ // try to remove item if ( ::RemoveMenu( itsHandle, itemIndex, MF_BYPOSITION ) ) { - size_t i = 0; - if(ownerDrawn) { ItemDataWrapper * wrapper = 0; int itemRemoved = -1; - for ( i = 0; i < itsItemDataRef.size(); ++i ) - { + for(size_t i = 0; i < itsItemData.size(); ++i) { // get current data wrapper - wrapper = itsItemDataRef[i]; + wrapper = itsItemData[i]; if ( wrapper->index == int(itemIndex) ) // if found { itemRemoved = int(i); delete wrapper; - itsItemDataRef[i] = 0; + itsItemData[i] = 0; } else if ( wrapper->index > int(itemIndex) ) --wrapper->index; // adjust succeeding item indices } if( itemRemoved != -1 ) - itsItemDataRef.erase( itsItemDataRef.begin() + itemRemoved ); + itsItemData.erase( itsItemData.begin() + itemRemoved ); } - if ( popup != NULL ) // remove sub menus if any - { - for ( i = 0; i < itsChildrenRef.size(); ++i ) - { - if ( itsChildrenRef[i]->itsHandle == popup ) - itsChildrenRef[i].reset(); - } - } + // remove sub menus if any + if(popup) + for(size_t i = 0; i < itsChildren.size(); ++i) + if(itsChildren[i]->handle() == popup) + itsChildren[i].reset(); } else throw xCeption( _T( "Couldn't remove item in removeItem()" ) ); @@ -979,7 +967,7 @@ ( itemExists && ::SetMenuItemInfo( itsHandle, id, FALSE, & info ) ) ) { if(ownerDrawn) - itsItemDataRef.push_back( wrapper ); + itsItemData.push_back( wrapper ); } else throw xCeption( _T( "Couldn't insert/update item in WidgetMenu::appendItem" ) ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arn...@us...> - 2008-04-14 20:12:16
|
Revision: 1145 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1145&view=rev Author: arnetheduck Date: 2008-04-14 13:12:11 -0700 (Mon, 14 Apr 2008) Log Message: ----------- Fix share size (still buggy), real filename matcher fix Modified Paths: -------------- dcplusplus/trunk/dcpp/ShareManager.cpp Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-07 13:44:23.698999882 +0200 committer: poy <po...@12...> properties: branch-nick: bzr + timestamp: 2008-04-07 21:48:26.266999960 +0200 committer: Jacek Sieka <arn...@gm...> properties: branch-nick: dcplusplus Name: bzr:revision-id:v3-trunk1 - 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky 1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai 1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf 1114 po...@12...-20080405220250-8y09d0samsj8ja94 1115 po...@12...-20080406134101-4860ytb61sbu3yhg 1116 po...@12...-20080406155849-2wzxzuzs5m8zpk0g 1117 po...@12...-20080406164835-bv5dydhm3qqydsty 1118 arn...@gm...-20080406210237-c7tyfgiz2sjgv044 1119 po...@12...-20080407114423-4yajg1rffidq76bj + 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky 1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai 1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf 1114 po...@12...-20080405220250-8y09d0samsj8ja94 1115 po...@12...-20080406134101-4860ytb61sbu3yhg 1116 po...@12...-20080406155849-2wzxzuzs5m8zpk0g 1117 po...@12...-20080406164835-bv5dydhm3qqydsty 1118 arn...@gm...-20080406210237-c7tyfgiz2sjgv044 1119 po...@12...-20080407114423-4yajg1rffidq76bj 1120 arn...@gm...-20080407194826-c42t4bjzw4vflejn Modified: dcplusplus/trunk/dcpp/ShareManager.cpp =================================================================== --- dcplusplus/trunk/dcpp/ShareManager.cpp 2008-04-14 20:11:28 UTC (rev 1144) +++ dcplusplus/trunk/dcpp/ShareManager.cpp 2008-04-14 20:12:11 UTC (rev 1145) @@ -115,8 +115,9 @@ string ShareManager::findRealRoot(const string& virtualRoot, const string& virtualPath) const throw(ShareException) { for(StringMap::const_iterator i = shares.begin(); i != shares.end(); ++i) { - if(Util::stricmp(i->second, virtualRoot)) { + if(Util::stricmp(i->second, virtualRoot) == 0) { std::string name = i->first + PATH_SEPARATOR_STR + virtualPath; + dcdebug("Matching %s\n", name.c_str()); if(File::getSize(name) != -1) { return name; } @@ -532,14 +533,15 @@ int64_t ShareManager::getShareSize(const string& realPath) const throw() { Lock l(cs); -#ifdef PORT_ME dcassert(realPath.size()>0); - Directory::Map::const_iterator i = directories.find(realPath); + StringMap::const_iterator i = shares.find(realPath); - if(i != directories.end()) { - return i->second->getSize(); + if(i != shares.end()) { + DirList::const_iterator j = getByVirtual(i->second); + if(j != directories.end()) { + return (*j)->getSize(); + } } -#endif return -1; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arn...@us...> - 2008-04-14 20:12:50
|
Revision: 1146 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1146&view=rev Author: arnetheduck Date: 2008-04-14 13:12:43 -0700 (Mon, 14 Apr 2008) Log Message: ----------- help updates by eMTee Modified Paths: -------------- dcplusplus/trunk/help/settings_downloads.html Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-07 21:48:26.266999960 +0200 committer: Jacek Sieka <arn...@gm...> properties: branch-nick: dcplusplus + timestamp: 2008-04-07 23:43:03.890000105 +0200 committer: poy <po...@12...> properties: branch-nick: bzr Name: bzr:revision-id:v3-trunk1 - 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky 1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai 1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf 1114 po...@12...-20080405220250-8y09d0samsj8ja94 1115 po...@12...-20080406134101-4860ytb61sbu3yhg 1116 po...@12...-20080406155849-2wzxzuzs5m8zpk0g 1117 po...@12...-20080406164835-bv5dydhm3qqydsty 1118 arn...@gm...-20080406210237-c7tyfgiz2sjgv044 1119 po...@12...-20080407114423-4yajg1rffidq76bj 1120 arn...@gm...-20080407194826-c42t4bjzw4vflejn + 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky 1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai 1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf 1114 po...@12...-20080405220250-8y09d0samsj8ja94 1115 po...@12...-20080406134101-4860ytb61sbu3yhg 1116 po...@12...-20080406155849-2wzxzuzs5m8zpk0g 1117 po...@12...-20080406164835-bv5dydhm3qqydsty 1118 arn...@gm...-20080406210237-c7tyfgiz2sjgv044 1119 po...@12...-20080407114423-4yajg1rffidq76bj 1120 arn...@gm...-20080407194826-c42t4bjzw4vflejn 1121 po...@12...-20080407214303-o7ul1bvcn6gvaoc9 Modified: dcplusplus/trunk/help/settings_downloads.html =================================================================== --- dcplusplus/trunk/help/settings_downloads.html 2008-04-14 20:12:11 UTC (rev 1145) +++ dcplusplus/trunk/help/settings_downloads.html 2008-04-14 20:12:43 UTC (rev 1146) @@ -17,17 +17,32 @@ <dt>Default Download Directory</dt> <dd cshelp=IDH_SETTINGS_DOWNLOAD_DOWNLOADDIR>After a download is complete, DC++ tries to move your just finished file to this directory. It defaults to the -"Downloads\" subdirectory under where the DC++ executable is located.</dd> +"Downloads\" subdirectory under where the DC++ executable is located. The directory will be automatically created if needed. +<br>Make sure you have enough disk space for your downloads, have write access to the directory and +have an appropriate file system if you download large files (note that maximum possible size for a +file on a FAT32 volume is 4 GiB). +<br>If the target volume runs out of space, DC++ will keep your downloaded files in the Unfinished Downloads Directory +having renamed them to their original filename. +</dd> <dt>Unfinished Downloads Directory</dt> <dd cshelp=IDH_SETTINGS_DOWNLOAD_TEMP_DOWNLOAD_DIRECTORY>All incomplete downloads will be stored in this directory. -If empty, temporary downloads will be stored in the "Incomplete\" -subdirectory under where the DC++ executable is located. You can +If you leave it empty, temporary downloads will be stored in the "Incomplete\" +subdirectory under where the DC++ executable is located. The directory will be automatically created if needed. +<br>Make sure you have enough disk space, appropriate write access and filesystem for unfinished downloads. +In case of an error (eg. when the drive that holds your Unfinished Downloads ran out of space) you will +get 'Not enough space on the disk' message even if your target drive has enough free space for your download! +<br>You can use <span style="font-weight: bold;">%[targetdrive]</span> for optional unfinished directory for target -drive. If the -file has been downloaded with a TTH, the incomplete file will -bear the name <filename>.<ext>.<TTH>.dctmp. If -the file has no TTH, it will be -named<filename>.<ext>.dctmp. If <a +drive. This way you can share the incomplete files among your drives which will result smaller chance of runnig out of disk space. +This option is also useful if you often download large files to a drive other than where your usual unfinished directory +resides. At the end of a successful download moving a large file to its target could be very time & resource consuming, +especially when moving files to another partition of a same physical drive. +<br> +For example : with %[targetdrive]DCUnfinished\ set, DC++ will use E:\DCUnfinished\ for incomplete files when you download to any target +located on drive E: and so on... +<br> +If the file has been downloaded the incomplete file will +bear the name <filename>.<ext>.<TTH>.dctmp. If <a href="settings_queue.html#antifrag">Use AntiFragmentation Method for Downloads</a> is enabled the files will have ".antifrag" added to the end of it's name. As in @@ -35,13 +50,14 @@ </dl> </div> <h2>Limits</h2> -<p cshelp=IDH_SETTINGS_DOWNLOAD_LIMITS>For both values listed below, certain conditions can result in the +<p cshelp=IDH_SETTINGS_DOWNLOAD_LIMITS>These settings are to avoid overloading your internet connection with +a large number of simulatenous downloads. However, for both values listed below, certain conditions can result in the limits not being obeyed. Specifically, up to 3 files that are set to the 'highest' priority can be transferred while other downloads are going. File lists and small files (64 kibibytes or smaller) are queued with 'highest' as their priority. When either of the limits are hit, DC++ shows <em>"All download slots taken"</em> -next to each source in the Transfer View.</p> +next to each source in the status column of the Connections tab.</p> <div style="margin-left: 40px;"> <dl> <dt>Maximum Simultaneous Downloads</dt> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arn...@us...> - 2008-04-14 20:13:34
|
Revision: 1147 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1147&view=rev Author: arnetheduck Date: 2008-04-14 13:13:28 -0700 (Mon, 14 Apr 2008) Log Message: ----------- use the standard Windows color for highlighted text Modified Paths: -------------- dcplusplus/trunk/dwt/include/dwt/widgets/WidgetMenu.h dcplusplus/trunk/dwt/src/widgets/WidgetMenu.cpp Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-07 23:43:03.890000105 +0200 committer: poy <po...@12...> properties: branch-nick: bzr + timestamp: 2008-04-08 00:06:47.437000036 +0200 committer: poy <po...@12...> properties: branch-nick: bzr Name: bzr:revision-id:v3-trunk1 - 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky 1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai 1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf 1114 po...@12...-20080405220250-8y09d0samsj8ja94 1115 po...@12...-20080406134101-4860ytb61sbu3yhg 1116 po...@12...-20080406155849-2wzxzuzs5m8zpk0g 1117 po...@12...-20080406164835-bv5dydhm3qqydsty 1118 arn...@gm...-20080406210237-c7tyfgiz2sjgv044 1119 po...@12...-20080407114423-4yajg1rffidq76bj 1120 arn...@gm...-20080407194826-c42t4bjzw4vflejn 1121 po...@12...-20080407214303-o7ul1bvcn6gvaoc9 + 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky 1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai 1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf 1114 po...@12...-20080405220250-8y09d0samsj8ja94 1115 po...@12...-20080406134101-4860ytb61sbu3yhg 1116 po...@12...-20080406155849-2wzxzuzs5m8zpk0g 1117 po...@12...-20080406164835-bv5dydhm3qqydsty 1118 arn...@gm...-20080406210237-c7tyfgiz2sjgv044 1119 po...@12...-20080407114423-4yajg1rffidq76bj 1120 arn...@gm...-20080407194826-c42t4bjzw4vflejn 1121 po...@12...-20080407214303-o7ul1bvcn6gvaoc9 1122 po...@12...-20080407220647-r7f3em92til5j67s Modified: dcplusplus/trunk/dwt/include/dwt/widgets/WidgetMenu.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/WidgetMenu.h 2008-04-14 20:12:43 UTC (rev 1146) +++ dcplusplus/trunk/dwt/include/dwt/widgets/WidgetMenu.h 2008-04-14 20:13:28 UTC (rev 1147) @@ -88,6 +88,9 @@ /// Highlighted menu item color COLORREF colorHighlight; + /// Text of highlighted menu item color + COLORREF colorHighlightText; + /// Title text color COLORREF colorTitleText; @@ -102,11 +105,13 @@ MenuColorInfo( COLORREF menuColor = ColorUtilities::darkenColor( ::GetSysColor( COLOR_WINDOW ), 0.02 ), COLORREF stripColor = ColorUtilities::darkenColor( ::GetSysColor( COLOR_3DFACE ), 0.02 ), COLORREF highlightColor = ::GetSysColor( COLOR_HIGHLIGHT ), + COLORREF highlightTextColor = ::GetSysColor( COLOR_HIGHLIGHTTEXT ), COLORREF titleTextColor = ::GetSysColor( COLOR_MENUTEXT ), COLORREF imageBackground = RGB( 0, 0, 0 ) ) // black : colorMenu( menuColor ), colorStrip( stripColor ), colorHighlight( highlightColor ), + colorHighlightText( highlightTextColor ), colorTitleText( titleTextColor ), colorImageBackground( imageBackground ) {} Modified: dcplusplus/trunk/dwt/src/widgets/WidgetMenu.cpp =================================================================== --- dcplusplus/trunk/dwt/src/widgets/WidgetMenu.cpp 2008-04-14 20:12:43 UTC (rev 1146) +++ dcplusplus/trunk/dwt/src/widgets/WidgetMenu.cpp 2008-04-14 20:13:28 UTC (rev 1147) @@ -593,7 +593,12 @@ bool oldMode = canvas.setBkMode( true ); // select item text color - canvas.setTextColor( isGrayed ? ::GetSysColor( COLOR_GRAYTEXT ) : wrapper->isMenuTitleItem ? colorInfo.colorTitleText : data->TextColor ); + canvas.setTextColor( + isGrayed ? ::GetSysColor(COLOR_GRAYTEXT) : + wrapper->isMenuTitleItem ? colorInfo.colorTitleText : + highlight ? colorInfo.colorHighlightText : + data->TextColor + ); // Select item font FontPtr font = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arn...@us...> - 2008-04-14 20:14:17
|
Revision: 1148 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1148&view=rev Author: arnetheduck Date: 2008-04-14 13:14:03 -0700 (Mon, 14 Apr 2008) Log Message: ----------- fix an option (exclude file lists), don't fill a vector that won't be used Modified Paths: -------------- dcplusplus/trunk/changelog.txt dcplusplus/trunk/dcpp/QueueManager.cpp dcplusplus/trunk/dcpp/QueueManager.h Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-08 00:06:47.437000036 +0200 committer: poy <po...@12...> properties: branch-nick: bzr + timestamp: 2008-04-08 23:24:39.858999968 +0200 committer: poy <po...@12...> properties: branch-nick: bzr Name: bzr:revision-id:v3-trunk1 - 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky 1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai 1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf 1114 po...@12...-20080405220250-8y09d0samsj8ja94 1115 po...@12...-20080406134101-4860ytb61sbu3yhg 1116 po...@12...-20080406155849-2wzxzuzs5m8zpk0g 1117 po...@12...-20080406164835-bv5dydhm3qqydsty 1118 arn...@gm...-20080406210237-c7tyfgiz2sjgv044 1119 po...@12...-20080407114423-4yajg1rffidq76bj 1120 arn...@gm...-20080407194826-c42t4bjzw4vflejn 1121 po...@12...-20080407214303-o7ul1bvcn6gvaoc9 1122 po...@12...-20080407220647-r7f3em92til5j67s + 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky 1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai 1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf 1114 po...@12...-20080405220250-8y09d0samsj8ja94 1115 po...@12...-20080406134101-4860ytb61sbu3yhg 1116 po...@12...-20080406155849-2wzxzuzs5m8zpk0g 1117 po...@12...-20080406164835-bv5dydhm3qqydsty 1118 arn...@gm...-20080406210237-c7tyfgiz2sjgv044 1119 po...@12...-20080407114423-4yajg1rffidq76bj 1120 arn...@gm...-20080407194826-c42t4bjzw4vflejn 1121 po...@12...-20080407214303-o7ul1bvcn6gvaoc9 1122 po...@12...-20080407220647-r7f3em92til5j67s 1123 po...@12...-20080408212439-54t3bqlhvw1nu4xc Modified: dcplusplus/trunk/changelog.txt =================================================================== --- dcplusplus/trunk/changelog.txt 2008-04-14 20:13:28 UTC (rev 1147) +++ dcplusplus/trunk/changelog.txt 2008-04-14 20:14:03 UTC (rev 1148) @@ -28,7 +28,7 @@ * [L#211313] Fixed bad virtual name being loaded (thanks kulmegil) * [L#202801] Allow virtual folders to have the same name * Allow more characters in virtual names -* Fixed downloading multiple file lists with the enter key (poy) +* [L#212411] Fixed downloading multiple file lists (poy) -- 0.705 2008-03-14 -- * Several patches for better *nix compatibility of the core (thanks steven sheehy et al) Modified: dcplusplus/trunk/dcpp/QueueManager.cpp =================================================================== --- dcplusplus/trunk/dcpp/QueueManager.cpp 2008-04-14 20:13:28 UTC (rev 1147) +++ dcplusplus/trunk/dcpp/QueueManager.cpp 2008-04-14 20:14:03 UTC (rev 1148) @@ -120,6 +120,13 @@ } } +bool QueueManager::FileQueue::exists(const TTHValue& tth) const { + for(QueueItem::StringMap::const_iterator i = queue.begin(); i != queue.end(); ++i) + if(i->second->getTTH() == tth) + return true; + return false; +} + static QueueItem* findCandidate(QueueItem* cand, QueueItem::StringIter start, QueueItem::StringIter end, const StringList& recent) { for(QueueItem::StringIter i = start; i != end; ++i) { QueueItem* q = i->second; @@ -457,14 +464,9 @@ { Lock l(cs); - if(BOOLSETTING(DONT_DL_ALREADY_QUEUED) && (aFlags & QueueItem::FLAG_USER_LIST)) { - // This will be pretty slow on large queues... - QueueItem::List ql; - fileQueue.find(ql, root); - if(!ql.empty()) { - throw QueueException(_("This file is already queued")); - } - } + // This will be pretty slow on large queues... + if(BOOLSETTING(DONT_DL_ALREADY_QUEUED) && !(aFlags & QueueItem::FLAG_USER_LIST) && fileQueue.exists(root)) + throw QueueException(_("This file is already queued")); QueueItem* q = fileQueue.find(target); if(q == NULL) { Modified: dcplusplus/trunk/dcpp/QueueManager.h =================================================================== --- dcplusplus/trunk/dcpp/QueueManager.h 2008-04-14 20:13:28 UTC (rev 1147) +++ dcplusplus/trunk/dcpp/QueueManager.h 2008-04-14 20:14:03 UTC (rev 1148) @@ -160,6 +160,8 @@ void find(QueueItem::List& sl, int64_t aSize, const string& ext); void find(QueueItem::List& ql, const TTHValue& tth); + bool exists(const TTHValue& tth) const; + QueueItem* findAutoSearch(StringList& recent); size_t getSize() { return queue.size(); } QueueItem::StringMap& getQueue() { return queue; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arn...@us...> - 2008-04-14 20:15:57
|
Revision: 1149 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1149&view=rev Author: arnetheduck Date: 2008-04-14 13:15:30 -0700 (Mon, 14 Apr 2008) Log Message: ----------- First go at auto-segment size Modified Paths: -------------- dcplusplus/trunk/changelog.txt dcplusplus/trunk/dcpp/Download.cpp dcplusplus/trunk/dcpp/DownloadManager.cpp dcplusplus/trunk/dcpp/QueueItem.cpp dcplusplus/trunk/dcpp/QueueItem.h dcplusplus/trunk/dcpp/QueueManager.cpp dcplusplus/trunk/dcpp/QueueManager.h dcplusplus/trunk/dcpp/Transfer.cpp dcplusplus/trunk/dcpp/Transfer.h dcplusplus/trunk/dcpp/UploadManager.cpp dcplusplus/trunk/dcpp/UserConnection.h Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-08 23:24:39.858999968 +0200 committer: poy <po...@12...> properties: branch-nick: bzr + timestamp: 2008-04-09 21:37:08.112999916 +0200 committer: Jacek Sieka <arn...@gm...> properties: branch-nick: dcplusplus Name: bzr:revision-id:v3-trunk1 - 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky 1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai 1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf 1114 po...@12...-20080405220250-8y09d0samsj8ja94 1115 po...@12...-20080406134101-4860ytb61sbu3yhg 1116 po...@12...-20080406155849-2wzxzuzs5m8zpk0g 1117 po...@12...-20080406164835-bv5dydhm3qqydsty 1118 arn...@gm...-20080406210237-c7tyfgiz2sjgv044 1119 po...@12...-20080407114423-4yajg1rffidq76bj 1120 arn...@gm...-20080407194826-c42t4bjzw4vflejn 1121 po...@12...-20080407214303-o7ul1bvcn6gvaoc9 1122 po...@12...-20080407220647-r7f3em92til5j67s 1123 po...@12...-20080408212439-54t3bqlhvw1nu4xc + 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky 1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai 1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf 1114 po...@12...-20080405220250-8y09d0samsj8ja94 1115 po...@12...-20080406134101-4860ytb61sbu3yhg 1116 po...@12...-20080406155849-2wzxzuzs5m8zpk0g 1117 po...@12...-20080406164835-bv5dydhm3qqydsty 1118 arn...@gm...-20080406210237-c7tyfgiz2sjgv044 1119 po...@12...-20080407114423-4yajg1rffidq76bj 1120 arn...@gm...-20080407194826-c42t4bjzw4vflejn 1121 po...@12...-20080407214303-o7ul1bvcn6gvaoc9 1122 po...@12...-20080407220647-r7f3em92til5j67s 1123 po...@12...-20080408212439-54t3bqlhvw1nu4xc 1124 arn...@gm...-20080409193708-y6erfzwrcb1seet3 Modified: dcplusplus/trunk/changelog.txt =================================================================== --- dcplusplus/trunk/changelog.txt 2008-04-14 20:14:03 UTC (rev 1148) +++ dcplusplus/trunk/changelog.txt 2008-04-14 20:15:30 UTC (rev 1149) @@ -28,6 +28,8 @@ * [L#211313] Fixed bad virtual name being loaded (thanks kulmegil) * [L#202801] Allow virtual folders to have the same name * Allow more characters in virtual names +* Fixed downloading multiple file lists with the enter key (poy) +* Improved transfer speed averaging * [L#212411] Fixed downloading multiple file lists (poy) -- 0.705 2008-03-14 -- Modified: dcplusplus/trunk/dcpp/Download.cpp =================================================================== --- dcplusplus/trunk/dcpp/Download.cpp 2008-04-14 20:14:03 UTC (rev 1148) +++ dcplusplus/trunk/dcpp/Download.cpp 2008-04-14 20:15:30 UTC (rev 1149) @@ -46,7 +46,7 @@ if(qi.getSize() != -1) { if(HashManager::getInstance()->getTree(getTTH(), getTigerTree())) { setTreeValid(true); - setSegment(qi.getNextSegment(getTigerTree().getBlockSize())); + setSegment(qi.getNextSegment(getTigerTree().getBlockSize(), conn.getSpeed(), conn.getChunkSize())); } else if(supportsTrees && !qi.getSource(conn.getUser())->isSet(QueueItem::Source::FLAG_NO_TREE) && qi.getSize() > HashManager::MIN_BLOCK_SIZE) { // Get the tree unless the file is small (for small files, we'd probably only get the root anyway) setType(TYPE_TREE); @@ -56,7 +56,7 @@ // Use the root as tree to get some sort of validation at least... getTigerTree() = TigerTree(qi.getSize(), qi.getSize(), getTTH()); setTreeValid(true); - setSegment(qi.getNextSegment(getTigerTree().getBlockSize())); + setSegment(qi.getNextSegment(getTigerTree().getBlockSize(), 0, 0)); } if(qi.isSet(QueueItem::FLAG_RESUME)) { Modified: dcplusplus/trunk/dcpp/DownloadManager.cpp =================================================================== --- dcplusplus/trunk/dcpp/DownloadManager.cpp 2008-04-14 20:14:03 UTC (rev 1148) +++ dcplusplus/trunk/dcpp/DownloadManager.cpp 2008-04-14 20:15:30 UTC (rev 1149) @@ -253,6 +253,7 @@ } d->setStart(GET_TICK()); + d->tick(); aSource->setState(UserConnection::STATE_RUNNING); fire(DownloadManagerListener::Starting(), d); @@ -275,7 +276,8 @@ try { d->addPos(d->getFile()->write(aData, aLen), aLen); - + d->tick(); + if(d->getPos() > d->getSize()) { failDownload(aSource, _("More data was sent than was expected")); } else if(d->getPos() == d->getSize()) { @@ -323,7 +325,12 @@ failDownload(aSource, e.getError()); return; } - + + aSource->setSpeed(d->getAverageSpeed()); + if(aSource->getChunkSize() < d->getSize()) { + aSource->setChunkSize(d->getSize()); + } + dcdebug("Download finished: %s, size " I64_FMT ", downloaded " I64_FMT "\n", d->getPath().c_str(), d->getSize(), d->getPos()); #if PORT_ME Modified: dcplusplus/trunk/dcpp/QueueItem.cpp =================================================================== --- dcplusplus/trunk/dcpp/QueueItem.cpp 2008-04-14 20:14:03 UTC (rev 1148) +++ dcplusplus/trunk/dcpp/QueueItem.cpp 2008-04-14 20:15:30 UTC (rev 1149) @@ -84,14 +84,31 @@ return tempTarget; } -Segment QueueItem::getNextSegment(int64_t blockSize) const { +// # ms we should aim for per segment +static const int64_t SEGMENT_TIME = 10*1000; + +Segment QueueItem::getNextSegment(int64_t blockSize, double lastSpeed, int64_t lastSize) const { if(getSize() == -1 || blockSize == 0) { return Segment(0, -1); } + + int64_t remaining = getSize() - getDownloadedBytes(); + + int64_t targetSize = std::max(blockSize, lastSize); + if(lastSpeed > 0) { + double msecs = 1000 * targetSize / lastSpeed; + if(msecs < SEGMENT_TIME / 2) { + targetSize *= 2; + } else if(msecs > SEGMENT_TIME * 2) { + targetSize = std::max(blockSize, targetSize / 2); + } + } + + // Round off to nearest block size + targetSize = ((targetSize + blockSize / 2) / blockSize) * blockSize; + int64_t start = 0; - int64_t maxSize = std::max(blockSize, static_cast<int64_t>(SETTING(MIN_SEGMENT_SIZE) * 1024)); - maxSize = ((maxSize + blockSize - 1) / blockSize) * blockSize; // Make sure we're on an even block boundary - int64_t curSize = maxSize; + int64_t curSize = targetSize; while(start < getSize()) { int64_t end = std::min(getSize(), start + curSize); @@ -122,7 +139,7 @@ curSize -= blockSize; } else { start = end; - curSize = maxSize; + curSize = targetSize; } } Modified: dcplusplus/trunk/dcpp/QueueItem.h =================================================================== --- dcplusplus/trunk/dcpp/QueueItem.h 2008-04-14 20:14:03 UTC (rev 1148) +++ dcplusplus/trunk/dcpp/QueueItem.h 2008-04-14 20:15:30 UTC (rev 1149) @@ -157,7 +157,7 @@ DownloadList& getDownloads() { return downloads; } /** Next segment that is not done and not being downloaded, zero-sized segment returned if there is none is found */ - Segment getNextSegment(int64_t blockSize) const; + Segment getNextSegment(int64_t blockSize, double lastSpeed, int64_t lastSize) const; void addSegment(const Segment& segment); Modified: dcplusplus/trunk/dcpp/QueueManager.cpp =================================================================== --- dcplusplus/trunk/dcpp/QueueManager.cpp 2008-04-14 20:14:03 UTC (rev 1148) +++ dcplusplus/trunk/dcpp/QueueManager.cpp 2008-04-14 20:15:30 UTC (rev 1149) @@ -192,7 +192,7 @@ } } -QueueItem* QueueManager::UserQueue::getNext(const UserPtr& aUser, QueueItem::Priority minPrio) { +QueueItem* QueueManager::UserQueue::getNext(const UserPtr& aUser, QueueItem::Priority minPrio, double lastSpeed, int64_t lastSize) { int p = QueueItem::LAST - 1; do { @@ -213,7 +213,7 @@ int64_t blockSize = HashManager::getInstance()->getBlockSize(qi->getTTH()); if(blockSize == 0) blockSize = qi->getSize(); - if(qi->getNextSegment(blockSize).getSize() == 0) { + if(qi->getNextSegment(blockSize, lastSpeed, lastSize).getSize() == 0) { dcdebug("No segment for %s in %s, block " I64_FMT "\n", aUser->getCID().toBase32().c_str(), qi->getTarget().c_str(), blockSize); continue; } Modified: dcplusplus/trunk/dcpp/QueueManager.h =================================================================== --- dcplusplus/trunk/dcpp/QueueManager.h 2008-04-14 20:14:03 UTC (rev 1148) +++ dcplusplus/trunk/dcpp/QueueManager.h 2008-04-14 20:15:30 UTC (rev 1149) @@ -178,7 +178,7 @@ public: void add(QueueItem* qi); void add(QueueItem* qi, const UserPtr& aUser); - QueueItem* getNext(const UserPtr& aUser, QueueItem::Priority minPrio = QueueItem::LOWEST); + QueueItem* getNext(const UserPtr& aUser, QueueItem::Priority minPrio = QueueItem::LOWEST, double lastSpeed = 0, int64_t lastSize = 0); QueueItem* getRunning(const UserPtr& aUser); void addDownload(QueueItem* qi, Download* d); void removeDownload(QueueItem* qi, const UserPtr& d); Modified: dcplusplus/trunk/dcpp/Transfer.cpp =================================================================== --- dcplusplus/trunk/dcpp/Transfer.cpp 2008-04-14 20:14:03 UTC (rev 1148) +++ dcplusplus/trunk/dcpp/Transfer.cpp 2008-04-14 20:15:30 UTC (rev 1149) @@ -38,9 +38,16 @@ void Transfer::tick() { Lock l(cs); - while(samples.size() >= SAMPLES) { - samples.pop_front(); + + if(samples.size() >= 1) { + int64_t tdiff = samples.back().first - samples.front().first; + if((tdiff / 1000) > MIN_SECS) { + while(samples.size() >= MIN_SAMPLES) { + samples.pop_front(); + } + } } + samples.push_back(std::make_pair(GET_TICK(), pos)); } Modified: dcplusplus/trunk/dcpp/Transfer.h =================================================================== --- dcplusplus/trunk/dcpp/Transfer.h 2008-04-14 20:14:03 UTC (rev 1148) +++ dcplusplus/trunk/dcpp/Transfer.h 2008-04-14 20:15:30 UTC (rev 1149) @@ -52,7 +52,7 @@ void addPos(int64_t aBytes, int64_t aActual) { pos += aBytes; actual+= aActual; } - enum { SAMPLES = 15 }; + enum { MIN_SAMPLES = 15, MIN_SECS = 15 }; /** Record a sample for average calculation */ void tick(); Modified: dcplusplus/trunk/dcpp/UploadManager.cpp =================================================================== --- dcplusplus/trunk/dcpp/UploadManager.cpp 2008-04-14 20:14:03 UTC (rev 1148) +++ dcplusplus/trunk/dcpp/UploadManager.cpp 2008-04-14 20:15:30 UTC (rev 1149) @@ -273,6 +273,7 @@ dcassert(u != NULL); u->setStart(GET_TICK()); + u->tick(); aSource->setState(UserConnection::STATE_RUNNING); aSource->transmitFile(u->getStream()); fire(UploadManagerListener::Starting(), u); @@ -307,6 +308,7 @@ aSource->send(cmd); u->setStart(GET_TICK()); + u->tick(); aSource->setState(UserConnection::STATE_RUNNING); aSource->transmitFile(u->getStream()); fire(UploadManagerListener::Starting(), u); @@ -318,6 +320,7 @@ Upload* u = aSource->getUpload(); dcassert(u != NULL); u->addPos(aBytes, aActual); + u->tick(); } void UploadManager::on(UserConnectionListener::Failed, UserConnection* aSource, const string& aError) throw() { Modified: dcplusplus/trunk/dcpp/UserConnection.h =================================================================== --- dcplusplus/trunk/dcpp/UserConnection.h 2008-04-14 20:14:03 UTC (rev 1148) +++ dcplusplus/trunk/dcpp/UserConnection.h 2008-04-14 20:15:30 UTC (rev 1149) @@ -33,7 +33,8 @@ namespace dcpp { class UserConnection : public Speaker<UserConnectionListener>, - private BufferedSocketListener, public Flags, private CommandHandler<UserConnection> + private BufferedSocketListener, public Flags, private CommandHandler<UserConnection>, + private boost::noncopyable { public: friend class ConnectionManager; @@ -166,6 +167,8 @@ GETSET(string, encoding, Encoding); GETSET(States, state, State); GETSET(uint64_t, lastActivity, LastActivity); + GETSET(double, speed, Speed); + GETSET(int64_t, chunkSize, ChunkSize); private: BufferedSocket* socket; bool secure; @@ -180,17 +183,15 @@ // We only want ConnectionManager to create this... UserConnection(bool secure_) throw() : encoding(Text::systemCharset), state(STATE_UNCONNECTED), - lastActivity(0), socket(0), secure(secure_), download(NULL) { + lastActivity(0), speed(0), chunkSize(0), socket(0), secure(secure_), download(NULL) { } virtual ~UserConnection() throw() { BufferedSocket::putSocket(socket); } + friend struct DeleteFunction; - UserConnection(const UserConnection&); - UserConnection& operator=(const UserConnection&); - void setUser(const UserPtr& aUser) { user = aUser; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arn...@us...> - 2008-04-14 20:17:17
|
Revision: 1150 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1150&view=rev Author: arnetheduck Date: 2008-04-14 13:16:49 -0700 (Mon, 14 Apr 2008) Log Message: ----------- commit patch Modified Paths: -------------- dcplusplus/trunk/changelog.txt dcplusplus/trunk/dcpp/SettingsManager.cpp dcplusplus/trunk/dcpp/SettingsManager.h dcplusplus/trunk/win32/AboutDlg.cpp dcplusplus/trunk/win32/SearchFrame.cpp dcplusplus/trunk/win32/SearchFrame.h Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-09 21:37:08.112999916 +0200 committer: Jacek Sieka <arn...@gm...> properties: branch-nick: dcplusplus + timestamp: 2008-04-09 21:58:27.263999939 +0200 committer: Jacek Sieka <arn...@gm...> properties: branch-nick: dcplusplus Name: bzr:ancestry:v3-trunk1 - arn...@gm...-20080329054606-ubefm4h98xjgvif9 arn...@gm...-20080329220538-g3f1nvcfh1ycetw7 + arn...@gm...-20080329054606-ubefm4h98xjgvif9 arn...@gm...-20080329220538-g3f1nvcfh1ycetw7 robert@smir-20080331181318-buvm17zqqym5ryct Name: bzr:revision-id:v3-trunk1 - 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky 1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai 1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf 1114 po...@12...-20080405220250-8y09d0samsj8ja94 1115 po...@12...-20080406134101-4860ytb61sbu3yhg 1116 po...@12...-20080406155849-2wzxzuzs5m8zpk0g 1117 po...@12...-20080406164835-bv5dydhm3qqydsty 1118 arn...@gm...-20080406210237-c7tyfgiz2sjgv044 1119 po...@12...-20080407114423-4yajg1rffidq76bj 1120 arn...@gm...-20080407194826-c42t4bjzw4vflejn 1121 po...@12...-20080407214303-o7ul1bvcn6gvaoc9 1122 po...@12...-20080407220647-r7f3em92til5j67s 1123 po...@12...-20080408212439-54t3bqlhvw1nu4xc 1124 arn...@gm...-20080409193708-y6erfzwrcb1seet3 + 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky 1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai 1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf 1114 po...@12...-20080405220250-8y09d0samsj8ja94 1115 po...@12...-20080406134101-4860ytb61sbu3yhg 1116 po...@12...-20080406155849-2wzxzuzs5m8zpk0g 1117 po...@12...-20080406164835-bv5dydhm3qqydsty 1118 arn...@gm...-20080406210237-c7tyfgiz2sjgv044 1119 po...@12...-20080407114423-4yajg1rffidq76bj 1120 arn...@gm...-20080407194826-c42t4bjzw4vflejn 1121 po...@12...-20080407214303-o7ul1bvcn6gvaoc9 1122 po...@12...-20080407220647-r7f3em92til5j67s 1123 po...@12...-20080408212439-54t3bqlhvw1nu4xc 1124 arn...@gm...-20080409193708-y6erfzwrcb1seet3 1125 arn...@gm...-20080409195827-ub6t2s3wdf28nfpz Modified: dcplusplus/trunk/changelog.txt =================================================================== --- dcplusplus/trunk/changelog.txt 2008-04-14 20:15:30 UTC (rev 1149) +++ dcplusplus/trunk/changelog.txt 2008-04-14 20:16:49 UTC (rev 1150) @@ -31,6 +31,7 @@ * Fixed downloading multiple file lists with the enter key (poy) * Improved transfer speed averaging * [L#212411] Fixed downloading multiple file lists (poy) +* Added filter already shared from search results (thanks smir) -- 0.705 2008-03-14 -- * Several patches for better *nix compatibility of the core (thanks steven sheehy et al) Modified: dcplusplus/trunk/dcpp/SettingsManager.cpp =================================================================== --- dcplusplus/trunk/dcpp/SettingsManager.cpp 2008-04-14 20:15:30 UTC (rev 1149) +++ dcplusplus/trunk/dcpp/SettingsManager.cpp 2008-04-14 20:16:49 UTC (rev 1150) @@ -77,7 +77,7 @@ "UseTLS", "AutoSearchLimit", "AltSortOrder", "AutoKickNoFavs", "PromptPassword", "SpyFrameIgnoreTthSearches", "DontDlAlreadyQueued", "MaxCommandLength", "AllowUntrustedHubs", "AllowUntrustedClients", "TLSPort", "FastHash", "SortFavUsersFirst", "ShowShellMenu", "MinSegmentSize", "FollowLinks", - "SendBloom", "OwnerDrawnMenus", "Coral", + "SendBloom", "OwnerDrawnMenus", "Coral", "SearchFilterShared" "SENTRY", // Int64 "TotalUpload", "TotalDownload", @@ -240,6 +240,7 @@ setDefault(OPEN_NOTEPAD, false); setDefault(NO_IP_OVERRIDE, false); setDefault(SEARCH_ONLY_FREE_SLOTS, false); + setDefault(SEARCH_FILTER_SHARED, true); setDefault(LAST_SEARCH_TYPE, 0); setDefault(SOCKET_IN_BUFFER, 64*1024); setDefault(SOCKET_OUT_BUFFER, 64*1024); Modified: dcplusplus/trunk/dcpp/SettingsManager.h =================================================================== --- dcplusplus/trunk/dcpp/SettingsManager.h 2008-04-14 20:15:30 UTC (rev 1149) +++ dcplusplus/trunk/dcpp/SettingsManager.h 2008-04-14 20:16:49 UTC (rev 1150) @@ -90,7 +90,7 @@ USE_TLS, AUTO_SEARCH_LIMIT, ALT_SORT_ORDER, AUTO_KICK_NO_FAVS, PROMPT_PASSWORD, SPY_FRAME_IGNORE_TTH_SEARCHES, DONT_DL_ALREADY_QUEUED, MAX_COMMAND_LENGTH, ALLOW_UNTRUSTED_HUBS, ALLOW_UNTRUSTED_CLIENTS, TLS_PORT, FAST_HASH, SORT_FAVUSERS_FIRST, SHOW_SHELL_MENU, MIN_SEGMENT_SIZE, FOLLOW_LINKS, - SEND_BLOOM, OWNER_DRAWN_MENUS, CORAL, + SEND_BLOOM, OWNER_DRAWN_MENUS, CORAL, SEARCH_FILTER_SHARED, INT_LAST }; enum Int64Setting { INT64_FIRST = INT_LAST + 1, Modified: dcplusplus/trunk/win32/AboutDlg.cpp =================================================================== --- dcplusplus/trunk/win32/AboutDlg.cpp 2008-04-14 20:15:30 UTC (rev 1149) +++ dcplusplus/trunk/win32/AboutDlg.cpp 2008-04-14 20:16:49 UTC (rev 1150) @@ -41,7 +41,7 @@ "bsod, sulan, jonathan stone, tim burton, izzzo, guitarm, paka, nils maier, jens oknelid, yoji, " "krzysztof tyszecki, poison, mikejj, pur, bigmuscle, martin, jove, bart vullings, " "steven sheehy, tobias nygren, poy, dorian, stephan hohe, mafa_45, mikael eman, james ross," -"stanislav maslovski, david grundberg, pavel andreev, yakov suraev, kulmegil. " +"stanislav maslovski, david grundberg, pavel andreev, yakov suraev, kulmegil, smir. " "Keep it coming!"; AboutDlg::AboutDlg(dwt::Widget* parent) : WidgetFactory<dwt::ModalDialog>(parent) { Modified: dcplusplus/trunk/win32/SearchFrame.cpp =================================================================== --- dcplusplus/trunk/win32/SearchFrame.cpp 2008-04-14 20:15:30 UTC (rev 1149) +++ dcplusplus/trunk/win32/SearchFrame.cpp 2008-04-14 20:16:49 UTC (rev 1150) @@ -24,6 +24,7 @@ #include <dcpp/FavoriteManager.h> #include <dcpp/QueueManager.h> #include <dcpp/ClientManager.h> +#include <dcpp/ShareManager.h> int SearchFrame::columnIndexes[] = { COLUMN_FILENAME, COLUMN_NICK, COLUMN_TYPE, COLUMN_SIZE, COLUMN_PATH, COLUMN_SLOTS, COLUMN_CONNECTION, COLUMN_HUB, COLUMN_EXACT_SIZE, COLUMN_IP, COLUMN_TTH, COLUMN_CID }; @@ -96,6 +97,8 @@ optionLabel(0), slots(0), onlyFree(BOOLSETTING(SEARCH_ONLY_FREE_SLOTS)), + filter(0), + filterShared(BOOLSETTING(SEARCH_FILTER_SHARED)), hubsLabel(0), hubs(0), results(0), @@ -213,6 +216,14 @@ } { + CheckBox::Seed cs(T_("Hide files already in share")); + filter = addChild(cs); + filter->setChecked(filterShared); + + filter->onClicked(std::tr1::bind(&SearchFrame::handleFilterClicked, this)) ; + } + + { WidgetHubs::Seed cs; cs.style |= LVS_NOCOLUMNHEADER; cs.lvStyle |= LVS_EX_CHECKBOXES; @@ -377,6 +388,10 @@ rect.pos.y += rect.size.y + spacing; rect.size.y = yedit; slots->setBounds(rect); + + rect.pos.y += rect.size.y + spacing; + rect.size.y = yedit; + filter->setBounds(rect); rect.pos.y += rect.size.y + groupSpacing; rect.size.y = labelH; @@ -585,6 +600,10 @@ onlyFree = slots->getChecked(); } +void SearchFrame::handleFilterClicked() { + filterShared = filter->getChecked(); +} + void SearchFrame::handleShowUIClicked() { bShowUI = showUI->getChecked(); @@ -849,6 +868,19 @@ } } + if (filterShared != BOOLSETTING(SEARCH_FILTER_SHARED)) + SettingsManager::getInstance()->set(SettingsManager::SEARCH_FILTER_SHARED, filterShared); + + // Filter already shared files + if( filterShared ) { + const TTHValue& t = aResult->getTTH(); + if( ShareManager::getInstance()->isTTHShared(t) ) { + droppedResults++; + speak(SPEAK_FILTER_RESULT); + return; + } + } + // Reject results without free slots if((onlyFree && aResult->getFreeSlots() < 1)) { Modified: dcplusplus/trunk/win32/SearchFrame.h =================================================================== --- dcplusplus/trunk/win32/SearchFrame.h 2008-04-14 20:15:30 UTC (rev 1149) +++ dcplusplus/trunk/win32/SearchFrame.h 2008-04-14 20:16:49 UTC (rev 1150) @@ -171,6 +171,9 @@ CheckBoxPtr slots; bool onlyFree; + CheckBoxPtr filter; + bool filterShared; + LabelPtr hubsLabel; typedef TypedTable<HubInfo> WidgetHubs; typedef WidgetHubs* WidgetHubsPtr; @@ -207,6 +210,7 @@ void handlePurgeClicked(); void handleSlotsClicked(); + void handleFilterClicked(); void handleShowUIClicked(); LRESULT handleHubItemChanged(WPARAM wParam, LPARAM lParam); void handleDoubleClick(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arn...@us...> - 2008-04-14 20:18:06
|
Revision: 1151 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1151&view=rev Author: arnetheduck Date: 2008-04-14 13:17:43 -0700 (Mon, 14 Apr 2008) Log Message: ----------- missing comma, change when the setting is saved Modified Paths: -------------- dcplusplus/trunk/dcpp/SettingsManager.cpp dcplusplus/trunk/win32/SearchFrame.cpp Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-09 21:58:27.263999939 +0200 committer: Jacek Sieka <arn...@gm...> properties: branch-nick: dcplusplus + timestamp: 2008-04-09 23:50:55.905999899 +0200 committer: poy <po...@12...> properties: branch-nick: bzr Name: bzr:revision-id:v3-trunk1 - 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky 1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai 1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf 1114 po...@12...-20080405220250-8y09d0samsj8ja94 1115 po...@12...-20080406134101-4860ytb61sbu3yhg 1116 po...@12...-20080406155849-2wzxzuzs5m8zpk0g 1117 po...@12...-20080406164835-bv5dydhm3qqydsty 1118 arn...@gm...-20080406210237-c7tyfgiz2sjgv044 1119 po...@12...-20080407114423-4yajg1rffidq76bj 1120 arn...@gm...-20080407194826-c42t4bjzw4vflejn 1121 po...@12...-20080407214303-o7ul1bvcn6gvaoc9 1122 po...@12...-20080407220647-r7f3em92til5j67s 1123 po...@12...-20080408212439-54t3bqlhvw1nu4xc 1124 arn...@gm...-20080409193708-y6erfzwrcb1seet3 1125 arn...@gm...-20080409195827-ub6t2s3wdf28nfpz + 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky 1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai 1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf 1114 po...@12...-20080405220250-8y09d0samsj8ja94 1115 po...@12...-20080406134101-4860ytb61sbu3yhg 1116 po...@12...-20080406155849-2wzxzuzs5m8zpk0g 1117 po...@12...-20080406164835-bv5dydhm3qqydsty 1118 arn...@gm...-20080406210237-c7tyfgiz2sjgv044 1119 po...@12...-20080407114423-4yajg1rffidq76bj 1120 arn...@gm...-20080407194826-c42t4bjzw4vflejn 1121 po...@12...-20080407214303-o7ul1bvcn6gvaoc9 1122 po...@12...-20080407220647-r7f3em92til5j67s 1123 po...@12...-20080408212439-54t3bqlhvw1nu4xc 1124 arn...@gm...-20080409193708-y6erfzwrcb1seet3 1125 arn...@gm...-20080409195827-ub6t2s3wdf28nfpz 1126 po...@12...-20080409215055-1zmqhhm2859878c1 Modified: dcplusplus/trunk/dcpp/SettingsManager.cpp =================================================================== --- dcplusplus/trunk/dcpp/SettingsManager.cpp 2008-04-14 20:16:49 UTC (rev 1150) +++ dcplusplus/trunk/dcpp/SettingsManager.cpp 2008-04-14 20:17:43 UTC (rev 1151) @@ -77,7 +77,7 @@ "UseTLS", "AutoSearchLimit", "AltSortOrder", "AutoKickNoFavs", "PromptPassword", "SpyFrameIgnoreTthSearches", "DontDlAlreadyQueued", "MaxCommandLength", "AllowUntrustedHubs", "AllowUntrustedClients", "TLSPort", "FastHash", "SortFavUsersFirst", "ShowShellMenu", "MinSegmentSize", "FollowLinks", - "SendBloom", "OwnerDrawnMenus", "Coral", "SearchFilterShared" + "SendBloom", "OwnerDrawnMenus", "Coral", "SearchFilterShared", "SENTRY", // Int64 "TotalUpload", "TotalDownload", Modified: dcplusplus/trunk/win32/SearchFrame.cpp =================================================================== --- dcplusplus/trunk/win32/SearchFrame.cpp 2008-04-14 20:16:49 UTC (rev 1150) +++ dcplusplus/trunk/win32/SearchFrame.cpp 2008-04-14 20:17:43 UTC (rev 1151) @@ -868,9 +868,6 @@ } } - if (filterShared != BOOLSETTING(SEARCH_FILTER_SHARED)) - SettingsManager::getInstance()->set(SettingsManager::SEARCH_FILTER_SHARED, filterShared); - // Filter already shared files if( filterShared ) { const TTHValue& t = aResult->getTTH(); @@ -943,6 +940,8 @@ // Change Default Settings If Changed if (onlyFree != BOOLSETTING(SEARCH_ONLY_FREE_SLOTS)) SettingsManager::getInstance()->set(SettingsManager::SEARCH_ONLY_FREE_SLOTS, onlyFree); + if (filterShared != BOOLSETTING(SEARCH_FILTER_SHARED)) + SettingsManager::getInstance()->set(SettingsManager::SEARCH_FILTER_SHARED, filterShared); if (!initialType && fileType->getSelected() != SETTING(LAST_SEARCH_TYPE)) SettingsManager::getInstance()->set(SettingsManager::LAST_SEARCH_TYPE, fileType->getSelected()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arn...@us...> - 2008-04-14 20:20:51
|
Revision: 1152 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1152&view=rev Author: arnetheduck Date: 2008-04-14 13:19:59 -0700 (Mon, 14 Apr 2008) Log Message: ----------- Attach text/comboboxes as we should, tighten protection of some methods Modified Paths: -------------- dcplusplus/trunk/dwt/include/dwt/Policies.h dcplusplus/trunk/dwt/include/dwt/Widget.h dcplusplus/trunk/dwt/include/dwt/WidgetCreator.h dcplusplus/trunk/dwt/include/dwt/aspects/AspectVisible.h dcplusplus/trunk/dwt/include/dwt/widgets/Composite.h dcplusplus/trunk/dwt/include/dwt/widgets/Control.h dcplusplus/trunk/dwt/src/Widget.cpp dcplusplus/trunk/dwt/src/widgets/MDIChild.cpp dcplusplus/trunk/win32/ADLSProperties.cpp dcplusplus/trunk/win32/AboutDlg.cpp dcplusplus/trunk/win32/Advanced3Page.cpp dcplusplus/trunk/win32/Appearance2Page.cpp dcplusplus/trunk/win32/AppearancePage.cpp dcplusplus/trunk/win32/CertificatesPage.cpp dcplusplus/trunk/win32/ComboBox.h dcplusplus/trunk/win32/CommandDlg.cpp dcplusplus/trunk/win32/DownloadPage.cpp dcplusplus/trunk/win32/FavHubProperties.cpp dcplusplus/trunk/win32/GeneralPage.cpp dcplusplus/trunk/win32/HubListsDlg.cpp dcplusplus/trunk/win32/LineDlg.cpp dcplusplus/trunk/win32/LogPage.cpp dcplusplus/trunk/win32/MagnetDlg.cpp dcplusplus/trunk/win32/NetworkPage.cpp dcplusplus/trunk/win32/QueuePage.cpp dcplusplus/trunk/win32/SplashWindow.cpp dcplusplus/trunk/win32/StatsFrame.cpp dcplusplus/trunk/win32/TextBox.h dcplusplus/trunk/win32/UploadPage.cpp dcplusplus/trunk/win32/WidgetFactory.h Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-09 23:50:55.905999899 +0200 committer: poy <po...@12...> properties: branch-nick: bzr + timestamp: 2008-04-10 12:24:47.999000072 +0200 committer: Jacek Sieka <arn...@gm...> properties: branch-nick: dcplusplus Name: bzr:revision-id:v3-trunk1 - 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky 1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai 1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf 1114 po...@12...-20080405220250-8y09d0samsj8ja94 1115 po...@12...-20080406134101-4860ytb61sbu3yhg 1116 po...@12...-20080406155849-2wzxzuzs5m8zpk0g 1117 po...@12...-20080406164835-bv5dydhm3qqydsty 1118 arn...@gm...-20080406210237-c7tyfgiz2sjgv044 1119 po...@12...-20080407114423-4yajg1rffidq76bj 1120 arn...@gm...-20080407194826-c42t4bjzw4vflejn 1121 po...@12...-20080407214303-o7ul1bvcn6gvaoc9 1122 po...@12...-20080407220647-r7f3em92til5j67s 1123 po...@12...-20080408212439-54t3bqlhvw1nu4xc 1124 arn...@gm...-20080409193708-y6erfzwrcb1seet3 1125 arn...@gm...-20080409195827-ub6t2s3wdf28nfpz 1126 po...@12...-20080409215055-1zmqhhm2859878c1 + 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky 1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai 1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf 1114 po...@12...-20080405220250-8y09d0samsj8ja94 1115 po...@12...-20080406134101-4860ytb61sbu3yhg 1116 po...@12...-20080406155849-2wzxzuzs5m8zpk0g 1117 po...@12...-20080406164835-bv5dydhm3qqydsty 1118 arn...@gm...-20080406210237-c7tyfgiz2sjgv044 1119 po...@12...-20080407114423-4yajg1rffidq76bj 1120 arn...@gm...-20080407194826-c42t4bjzw4vflejn 1121 po...@12...-20080407214303-o7ul1bvcn6gvaoc9 1122 po...@12...-20080407220647-r7f3em92til5j67s 1123 po...@12...-20080408212439-54t3bqlhvw1nu4xc 1124 arn...@gm...-20080409193708-y6erfzwrcb1seet3 1125 arn...@gm...-20080409195827-ub6t2s3wdf28nfpz 1126 po...@12...-20080409215055-1zmqhhm2859878c1 1127 arn...@gm...-20080410102447-l4es4cbukkqwcnpc Modified: dcplusplus/trunk/dwt/include/dwt/Policies.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/Policies.h 2008-04-14 20:17:43 UTC (rev 1151) +++ dcplusplus/trunk/dwt/include/dwt/Policies.h 2008-04-14 20:19:59 UTC (rev 1152) @@ -40,9 +40,13 @@ namespace dwt { +namespace Policies { +class Subclassed; +} + template<typename Policy> class MessageMap : public Policy { -public: +protected: typedef MessageMap<Policy> PolicyType; MessageMap(Widget* parent) : Policy(parent) { } @@ -75,12 +79,12 @@ return Policy::returnHandled(res, hwnd, uMsg, wParam, lParam); } } - Policy* p; + PolicyType* p; if(handler != hwnd) { - p = hwnd_cast<Policy*>(hwnd); + p = hwnd_cast<PolicyType*>(hwnd); } else { - p = dynamic_cast<Policy*>(w); + p = dynamic_cast<PolicyType*>(w); } if(!p) { @@ -90,7 +94,8 @@ return p->returnUnhandled(hwnd, uMsg, wParam, lParam); } private: - + friend class Policies::Subclassed; + static HWND getHandler(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { HWND handler; // Check who should handle the message - parent or child @@ -129,7 +134,7 @@ class ModelessDialog : public Widget { -public: +protected: ModelessDialog(Widget* parent) : Widget(parent) { } static LRESULT returnDestroyed(HWND hWnd, UINT msg, WPARAM wPar, LPARAM lPar) { @@ -166,7 +171,7 @@ { // extracting the this pointer and stuffing it into the Window with SetProp ModelessDialog* This = reinterpret_cast<ModelessDialog*>(lParam); - This->attach( hwnd ); + This->setHandle( hwnd ); } } }; @@ -175,7 +180,7 @@ class ModalDialog : public ModelessDialog { -public: +protected: ModalDialog(Widget* parent) : ModelessDialog(parent) { } virtual void kill() { @@ -191,7 +196,7 @@ class Normal : public Widget { -public: +protected: Normal(Widget* parent) : Widget(parent) { } static LRESULT returnDestroyed(HWND hWnd, UINT msg, WPARAM wPar, LPARAM lPar) { @@ -217,13 +222,13 @@ // extracting the this pointer and stuffing it into the Window with SetProp CREATESTRUCT * cs = reinterpret_cast< CREATESTRUCT * >( lParam ); Normal* This = reinterpret_cast<Normal*>( cs->lpCreateParams ); - This->attach( hWnd ); + This->setHandle( hWnd ); } } }; class Subclassed : public Normal { -public: +protected: Subclassed(Widget* parent) : Normal(parent), oldProc(0) { } LRESULT returnUnhandled(HWND hWnd, UINT msg, WPARAM wPar, LPARAM lPar) { @@ -233,14 +238,14 @@ return Normal::returnUnhandled(hWnd, msg, wPar, lPar); } - virtual HWND create(const Widget::Seed& seed) { - HWND hWnd = Widget::create(seed); - attach(hWnd); + HWND create(const Normal::Seed& seed) { + HWND hWnd = Normal::create(seed); + setHandle(hWnd); return hWnd; } - virtual void attach(HWND hWnd) { - Normal::attach(hWnd); + virtual void setHandle(HWND hWnd) { + Normal::setHandle(hWnd); oldProc = reinterpret_cast< WNDPROC >( ::SetWindowLongPtr( hWnd, GWL_WNDPROC, ( LONG_PTR ) &MessageMap<Subclassed>::wndProc ) ); } using Widget::attach; @@ -256,7 +261,7 @@ class MDIChild : public Widget { -public: +protected: MDIChild(Widget* parent) : Widget(parent) { } static LRESULT returnDestroyed(HWND hWnd, UINT msg, WPARAM wPar, LPARAM lPar) { @@ -296,14 +301,14 @@ MDICREATESTRUCT * mcs = reinterpret_cast< MDICREATESTRUCT*>(cs->lpCreateParams); MDIChild* This = reinterpret_cast<MDIChild*>(mcs->lParam); - This->attach(hWnd); + This->setHandle(hWnd); } } }; template<typename WidgetType> class MDIFrame : public Normal { -public: +protected: MDIFrame(Widget* parent) : Normal(parent) { } LRESULT returnUnhandled( HWND hWnd, UINT msg, WPARAM wPar, LPARAM lPar ) Modified: dcplusplus/trunk/dwt/include/dwt/Widget.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/Widget.h 2008-04-14 20:17:43 UTC (rev 1151) +++ dcplusplus/trunk/dwt/include/dwt/Widget.h 2008-04-14 20:19:59 UTC (rev 1152) @@ -94,16 +94,6 @@ */ Widget* getParent() const; - /// Repaints the whole window - /** Invalidate the window and repaints it. - */ - void updateWidget(); - - /// Add this widget to the update area. - /** Same as updateWidget except that this does not force an immediate redraw. - */ - void invalidateWidget(); - /// Use this function to add or remove windows styles. /** The first parameter is the type of style you wish to add/remove. <br> * The second argument is a boolean indicating if you wish to add or remove the @@ -185,8 +175,6 @@ {} }; - - Widget(Widget * parent); virtual ~Widget(); @@ -195,7 +183,7 @@ // derived class - otherwise the wrong seed will be used HWND create(const Seed & cs); - virtual void attach(HWND wnd); + virtual void setHandle(HWND wnd); private: friend class Application; Modified: dcplusplus/trunk/dwt/include/dwt/WidgetCreator.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/WidgetCreator.h 2008-04-14 20:17:43 UTC (rev 1151) +++ dcplusplus/trunk/dwt/include/dwt/WidgetCreator.h 2008-04-14 20:19:59 UTC (rev 1152) @@ -91,7 +91,7 @@ static typename WidgetType::ObjectType attach( Widget * parent, HWND hwnd ) { typename WidgetType::ObjectType retVal(new WidgetType( parent )); - retVal->attach( hwnd ); + retVal->setHandle( hwnd ); return retVal; } Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectVisible.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/aspects/AspectVisible.h 2008-04-14 20:17:43 UTC (rev 1151) +++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectVisible.h 2008-04-14 20:19:59 UTC (rev 1152) @@ -37,6 +37,7 @@ #define DWT_AspectVisible_h #include "../Dispatchers.h" +#include "../Rectangle.h" namespace dwt { @@ -68,7 +69,7 @@ /** Changes the visibility property of the Widget. <br> * Use this function to change the visibility property of the Widget */ - void setVisible( bool visible ); + void setVisible(bool visible); /// Retrieves the visible property of the Widget /** Use this function to check if the Widget is visible or not. <br> @@ -88,6 +89,13 @@ W().addCallback(Message( WM_SHOWWINDOW ), Dispatcher(f)); } + /// Repaints the whole window + /** Invalidate the window and repaints it. + */ + void redraw(bool now = false); + + void redraw(const Rectangle& r, bool now = false); + protected: virtual ~AspectVisible() {} @@ -108,6 +116,17 @@ return ::IsWindowVisible( H() ) != 0; } +template<class WidgetType> +void AspectVisible<WidgetType>::redraw(bool now) { + ::RedrawWindow(H(), NULL, NULL, RDW_ERASE | RDW_INVALIDATE | (now ? RDW_UPDATENOW : 0)); } +template<class WidgetType> +void AspectVisible<WidgetType>::redraw(const Rectangle& r, bool now) { + RECT rc = r; + ::RedrawWindow(H(), &rc, NULL, RDW_ERASE | RDW_INVALIDATE | (now ? RDW_UPDATENOW : 0)); +} + +} + #endif Modified: dcplusplus/trunk/dwt/include/dwt/widgets/Composite.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/Composite.h 2008-04-14 20:17:43 UTC (rev 1151) +++ dcplusplus/trunk/dwt/include/dwt/widgets/Composite.h 2008-04-14 20:19:59 UTC (rev 1152) @@ -63,13 +63,13 @@ public AspectPainting< Composite< Policy > >, public AspectText< Composite< Policy > > { + typedef Control<Policy> BaseType; + public: typedef Composite<Policy> ThisType; typedef ThisType* ObjectType; - typedef Control<Policy> BaseType; - // TODO Maybe move this to a separate class? // This brings these classes into the namespace of classes that inherit from Composite // Note; only child windows should be here... @@ -129,7 +129,7 @@ return WidgetCreator<typename SeedType::WidgetType>::create(this, seed); } - virtual void create(const Seed& cs); + void create(const Seed& cs); protected: friend class WidgetCreator<Composite<Policy> >; Modified: dcplusplus/trunk/dwt/include/dwt/widgets/Control.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/Control.h 2008-04-14 20:17:43 UTC (rev 1151) +++ dcplusplus/trunk/dwt/include/dwt/widgets/Control.h 2008-04-14 20:19:59 UTC (rev 1152) @@ -65,8 +65,8 @@ public AspectTimer<Control<Policy> >, public AspectVisible<Control<Policy> > { + typedef MessageMap<Policy> BaseType; public: - typedef MessageMap<Policy> BaseType; protected: struct Seed : public BaseType::Seed { Modified: dcplusplus/trunk/dwt/src/Widget.cpp =================================================================== --- dcplusplus/trunk/dwt/src/Widget.cpp 2008-04-14 20:17:43 UTC (rev 1151) +++ dcplusplus/trunk/dwt/src/Widget.cpp 2008-04-14 20:19:59 UTC (rev 1152) @@ -64,19 +64,9 @@ HWND hWnd = ::GetDlgItem( itsParent->handle(), id ); if ( !hWnd ) throw xCeption( _T( "GetDlgItem failed." ) ); - attach(hWnd); + setHandle(hWnd); } -void Widget::updateWidget() -{ - ::InvalidateRect( itsHandle, 0, TRUE ); - ::UpdateWindow( itsHandle ); -} - -void Widget::invalidateWidget() { - ::InvalidateRect( itsHandle, 0, TRUE ); -} - void Widget::kill() { delete this; } @@ -99,7 +89,7 @@ return hWnd; } -void Widget::attach(HWND hwnd) { +void Widget::setHandle(HWND hwnd) { if(itsHandle) { throw xCeption(_T("You may not attach to a widget that's already attached")); } Modified: dcplusplus/trunk/dwt/src/widgets/MDIChild.cpp =================================================================== --- dcplusplus/trunk/dwt/src/widgets/MDIChild.cpp 2008-04-14 20:17:43 UTC (rev 1151) +++ dcplusplus/trunk/dwt/src/widgets/MDIChild.cpp 2008-04-14 20:19:59 UTC (rev 1152) @@ -59,7 +59,7 @@ } getParent()->sendMessage(WM_SETREDRAW, TRUE); - invalidateWidget(); + redraw(); if ( !wnd ) { xCeption x( _T( "CreateWindowEx in MDIChild::createMDIChild fizzled..." ) ); Modified: dcplusplus/trunk/win32/ADLSProperties.cpp =================================================================== --- dcplusplus/trunk/win32/ADLSProperties.cpp 2008-04-14 20:17:43 UTC (rev 1151) +++ dcplusplus/trunk/win32/ADLSProperties.cpp 2008-04-14 20:19:59 UTC (rev 1152) @@ -79,30 +79,30 @@ setItemText(IDC_ADLSP_UNITS, T_("Size Type")); setItemText(IDC_ADLSP_DESTINATION, T_("Destination Directory")); - searchString = attachTextBox(IDC_SEARCH_STRING); + searchString = attachChild<TextBox>(IDC_SEARCH_STRING); searchString->setText(Text::toT(search->searchString)); searchString->setFocus(); - searchType = attachComboBox(IDC_SOURCE_TYPE); + searchType = attachChild<ComboBox>(IDC_SOURCE_TYPE); searchType->addValue(T_("Filename")); searchType->addValue(T_("Directory")); searchType->addValue(T_("Full Path")); searchType->setSelected(search->sourceType); - minSize = attachTextBox(IDC_MIN_FILE_SIZE); + minSize = attachChild<TextBox>(IDC_MIN_FILE_SIZE); minSize->setText((search->minFileSize > 0) ? Text::toT(Util::toString(search->minFileSize)) : Util::emptyStringT); - maxSize = attachTextBox(IDC_MAX_FILE_SIZE); + maxSize = attachChild<TextBox>(IDC_MAX_FILE_SIZE); maxSize->setText((search->maxFileSize > 0) ? Text::toT(Util::toString(search->maxFileSize)) : Util::emptyStringT); - sizeType = attachComboBox(IDC_SIZE_TYPE); + sizeType = attachChild<ComboBox>(IDC_SIZE_TYPE); sizeType->addValue(T_("B")); sizeType->addValue(T_("KiB")); sizeType->addValue(T_("MiB")); sizeType->addValue(T_("GiB")); sizeType->setSelected(search->typeFileSize); - destDir = attachTextBox(IDC_DEST_DIR); + destDir = attachChild<TextBox>(IDC_DEST_DIR); destDir->setText(Text::toT(search->destDir)); active = attachChild<CheckBox>(IDC_IS_ACTIVE); Modified: dcplusplus/trunk/win32/AboutDlg.cpp =================================================================== --- dcplusplus/trunk/win32/AboutDlg.cpp 2008-04-14 20:17:43 UTC (rev 1151) +++ dcplusplus/trunk/win32/AboutDlg.cpp 2008-04-14 20:19:59 UTC (rev 1152) @@ -56,8 +56,8 @@ setText(T_("About DC++")); setItemText(IDC_VERSION, Text::toT(APPNAME " " VERSIONSTRING) + T_("\n(c) Copyright 2001-2008 Jacek Sieka\nEx-codeveloper: Per Lind\303\251n\nGraphics: Martin Skogevall et al.\nDC++ is licenced under GPL\nhttp://dcplusplus.sourceforge.net/")); - attachTextBox(IDC_TTH)->setText(WinUtil::tth); - attachTextBox(IDC_THANKS)->setText(Text::toT(thanks)); + attachChild<TextBox>(IDC_TTH)->setText(WinUtil::tth); + attachChild<TextBox>(IDC_THANKS)->setText(Text::toT(thanks)); setItemText(IDC_UPDOWN, str(TF_("Upload: %1%, Download: %2%") % Text::toT(Util::formatBytes(SETTING(TOTAL_UPLOAD))) % Text::toT(Util::formatBytes(SETTING(TOTAL_DOWNLOAD))))); setItemText(IDC_GREETZ, T_("Greetz and Contributors")); setItemText(IDC_TOTALS, T_("Totals")); Modified: dcplusplus/trunk/win32/Advanced3Page.cpp =================================================================== --- dcplusplus/trunk/win32/Advanced3Page.cpp 2008-04-14 20:17:43 UTC (rev 1151) +++ dcplusplus/trunk/win32/Advanced3Page.cpp 2008-04-14 20:19:59 UTC (rev 1152) @@ -122,20 +122,20 @@ SpinnerPtr spinner = attachChild<Spinner>(IDC_SEARCH_HISTORY_SPIN); spinner->setRange(0, 100); - attachTextBox(IDC_ROLLBACK); - attachTextBox(IDC_MAX_HASH_SPEED); - attachTextBox(IDC_SHOW_LAST_LINES_LOG); - attachTextBox(IDC_SET_MINISLOT_SIZE); - attachTextBox(IDC_MAX_FILELIST_SIZE); - attachTextBox(IDC_PRIVATE_ID); - attachTextBox(IDC_AUTO_REFRESH_TIME); - attachTextBox(IDC_BUFFERSIZE); - attachTextBox(IDC_AUTO_SEARCH_LIMIT); - attachTextBox(IDC_SEARCH_HISTORY); - attachTextBox(IDC_BIND_ADDRESS); - attachTextBox(IDC_SOCKET_IN_BUFFER); - attachTextBox(IDC_SOCKET_OUT_BUFFER); - attachTextBox(IDC_MIN_SEGMENT_SIZE); + attachChild<TextBox>(IDC_ROLLBACK); + attachChild<TextBox>(IDC_MAX_HASH_SPEED); + attachChild<TextBox>(IDC_SHOW_LAST_LINES_LOG); + attachChild<TextBox>(IDC_SET_MINISLOT_SIZE); + attachChild<TextBox>(IDC_MAX_FILELIST_SIZE); + attachChild<TextBox>(IDC_PRIVATE_ID); + attachChild<TextBox>(IDC_AUTO_REFRESH_TIME); + attachChild<TextBox>(IDC_BUFFERSIZE); + attachChild<TextBox>(IDC_AUTO_SEARCH_LIMIT); + attachChild<TextBox>(IDC_SEARCH_HISTORY); + attachChild<TextBox>(IDC_BIND_ADDRESS); + attachChild<TextBox>(IDC_SOCKET_IN_BUFFER); + attachChild<TextBox>(IDC_SOCKET_OUT_BUFFER); + attachChild<TextBox>(IDC_MIN_SEGMENT_SIZE); } Advanced3Page::~Advanced3Page() { Modified: dcplusplus/trunk/win32/Appearance2Page.cpp =================================================================== --- dcplusplus/trunk/win32/Appearance2Page.cpp 2008-04-14 20:17:43 UTC (rev 1151) +++ dcplusplus/trunk/win32/Appearance2Page.cpp 2008-04-14 20:19:59 UTC (rev 1152) @@ -97,7 +97,7 @@ button = attachChild<Button>(IDC_BROWSE); button->onClicked(std::tr1::bind(&Appearance2Page::handleBrowseClicked, this)); - attachTextBox(IDC_BEEPFILE); + attachChild<TextBox>(IDC_BEEPFILE); } Appearance2Page::~Appearance2Page() { @@ -120,7 +120,7 @@ if(createColorDialog().open(colorParams)) { bg = colorParams.getColor(); example->setColor(fg, bg); - example->invalidateWidget(); + example->redraw(); } } @@ -133,7 +133,7 @@ font = dwt::FontPtr(new dwt::Font(::CreateFontIndirect(&logFont), true)); example->setColor(fg, bg); example->setFont(font); - example->invalidateWidget(); + example->redraw(); } } Modified: dcplusplus/trunk/win32/AppearancePage.cpp =================================================================== --- dcplusplus/trunk/win32/AppearancePage.cpp 2008-04-14 20:17:43 UTC (rev 1151) +++ dcplusplus/trunk/win32/AppearancePage.cpp 2008-04-14 20:19:59 UTC (rev 1152) @@ -76,7 +76,7 @@ PropPage::translate(handle(), texts); PropPage::read(handle(), items, listItems, ::GetDlgItem(handle(), IDC_APPEARANCE_BOOLEANS)); - languages = attachComboBox(IDC_LANGUAGE); + languages = attachChild<ComboBox>(IDC_LANGUAGE); StringList dirs = File::findFiles(Util::getLocalePath(), "*"); @@ -110,8 +110,8 @@ languages->setSelected(selected); - attachTextBox(IDC_DEFAULT_AWAY_MESSAGE); - attachTextBox(IDC_TIME_STAMPS_FORMAT); + attachChild<TextBox>(IDC_DEFAULT_AWAY_MESSAGE); + attachChild<TextBox>(IDC_TIME_STAMPS_FORMAT); } AppearancePage::~AppearancePage() { Modified: dcplusplus/trunk/win32/CertificatesPage.cpp =================================================================== --- dcplusplus/trunk/win32/CertificatesPage.cpp 2008-04-14 20:17:43 UTC (rev 1151) +++ dcplusplus/trunk/win32/CertificatesPage.cpp 2008-04-14 20:19:59 UTC (rev 1152) @@ -69,13 +69,13 @@ PropPage::translate(handle(), texts); PropPage::read(handle(), items, listItems, ::GetDlgItem(handle(), IDC_TLS_OPTIONS)); - privateKeyFile = attachTextBox(IDC_TLS_PRIVATE_KEY_FILE); + privateKeyFile = attachChild<TextBox>(IDC_TLS_PRIVATE_KEY_FILE); attachChild<Button>(IDC_BROWSE_PRIVATE_KEY)->onClicked(std::tr1::bind(&CertificatesPage::handleBrowsePrivateKeyClicked, this)); - certificateFile = attachTextBox(IDC_TLS_CERTIFICATE_FILE); + certificateFile = attachChild<TextBox>(IDC_TLS_CERTIFICATE_FILE); attachChild<Button>(IDC_BROWSE_CERTIFICATE)->onClicked(std::tr1::bind(&CertificatesPage::handleBrowseCertificateClicked, this)); - trustedCertificatesPath = attachTextBox(IDC_TLS_TRUSTED_CERTIFICATES_PATH); + trustedCertificatesPath = attachChild<TextBox>(IDC_TLS_TRUSTED_CERTIFICATES_PATH); attachChild<Button>(IDC_BROWSE_TRUSTED_PATH)->onClicked(std::tr1::bind(&CertificatesPage::handleBrowseTrustedPathClicked, this)); attachChild<Button>(IDC_GENERATE_CERTS)->onClicked(std::tr1::bind(&CertificatesPage::handleGenerateCertsClicked, this)); Modified: dcplusplus/trunk/win32/ComboBox.h =================================================================== --- dcplusplus/trunk/win32/ComboBox.h 2008-04-14 20:17:43 UTC (rev 1151) +++ dcplusplus/trunk/win32/ComboBox.h 2008-04-14 20:19:59 UTC (rev 1152) @@ -23,7 +23,7 @@ class ComboBox : public dwt::ComboBox { typedef dwt::ComboBox BaseType; - + friend class dwt::WidgetCreator<ComboBox>; public: typedef ComboBox ThisType; Modified: dcplusplus/trunk/win32/CommandDlg.cpp =================================================================== --- dcplusplus/trunk/win32/CommandDlg.cpp 2008-04-14 20:17:43 UTC (rev 1151) +++ dcplusplus/trunk/win32/CommandDlg.cpp 2008-04-14 20:19:59 UTC (rev 1152) @@ -127,20 +127,20 @@ fileListMenu = attachChild<CheckBox>(IDC_SETTINGS_FILELIST_MENU); fileListMenu->setText(T_( "Filelist Menu")); - nameBox = attachTextBox(IDC_NAME); + nameBox = attachChild<TextBox>(IDC_NAME); - commandBox = attachTextBox(IDC_COMMAND); + commandBox = attachChild<TextBox>(IDC_COMMAND); commandBox->onTextChanged(std::tr1::bind(&CommandDlg::updateCommand, this)); - hubBox = attachTextBox(IDC_HUB); + hubBox = attachChild<TextBox>(IDC_HUB); - nick = attachTextBox(IDC_NICK); + nick = attachChild<TextBox>(IDC_NICK); nick->onTextChanged(std::tr1::bind(&CommandDlg::updateCommand, this)); once = attachChild<CheckBox>(IDC_SETTINGS_ONCE); once->setText(T_("Send once per nick")); - result = attachTextBox(IDC_RESULT); + result = attachChild<TextBox>(IDC_RESULT); openHelp = attachChild<CheckBox>(IDC_USER_CMD_OPEN_HELP); openHelp->setText(T_("Always open help file with this dialog")); Modified: dcplusplus/trunk/win32/DownloadPage.cpp =================================================================== --- dcplusplus/trunk/win32/DownloadPage.cpp 2008-04-14 20:17:43 UTC (rev 1151) +++ dcplusplus/trunk/win32/DownloadPage.cpp 2008-04-14 20:19:59 UTC (rev 1152) @@ -94,11 +94,11 @@ attachChild(spinner, IDC_SPEEDSPIN); spinner->setRange(0, 10000); - attachTextBox(IDC_DOWNLOADDIR); - attachTextBox(IDC_TEMP_DOWNLOAD_DIRECTORY); - attachTextBox(IDC_DOWNLOADS); - attachTextBox(IDC_MAXSPEED); - attachTextBox(IDC_PROXY); + attachChild<TextBox>(IDC_DOWNLOADDIR); + attachChild<TextBox>(IDC_TEMP_DOWNLOAD_DIRECTORY); + attachChild<TextBox>(IDC_DOWNLOADS); + attachChild<TextBox>(IDC_MAXSPEED); + attachChild<TextBox>(IDC_PROXY); } DownloadPage::~DownloadPage() { Modified: dcplusplus/trunk/win32/FavHubProperties.cpp =================================================================== --- dcplusplus/trunk/win32/FavHubProperties.cpp 2008-04-14 20:17:43 UTC (rev 1151) +++ dcplusplus/trunk/win32/FavHubProperties.cpp 2008-04-14 20:19:59 UTC (rev 1152) @@ -77,28 +77,28 @@ setItemText(IDC_FH_PASSWORD, T_("Password")); setItemText(IDC_FH_USER_DESC, T_("Description")); - name = attachTextBox(IDC_HUBNAME); + name = attachChild<TextBox>(IDC_HUBNAME); name->setText(Text::toT(entry->getName())); name->setFocus(); name->setSelection(); - address = attachTextBox(IDC_HUBADDR); + address = attachChild<TextBox>(IDC_HUBADDR); address->setText(Text::toT(entry->getServer())); - description = attachTextBox(IDC_HUBDESCR); + description = attachChild<TextBox>(IDC_HUBDESCR); description->setText(Text::toT(entry->getDescription())); - nick = attachTextBox(IDC_HUBNICK); + nick = attachChild<TextBox>(IDC_HUBNICK); nick->setTextLimit(35); nick->setText(Text::toT(entry->getNick(false))); nick->onTextChanged(std::tr1::bind(&FavHubProperties::handleTextChanged, this, nick)); - password = attachTextBox(IDC_HUBPASS); + password = attachChild<TextBox>(IDC_HUBPASS); password->setPassword(); password->setText(Text::toT(entry->getPassword())); password->onTextChanged(std::tr1::bind(&FavHubProperties::handleTextChanged, this, password)); - userDescription = attachTextBox(IDC_HUBUSERDESCR); + userDescription = attachChild<TextBox>(IDC_HUBUSERDESCR); userDescription->setTextLimit(35); userDescription->setText(Text::toT(entry->getUserDescription())); Modified: dcplusplus/trunk/win32/GeneralPage.cpp =================================================================== --- dcplusplus/trunk/win32/GeneralPage.cpp 2008-04-14 20:17:43 UTC (rev 1151) +++ dcplusplus/trunk/win32/GeneralPage.cpp 2008-04-14 20:19:59 UTC (rev 1152) @@ -65,7 +65,7 @@ PropPage::translate(handle(), texts); PropPage::read(handle(), items); - ComboBoxPtr connections = attachComboBox(IDC_CONNECTION); + ComboBoxPtr connections = attachChild<ComboBox>(IDC_CONNECTION); int selected = 0, j = 0; for(StringIter i = SettingsManager::connectionSpeeds.begin(); i != SettingsManager::connectionSpeeds.end(); ++i, ++j) { @@ -77,13 +77,13 @@ connections->setSelected(selected); - nick = attachTextBox(IDC_NICK); + nick = attachChild<TextBox>(IDC_NICK); nick->setTextLimit(35); nick->onTextChanged(std::tr1::bind(&GeneralPage::handleNickTextChanged, this)); - attachTextBox(IDC_EMAIL); + attachChild<TextBox>(IDC_EMAIL); - attachTextBox(IDC_DESCRIPTION)->setTextLimit(35); + attachChild<TextBox>(IDC_DESCRIPTION)->setTextLimit(35); } GeneralPage::~GeneralPage() { Modified: dcplusplus/trunk/win32/HubListsDlg.cpp =================================================================== --- dcplusplus/trunk/win32/HubListsDlg.cpp 2008-04-14 20:17:43 UTC (rev 1151) +++ dcplusplus/trunk/win32/HubListsDlg.cpp 2008-04-14 20:19:59 UTC (rev 1152) @@ -60,7 +60,7 @@ setText(T_("Configured Public Hub Lists")); - editBox = attachTextBox(IDC_LIST_EDIT_BOX); + editBox = attachChild<TextBox>(IDC_LIST_EDIT_BOX); attachChild(hubLists, IDC_LIST_LIST); hubLists->setTableStyle(LVS_EX_LABELTIP | LVS_EX_FULLROWSELECT); Modified: dcplusplus/trunk/win32/LineDlg.cpp =================================================================== --- dcplusplus/trunk/win32/LineDlg.cpp 2008-04-14 20:17:43 UTC (rev 1151) +++ dcplusplus/trunk/win32/LineDlg.cpp 2008-04-14 20:19:59 UTC (rev 1152) @@ -36,7 +36,7 @@ attachChild<Button>(IDCANCEL)->onClicked(std::tr1::bind(&LineDlg::cancelClicked, this)); attachChild<Label>(IDC_DESCRIPTION)->setText(desc); - line = attachTextBox(IDC_LINE); + line = attachChild<TextBox>(IDC_LINE); line->setFocus(); line->setText(initial); line->setSelection(); Modified: dcplusplus/trunk/win32/LogPage.cpp =================================================================== --- dcplusplus/trunk/win32/LogPage.cpp 2008-04-14 20:17:43 UTC (rev 1151) +++ dcplusplus/trunk/win32/LogPage.cpp 2008-04-14 20:19:59 UTC (rev 1152) @@ -74,17 +74,17 @@ options.push_back(pair); } - attachTextBox(IDC_LOG_DIRECTORY); + attachChild<TextBox>(IDC_LOG_DIRECTORY); attachChild<Button>(IDC_BROWSE_LOG)->onClicked(std::tr1::bind(&LogPage::handleBrowseClicked, this)); attachChild(dataGrid, IDC_LOG_OPTIONS); dataGrid->onRaw(std::tr1::bind(&LogPage::handleItemChanged, this), dwt::Message(WM_NOTIFY, LVN_ITEMCHANGED)); - logFormat = attachTextBox(IDC_LOG_FORMAT); + logFormat = attachChild<TextBox>(IDC_LOG_FORMAT); logFormat->setEnabled(false); - logFile = attachTextBox(IDC_LOG_FILE); + logFile = attachChild<TextBox>(IDC_LOG_FILE); logFile->setEnabled(false); oldSelection = -1; Modified: dcplusplus/trunk/win32/MagnetDlg.cpp =================================================================== --- dcplusplus/trunk/win32/MagnetDlg.cpp 2008-04-14 20:17:43 UTC (rev 1151) +++ dcplusplus/trunk/win32/MagnetDlg.cpp 2008-04-14 20:19:59 UTC (rev 1152) @@ -44,9 +44,9 @@ setText(T_("MAGNET Link detected")); setItemText(IDC_MAGNET_TEXT, T_("DC++ has detected a MAGNET link with a file hash that can be searched for on the Direct Connect network. What would you like to do?")); setItemText(IDC_MAGNET_HASH, T_("File Hash:")); - attachTextBox(IDC_MAGNET_DISP_HASH)->setText(mHash.c_str()); + attachChild<TextBox>(IDC_MAGNET_DISP_HASH)->setText(mHash.c_str()); setItemText(IDC_MAGNET_NAME, T_("Filename:")); - attachTextBox(IDC_MAGNET_DISP_NAME)->setText(mFileName); + attachChild<TextBox>(IDC_MAGNET_DISP_NAME)->setText(mFileName); //queue = attachRadioButton(IDC_MAGNET_1_QUEUE); //queue->setText(T_("Add this file to your download queue")); Modified: dcplusplus/trunk/win32/NetworkPage.cpp =================================================================== --- dcplusplus/trunk/win32/NetworkPage.cpp 2008-04-14 20:17:43 UTC (rev 1151) +++ dcplusplus/trunk/win32/NetworkPage.cpp 2008-04-14 20:19:59 UTC (rev 1152) @@ -130,17 +130,17 @@ RADIO_ATTACH(IDC_SOCKS5); #undef RADIO_ATTACH -#define TEXTBOX_LIMIT(id) attachTextBox(id)->setTextLimit(250) +#define TEXTBOX_LIMIT(id) attachChild<TextBox>(id)->setTextLimit(250) TEXTBOX_LIMIT(IDC_SOCKS_SERVER); TEXTBOX_LIMIT(IDC_SOCKS_PORT); TEXTBOX_LIMIT(IDC_SOCKS_USER); TEXTBOX_LIMIT(IDC_SOCKS_PASSWORD); #undef TEXTBOX_LIMIT - attachTextBox(IDC_PORT_TCP); - attachTextBox(IDC_PORT_UDP); - attachTextBox(IDC_PORT_TLS); - attachTextBox(IDC_EXTERNAL_IP); + attachChild<TextBox>(IDC_PORT_TCP); + attachChild<TextBox>(IDC_PORT_UDP); + attachChild<TextBox>(IDC_PORT_TLS); + attachChild<TextBox>(IDC_EXTERNAL_IP); } NetworkPage::~NetworkPage() { Modified: dcplusplus/trunk/win32/QueuePage.cpp =================================================================== --- dcplusplus/trunk/win32/QueuePage.cpp 2008-04-14 20:17:43 UTC (rev 1151) +++ dcplusplus/trunk/win32/QueuePage.cpp 2008-04-14 20:19:59 UTC (rev 1152) @@ -123,16 +123,16 @@ PropPage::read(handle(), items, 0, 0); PropPage::read(handle(), items, optionItems, ::GetDlgItem(handle(), IDC_OTHER_QUEUE_OPTIONS)); - attachTextBox(IDC_PRIO_HIGHEST_SIZE); - attachTextBox(IDC_PRIO_NORMAL_SIZE); - attachTextBox(IDC_PRIO_HIGH_SIZE); - attachTextBox(IDC_PRIO_LOW_SIZE); - attachTextBox(IDC_AUTODROP_SPEED); - attachTextBox(IDC_AUTODROP_ELAPSED); - attachTextBox(IDC_AUTODROP_MINSOURCES); - attachTextBox(IDC_AUTODROP_INTERVAL); - attachTextBox(IDC_AUTODROP_INACTIVITY); - attachTextBox(IDC_AUTODROP_FILESIZE); + attachChild<TextBox>(IDC_PRIO_HIGHEST_SIZE); + attachChild<TextBox>(IDC_PRIO_NORMAL_SIZE); + attachChild<TextBox>(IDC_PRIO_HIGH_SIZE); + attachChild<TextBox>(IDC_PRIO_LOW_SIZE); + attachChild<TextBox>(IDC_AUTODROP_SPEED); + attachChild<TextBox>(IDC_AUTODROP_ELAPSED); + attachChild<TextBox>(IDC_AUTODROP_MINSOURCES); + attachChild<TextBox>(IDC_AUTODROP_INTERVAL); + attachChild<TextBox>(IDC_AUTODROP_INACTIVITY); + attachChild<TextBox>(IDC_AUTODROP_FILESIZE); } QueuePage::~QueuePage() { Modified: dcplusplus/trunk/win32/SplashWindow.cpp =================================================================== --- dcplusplus/trunk/win32/SplashWindow.cpp 2008-04-14 20:17:43 UTC (rev 1151) +++ dcplusplus/trunk/win32/SplashWindow.cpp 2008-04-14 20:19:59 UTC (rev 1152) @@ -66,7 +66,7 @@ ::HideCaret(text->handle()); text->setVisible(true); text->bringToFront(); - text->updateWidget(); + text->redraw(true); } SplashWindow::~SplashWindow() { @@ -75,5 +75,5 @@ void SplashWindow::operator()(const string& status) { text->setText(str(TF_("Loading DC++, please wait... (%1%)") % Text::toT(status) )); - text->updateWidget(); + text->redraw(true); } Modified: dcplusplus/trunk/win32/StatsFrame.cpp =================================================================== --- dcplusplus/trunk/win32/StatsFrame.cpp 2008-04-14 20:17:43 UTC (rev 1151) +++ dcplusplus/trunk/win32/StatsFrame.cpp 2008-04-14 20:19:59 UTC (rev 1152) @@ -125,7 +125,7 @@ width = r.width(); height = r.size.y - 1; - invalidateWidget(); + redraw(); } bool StatsFrame::eachSecond() { @@ -166,7 +166,7 @@ } if(mspeed > max || ((max * 3 / 4) > mspeed) ) { max = mspeed; - invalidateWidget(); + redraw(); } lastTick = tick; Modified: dcplusplus/trunk/win32/TextBox.h =================================================================== --- dcplusplus/trunk/win32/TextBox.h 2008-04-14 20:17:43 UTC (rev 1151) +++ dcplusplus/trunk/win32/TextBox.h 2008-04-14 20:19:59 UTC (rev 1152) @@ -22,7 +22,7 @@ /** Our own flavour of text boxes that handle double clicks and have fancy menus */ class TextBox : public dwt::TextBox { typedef dwt::TextBox BaseType; - + friend class dwt::WidgetCreator<TextBox>; public: typedef TextBox ThisType; Modified: dcplusplus/trunk/win32/UploadPage.cpp =================================================================== --- dcplusplus/trunk/win32/UploadPage.cpp 2008-04-14 20:17:43 UTC (rev 1151) +++ dcplusplus/trunk/win32/UploadPage.cpp 2008-04-14 20:19:59 UTC (rev 1152) @@ -129,8 +129,8 @@ attachChild(spinner, IDC_MIN_UPLOAD_SPIN); spinner->setRange(0, UD_MAXVAL); - attachTextBox(IDC_MIN_UPLOAD_SPEED); - attachTextBox(IDC_SLOTS); + attachChild<TextBox>(IDC_MIN_UPLOAD_SPEED); + attachChild<TextBox>(IDC_SLOTS); } UploadPage::~UploadPage() { Modified: dcplusplus/trunk/win32/WidgetFactory.h =================================================================== --- dcplusplus/trunk/win32/WidgetFactory.h 2008-04-14 20:17:43 UTC (rev 1151) +++ dcplusplus/trunk/win32/WidgetFactory.h 2008-04-14 20:19:59 UTC (rev 1152) @@ -37,28 +37,12 @@ /// TextBox object type. typedef typename TextBox::ObjectType TextBoxPtr; - TextBoxPtr createTextBox( const TextBox::Seed & cs = TextBox::Seed() ) { - return dwt::WidgetCreator< TextBox >::create( this, cs ); - } - - TextBoxPtr attachTextBox( unsigned id ) { - return dwt::WidgetCreator< TextBox >::attach( this, id ); - } - /// ComboBox class type. typedef ::ComboBox ComboBox; /// ComboBox object type. typedef typename ComboBox::ObjectType ComboBoxPtr; - ComboBoxPtr createComboBox( const ComboBox::Seed & cs = ComboBox::Seed() ) { - return dwt::WidgetCreator< ComboBox >::create( this, cs ); - } - - ComboBoxPtr attachComboBox( unsigned id ) { - return dwt::WidgetCreator< ComboBox >::attach( this, id ); - } - /// VPaned class type. typedef WidgetPaned< false > WidgetVPaned; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arn...@us...> - 2008-04-14 20:23:32
|
Revision: 1153 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1153&view=rev Author: arnetheduck Date: 2008-04-14 13:23:20 -0700 (Mon, 14 Apr 2008) Log Message: ----------- consolidate basetype usage Modified Paths: -------------- dcplusplus/trunk/dwt/include/dwt/Dispatchers.h dcplusplus/trunk/dwt/include/dwt/widgets/Button.h dcplusplus/trunk/dwt/include/dwt/widgets/CheckBox.h dcplusplus/trunk/dwt/include/dwt/widgets/ComboBox.h dcplusplus/trunk/dwt/include/dwt/widgets/Container.h dcplusplus/trunk/dwt/include/dwt/widgets/CoolBar.h dcplusplus/trunk/dwt/include/dwt/widgets/DateTime.h dcplusplus/trunk/dwt/include/dwt/widgets/Frame.h dcplusplus/trunk/dwt/include/dwt/widgets/GroupBox.h dcplusplus/trunk/dwt/include/dwt/widgets/Label.h dcplusplus/trunk/dwt/include/dwt/widgets/MDIChild.h dcplusplus/trunk/dwt/include/dwt/widgets/MDIFrame.h dcplusplus/trunk/dwt/include/dwt/widgets/MDIParent.h dcplusplus/trunk/dwt/include/dwt/widgets/ModalDialog.h dcplusplus/trunk/dwt/include/dwt/widgets/ModelessDialog.h dcplusplus/trunk/dwt/include/dwt/widgets/RadioButton.h dcplusplus/trunk/dwt/include/dwt/widgets/StatusBar.h dcplusplus/trunk/dwt/include/dwt/widgets/TabSheet.h dcplusplus/trunk/dwt/include/dwt/widgets/TabView.h dcplusplus/trunk/dwt/include/dwt/widgets/Table.h dcplusplus/trunk/dwt/include/dwt/widgets/TextBox.h dcplusplus/trunk/dwt/include/dwt/widgets/ToolBar.h dcplusplus/trunk/dwt/include/dwt/widgets/ToolTip.h dcplusplus/trunk/dwt/include/dwt/widgets/Tree.h dcplusplus/trunk/win32/ADLSearchFrame.h dcplusplus/trunk/win32/DirectoryListingFrame.h dcplusplus/trunk/win32/FavHubsFrame.h dcplusplus/trunk/win32/FinishedDLFrame.h dcplusplus/trunk/win32/FinishedFrameBase.h dcplusplus/trunk/win32/FinishedULFrame.h dcplusplus/trunk/win32/MDIChildFrame.h dcplusplus/trunk/win32/NotepadFrame.h dcplusplus/trunk/win32/PrivateFrame.h dcplusplus/trunk/win32/PublicHubsFrame.h dcplusplus/trunk/win32/QueueFrame.h dcplusplus/trunk/win32/SearchFrame.h dcplusplus/trunk/win32/SpyFrame.h dcplusplus/trunk/win32/StatsFrame.h dcplusplus/trunk/win32/SystemFrame.h dcplusplus/trunk/win32/TextFrame.h dcplusplus/trunk/win32/TypedTable.h dcplusplus/trunk/win32/TypedTree.h dcplusplus/trunk/win32/UsersFrame.h dcplusplus/trunk/win32/WaitingUsersFrame.h dcplusplus/trunk/win32/WidgetPaned.h Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-10 12:24:47.999000072 +0200 committer: Jacek Sieka <arn...@gm...> properties: branch-nick: dcplusplus + timestamp: 2008-04-10 23:41:18.571000099 +0200 committer: Jacek Sieka <arn...@gm...> properties: branch-nick: dcplusplus Name: bzr:revision-id:v3-trunk1 - 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky 1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai 1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf 1114 po...@12...-20080405220250-8y09d0samsj8ja94 1115 po...@12...-20080406134101-4860ytb61sbu3yhg 1116 po...@12...-20080406155849-2wzxzuzs5m8zpk0g 1117 po...@12...-20080406164835-bv5dydhm3qqydsty 1118 arn...@gm...-20080406210237-c7tyfgiz2sjgv044 1119 po...@12...-20080407114423-4yajg1rffidq76bj 1120 arn...@gm...-20080407194826-c42t4bjzw4vflejn 1121 po...@12...-20080407214303-o7ul1bvcn6gvaoc9 1122 po...@12...-20080407220647-r7f3em92til5j67s 1123 po...@12...-20080408212439-54t3bqlhvw1nu4xc 1124 arn...@gm...-20080409193708-y6erfzwrcb1seet3 1125 arn...@gm...-20080409195827-ub6t2s3wdf28nfpz 1126 po...@12...-20080409215055-1zmqhhm2859878c1 1127 arn...@gm...-20080410102447-l4es4cbukkqwcnpc + 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky 1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai 1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf 1114 po...@12...-20080405220250-8y09d0samsj8ja94 1115 po...@12...-20080406134101-4860ytb61sbu3yhg 1116 po...@12...-20080406155849-2wzxzuzs5m8zpk0g 1117 po...@12...-20080406164835-bv5dydhm3qqydsty 1118 arn...@gm...-20080406210237-c7tyfgiz2sjgv044 1119 po...@12...-20080407114423-4yajg1rffidq76bj 1120 arn...@gm...-20080407194826-c42t4bjzw4vflejn 1121 po...@12...-20080407214303-o7ul1bvcn6gvaoc9 1122 po...@12...-20080407220647-r7f3em92til5j67s 1123 po...@12...-20080408212439-54t3bqlhvw1nu4xc 1124 arn...@gm...-20080409193708-y6erfzwrcb1seet3 1125 arn...@gm...-20080409195827-ub6t2s3wdf28nfpz 1126 po...@12...-20080409215055-1zmqhhm2859878c1 1127 arn...@gm...-20080410102447-l4es4cbukkqwcnpc 1128 arn...@gm...-20080410214118-b70g50tl27cq9q29 Modified: dcplusplus/trunk/dwt/include/dwt/Dispatchers.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/Dispatchers.h 2008-04-14 20:19:59 UTC (rev 1152) +++ dcplusplus/trunk/dwt/include/dwt/Dispatchers.h 2008-04-14 20:23:20 UTC (rev 1153) @@ -53,8 +53,9 @@ } template<typename P, P (*C)(const MSG&) = convert<P>, bool handled = true > -struct ConvertBase : public Base<void(const P&)> { +class ConvertBase : public Base<void(const P&)> { typedef Base<void(const P&)> BaseType; +public: ConvertBase(const typename BaseType::F& f_) : BaseType(f_) { } bool operator()(const MSG& msg, LRESULT& ret) { Modified: dcplusplus/trunk/dwt/include/dwt/widgets/Button.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/Button.h 2008-04-14 20:19:59 UTC (rev 1152) +++ dcplusplus/trunk/dwt/include/dwt/widgets/Button.h 2008-04-14 20:23:20 UTC (rev 1153) @@ -59,6 +59,7 @@ public AspectPainting< Button >, public AspectText< Button > { + typedef CommonControl BaseType; friend class AspectClickable<Button>; friend class AspectDblClickable<Button>; friend class WidgetCreator<Button>; @@ -69,8 +70,6 @@ /// Object type typedef ThisType* ObjectType; - typedef CommonControl BaseType; - /// Seed class /** This class contains all of the values needed to create the widget. It also * knows the type of the class whose seed values it contains. Every widget Modified: dcplusplus/trunk/dwt/include/dwt/widgets/CheckBox.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/CheckBox.h 2008-04-14 20:19:59 UTC (rev 1152) +++ dcplusplus/trunk/dwt/include/dwt/widgets/CheckBox.h 2008-04-14 20:23:20 UTC (rev 1153) @@ -53,7 +53,9 @@ // Aspect classes public Button { + typedef Button BaseType; friend class WidgetCreator< CheckBox >; + public: /// Class type typedef CheckBox ThisType; @@ -61,8 +63,6 @@ /// Object type typedef ThisType* ObjectType; - typedef Button BaseType; - /// Seed class /** This class contains all of the values needed to create the widget. It also * knows the type of the class whose seed values it contains. Every widget Modified: dcplusplus/trunk/dwt/include/dwt/widgets/ComboBox.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/ComboBox.h 2008-04-14 20:19:59 UTC (rev 1152) +++ dcplusplus/trunk/dwt/include/dwt/widgets/ComboBox.h 2008-04-14 20:23:20 UTC (rev 1153) @@ -71,6 +71,7 @@ public AspectSelection< ComboBox, int >, public AspectText< ComboBox > { + typedef CommonControl BaseType; friend class WidgetCreator< ComboBox >; friend class AspectCollection<ComboBox, int>; friend class AspectColor<ComboBox>; @@ -85,7 +86,6 @@ /// Object type typedef ThisType* ObjectType; - typedef CommonControl BaseType; /// Seed class /** This class contains all of the values needed to create the widget. It also Modified: dcplusplus/trunk/dwt/include/dwt/widgets/Container.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/Container.h 2008-04-14 20:19:59 UTC (rev 1152) +++ dcplusplus/trunk/dwt/include/dwt/widgets/Container.h 2008-04-14 20:23:20 UTC (rev 1153) @@ -43,14 +43,13 @@ class Container : public Composite<Policies::Normal> { + typedef Composite<Policies::Normal> BaseType; friend class WidgetCreator<Container>; public: typedef Container ThisType; typedef ThisType* ObjectType; - typedef Composite<Policies::Normal> BaseType; - struct Seed : public BaseType::Seed { typedef ThisType WidgetType; Modified: dcplusplus/trunk/dwt/include/dwt/widgets/CoolBar.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/CoolBar.h 2008-04-14 20:19:59 UTC (rev 1152) +++ dcplusplus/trunk/dwt/include/dwt/widgets/CoolBar.h 2008-04-14 20:23:20 UTC (rev 1153) @@ -73,6 +73,7 @@ private AspectSizable< CoolBar >, public AspectVisible< CoolBar > { + typedef MessageMap<Policies::Subclassed> BaseType; typedef dwt::AspectSizable< CoolBar > AspectSizable; friend class WidgetCreator< CoolBar >; public: @@ -95,8 +96,6 @@ /// Object type typedef ThisType* ObjectType; - typedef MessageMap<Policies::Subclassed> BaseType; - /// Seed class /** This class contains all of the values needed to create the widget. It also * knows the type of the class whose seed values it contains. Every widget Modified: dcplusplus/trunk/dwt/include/dwt/widgets/DateTime.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/DateTime.h 2008-04-14 20:19:59 UTC (rev 1152) +++ dcplusplus/trunk/dwt/include/dwt/widgets/DateTime.h 2008-04-14 20:23:20 UTC (rev 1153) @@ -61,6 +61,7 @@ public AspectFont< DateTime >, public AspectPainting< DateTime > { + typedef CommonControl BaseType; friend class WidgetCreator< DateTime >; friend class AspectClickable<DateTime>; @@ -85,8 +86,6 @@ /// Object type typedef ThisType* ObjectType; - typedef CommonControl BaseType; - /// Seed class /** This class contains all of the values needed to create the widget. It also * knows the type of the class whose seed values it contains. Every widget Modified: dcplusplus/trunk/dwt/include/dwt/widgets/Frame.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/Frame.h 2008-04-14 20:19:59 UTC (rev 1152) +++ dcplusplus/trunk/dwt/include/dwt/widgets/Frame.h 2008-04-14 20:23:20 UTC (rev 1153) @@ -73,6 +73,7 @@ public Composite< Policy >, public AspectMinMax<Frame<Policy> > { + typedef Composite< Policy > BaseType; public: /// Class type typedef Frame< Policy > ThisType; @@ -80,8 +81,6 @@ /// Object type typedef ThisType * ObjectType; - typedef Composite< Policy > BaseType; - #ifndef WINCE /// Animates a window /** Slides the window into view from either right or left depending on the Modified: dcplusplus/trunk/dwt/include/dwt/widgets/GroupBox.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/GroupBox.h 2008-04-14 20:19:59 UTC (rev 1152) +++ dcplusplus/trunk/dwt/include/dwt/widgets/GroupBox.h 2008-04-14 20:23:20 UTC (rev 1153) @@ -51,6 +51,8 @@ class GroupBox : public Button { + typedef Button BaseType; + friend class WidgetCreator< GroupBox >; public: /// Class type @@ -59,8 +61,6 @@ /// Object type typedef ThisType* ObjectType; - typedef Button BaseType; - /// Seed class /** This class contains all of the values needed to create the widget. It also * knows the type of the class whose seed values it contains. Every widget Modified: dcplusplus/trunk/dwt/include/dwt/widgets/Label.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/Label.h 2008-04-14 20:19:59 UTC (rev 1152) +++ dcplusplus/trunk/dwt/include/dwt/widgets/Label.h 2008-04-14 20:23:20 UTC (rev 1153) @@ -72,6 +72,7 @@ public AspectPainting< Label >, public AspectText< Label > { + typedef CommonControl BaseType; friend class WidgetCreator< Label >; friend class AspectClickable<Label>; friend class AspectDblClickable<Label>; @@ -81,9 +82,7 @@ /// Object type typedef ThisType* ObjectType; - - typedef CommonControl BaseType; - + /// Seed class /** This class contains all of the values needed to create the widget. It also * knows the type of the class whose seed values it contains. Every widget Modified: dcplusplus/trunk/dwt/include/dwt/widgets/MDIChild.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/MDIChild.h 2008-04-14 20:19:59 UTC (rev 1152) +++ dcplusplus/trunk/dwt/include/dwt/widgets/MDIChild.h 2008-04-14 20:23:20 UTC (rev 1153) @@ -68,8 +68,8 @@ public AspectMinMax<MDIChild> { + typedef Composite<Policies::MDIChild> BaseType; public: - typedef Composite<Policies::MDIChild> BaseType; /// Class type typedef MDIChild ThisType; Modified: dcplusplus/trunk/dwt/include/dwt/widgets/MDIFrame.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/MDIFrame.h 2008-04-14 20:19:59 UTC (rev 1152) +++ dcplusplus/trunk/dwt/include/dwt/widgets/MDIFrame.h 2008-04-14 20:23:20 UTC (rev 1153) @@ -55,6 +55,7 @@ class MDIFrame : public Frame< Policies::MDIFrame<MDIFrame> > { + typedef Frame< Policies::MDIFrame<MDIFrame> > BaseType; public: /// Class type typedef MDIFrame ThisType; @@ -62,7 +63,6 @@ /// Object type typedef ThisType* ObjectType; - typedef Frame< Policies::MDIFrame<MDIFrame> > BaseType; /// Seed class /** This class contains all of the values needed to create the widget. It also Modified: dcplusplus/trunk/dwt/include/dwt/widgets/MDIParent.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/MDIParent.h 2008-04-14 20:19:59 UTC (rev 1152) +++ dcplusplus/trunk/dwt/include/dwt/widgets/MDIParent.h 2008-04-14 20:23:20 UTC (rev 1153) @@ -65,15 +65,14 @@ public Control< Policies::Subclassed > { + typedef Control<Policies::Subclassed> BaseType; friend class WidgetCreator< MDIParent >; public: /// Class type typedef MDIParent ThisType; /// Object type - typedef ThisType * ObjectType; - - typedef Control<Policies::Subclassed> BaseType; + typedef ThisType * ObjectType; /// Seed class /** This class contains all of the values needed to create the widget. It also Modified: dcplusplus/trunk/dwt/include/dwt/widgets/ModalDialog.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/ModalDialog.h 2008-04-14 20:19:59 UTC (rev 1152) +++ dcplusplus/trunk/dwt/include/dwt/widgets/ModalDialog.h 2008-04-14 20:23:20 UTC (rev 1153) @@ -64,6 +64,7 @@ public Frame< Policies::ModalDialog >, public AspectDialog<ModalDialog > { + typedef Frame< Policies::ModalDialog > BaseType; struct Dispatcher { typedef std::tr1::function<bool ()> F; @@ -79,7 +80,6 @@ }; public: - typedef Frame< Policies::ModalDialog > BaseType; /// Class type typedef ModalDialog ThisType; Modified: dcplusplus/trunk/dwt/include/dwt/widgets/ModelessDialog.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/ModelessDialog.h 2008-04-14 20:19:59 UTC (rev 1152) +++ dcplusplus/trunk/dwt/include/dwt/widgets/ModelessDialog.h 2008-04-14 20:23:20 UTC (rev 1153) @@ -54,6 +54,7 @@ public Frame< Policies::ModelessDialog >, public AspectDialog<ModelessDialog > { + typedef Frame< Policies::ModelessDialog > BaseType; public: /// Class type typedef ModelessDialog ThisType; @@ -61,7 +62,6 @@ /// Object type typedef ThisType * ObjectType; - typedef Frame< Policies::ModelessDialog > BaseType; /// Creates a Dialog Window /** This version creates a window from the given Dialog Resource Id. */ Modified: dcplusplus/trunk/dwt/include/dwt/widgets/RadioButton.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/RadioButton.h 2008-04-14 20:19:59 UTC (rev 1152) +++ dcplusplus/trunk/dwt/include/dwt/widgets/RadioButton.h 2008-04-14 20:23:20 UTC (rev 1153) @@ -52,9 +52,9 @@ * previously selected one. */ class RadioButton : - // Aspects public Button { + typedef Button BaseType; friend class WidgetCreator< RadioButton >; public: /// Class type @@ -63,8 +63,6 @@ /// Object type typedef ThisType* ObjectType; - typedef Button BaseType; - /// Seed class /** This class contains all of the values needed to create the widget. It also * knows the type of the class whose seed values it contains. Every widget Modified: dcplusplus/trunk/dwt/include/dwt/widgets/StatusBar.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/StatusBar.h 2008-04-14 20:19:59 UTC (rev 1152) +++ dcplusplus/trunk/dwt/include/dwt/widgets/StatusBar.h 2008-04-14 20:23:20 UTC (rev 1153) @@ -113,6 +113,7 @@ public AspectFont< StatusBar< TypeOfStatusBar > >, public AspectPainting< StatusBar< TypeOfStatusBar > > { + typedef CommonControl BaseType; friend class WidgetCreator< StatusBar >; friend class AspectClickable< StatusBar< TypeOfStatusBar > >; friend class AspectDblClickable< StatusBar< TypeOfStatusBar > >; @@ -123,8 +124,6 @@ /// Object type typedef ThisType* ObjectType; - typedef CommonControl BaseType; - /// Seed class /** This class contains all of the values needed to create the widget. It also * knows the type of the class whose seed values it contains. Every widget Modified: dcplusplus/trunk/dwt/include/dwt/widgets/TabSheet.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/TabSheet.h 2008-04-14 20:19:59 UTC (rev 1152) +++ dcplusplus/trunk/dwt/include/dwt/widgets/TabSheet.h 2008-04-14 20:23:20 UTC (rev 1153) @@ -72,6 +72,7 @@ public AspectSelection< TabSheet, int >, public AspectText< TabSheet > { + typedef CommonControl BaseType; friend class AspectCollection<TabSheet, int>; friend class AspectSelection<TabSheet, int>; friend class WidgetCreator< TabSheet >; @@ -100,8 +101,6 @@ /// Object type typedef ThisType* ObjectType; - typedef CommonControl BaseType; - /// Seed class /** This class contains all of the values needed to create the widget. It also * knows the type of the class whose seed values it contains. Every widget Modified: dcplusplus/trunk/dwt/include/dwt/widgets/TabView.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/TabView.h 2008-04-14 20:19:59 UTC (rev 1152) +++ dcplusplus/trunk/dwt/include/dwt/widgets/TabView.h 2008-04-14 20:23:20 UTC (rev 1153) @@ -50,6 +50,7 @@ public AspectRaw<TabView>, public AspectSizable<TabView> { + typedef MessageMap<Policies::Normal> BaseType; typedef std::tr1::function<void (const SmartUtil::tstring&)> TitleChangedFunction; typedef std::tr1::function<void (HWND, unsigned)> HelpFunction; typedef std::tr1::function<bool (const ScreenCoordinate&)> ContextMenuFunction; @@ -61,8 +62,6 @@ /// Object type typedef ThisType* ObjectType; - typedef MessageMap<Policies::Normal> BaseType; - struct Seed : public BaseType::Seed { typedef ThisType WidgetType; Modified: dcplusplus/trunk/dwt/include/dwt/widgets/Table.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/Table.h 2008-04-14 20:19:59 UTC (rev 1152) +++ dcplusplus/trunk/dwt/include/dwt/widgets/Table.h 2008-04-14 20:23:20 UTC (rev 1153) @@ -81,6 +81,8 @@ public AspectScrollable< Table >, public AspectSelection< Table, int > { + typedef CommonControl BaseType; + struct HeaderDispatcher { typedef std::tr1::function<void (int)> F; @@ -111,8 +113,6 @@ /// Object type typedef ThisType* ObjectType; - typedef CommonControl BaseType; - typedef std::tr1::function<int (LPARAM a, LPARAM b)> SortFunction; /// Seed class Modified: dcplusplus/trunk/dwt/include/dwt/widgets/TextBox.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/TextBox.h 2008-04-14 20:19:59 UTC (rev 1152) +++ dcplusplus/trunk/dwt/include/dwt/widgets/TextBox.h 2008-04-14 20:23:20 UTC (rev 1153) @@ -75,13 +75,13 @@ public AspectText< TextBoxBase >, public AspectUpdate< TextBoxBase > { + typedef CommonControl BaseType; friend class WidgetCreator< TextBoxBase >; friend class AspectUpdate<TextBoxBase>; typedef Dispatchers::VoidVoid<> Dispatcher; protected: - typedef CommonControl BaseType; public: /// Sets the current selection of the Edit Control @@ -194,6 +194,7 @@ class TextBox : public TextBoxBase { + typedef TextBoxBase BaseType; public: typedef TextBox ThisType; Modified: dcplusplus/trunk/dwt/include/dwt/widgets/ToolBar.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/ToolBar.h 2008-04-14 20:19:59 UTC (rev 1152) +++ dcplusplus/trunk/dwt/include/dwt/widgets/ToolBar.h 2008-04-14 20:23:20 UTC (rev 1153) @@ -64,6 +64,7 @@ public AspectFocus< ToolBar >, public AspectFont< ToolBar > { + typedef CommonControl BaseType; typedef Dispatchers::VoidVoid<> Dispatcher; friend class WidgetCreator< ToolBar >; public: @@ -73,8 +74,6 @@ /// Object type typedef ThisType* ObjectType; - typedef CommonControl BaseType; - /// Seed class /** This class contains all of the values needed to create the widget. It also * knows the type of the class whose seed values it contains. Every widget Modified: dcplusplus/trunk/dwt/include/dwt/widgets/ToolTip.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/ToolTip.h 2008-04-14 20:19:59 UTC (rev 1152) +++ dcplusplus/trunk/dwt/include/dwt/widgets/ToolTip.h 2008-04-14 20:23:20 UTC (rev 1153) @@ -49,6 +49,7 @@ public AspectRaw< ToolTip >, public AspectVisible< ToolTip > { + typedef MessageMap< Policies::Subclassed > BaseType; friend class WidgetCreator< ToolTip >; struct Dispatcher @@ -73,8 +74,6 @@ /// Object type typedef ThisType * ObjectType; - typedef MessageMap< Policies::Subclassed > BaseType; - struct Seed : public BaseType::Seed { typedef ThisType WidgetType; Modified: dcplusplus/trunk/dwt/include/dwt/widgets/Tree.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/Tree.h 2008-04-14 20:19:59 UTC (rev 1152) +++ dcplusplus/trunk/dwt/include/dwt/widgets/Tree.h 2008-04-14 20:23:20 UTC (rev 1153) @@ -73,6 +73,7 @@ public AspectFont< Tree >, public AspectSelection< Tree, HTREEITEM > { + typedef CommonControl BaseType; protected: struct Dispatcher { @@ -109,8 +110,6 @@ /// Object type typedef ThisType* ObjectType; - typedef CommonControl BaseType; - /// Seed class /** This class contains all of the values needed to create the widget. It also * knows the type of the class whose seed values it contains. Every widget Modified: dcplusplus/trunk/win32/ADLSearchFrame.h =================================================================== --- dcplusplus/trunk/win32/ADLSearchFrame.h 2008-04-14 20:19:59 UTC (rev 1152) +++ dcplusplus/trunk/win32/ADLSearchFrame.h 2008-04-14 20:23:20 UTC (rev 1153) @@ -22,7 +22,10 @@ #include "StaticFrame.h" #include <dcpp/ADLSearch.h> -class ADLSearchFrame : public StaticFrame<ADLSearchFrame> { +class ADLSearchFrame : + public StaticFrame<ADLSearchFrame> +{ + typedef StaticFrame<ADLSearchFrame> BaseType; public: enum Status { STATUS_STATUS, @@ -30,7 +33,6 @@ }; protected: - typedef StaticFrame<ADLSearchFrame> BaseType; friend class StaticFrame<ADLSearchFrame>; friend class MDIChildFrame<ADLSearchFrame>; Modified: dcplusplus/trunk/win32/DirectoryListingFrame.h =================================================================== --- dcplusplus/trunk/win32/DirectoryListingFrame.h 2008-04-14 20:19:59 UTC (rev 1152) +++ dcplusplus/trunk/win32/DirectoryListingFrame.h 2008-04-14 20:23:20 UTC (rev 1153) @@ -33,6 +33,7 @@ public MDIChildFrame<DirectoryListingFrame>, public AspectUserCommand<DirectoryListingFrame> { + typedef MDIChildFrame<DirectoryListingFrame> BaseType; public: enum Status { STATUS_STATUS, @@ -53,7 +54,6 @@ static void closeAll(); protected: - typedef MDIChildFrame<DirectoryListingFrame> BaseType; friend class MDIChildFrame<DirectoryListingFrame>; friend class AspectUserCommand<DirectoryListingFrame>; Modified: dcplusplus/trunk/win32/FavHubsFrame.h =================================================================== --- dcplusplus/trunk/win32/FavHubsFrame.h 2008-04-14 20:19:59 UTC (rev 1152) +++ dcplusplus/trunk/win32/FavHubsFrame.h 2008-04-14 20:23:20 UTC (rev 1153) @@ -28,6 +28,7 @@ public StaticFrame<FavHubsFrame>, private FavoriteManagerListener { + typedef StaticFrame<FavHubsFrame> BaseType; public: enum Status { STATUS_STATUS, @@ -35,7 +36,6 @@ }; protected: - typedef StaticFrame<FavHubsFrame> BaseType; friend class StaticFrame<FavHubsFrame>; friend class MDIChildFrame<FavHubsFrame>; Modified: dcplusplus/trunk/win32/FinishedDLFrame.h =================================================================== --- dcplusplus/trunk/win32/FinishedDLFrame.h 2008-04-14 20:19:59 UTC (rev 1152) +++ dcplusplus/trunk/win32/FinishedDLFrame.h 2008-04-14 20:23:20 UTC (rev 1153) @@ -24,11 +24,11 @@ class FinishedDLFrame : public FinishedFrameBase<FinishedDLFrame, false> { + typedef FinishedFrameBase<FinishedDLFrame, false> BaseType; public: FinishedDLFrame(dwt::TabView* mdiParent); virtual ~FinishedDLFrame() { } - typedef FinishedFrameBase<FinishedDLFrame, false> BaseType; }; #endif // !defined(DCPLUSPLUS_WIN32_FINISHED_DL_FRAME_H) Modified: dcplusplus/trunk/win32/FinishedFrameBase.h =================================================================== --- dcplusplus/trunk/win32/FinishedFrameBase.h 2008-04-14 20:19:59 UTC (rev 1152) +++ dcplusplus/trunk/win32/FinishedFrameBase.h 2008-04-14 20:23:20 UTC (rev 1153) @@ -30,7 +30,11 @@ #include <dcpp/TimerManager.h> template<class T, bool in_UL> -class FinishedFrameBase : public StaticFrame<T>, private FinishedManagerListener { +class FinishedFrameBase : + public StaticFrame<T>, + private FinishedManagerListener +{ + typedef StaticFrame<T> BaseType; public: enum Status { STATUS_STATUS, @@ -41,7 +45,6 @@ }; protected: - typedef StaticFrame<T> BaseType; typedef MDIChildFrame<T> MDIChildType; friend class StaticFrame<T>; friend class MDIChildFrame<T>; Modified: dcplusplus/trunk/win32/FinishedULFrame.h =================================================================== --- dcplusplus/trunk/win32/FinishedULFrame.h 2008-04-14 20:19:59 UTC (rev 1152) +++ dcplusplus/trunk/win32/FinishedULFrame.h 2008-04-14 20:23:20 UTC (rev 1153) @@ -24,11 +24,11 @@ class FinishedULFrame : public FinishedFrameBase<FinishedULFrame, true> { + typedef FinishedFrameBase<FinishedULFrame, true> BaseType; public: FinishedULFrame(dwt::TabView* mdiParent); virtual ~FinishedULFrame() { } - typedef FinishedFrameBase<FinishedULFrame, true> BaseType; }; #endif // !defined(DCPLUSPLUS_WIN32_FINISHED_UL_FRAME_H) Modified: dcplusplus/trunk/win32/MDIChildFrame.h =================================================================== --- dcplusplus/trunk/win32/MDIChildFrame.h 2008-04-14 20:19:59 UTC (rev 1152) +++ dcplusplus/trunk/win32/MDIChildFrame.h 2008-04-14 20:23:20 UTC (rev 1153) @@ -33,9 +33,9 @@ public AspectSpeaker<T>, public AspectStatus<T> { + typedef WidgetFactory< dwt::Container > BaseType; public: typedef MDIChildFrame<T> ThisType; - typedef WidgetFactory< dwt::Container > BaseType; protected: MDIChildFrame(dwt::TabView* tabView, const tstring& title, unsigned helpId = 0, dwt::IconPtr icon = dwt::IconPtr(), bool activate = true) : Modified: dcplusplus/trunk/win32/NotepadFrame.h =================================================================== --- dcplusplus/trunk/win32/NotepadFrame.h 2008-04-14 20:19:59 UTC (rev 1152) +++ dcplusplus/trunk/win32/NotepadFrame.h 2008-04-14 20:23:20 UTC (rev 1153) @@ -22,7 +22,10 @@ #include "StaticFrame.h" #include "resource.h" -class NotepadFrame : public StaticFrame<NotepadFrame> { +class NotepadFrame : + public StaticFrame<NotepadFrame> +{ + typedef StaticFrame<NotepadFrame> BaseType; public: enum Status { STATUS_STATUS, @@ -30,7 +33,6 @@ }; protected: - typedef StaticFrame<NotepadFrame> BaseType; friend class StaticFrame<NotepadFrame>; friend class MDIChildFrame<NotepadFrame>; Modified: dcplusplus/trunk/win32/PrivateFrame.h =================================================================== --- dcplusplus/trunk/win32/PrivateFrame.h 2008-04-14 20:19:59 UTC (rev 1152) +++ dcplusplus/trunk/win32/PrivateFrame.h 2008-04-14 20:23:20 UTC (rev 1153) @@ -30,6 +30,7 @@ private ClientManagerListener, public AspectUserCommand<PrivateFrame> { + typedef MDIChildFrame<PrivateFrame> BaseType; public: enum Status { STATUS_STATUS, @@ -45,7 +46,6 @@ void sendMessage(const tstring& msg, bool thirdPerson = false); private: - typedef MDIChildFrame<PrivateFrame> BaseType; friend class MDIChildFrame<PrivateFrame>; friend class AspectUserCommand<PrivateFrame>; Modified: dcplusplus/trunk/win32/PublicHubsFrame.h =================================================================== --- dcplusplus/trunk/win32/PublicHubsFrame.h 2008-04-14 20:19:59 UTC (rev 1152) +++ dcplusplus/trunk/win32/PublicHubsFrame.h 2008-04-14 20:23:20 UTC (rev 1153) @@ -31,6 +31,7 @@ public StaticFrame<PublicHubsFrame>, public FavoriteManagerListener { + typedef StaticFrame<PublicHubsFrame> BaseType; public: enum Status { STATUS_STATUS, @@ -40,7 +41,6 @@ }; private: - typedef StaticFrame<PublicHubsFrame> BaseType; friend class StaticFrame<PublicHubsFrame>; friend class MDIChildFrame<PublicHubsFrame>; Modified: dcplusplus/trunk/win32/QueueFrame.h =================================================================== --- dcplusplus/trunk/win32/QueueFrame.h 2008-04-14 20:19:59 UTC (rev 1152) +++ dcplusplus/trunk/win32/QueueFrame.h 2008-04-14 20:23:20 UTC (rev 1153) @@ -33,6 +33,7 @@ public StaticFrame<QueueFrame>, private QueueManagerListener { + typedef StaticFrame<QueueFrame> BaseType; public: enum Status { STATUS_SHOW_TREE, @@ -45,7 +46,6 @@ }; private: - typedef StaticFrame<QueueFrame> BaseType; friend class StaticFrame<QueueFrame>; friend class MDIChildFrame<QueueFrame>; Modified: dcplusplus/trunk/win32/SearchFrame.h =================================================================== --- dcplusplus/trunk/win32/SearchFrame.h 2008-04-14 20:19:59 UTC (rev 1152) +++ dcplusplus/trunk/win32/SearchFrame.h 2008-04-14 20:23:20 UTC (rev 1153) @@ -35,6 +35,7 @@ public AspectUserInfo<SearchFrame>, public AspectUserCommand<SearchFrame> { + typedef MDIChildFrame<SearchFrame> BaseType; public: enum Status { STATUS_SHOW_UI, @@ -48,7 +49,6 @@ static void closeAll(); private: - typedef MDIChildFrame<SearchFrame> BaseType; friend class MDIChildFrame<SearchFrame>; friend class AspectUserInfo<SearchFrame>; friend class AspectUserCommand<SearchFrame>; Modified: dcplusplus/trunk/win32/SpyFrame.h =================================================================== --- dcplusplus/trunk/win32/SpyFrame.h 2008-04-14 20:19:59 UTC (rev 1152) +++ dcplusplus/trunk/win32/SpyFrame.h 2008-04-14 20:23:20 UTC (rev 1153) @@ -25,6 +25,7 @@ #include "resource.h" class SpyFrame : public StaticFrame<SpyFrame>, private ClientManagerListener { + typedef StaticFrame<SpyFrame> BaseType; public: enum Status { STATUS_IGNORE_TTH, @@ -37,7 +38,6 @@ }; protected: - typedef StaticFrame<SpyFrame> BaseType; friend class StaticFrame<SpyFrame>; friend class MDIChildFrame<SpyFrame>; Modified: dcplusplus/trunk/win32/StatsFrame.h =================================================================== --- dcplusplus/trunk/win32/StatsFrame.h 2008-04-14 20:19:59 UTC (rev 1152) +++ dcplusplus/trunk/win32/StatsFrame.h 2008-04-14 20:23:20 UTC (rev 1153) @@ -24,6 +24,7 @@ class StatsFrame : public StaticFrame<StatsFrame> { + typedef StaticFrame<StatsFrame> BaseType; public: enum Stats { STATUS_STATUS, @@ -31,7 +32,6 @@ }; private: - typedef StaticFrame<StatsFrame> BaseType; friend class StaticFrame<StatsFrame>; friend class MDIChildFrame<StatsFrame>; Modified: dcplusplus/trunk/win32/SystemFrame.h =================================================================== --- dcplusplus/trunk/win32/SystemFrame.h 2008-04-14 20:19:59 UTC (rev 1152) +++ dcplusplus/trunk/win32/SystemFrame.h 2008-04-14 20:23:20 UTC (rev 1153) @@ -27,6 +27,7 @@ class SystemFrame : public StaticFrame<SystemFrame>, private LogManagerListener { + typedef StaticFrame<SystemFrame> BaseType; public: enum Status { STATUS_STATUS, @@ -34,7 +35,6 @@ }; private: - typedef StaticFrame<SystemFrame> BaseType; friend class StaticFrame<SystemFrame>; friend class MDIChildFrame<SystemFrame>; Modified: dcplusplus/trunk/win32/TextFrame.h =================================================================== --- dcplusplus/trunk/win32/TextFrame.h 2008-04-14 20:19:59 UTC (rev 1152) +++ dcplusplus/trunk/win32/TextFrame.h 2008-04-14 20:23:20 UTC (rev 1153) @@ -23,6 +23,7 @@ class TextFrame : public MDIChildFrame<TextFrame> { + typedef MDIChildFrame<TextFrame> BaseType; public: TextFrame(dwt::TabView* mdiParent, const string& fileName); enum Status { @@ -31,7 +32,6 @@ }; private: - typedef MDIChildFrame<TextFrame> BaseType; friend class MDIChildFrame<TextFrame>; TextBoxPtr pad; Modified: dcplusplus/trunk/win32/TypedTable.h =================================================================== --- dcplusplus/trunk/win32/TypedTable.h 2008-04-14 20:19:59 UTC (rev 1152) +++ dcplusplus/trunk/win32/TypedTable.h 2008-04-14 20:23:20 UTC (rev 1153) @@ -24,7 +24,6 @@ template<class ContentType, bool managed = true> class TypedTable : public dwt::Table { -private: typedef typename dwt::Table BaseType; typedef TypedTable<ContentType, managed> ThisType; Modified: dcplusplus/trunk/win32/TypedTree.h =================================================================== --- dcplusplus/trunk/win32/TypedTree.h 2008-04-14 20:19:59 UTC (rev 1152) +++ dcplusplus/trunk/win32/TypedTree.h 2008-04-14 20:23:20 UTC (rev 1153) @@ -24,7 +24,6 @@ template<class ContentType> class TypedTree : public dwt::Tree { -private: typedef typename dwt::Tree BaseType; typedef TypedTree<ContentType> ThisType; Modified: dcplusplus/trunk/win32/UsersFrame.h =================================================================== --- dcplusplus/trunk/win32/UsersFrame.h 2008-04-14 20:19:59 UTC (rev 1152) +++ dcplusplus/trunk/win32/UsersFrame.h 2008-04-14 20:23:20 UTC (rev 1153) @@ -33,6 +33,7 @@ private FavoriteManagerListener, public AspectUserInfo<UsersFrame> { + typedef StaticFrame<UsersFrame> BaseType; public: enum Status { STATUS_STATUS, @@ -40,7 +41,6 @@ }; protected: - typedef StaticFrame<UsersFrame> BaseType; friend class StaticFrame<UsersFrame>; friend class MDIChildFrame<UsersFrame>; friend class AspectUserInfo<UsersFrame>; Modified: dcplusplus/trunk/win32/WaitingUsersFrame.h =================================================================== --- dcplusplus/trunk/win32/WaitingUsersFrame.h 2008-04-14 20:19:59 UTC (rev 1152) +++ dcplusplus/trunk/win32/WaitingUsersFrame.h 2008-04-14 20:23:20 UTC (rev 1153) @@ -30,13 +30,13 @@ public StaticFrame<WaitingUsersFrame>, public UploadManagerListener { + typedef StaticFrame<WaitingUsersFrame> BaseType; public: enum Status { STATUS_STATUS, STATUS_LAST }; protected: - typedef StaticFrame<WaitingUsersFrame> BaseType; friend class StaticFrame<WaitingUsersFrame>; friend class MDIChildFrame<WaitingUsersFrame>; Modified: dcplusplus/trunk/win32/WidgetPaned.h =================================================================== --- dcplusplus/trunk/win32/WidgetPaned.h 2008-04-14 20:19:59 UTC (rev 1152) +++ dcplusplus/trunk/win32/WidgetPaned.h 2008-04-14 20:23:20 UTC (rev 1153) @@ -27,6 +27,7 @@ public dwt::AspectVisible< WidgetPaned< horizontal > >, public dwt::AspectRaw< WidgetPaned< horizontal > > { + typedef dwt::MessageMap< dwt::Policies::Normal > BaseType; friend class dwt::WidgetCreator< WidgetPaned >; public: /// Class type @@ -35,8 +36,6 @@ /// Object type typedef ThisType * ObjectType; - typedef dwt::MessageMap< dwt::Policies::Normal > BaseType; - struct Seed : public BaseType::Seed { typedef ThisType WidgetType; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arn...@us...> - 2008-04-14 20:24:43
|
Revision: 1154 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1154&view=rev Author: arnetheduck Date: 2008-04-14 13:24:38 -0700 (Mon, 14 Apr 2008) Log Message: ----------- Only offer a single type of status bar Modified Paths: -------------- dcplusplus/trunk/dwt/include/dwt/GCCHeaders.h dcplusplus/trunk/dwt/include/dwt/VCDesktopHeaders.h dcplusplus/trunk/dwt/include/dwt/WidgetFactory.h dcplusplus/trunk/dwt/include/dwt/WindowsHeaders.h dcplusplus/trunk/dwt/include/dwt/dwt.hpp dcplusplus/trunk/dwt/include/dwt/forward.h dcplusplus/trunk/dwt/include/dwt/widgets/Composite.h dcplusplus/trunk/dwt/include/dwt/widgets/StatusBar.h dcplusplus/trunk/dwt/include/dwt/widgets/TextBox.h dcplusplus/trunk/win32/AspectStatus.h Added Paths: ----------- dcplusplus/trunk/dwt/src/widgets/StatusBar.cpp Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-10 23:41:18.571000099 +0200 committer: Jacek Sieka <arn...@gm...> properties: branch-nick: dcplusplus + timestamp: 2008-04-11 09:47:30.551000118 +0200 committer: Jacek Sieka <arn...@gm...> properties: branch-nick: dcplusplus Name: bzr:file-ids - + dwt/src/widgets/StatusBar.cpp statusbar.cpp-20080411074555-dsjf6pam1593f02o-1 Name: bzr:revision-id:v3-trunk1 - 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky 1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai 1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf 1114 po...@12...-20080405220250-8y09d0samsj8ja94 1115 po...@12...-20080406134101-4860ytb61sbu3yhg 1116 po...@12...-20080406155849-2wzxzuzs5m8zpk0g 1117 po...@12...-20080406164835-bv5dydhm3qqydsty 1118 arn...@gm...-20080406210237-c7tyfgiz2sjgv044 1119 po...@12...-20080407114423-4yajg1rffidq76bj 1120 arn...@gm...-20080407194826-c42t4bjzw4vflejn 1121 po...@12...-20080407214303-o7ul1bvcn6gvaoc9 1122 po...@12...-20080407220647-r7f3em92til5j67s 1123 po...@12...-20080408212439-54t3bqlhvw1nu4xc 1124 arn...@gm...-20080409193708-y6erfzwrcb1seet3 1125 arn...@gm...-20080409195827-ub6t2s3wdf28nfpz 1126 po...@12...-20080409215055-1zmqhhm2859878c1 1127 arn...@gm...-20080410102447-l4es4cbukkqwcnpc 1128 arn...@gm...-20080410214118-b70g50tl27cq9q29 + 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky 1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai 1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf 1114 po...@12...-20080405220250-8y09d0samsj8ja94 1115 po...@12...-20080406134101-4860ytb61sbu3yhg 1116 po...@12...-20080406155849-2wzxzuzs5m8zpk0g 1117 po...@12...-20080406164835-bv5dydhm3qqydsty 1118 arn...@gm...-20080406210237-c7tyfgiz2sjgv044 1119 po...@12...-20080407114423-4yajg1rffidq76bj 1120 arn...@gm...-20080407194826-c42t4bjzw4vflejn 1121 po...@12...-20080407214303-o7ul1bvcn6gvaoc9 1122 po...@12...-20080407220647-r7f3em92til5j67s 1123 po...@12...-20080408212439-54t3bqlhvw1nu4xc 1124 arn...@gm...-20080409193708-y6erfzwrcb1seet3 1125 arn...@gm...-20080409195827-ub6t2s3wdf28nfpz 1126 po...@12...-20080409215055-1zmqhhm2859878c1 1127 arn...@gm...-20080410102447-l4es4cbukkqwcnpc 1128 arn...@gm...-20080410214118-b70g50tl27cq9q29 1129 arn...@gm...-20080411074730-w1pu78qigtx87lx3 Modified: dcplusplus/trunk/dwt/include/dwt/GCCHeaders.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/GCCHeaders.h 2008-04-14 20:23:20 UTC (rev 1153) +++ dcplusplus/trunk/dwt/include/dwt/GCCHeaders.h 2008-04-14 20:24:38 UTC (rev 1154) @@ -38,20 +38,6 @@ #ifdef __GNUC__ - // Need to tell gcc which version of Windows we're targeting! -#ifndef _WIN32_WINNT - #define _WIN32_WINNT 0x0501 -#endif -#ifndef _WIN32_IE - #define _WIN32_IE 0x0501 -#endif -#ifndef WINVER - #define WINVER 0x501 -#endif - // Removing windows.h max and min macro - #undef NOMINMAX - #define NOMINMAX - static const dwt::Platform CurrentPlatform = dwt::dwtDesktop; #define SMARTWIN_WNDCLASSEX WNDCLASSEX Modified: dcplusplus/trunk/dwt/include/dwt/VCDesktopHeaders.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/VCDesktopHeaders.h 2008-04-14 20:23:20 UTC (rev 1153) +++ dcplusplus/trunk/dwt/include/dwt/VCDesktopHeaders.h 2008-04-14 20:24:38 UTC (rev 1154) @@ -39,16 +39,19 @@ #ifndef __GNUC__ #ifndef WINCE - // Need to tell msvc which version of Windows we're targeting! -#ifndef _WIN32_WINNT - #define _WIN32_WINNT 0x0501 + +#ifdef _MSC_VER +// We don't want the stupid "pointer trunctation" to 64 bit architecture warning. +// The warnings aren't justified anyway since they are basically a bug in 7.1 +// release... E.g. the SetWindowLongPtr is defined as SetWindowLong in 32 bits mode +// but will in 64 bits mode be defined as the 64 bits equivalent version, therefore +// it will give you a 64 bit compile warning when this file is compiled with +// warning level 4 (MSVC) +#pragma warning( disable : 4244 ) +#pragma warning( disable : 4312 ) +#pragma warning( disable : 4311 ) + #endif -#ifndef _WIN32_IE - #define _WIN32_IE 0x0501 -#endif -#ifndef WINVER - #define WINVER 0x501 -#endif static const dwt::Platform CurrentPlatform = dwt::dwtDesktop; Modified: dcplusplus/trunk/dwt/include/dwt/WidgetFactory.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/WidgetFactory.h 2008-04-14 20:23:20 UTC (rev 1153) +++ dcplusplus/trunk/dwt/include/dwt/WidgetFactory.h 2008-04-14 20:24:38 UTC (rev 1154) @@ -41,9 +41,7 @@ #include "widgets/MessageBox.h" #include "widgets/LoadDialog.h" #include "widgets/SaveDialog.h" -#include "widgets/StatusBar.h" #include "WidgetFactoryPlatformImplementation.h" -#include "WidgetCreator.h" namespace dwt { @@ -85,18 +83,6 @@ /// MessageBox class and object type. typedef dwt::MessageBox MessageBox; - /// StatusBar class type. - typedef dwt::StatusBar< > StatusBar; - - /// StatusBar object type. - typedef typename StatusBar::ObjectType StatusBarPtr; - - /// StatusBarSections class type. - typedef dwt::StatusBar< Section > StatusBarSections; - - /// StatusBarSections object type. - typedef typename StatusBarSections::ObjectType StatusBarSectionsPtr; - /// LoadFileDialog class type. typedef dwt::LoadDialog LoadDialog; @@ -138,17 +124,6 @@ */ MessageBox createMessageBox(); - // TODO: Is there any point in attaching a status bar ? ! ? - /// Creates a Status Bar and returns a pointer to it. - /** DON'T delete the returned pointer!!! - */ - StatusBarPtr createStatusBar( const typename StatusBar::Seed & cs = StatusBar::Seed() ); - - /// Creates a Status Bar and returns a pointer to it. - /** DON'T delete the returned pointer!!! - */ - StatusBarSectionsPtr createStatusBarSections( const typename StatusBarSections::Seed & cs = StatusBarSections::Seed() ); - protected: // Protected to try to avoid stack creation... virtual ~WidgetFactory() @@ -199,20 +174,6 @@ return MessageBox( this ); } -template<typename ContainerWidgetType> -typename WidgetFactory< ContainerWidgetType >::StatusBarPtr -WidgetFactory< ContainerWidgetType >::createStatusBar( const typename StatusBar::Seed & cs ) -{ - return WidgetCreator< StatusBar >::create( this, cs ); } -template<typename ContainerWidgetType> -typename WidgetFactory< ContainerWidgetType >::StatusBarSectionsPtr -WidgetFactory< ContainerWidgetType >::createStatusBarSections( const typename StatusBarSections::Seed & cs ) -{ - return WidgetCreator< StatusBarSections >::create( this, cs ); -} - -} - #endif Modified: dcplusplus/trunk/dwt/include/dwt/WindowsHeaders.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/WindowsHeaders.h 2008-04-14 20:23:20 UTC (rev 1153) +++ dcplusplus/trunk/dwt/include/dwt/WindowsHeaders.h 2008-04-14 20:24:38 UTC (rev 1154) @@ -50,6 +50,20 @@ } +#ifndef _WIN32_WINNT + #define _WIN32_WINNT 0x0501 +#endif +#ifndef _WIN32_IE + #define _WIN32_IE 0x0501 +#endif +#ifndef WINVER + #define WINVER 0x501 +#endif + +// Removing windows.h max and min macro +#undef NOMINMAX +#define NOMINMAX + // Including special GCC Stuff #ifdef __GNUC__ #include "GCCHeaders.h" Modified: dcplusplus/trunk/dwt/include/dwt/dwt.hpp =================================================================== --- dcplusplus/trunk/dwt/include/dwt/dwt.hpp 2008-04-14 20:23:20 UTC (rev 1153) +++ dcplusplus/trunk/dwt/include/dwt/dwt.hpp 2008-04-14 20:24:38 UTC (rev 1154) @@ -36,19 +36,6 @@ #ifndef DWT_SmartWin_h #define DWT_SmartWin_h -#ifdef _MSC_VER -// We don't want the stupid "pointer trunctation" to 64 bit architecture warning. -// The warnings aren't justified anyway since they are basically a bug in 7.1 -// release... E.g. the SetWindowLongPtr is defined as SetWindowLong in 32 bits mode -// but will in 64 bits mode be defined as the 64 bits equivalent version, therefore -// it will give you a 64 bit compile warning when this file is compiled with -// warning level 4 (MSVC) -#pragma warning( disable : 4244 ) -#pragma warning( disable : 4312 ) -#pragma warning( disable : 4311 ) - -#endif - #include "WindowsHeaders.h" #include "Anchors.h" @@ -89,6 +76,7 @@ #include "widgets/RichTextBox.h" #include "widgets/Slider.h" #include "widgets/Spinner.h" +#include "widgets/StatusBar.h" #include "widgets/Table.h" #include "widgets/TabSheet.h" #include "widgets/TabView.h" Modified: dcplusplus/trunk/dwt/include/dwt/forward.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/forward.h 2008-04-14 20:23:20 UTC (rev 1153) +++ dcplusplus/trunk/dwt/include/dwt/forward.h 2008-04-14 20:24:38 UTC (rev 1154) @@ -79,11 +79,14 @@ class RichTextBox; typedef RichTextBox* RichTextBoxPtr; +class Slider; +typedef Slider* SliderPtr; + class Spinner; typedef Spinner* SpinnerPtr; -class Slider; -typedef Slider* SliderPtr; +class StatusBar; +typedef StatusBar* StatusBarPtr; class Table; typedef Table* TablePtr; Modified: dcplusplus/trunk/dwt/include/dwt/widgets/Composite.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/Composite.h 2008-04-14 20:23:20 UTC (rev 1153) +++ dcplusplus/trunk/dwt/include/dwt/widgets/Composite.h 2008-04-14 20:24:38 UTC (rev 1154) @@ -93,8 +93,12 @@ typedef dwt::ProgressBarPtr ProgressBarPtr; typedef dwt::RadioButton RadioButton; typedef dwt::RadioButtonPtr RadioButtonPtr; + typedef dwt::Slider Slider; + typedef dwt::SliderPtr SliderPtr; typedef dwt::Spinner Spinner; typedef dwt::SpinnerPtr SpinnerPtr; + typedef dwt::StatusBar StatusBar; + typedef dwt::StatusBarPtr StatusBarPtr; typedef dwt::Table Table; typedef dwt::TablePtr TablePtr; typedef dwt::TabSheet TabSheet; Modified: dcplusplus/trunk/dwt/include/dwt/widgets/StatusBar.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/StatusBar.h 2008-04-14 20:23:20 UTC (rev 1153) +++ dcplusplus/trunk/dwt/include/dwt/widgets/StatusBar.h 2008-04-14 20:24:38 UTC (rev 1154) @@ -40,48 +40,12 @@ #include "../aspects/AspectDblClickable.h" #include "../aspects/AspectFont.h" #include "../aspects/AspectPainting.h" -#include "../aspects/AspectText.h" #include "Control.h" +#include <vector> + namespace dwt { -/// Policy class for StatusBar with sections instead of one large area where -/// you can add information -/** A Status Bar with sections is a normal statusbar except instead of one large area - * where you can add text there are several smaller sections which divides the - * status bar into smaller areas where you can separate information. - */ -class Section -{ -public: - /// Initializes the sections of the StatusBar - /** Use this one to set the number of sections and the width of them - */ - void setSections( const std::vector< unsigned > & width ); - - /// Sets the text of the given section number - /** Use this one to set the text of a specific section of the StatusBar - */ - void setText( const SmartUtil::tstring & newText, unsigned partNo ); -}; - -// Forward declaration -template< class TypeOfStatusBar > -class StatusBar; - -// Note, this Aspect class indirectly brings in AspectText while the Section one DOES NOT! -/// Policy class for a StatusBar with no sections. -/** Policy class for a StatusBar with no sections or rather with _one big_ - * section which will hold all the text of the Status Bar Control within the same - * area! <br> - * Use the setText member ( which is included by inheritance to AspectText ) to set - * the text of the Status Bar Control! - */ -class NoSection : - public AspectText< StatusBar<NoSection> > -{ -}; - /// StatusBar class /** \ingroup WidgetControls * \WidgetUsageInfo @@ -96,30 +60,28 @@ * instance the security settings of the current page and how far in the download * process you are currently etc... <br> * Note that there are TWO DIFFERENT status bar controls though, one which does have - * "sections" which sub divides the status bar into several smaller sections which + * "sections" which sub divide< TypeOfStatusBar >s the status bar into several smaller sections which * are independant of eachother and another type which is a "flat strip" containing * only one large portion of text. <br> * The default one is the flat one, use Section as the last template parameter to * use the one with sections! */ -template< class TypeOfStatusBar = NoSection > class StatusBar : - public TypeOfStatusBar, public CommonControl, // Aspects - public AspectClickable< StatusBar< TypeOfStatusBar > >, - public AspectDblClickable< StatusBar< TypeOfStatusBar > >, - public AspectFont< StatusBar< TypeOfStatusBar > >, - public AspectPainting< StatusBar< TypeOfStatusBar > > + public AspectClickable< StatusBar >, + public AspectDblClickable< StatusBar >, + public AspectFont< StatusBar >, + public AspectPainting< StatusBar > { typedef CommonControl BaseType; friend class WidgetCreator< StatusBar >; - friend class AspectClickable< StatusBar< TypeOfStatusBar > >; - friend class AspectDblClickable< StatusBar< TypeOfStatusBar > >; + friend class AspectClickable< StatusBar>; + friend class AspectDblClickable< StatusBar >; public: /// Class type - typedef StatusBar<TypeOfStatusBar> ThisType; + typedef StatusBar ThisType; /// Object type typedef ThisType* ObjectType; @@ -148,6 +110,16 @@ */ void refresh(); + /// Initializes the sections of the StatusBar + /** Use this one to set the number of sections and the width of them + */ + void setSections( const std::vector< unsigned > & width ); + + /// Sets the text of the given section number + /** Use this one to set the text of a specific section of the StatusBar + */ + void setText( const SmartUtil::tstring & newText, unsigned partNo = 0); + /// Actually creates the StatusBar /** You should call WidgetFactory::createStatusBar if you instantiate class * directly. <br> @@ -175,43 +147,17 @@ // Implementation of class /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -template< class TypeOfStatusBar > -StatusBar< TypeOfStatusBar >::Seed::Seed(bool sizeGrip) : BaseType::Seed(STATUSCLASSNAME, WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS) { +inline StatusBar::Seed::Seed(bool sizeGrip) : BaseType::Seed(STATUSCLASSNAME, WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS) { if(sizeGrip) { style |= SBARS_SIZEGRIP; } } -inline void Section::setSections( const std::vector< unsigned > & width ) -{ - StatusBar< Section > * This - = static_cast< StatusBar < Section > * >( this ); - - std::vector< unsigned > newVec( width ); - std::vector< unsigned >::const_iterator origIdx = width.begin(); - unsigned offset = 0; - for ( std::vector< unsigned >::iterator idx = newVec.begin(); - idx < newVec.end(); - ++idx, ++origIdx ) - { - * idx = ( * origIdx ) + offset; - offset += * origIdx; - } - const unsigned * intArr = & newVec[0]; - const size_t size = newVec.size(); - ::SendMessage( This->handle(), SB_SETPARTS, static_cast< WPARAM >( size ), reinterpret_cast< LPARAM >( intArr ) ); +inline void StatusBar::setText( const SmartUtil::tstring & newText, unsigned partNo ) { + sendMessage(SB_SETTEXT, static_cast< WPARAM >( partNo ), reinterpret_cast< LPARAM >( newText.c_str() ) ); } -inline void Section::setText( const SmartUtil::tstring & newText, unsigned partNo ) -{ - StatusBar< Section > * This - = static_cast< StatusBar < Section > * >( this ); - ::SendMessage( This->handle(), SB_SETTEXT, static_cast< WPARAM >( partNo ), reinterpret_cast< LPARAM >( newText.c_str() ) ); -} - -template< class TypeOfStatusBar > -void StatusBar< TypeOfStatusBar >::refresh() -{ +inline void StatusBar::refresh() { // A status bar can't really be resized since its size is controlled by the // parent window. But to not let the status bar "hang" we need to refresh its // size after the main window is being resized. @@ -224,27 +170,20 @@ } } -template< class TypeOfStatusBar > -Message StatusBar< TypeOfStatusBar >::getClickMessage() -{ +inline Message StatusBar::getClickMessage() { return Message( WM_NOTIFY, NM_CLICK ); } -template< class TypeOfStatusBar > -Message StatusBar< TypeOfStatusBar >::getDblClickMessage() -{ +inline Message StatusBar::getDblClickMessage() { return Message( WM_NOTIFY, NM_DBLCLK ); } -template< class TypeOfStatusBar > -StatusBar< TypeOfStatusBar >::StatusBar( dwt::Widget * parent ) +inline StatusBar::StatusBar( Widget * parent ) : BaseType( parent ) { } -template< class TypeOfStatusBar > -void StatusBar< TypeOfStatusBar >::create( const Seed & cs ) -{ +inline void StatusBar::create( const Seed & cs ) { BaseType::create(cs); if(cs.font) setFont( cs.font ); Modified: dcplusplus/trunk/dwt/include/dwt/widgets/TextBox.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/TextBox.h 2008-04-14 20:23:20 UTC (rev 1153) +++ dcplusplus/trunk/dwt/include/dwt/widgets/TextBox.h 2008-04-14 20:24:38 UTC (rev 1154) @@ -81,8 +81,6 @@ typedef Dispatchers::VoidVoid<> Dispatcher; -protected: - public: /// Sets the current selection of the Edit Control /** Start means the offset of where the current selection shall start, if it is @@ -90,7 +88,7 @@ * end means where it shall end, if it is omitted it defaults to - 1 or "the * rest from start". */ - void setSelection( long start = 0, long end = - 1 ); + void setSelection( int start = 0, int end = - 1 ); /// Returns the current selected text from the text box /** The selected text of the text box is the return value from this. @@ -111,12 +109,11 @@ */ void replaceSelection( const SmartUtil::tstring & txt, bool canUndo = true ); - // TODO: Case sensitivity /// Finds the given text in the text field and returns true if successfully - long findText( const SmartUtil::tstring & txt, unsigned offset = 0 ) const; + int findText( const SmartUtil::tstring & txt, unsigned offset = 0 ) const; /// Returns the position of the caret - long getCaretPos(); + int getCaretPos(); /// Call this function to scroll the caret into view /** If the caret is not visible within the currently scrolled in area, the Text @@ -158,12 +155,12 @@ /// Set the maximum number of characters that can be entered. /** Although this prevents user from entering more maxChars, Paste can overrun the limit. */ - void setTextLimit( DWORD maxChars ); + void setTextLimit( int maxChars ); /// Returns the maximum number of characters that can be entered. /** Note that the maxChars returned will vary by OS if left unset. */ - DWORD getTextLimit() const ; + int getTextLimit() const ; void onTextChanged( const Dispatcher::F& f ); @@ -188,7 +185,6 @@ // Contract needed by AspectUpdate Aspect class static Message getUpdateMessage(); - }; class TextBox : @@ -286,7 +282,7 @@ return Message( WM_COMMAND, MAKEWPARAM(0, EN_UPDATE) ); } -inline void TextBoxBase::setSelection( long start, long end ) +inline void TextBoxBase::setSelection( int start, int end ) { this->sendMessage(EM_SETSEL, start, end ); } @@ -298,23 +294,23 @@ inline void TextBoxBase::addText( const SmartUtil::tstring & addtxt ) { - setSelection( ( long ) this->getText().size() ); + setSelection( length() ); replaceSelection( addtxt ); } -inline long TextBoxBase::findText( const SmartUtil::tstring & txt, unsigned offset ) const +inline int TextBoxBase::findText( const SmartUtil::tstring & txt, unsigned offset ) const { SmartUtil::tstring txtOfBox = this->getText(); size_t position = txtOfBox.find( txt, offset ); if ( position == std::string::npos ) - return - 1; - return static_cast< long >( position ); + return -1; + return static_cast< int >( position ); } -inline long TextBoxBase::getCaretPos() { +inline int TextBoxBase::getCaretPos() { DWORD start, end; this->sendMessage(EM_GETSEL, reinterpret_cast< WPARAM >( & start ), reinterpret_cast< LPARAM >( & end ) ); - return static_cast< long >( end ); + return static_cast< int >( end ); } inline void TextBoxBase::showCaret() { @@ -341,12 +337,12 @@ this->Widget::addRemoveStyle( WS_BORDER, value ); } -inline void TextBoxBase::setTextLimit( DWORD maxChars ) { +inline void TextBoxBase::setTextLimit( int maxChars ) { this->sendMessage(EM_LIMITTEXT, static_cast< WPARAM >(maxChars) ); } -inline DWORD TextBoxBase::getTextLimit() const { - return static_cast< DWORD >( this->sendMessage(EM_GETLIMITTEXT) ); +inline int TextBoxBase::getTextLimit() const { + return static_cast< int >( this->sendMessage(EM_GETLIMITTEXT) ); } inline void TextBoxBase::onTextChanged( const Dispatcher::F& f ) { Added: dcplusplus/trunk/dwt/src/widgets/StatusBar.cpp =================================================================== --- dcplusplus/trunk/dwt/src/widgets/StatusBar.cpp (rev 0) +++ dcplusplus/trunk/dwt/src/widgets/StatusBar.cpp 2008-04-14 20:24:38 UTC (rev 1154) @@ -0,0 +1,49 @@ +/* + DC++ Widget Toolkit + + Copyright (c) 2007-2008, Jacek Sieka + + All rights reserved. + + Redistribution and use in source and binary forms, with or without modification, + are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of the DWT nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#include <dwt/widgets/StatusBar.h> + +namespace dwt { + +void StatusBar::setSections( const std::vector< unsigned > & width ) { + std::vector< unsigned > newVec( width ); + std::vector< unsigned >::const_iterator origIdx = width.begin(); + unsigned offset = 0; + for ( std::vector< unsigned >::iterator idx = newVec.begin(); idx != newVec.end(); ++idx, ++origIdx ) { + * idx = ( * origIdx ) + offset; + offset += * origIdx; + } + const unsigned * intArr = & newVec[0]; + const size_t size = newVec.size(); + sendMessage(SB_SETPARTS, static_cast< WPARAM >( size ), reinterpret_cast< LPARAM >( intArr ) ); +} + +} Modified: dcplusplus/trunk/win32/AspectStatus.h =================================================================== --- dcplusplus/trunk/win32/AspectStatus.h 2008-04-14 20:23:20 UTC (rev 1153) +++ dcplusplus/trunk/win32/AspectStatus.h 2008-04-14 20:24:38 UTC (rev 1154) @@ -19,14 +19,13 @@ #ifndef DCPLUSPLUS_WIN32_ASPECTSTATUS_H_ #define DCPLUSPLUS_WIN32_ASPECTSTATUS_H_ +#include <dwt/widgets/StatusBar.h> #include "WinUtil.h" template<class WidgetType> class AspectStatus { typedef AspectStatus<WidgetType> ThisType; protected: - typedef dwt::StatusBar<dwt::Section>::ThisType StatusBarSections; - typedef StatusBarSections::ObjectType StatusBarSectionsPtr; AspectStatus() : status(0) { statusSizes.resize(WidgetType::STATUS_LAST); @@ -38,7 +37,7 @@ } void initStatus(bool sizeGrip = false) { - StatusBarSections::Seed cs(sizeGrip); + dwt::StatusBar::Seed cs(sizeGrip); cs.font = WinUtil::font; status = static_cast<WidgetType*>(this)->addChild(cs); @@ -86,7 +85,7 @@ ::MoveWindow(widget->handle(), p[0].x, p[0].y, p[1].x - p[0].x, p[1].y - p[0].y, TRUE); } - StatusBarSectionsPtr status; + dwt::StatusBarPtr status; std::vector<unsigned> statusSizes; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arn...@us...> - 2008-04-14 20:28:46
|
Revision: 1155 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1155&view=rev Author: arnetheduck Date: 2008-04-14 13:28:35 -0700 (Mon, 14 Apr 2008) Log Message: ----------- rename smartutil, move tstring to core Modified Paths: -------------- dcplusplus/trunk/dwt/include/dwt/Application.h dcplusplus/trunk/dwt/include/dwt/CanvasClasses.h dcplusplus/trunk/dwt/include/dwt/ClipBoard.h dcplusplus/trunk/dwt/include/dwt/CommandLine.h dcplusplus/trunk/dwt/include/dwt/LibraryLoader.h dcplusplus/trunk/dwt/include/dwt/Resource.h dcplusplus/trunk/dwt/include/dwt/Widget.h dcplusplus/trunk/dwt/include/dwt/WindowClass.h dcplusplus/trunk/dwt/include/dwt/aspects/AspectDialog.h dcplusplus/trunk/dwt/include/dwt/aspects/AspectDragDrop.h dcplusplus/trunk/dwt/include/dwt/aspects/AspectFileFilter.h dcplusplus/trunk/dwt/include/dwt/aspects/AspectSizable.h dcplusplus/trunk/dwt/include/dwt/aspects/AspectText.h dcplusplus/trunk/dwt/include/dwt/dwt.hpp dcplusplus/trunk/dwt/include/dwt/resources/Bitmap.h dcplusplus/trunk/dwt/include/dwt/resources/Font.h dcplusplus/trunk/dwt/include/dwt/resources/Icon.h dcplusplus/trunk/dwt/include/dwt/resources/ImageList.h dcplusplus/trunk/dwt/include/dwt/util/DateTime.h dcplusplus/trunk/dwt/include/dwt/util/RegKey.h dcplusplus/trunk/dwt/include/dwt/util/StringConversion.h dcplusplus/trunk/dwt/include/dwt/util/StringUtils.h dcplusplus/trunk/dwt/include/dwt/util/TimeSpan.h dcplusplus/trunk/dwt/include/dwt/util/xCeptionSmartUtilities.h dcplusplus/trunk/dwt/include/dwt/widgets/Button.h dcplusplus/trunk/dwt/include/dwt/widgets/CheckBox.h dcplusplus/trunk/dwt/include/dwt/widgets/ComboBox.h dcplusplus/trunk/dwt/include/dwt/widgets/Composite.h dcplusplus/trunk/dwt/include/dwt/widgets/Container.h dcplusplus/trunk/dwt/include/dwt/widgets/Control.h dcplusplus/trunk/dwt/include/dwt/widgets/CoolBar.h dcplusplus/trunk/dwt/include/dwt/widgets/DateTime.h dcplusplus/trunk/dwt/include/dwt/widgets/FolderDialog.h dcplusplus/trunk/dwt/include/dwt/widgets/Frame.h dcplusplus/trunk/dwt/include/dwt/widgets/GroupBox.h dcplusplus/trunk/dwt/include/dwt/widgets/Label.h dcplusplus/trunk/dwt/include/dwt/widgets/LoadDialog.h dcplusplus/trunk/dwt/include/dwt/widgets/MDIChild.h dcplusplus/trunk/dwt/include/dwt/widgets/MDIFrame.h dcplusplus/trunk/dwt/include/dwt/widgets/MessageBox.h dcplusplus/trunk/dwt/include/dwt/widgets/RadioButton.h dcplusplus/trunk/dwt/include/dwt/widgets/SaveDialog.h dcplusplus/trunk/dwt/include/dwt/widgets/StatusBar.h dcplusplus/trunk/dwt/include/dwt/widgets/TabSheet.h dcplusplus/trunk/dwt/include/dwt/widgets/TabView.h dcplusplus/trunk/dwt/include/dwt/widgets/Table.h dcplusplus/trunk/dwt/include/dwt/widgets/TextBox.h dcplusplus/trunk/dwt/include/dwt/widgets/ToolBar.h dcplusplus/trunk/dwt/include/dwt/widgets/ToolTip.h dcplusplus/trunk/dwt/include/dwt/widgets/Tree.h dcplusplus/trunk/dwt/include/dwt/widgets/WidgetMenu.h dcplusplus/trunk/dwt/include/dwt/widgets/Window.h dcplusplus/trunk/dwt/include/dwt/xCeption.h dcplusplus/trunk/dwt/src/Application.cpp dcplusplus/trunk/dwt/src/Bitmap.cpp dcplusplus/trunk/dwt/src/CanvasClasses.cpp dcplusplus/trunk/dwt/src/CommandLine.cpp dcplusplus/trunk/dwt/src/Font.cpp dcplusplus/trunk/dwt/src/Icon.cpp dcplusplus/trunk/dwt/src/LibraryLoader.cpp dcplusplus/trunk/dwt/src/Resource.cpp dcplusplus/trunk/dwt/src/WindowClass.cpp dcplusplus/trunk/dwt/src/util/DateTime.cpp dcplusplus/trunk/dwt/src/util/RegKey.cpp dcplusplus/trunk/dwt/src/util/StringUtils.cpp dcplusplus/trunk/dwt/src/util/TimeSpan.cpp dcplusplus/trunk/dwt/src/widgets/Button.cpp dcplusplus/trunk/dwt/src/widgets/CheckBox.cpp dcplusplus/trunk/dwt/src/widgets/ComboBox.cpp dcplusplus/trunk/dwt/src/widgets/CoolBar.cpp dcplusplus/trunk/dwt/src/widgets/DateTime.cpp dcplusplus/trunk/dwt/src/widgets/FolderDialog.cpp dcplusplus/trunk/dwt/src/widgets/GroupBox.cpp dcplusplus/trunk/dwt/src/widgets/Label.cpp dcplusplus/trunk/dwt/src/widgets/LoadDialog.cpp dcplusplus/trunk/dwt/src/widgets/MDIChild.cpp dcplusplus/trunk/dwt/src/widgets/MDIFrame.cpp dcplusplus/trunk/dwt/src/widgets/RadioButton.cpp dcplusplus/trunk/dwt/src/widgets/SaveDialog.cpp dcplusplus/trunk/dwt/src/widgets/TabSheet.cpp dcplusplus/trunk/dwt/src/widgets/TabView.cpp dcplusplus/trunk/dwt/src/widgets/Table.cpp dcplusplus/trunk/dwt/src/widgets/TextBox.cpp dcplusplus/trunk/dwt/src/widgets/ToolBar.cpp dcplusplus/trunk/dwt/src/widgets/Tree.cpp dcplusplus/trunk/dwt/src/widgets/WidgetMenu.cpp dcplusplus/trunk/dwt/src/widgets/Window.cpp dcplusplus/trunk/win32/MainWindow.cpp dcplusplus/trunk/win32/MainWindow.h dcplusplus/trunk/win32/QueueFrame.cpp dcplusplus/trunk/win32/TextBox.cpp dcplusplus/trunk/win32/TextBox.h Added Paths: ----------- dcplusplus/trunk/dwt/include/dwt/tstring.h dcplusplus/trunk/dwt/include/dwt/util/tstream.h Removed Paths: ------------- dcplusplus/trunk/dwt/include/dwt/util/ChooseWideNarrowChar.h dcplusplus/trunk/dwt/include/dwt/util/tstring.h dcplusplus/trunk/dwt/src/util/tstring.cpp Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-11 09:47:30.551000118 +0200 committer: Jacek Sieka <arn...@gm...> properties: branch-nick: dcplusplus + timestamp: 2008-04-11 11:07:24.957000017 +0200 committer: Jacek Sieka <arn...@gm...> properties: branch-nick: dcplusplus Name: bzr:file-ids - dwt/src/widgets/StatusBar.cpp statusbar.cpp-20080411074555-dsjf6pam1593f02o-1 + dwt/include/dwt/tstring.h 712@f586c4b0-9d0d-0410-bc51-f1fe239209fc:dcplusplus%2Ftrunk:smartwin%2FSmartUtil%2Ftstring.h dwt/include/dwt/util/tstream.h tstream.h-20080411080221-6gcjog2gf271jxh3-1 Name: bzr:revision-id:v3-trunk1 - 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky 1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai 1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf 1114 po...@12...-20080405220250-8y09d0samsj8ja94 1115 po...@12...-20080406134101-4860ytb61sbu3yhg 1116 po...@12...-20080406155849-2wzxzuzs5m8zpk0g 1117 po...@12...-20080406164835-bv5dydhm3qqydsty 1118 arn...@gm...-20080406210237-c7tyfgiz2sjgv044 1119 po...@12...-20080407114423-4yajg1rffidq76bj 1120 arn...@gm...-20080407194826-c42t4bjzw4vflejn 1121 po...@12...-20080407214303-o7ul1bvcn6gvaoc9 1122 po...@12...-20080407220647-r7f3em92til5j67s 1123 po...@12...-20080408212439-54t3bqlhvw1nu4xc 1124 arn...@gm...-20080409193708-y6erfzwrcb1seet3 1125 arn...@gm...-20080409195827-ub6t2s3wdf28nfpz 1126 po...@12...-20080409215055-1zmqhhm2859878c1 1127 arn...@gm...-20080410102447-l4es4cbukkqwcnpc 1128 arn...@gm...-20080410214118-b70g50tl27cq9q29 1129 arn...@gm...-20080411074730-w1pu78qigtx87lx3 + 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky 1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai 1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf 1114 po...@12...-20080405220250-8y09d0samsj8ja94 1115 po...@12...-20080406134101-4860ytb61sbu3yhg 1116 po...@12...-20080406155849-2wzxzuzs5m8zpk0g 1117 po...@12...-20080406164835-bv5dydhm3qqydsty 1118 arn...@gm...-20080406210237-c7tyfgiz2sjgv044 1119 po...@12...-20080407114423-4yajg1rffidq76bj 1120 arn...@gm...-20080407194826-c42t4bjzw4vflejn 1121 po...@12...-20080407214303-o7ul1bvcn6gvaoc9 1122 po...@12...-20080407220647-r7f3em92til5j67s 1123 po...@12...-20080408212439-54t3bqlhvw1nu4xc 1124 arn...@gm...-20080409193708-y6erfzwrcb1seet3 1125 arn...@gm...-20080409195827-ub6t2s3wdf28nfpz 1126 po...@12...-20080409215055-1zmqhhm2859878c1 1127 arn...@gm...-20080410102447-l4es4cbukkqwcnpc 1128 arn...@gm...-20080410214118-b70g50tl27cq9q29 1129 arn...@gm...-20080411074730-w1pu78qigtx87lx3 1130 arn...@gm...-20080411090724-kwdj9pg9hrv1xhwb Modified: dcplusplus/trunk/dwt/include/dwt/Application.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/Application.h 2008-04-14 20:24:38 UTC (rev 1154) +++ dcplusplus/trunk/dwt/include/dwt/Application.h 2008-04-14 20:28:35 UTC (rev 1155) @@ -37,7 +37,7 @@ #define DWT_Application_h #include "WindowsHeaders.h" -#include "util/tstring.h" +#include "tstring.h" #include "CommandLine.h" #include "ApplicationPlatform.h" #include "xCeption.h" @@ -118,7 +118,7 @@ * If you want to have the path AND the FILENAME of the image process you must * use Application::getModuleFileName. */ - SmartUtil::tstring getModulePath() const; + tstring getModulePath() const; /// Returns the full filename to the process /** NOTE! <br> @@ -126,7 +126,7 @@ * image name. <br> * If you want to have only the path you must use Application::getModulePath. */ - SmartUtil::tstring getModuleFileName() const; + tstring getModuleFileName() const; typedef std::tr1::function<bool (MSG&)> FilterFunction; // List becuse its iterators aren't invalidated on add/delete... Modified: dcplusplus/trunk/dwt/include/dwt/CanvasClasses.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/CanvasClasses.h 2008-04-14 20:24:38 UTC (rev 1154) +++ dcplusplus/trunk/dwt/include/dwt/CanvasClasses.h 2008-04-14 20:28:35 UTC (rev 1155) @@ -443,13 +443,13 @@ * </ul> * Google for or look at MSDN what their different meaning are. */ - int drawText( const SmartUtil::tstring & text, const dwt::Rectangle & rect, unsigned format ); + int drawText( const tstring & text, const dwt::Rectangle & rect, unsigned format ); /// Draws given text inside given Rectangle /** Draw text within coordinates of given Rectangle according to <br> * setTextColor, setTextAlign, SetTextJustification */ - void extTextOut( const SmartUtil::tstring & text, unsigned x, unsigned y ); + void extTextOut( const tstring & text, unsigned x, unsigned y ); /// Sets the TextColor of the this Canvas. /** Sets the TextColor for future TextOut() calls. Returns the previous color. Modified: dcplusplus/trunk/dwt/include/dwt/ClipBoard.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/ClipBoard.h 2008-04-14 20:24:38 UTC (rev 1154) +++ dcplusplus/trunk/dwt/include/dwt/ClipBoard.h 2008-04-14 20:28:35 UTC (rev 1155) @@ -37,7 +37,7 @@ #define DWT_ClipBoard_h #include "WindowsHeaders.h" -#include "util/tstring.h" +#include "tstring.h" namespace dwt { @@ -86,9 +86,9 @@ ClipBoard(); }; -/// Class for manipulating the clipboard, specialized for SmartUtil::tstring +/// Class for manipulating the clipboard, specialized for tstring /// clipboard operations. -/** At the moment SmartWin only supports SmartUtil::tstring clipboard operations. +/** At the moment SmartWin only supports tstring clipboard operations. * <br> * More clipboard formats will be supported in later version. <br> * Every clipboard class is a Singleton to make access easy. <br> @@ -96,7 +96,7 @@ * later as the type you stuffed it in as!</b> */ template< > -class ClipBoard< SmartUtil::tstring > : public ClipBoardBase +class ClipBoard< tstring > : public ClipBoardBase { public: /// Returns the actual instance of the object @@ -114,13 +114,13 @@ /// Sets clipboard data to given string /** Takes a "parent" window which will "own" the clipboard and a - * SmartUtil::tstring which will be stuffed into the clipboard and made <br> + * tstring which will be stuffed into the clipboard and made <br> * accessible for other applications as CF_TEXT or your own application. <br> * Just remember that if you use this specialized instance of the clipboard * class you must access the clipboard again (through getClipBoardData) <br> - * through the same specialization (SmartUtil::tstring specialization). + * through the same specialization (tstring specialization). */ - void setClipBoardData( const SmartUtil::tstring & str, const Widget * owner ) + void setClipBoardData( const tstring & str, const Widget * owner ) { if ( !::OpenClipboard( owner->handle() ) ) throw dwt::xCeption( _T( "Couldn't open the clipboard" ) ); @@ -151,7 +151,7 @@ * if the clipboard is either empty or if the clipboard data was of the wrong * format. */ - SmartUtil::tstring getClipBoardData( const Widget * owner ) const + tstring getClipBoardData( const Widget * owner ) const { if ( !::IsClipboardFormatAvailable( CF_TEXT ) ) return _T( "" ); @@ -160,7 +160,7 @@ HANDLE handle = ::GetClipboardData( CF_TEXT ); if ( 0 == handle ) return _T( "" ); - SmartUtil::tstring retVal( reinterpret_cast< TCHAR * >( GlobalLock( handle ) ) ); + tstring retVal( reinterpret_cast< TCHAR * >( GlobalLock( handle ) ) ); GlobalUnlock( handle ); CloseClipboard(); return retVal; @@ -179,7 +179,7 @@ /// \ingroup GlobalStuff // For easy access of the most common ClipBoard specializations. -typedef ClipBoard< SmartUtil::tstring > ClipBoardString; +typedef ClipBoard< tstring > ClipBoardString; } Modified: dcplusplus/trunk/dwt/include/dwt/CommandLine.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/CommandLine.h 2008-04-14 20:24:38 UTC (rev 1154) +++ dcplusplus/trunk/dwt/include/dwt/CommandLine.h 2008-04-14 20:28:35 UTC (rev 1155) @@ -38,7 +38,7 @@ #include <boost/noncopyable.hpp> #include <vector> -#include "util/tstring.h" +#include "tstring.h" namespace dwt { @@ -55,19 +55,19 @@ public: /// Returns a vector of the actual params /** The parameters are split using standard argv semantics */ - const std::vector< SmartUtil::tstring > & getParams() const; + const std::vector< tstring > & getParams() const; /// Returns the "raw" command line parameter /** For those of you which MUST have the actual RAW command line parameter you * can use this function which will return them as given to the application. */ - const SmartUtil::tstring& getParamsRaw() const; + const tstring& getParamsRaw() const; private: // Only Application which is friend can instantiate an object of this type!! CommandLine( ) { } - mutable std::vector< SmartUtil::tstring > itsCmdLine; - mutable SmartUtil::tstring itsRawCmdLine; + mutable std::vector< tstring > itsCmdLine; + mutable tstring itsRawCmdLine; }; } Modified: dcplusplus/trunk/dwt/include/dwt/LibraryLoader.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/LibraryLoader.h 2008-04-14 20:24:38 UTC (rev 1154) +++ dcplusplus/trunk/dwt/include/dwt/LibraryLoader.h 2008-04-14 20:28:35 UTC (rev 1155) @@ -37,7 +37,7 @@ #define DWT_LibraryLoader_h #include "WindowsHeaders.h" -#include "util/tstring.h" +#include "tstring.h" #include "Threads.h" #include "xCeption.h" #include <map> @@ -81,7 +81,7 @@ * just allocate a static stack object of this type with the given library name * anywhere you need to ensure your library must be loaded! */ - LibraryLoader( const SmartUtil::tstring & libraryName ); + LibraryLoader( const tstring & libraryName ); /// Argument free Constructor /** Argument free Constructor, does NOTHING call load to actually load library! @@ -90,9 +90,9 @@ /// Actually loads library /** Call this one to actually load the given library or use Constructor taking - * SmartUtil::tstring argument which automatically loads library! + * tstring argument which automatically loads library! */ - void load( const SmartUtil::tstring & libraryName ); + void load( const tstring & libraryName ); @@ -103,7 +103,7 @@ * FARPROC x1 = richEditLibrary.getProcAddress( _T("CreateTextServices") ); <br> * FARPROC x2 = richEditLibrary.getProcAddress( 4 ); <br> */ - FARPROC getProcAddress( const SmartUtil::tstring & procedureName ); + FARPROC getProcAddress( const tstring & procedureName ); /// Get procedure address from loaded library by ordinal value /** @@ -124,10 +124,10 @@ private: LibraryLoader( const LibraryLoader & ); // DENY COPY LibraryLoader & operator =( const LibraryLoader & ); // DENY ASSIGNMENT - SmartUtil::tstring itsLibraryName; + tstring itsLibraryName; HMODULE itsHMod; static Utilities::CriticalSection itsCs; - static std::map< SmartUtil::tstring, std::pair< int, HMODULE > > itsLibrariesLoaded; + static std::map< tstring, std::pair< int, HMODULE > > itsLibrariesLoaded; bool hasCalledLoad; }; Modified: dcplusplus/trunk/dwt/include/dwt/Resource.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/Resource.h 2008-04-14 20:24:38 UTC (rev 1154) +++ dcplusplus/trunk/dwt/include/dwt/Resource.h 2008-04-14 20:28:35 UTC (rev 1155) @@ -37,7 +37,7 @@ #define DWT_Resources_h #include "WindowsHeaders.h" -#include "util/tstring.h" +#include "tstring.h" namespace dwt { @@ -52,9 +52,9 @@ /// Constructor taking path to a resource dll /** Pass in the path to the DLL you wish to load resources from */ - explicit Resource(const SmartUtil::tstring & file); + explicit Resource(const tstring & file); - SmartUtil::tstring operator[] ( unsigned key ); + tstring operator[] ( unsigned key ); // DTOR freeing the instance handle virtual ~Resource(); Modified: dcplusplus/trunk/dwt/include/dwt/Widget.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/Widget.h 2008-04-14 20:24:38 UTC (rev 1154) +++ dcplusplus/trunk/dwt/include/dwt/Widget.h 2008-04-14 20:28:35 UTC (rev 1155) @@ -40,7 +40,7 @@ #include "Atom.h" #include "Rectangle.h" #include "Message.h" -#include "util/tstring.h" +#include "tstring.h" #include <boost/noncopyable.hpp> #include <list> @@ -150,7 +150,7 @@ * It is feed directly to CreateWindowEx, this means that it follows its * conventions. In particular, the string "#num" has a special meaning. */ - SmartUtil::tstring caption; + tstring caption; /// The style of the object (starts with WS_ or BS_ etc...) /** WARNING: The creation of most of the controls require WS_CHILD to be set. @@ -169,7 +169,7 @@ /// Constructor initializing all member variables to default values Seed(LPCTSTR className_, DWORD style_ = WS_VISIBLE, DWORD exStyle_ = 0, - const SmartUtil::tstring& caption_ = SmartUtil::tstring(), + const tstring& caption_ = tstring(), const Rectangle& location_ = letTheSystemDecide, HMENU menuHandle_ = NULL) : className(className_), caption(caption_), style( style_ ), exStyle( exStyle_ ), location( location_ ), menuHandle( menuHandle_ ) {} Modified: dcplusplus/trunk/dwt/include/dwt/WindowClass.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/WindowClass.h 2008-04-14 20:24:38 UTC (rev 1154) +++ dcplusplus/trunk/dwt/include/dwt/WindowClass.h 2008-04-14 20:28:35 UTC (rev 1155) @@ -42,13 +42,13 @@ class WindowClass : boost::noncopyable { public: - WindowClass(const SmartUtil::tstring& className, WNDPROC wndProc, LPCTSTR menu = NULL, HBRUSH background = NULL, IconPtr icon = IconPtr(), IconPtr iconsm = IconPtr(), HCURSOR cursor = NULL); + WindowClass(const tstring& className, WNDPROC wndProc, LPCTSTR menu = NULL, HBRUSH background = NULL, IconPtr icon = IconPtr(), IconPtr iconsm = IconPtr(), HCURSOR cursor = NULL); ~WindowClass(); LPCTSTR getClassName() { return reinterpret_cast<LPCTSTR>(static_cast<size_t>(atom)); } /// Generate a new unique window class name - static SmartUtil::tstring getNewClassName(Widget* widget); + static tstring getNewClassName(Widget* widget); private: static int itsInstanceNo; Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectDialog.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/aspects/AspectDialog.h 2008-04-14 20:24:38 UTC (rev 1154) +++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectDialog.h 2008-04-14 20:28:35 UTC (rev 1155) @@ -32,7 +32,7 @@ #ifndef DWT_ASPECTDIALOG_H_ #define DWT_ASPECTDIALOG_H_ -#include "../util/tstring.h" +#include "../tstring.h" #include "../WidgetCreator.h" #include <type_traits> @@ -49,7 +49,7 @@ return ::GetDlgItem(H(), id); } - void setItemText(int id, const SmartUtil::tstring& text) { + void setItemText(int id, const tstring& text) { ::SetDlgItemText(H(), id, text.c_str()); } Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectDragDrop.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/aspects/AspectDragDrop.h 2008-04-14 20:24:38 UTC (rev 1154) +++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectDragDrop.h 2008-04-14 20:28:35 UTC (rev 1155) @@ -53,12 +53,12 @@ class AspectDragDrop { struct Dispatcher { - typedef std::tr1::function<void (std::vector< SmartUtil::tstring>, Point )> F; + typedef std::tr1::function<void (std::vector< tstring>, Point )> F; Dispatcher(const F& f_) : f(f_) { } bool operator()(const MSG& msg, LRESULT& ret) { - std::vector<SmartUtil::tstring> files; + std::vector<tstring> files; Point pt; HDROP handle = (HDROP)msg.wParam; if (handle) { @@ -91,8 +91,8 @@ * * Example: * - * void DropFile(std::vector<SmartUtil::tstring> files, Point droppoint) { - * SmartUtil::tstring path = files.at(0); + * void DropFile(std::vector<tstring> files, Point droppoint) { + * tstring path = files.at(0); * setText(path); * int x = droppoint.x; * int y = droppoint.y; Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectFileFilter.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/aspects/AspectFileFilter.h 2008-04-14 20:24:38 UTC (rev 1154) +++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectFileFilter.h 2008-04-14 20:28:35 UTC (rev 1155) @@ -37,7 +37,7 @@ #define DWT_AspectFileFilter_h #include "../WindowsHeaders.h" -#include "../util/tstring.h" +#include "../tstring.h" #include "../xCeption.h" namespace dwt { @@ -58,7 +58,7 @@ * "HTML Files" etc. filter is the actual filter to filter in files to show * normally this would be e.g. "*.html". */ - WidgetType& addFilter( const SmartUtil::tstring & filterName, const SmartUtil::tstring & filter ) + WidgetType& addFilter( const tstring & filterName, const tstring & filter ) { itsFilter.insert( itsFilter.end(), filterName.begin(), filterName.end() ); itsFilter.push_back( '\0' ); @@ -82,7 +82,7 @@ return *static_cast<WidgetType*>(this); } - WidgetType& setDefaultExtension(const SmartUtil::tstring& defExt) { + WidgetType& setDefaultExtension(const tstring& defExt) { itsDefExt = defExt; return *static_cast<WidgetType*>(this); } @@ -99,7 +99,7 @@ /** If given your dialog will try to start in the given directory, otherwise it * will use the working directory of the process. */ - WidgetType& setInitialDirectory( const SmartUtil::tstring& initialDir ) { + WidgetType& setInitialDirectory( const tstring& initialDir ) { itsInitialDir = initialDir; return *static_cast<WidgetType*>(this); } @@ -133,11 +133,11 @@ private: unsigned int itsActiveFilter; - SmartUtil::tstring itsInitialDir; - SmartUtil::tstring itsFilter; - SmartUtil::tstring itsDefExt; + tstring itsInitialDir; + tstring itsFilter; + tstring itsDefExt; - static const TCHAR* ifNotEmpty(const SmartUtil::tstring& str) { + static const TCHAR* ifNotEmpty(const tstring& str) { return str.empty() ? NULL : str.c_str(); } }; Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectSizable.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/aspects/AspectSizable.h 2008-04-14 20:24:38 UTC (rev 1154) +++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectSizable.h 2008-04-14 20:28:35 UTC (rev 1155) @@ -154,7 +154,7 @@ * then continues with the next row. <br> * The internal position of bound is updated. */ - void setSizePerTextPerPlace( Place & bound, const SmartUtil::tstring & text, + void setSizePerTextPerPlace( Place & bound, const tstring & text, int extraX = 0, int extraY = 0 ); /// Returns the screen size. @@ -200,7 +200,7 @@ * This is useful if you want to allocate enough space to fit known text. <br> * It accounts for the set font too. */ - Point getTextSize( const SmartUtil::tstring & text ); + Point getTextSize( const tstring & text ); /// Brings the widget to the front /** Makes the widget become the front most widget meaning it will not be obscured @@ -342,7 +342,7 @@ template< class WidgetType > void AspectSizable< WidgetType > -::setSizePerTextPerPlace( Place & bound, const SmartUtil::tstring & text, +::setSizePerTextPerPlace( Place & bound, const tstring & text, int extraX, int extraY ) { Point textSize = getTextSize( text ); @@ -418,7 +418,7 @@ template< class WidgetType > Point AspectSizable< WidgetType > -::getTextSize( const SmartUtil::tstring & text ) +::getTextSize( const tstring & text ) { // Some win32 api code to determine the actual size of the string HWND hWnd = H(); Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectText.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/aspects/AspectText.h 2008-04-14 20:24:38 UTC (rev 1154) +++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectText.h 2008-04-14 20:28:35 UTC (rev 1155) @@ -36,7 +36,7 @@ #ifndef DWT_AspectText_h #define DWT_AspectText_h -#include "../util/tstring.h" +#include "../tstring.h" #include "../Dispatchers.h" #include "../Message.h" @@ -54,22 +54,22 @@ WidgetType& W() { return *static_cast<WidgetType*>(this); } const WidgetType& W() const { return *static_cast<const WidgetType*>(this); } - static SmartUtil::tstring getText(const MSG& msg) { - return SmartUtil::tstring( reinterpret_cast< TCHAR * >( msg.lParam ) ); + static tstring getText(const MSG& msg) { + return tstring( reinterpret_cast< TCHAR * >( msg.lParam ) ); } - typedef Dispatchers::ConvertBase<SmartUtil::tstring, &AspectText<WidgetType>::getText, false> Dispatcher; - friend class Dispatchers::ConvertBase<SmartUtil::tstring, &AspectText<WidgetType>::getText, false>; + typedef Dispatchers::ConvertBase<tstring, &AspectText<WidgetType>::getText, false> Dispatcher; + friend class Dispatchers::ConvertBase<tstring, &AspectText<WidgetType>::getText, false>; public: /// Sets the text of the AspectText realizing class /** The txt parameter is the new text to put into the realizing object. */ - void setText( const SmartUtil::tstring & txt ); + void setText( const tstring & txt ); /// Gets the text of the AspectText realizing class /** The Return value is the text of the realizing class. */ - SmartUtil::tstring getText() const; + tstring getText() const; /// Length of text in characters size_t length() const; @@ -77,7 +77,7 @@ /// \ingroup EventHandlersAspectText /// Setting the event handler for the "setText" event /** When the text changes in the Widget this event will be raised. <br> - * The parameter passed is SmartUtil::tstring & which is the new text of the + * The parameter passed is tstring & which is the new text of the * Widget. */ void onTextChanging(const typename Dispatcher::F& f) { @@ -92,7 +92,7 @@ // Implementation of class /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// template< class WidgetType > -void AspectText< WidgetType >::setText( const SmartUtil::tstring & txt ) { +void AspectText< WidgetType >::setText( const tstring & txt ) { W().sendMessage(WM_SETTEXT, 0, reinterpret_cast< LPARAM >(txt.c_str()) ); } @@ -102,12 +102,12 @@ } template< class WidgetType > -SmartUtil::tstring AspectText< WidgetType >::getText() const +tstring AspectText< WidgetType >::getText() const { size_t textLength = length(); if ( textLength == 0 ) return _T( "" ); - SmartUtil::tstring retVal(textLength + 1, 0); + tstring retVal(textLength + 1, 0); retVal.resize(W().sendMessage(WM_GETTEXT, static_cast<WPARAM>(textLength + 1), reinterpret_cast<LPARAM>(&retVal[0]))); return retVal; } Modified: dcplusplus/trunk/dwt/include/dwt/dwt.hpp =================================================================== --- dcplusplus/trunk/dwt/include/dwt/dwt.hpp 2008-04-14 20:24:38 UTC (rev 1154) +++ dcplusplus/trunk/dwt/include/dwt/dwt.hpp 2008-04-14 20:28:35 UTC (rev 1155) @@ -57,7 +57,7 @@ #include "resources/Icon.h" #include "resources/ImageList.h" #include "resources/Pen.h" -#include "util/tstring.h" +#include "tstring.h" #include "widgets/Button.h" #include "widgets/CheckBox.h" #include "widgets/ComboBox.h" Modified: dcplusplus/trunk/dwt/include/dwt/resources/Bitmap.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/resources/Bitmap.h 2008-04-14 20:24:38 UTC (rev 1154) +++ dcplusplus/trunk/dwt/include/dwt/resources/Bitmap.h 2008-04-14 20:28:35 UTC (rev 1155) @@ -37,7 +37,7 @@ #define DWT_Bitmap_h #include "../WindowsHeaders.h" -#include "../util/tstring.h" +#include "../tstring.h" #include "Handle.h" #include <boost/intrusive_ptr.hpp> @@ -90,7 +90,7 @@ * <li>Icons (ICO)</li> * </ul> */ - explicit Bitmap( const SmartUtil::tstring & filePath, unsigned flags = LR_CREATEDIBSECTION ); + explicit Bitmap( const tstring & filePath, unsigned flags = LR_CREATEDIBSECTION ); /// @deprecated, use handle HBITMAP getBitmap() const; Modified: dcplusplus/trunk/dwt/include/dwt/resources/Font.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/resources/Font.h 2008-04-14 20:24:38 UTC (rev 1154) +++ dcplusplus/trunk/dwt/include/dwt/resources/Font.h 2008-04-14 20:28:35 UTC (rev 1155) @@ -37,7 +37,7 @@ #define DWT_Font_h #include "../WindowsHeaders.h" -#include "../util/tstring.h" +#include "../tstring.h" #include "../xCeption.h" #include "Handle.h" @@ -94,7 +94,7 @@ /** The object can't be manipulated after creation so when creating an instance * of this class be sure you are certain that you know what you want. */ - Font( const SmartUtil::tstring & faceName, int height = 10, + Font( const tstring & faceName, int height = 10, int width = 10, int weight = 2, DWORD charSet = ANSI_CHARSET, @@ -152,7 +152,7 @@ * typedef FontPtr and not <br> * the shared_ptr itself since this may change in future releases. */ -FontPtr createFont( const SmartUtil::tstring & faceName, +FontPtr createFont( const tstring & faceName, int height = 10, int width = 10, int weight = 2, Modified: dcplusplus/trunk/dwt/include/dwt/resources/Icon.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/resources/Icon.h 2008-04-14 20:24:38 UTC (rev 1154) +++ dcplusplus/trunk/dwt/include/dwt/resources/Icon.h 2008-04-14 20:28:35 UTC (rev 1155) @@ -37,7 +37,7 @@ #define DWT_Icon_h #include "../WindowsHeaders.h" -#include "../util/tstring.h" +#include "../tstring.h" #include "Handle.h" namespace dwt { @@ -81,7 +81,7 @@ * Class takes "control" of HICON meaning it will automatically free the * contained HICON upon destruction */ - explicit Icon( const SmartUtil::tstring & filePath ); + explicit Icon( const tstring & filePath ); /// Deprecated, use handle() HICON getIcon() const; Modified: dcplusplus/trunk/dwt/include/dwt/resources/ImageList.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/resources/ImageList.h 2008-04-14 20:24:38 UTC (rev 1154) +++ dcplusplus/trunk/dwt/include/dwt/resources/ImageList.h 2008-04-14 20:28:35 UTC (rev 1155) @@ -37,7 +37,7 @@ #define DWT_ImageList_h #include "../WindowsHeaders.h" -#include "../util/tstring.h" +#include "../tstring.h" #include "../Point.h" #include "Bitmap.h" #include "Icon.h" Copied: dcplusplus/trunk/dwt/include/dwt/tstring.h (from rev 1154, dcplusplus/trunk/dwt/include/dwt/util/tstring.h) =================================================================== --- dcplusplus/trunk/dwt/include/dwt/tstring.h (rev 0) +++ dcplusplus/trunk/dwt/include/dwt/tstring.h 2008-04-14 20:28:35 UTC (rev 1155) @@ -0,0 +1,55 @@ +/* + DC++ Widget Toolkit + + Copyright (c) 2007-2008, Jacek Sieka + + SmartWin++ + + Copyright (c) 2005 Thomas Hansen + + All rights reserved. + + Redistribution and use in source and binary forms, with or without modification, + are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of the DWT nor SmartWin++ nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#include <string> + +#ifndef DWT_tstring_smartwin_H +#define DWT_tstring_smartwin_H + +namespace dwt { + +#if defined UNICODE || defined _UNICODE + +typedef std::wstring tstring; + +#else // UNICODE + +typedef std::string tstring; + +#endif //UNICODE + +} + +#endif Deleted: dcplusplus/trunk/dwt/include/dwt/util/ChooseWideNarrowChar.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/util/ChooseWideNarrowChar.h 2008-04-14 20:24:38 UTC (rev 1154) +++ dcplusplus/trunk/dwt/include/dwt/util/ChooseWideNarrowChar.h 2008-04-14 20:28:35 UTC (rev 1155) @@ -1,95 +0,0 @@ -/* - DC++ Widget Toolkit - - Copyright (c) 2007-2008, Jacek Sieka - - SmartWin++ - - Copyright (c) 2005 Thomas Hansen - - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of the DWT nor SmartWin++ nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -namespace SmartUtil -{ -// begin namespace SmartUtil - -#if defined UNICODE || defined _UNICODE - typedef wchar_t tchar; -# ifndef _INC_TCHAR -# define _T(x) L##x -# endif -# if defined _STRING_ || defined _GLIBCXX_STRING - typedef std::wstring tstring; -# endif //_STRING_ -# if defined _IOSTREAM_ || defined _GLIBCXX_IOSTREAM - typedef std::wcout tcout; -# endif //_IOSTREAM_ -# if defined _SSTREAM_ || defined _GLIBCXX_SSTREAM - typedef std::wstringstream tstringstream; -# endif //_SSTREAM_ -# if defined _OSTREAM_ || defined _GLIBCXX_OSTREAM - typedef std::wostream tostream; -# endif //_OSTREAM_ -# if defined _ISTREAM_ || defined _GLIBCXX_ISTREAM - typedef std::wistream tistream; -# endif //_ISTREAM_ -# if defined _FSTREAM_ || defined _GLIBCXX_FSTREAM - typedef std::wfilebuf tfilebuf; - typedef std::wfstream tfstream; - typedef std::wifstream tifstream; - typedef std::wofstream tofstream; -# endif //_FSTREAM_ -#else // UNICODE - typedef char tchar; -# ifndef _INC_TCHAR -# define _T(x) x -# endif -# if defined _STRING_ || defined _GLIBCXX_STRING - typedef std::string tstring; -# endif //_STRING_ -# if defined _IOSTREAM_ || defined _GLIBCXX_IOSTREAM - typedef std::cout tcout; -# endif //_IOSTREAM_ -# if defined _SSTREAM_ || defined _GLIBCXX_SSTREAM - typedef std::stringstream tstringstream; -# endif //_SSTREAM_ -# if defined _OSTREAM_ || defined _GLIBCXX_OSTREAM - typedef std::ostream tostream; -# endif //_OSTREAM_ -# if defined _ISTREAM_ || defined _GLIBCXX_ISTREAM - typedef std::istream tistream; -# endif //_ISTREAM_ -# if defined _FSTREAM_ || defined _GLIBCXX_FSTREAM - typedef std::filebuf tfilebuf; - typedef std::fstream tfstream; - typedef std::ifstream tifstream; - typedef std::ofstream tofstream; -# endif //_FSTREAM_ -#endif //UNICODE - -// end namespace SmartUtil -} Modified: dcplusplus/trunk/dwt/include/dwt/util/DateTime.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/util/DateTime.h 2008-04-14 20:24:38 UTC (rev 1154) +++ dcplusplus/trunk/dwt/include/dwt/util/DateTime.h 2008-04-14 20:28:35 UTC (rev 1155) @@ -36,96 +36,96 @@ #ifndef DWT_DateTime_H #define DWT_DateTime_H -#include <string.h> #include "../WindowsHeaders.h" -#include "TimeSpan.h" -#include "tstring.h" +#include "../tstring.h" #include <time.h> -/// Contains utility classes for helping out with different aspects in SmartWin and SmartSOAP -namespace SmartUtil +namespace dwt { namespace util { + +class DateTime; +class TimeSpan; + +DateTime operator +( const DateTime & date, const TimeSpan & time ); +DateTime operator -( const DateTime & date, const TimeSpan & time ); + +/// Date and Time class +/** Class is inspired from the .Net Framework class System.DateTime and usable areas would be e.g. to parse DateTime objects transfered across SOAP callings + */ +class DateTime { - class DateTime; - DateTime operator +( const DateTime & date, const TimeSpan & time ); - DateTime operator -( const DateTime & date, const TimeSpan & time ); + friend DateTime operator +( const DateTime & date, const TimeSpan & time ); + friend DateTime operator -( const DateTime & date, const TimeSpan & time ); +private: + SYSTEMTIME itsSysTime; - /// Date and Time class - /** Class is inspired from the .Net Framework class System.DateTime and usable areas would be e.g. to parse DateTime objects transfered across SOAP callings - */ - class DateTime - { - friend DateTime operator +( const DateTime & date, const TimeSpan & time ); - friend DateTime operator -( const DateTime & date, const TimeSpan & time ); - private: - SYSTEMTIME itsSysTime; +public: + /// Constructs by default the smallest possible date + DateTime(); - public: - /// Constructs by default the smallest possible date - DateTime(); + /// Construct a new DateTime from the given SYSTEMTIME + explicit DateTime( const SYSTEMTIME & sysTime ); - /// Construct a new DateTime from the given SYSTEMTIME - explicit DateTime( const SYSTEMTIME & sysTime ); + /// Constructs a date according to the values given + DateTime( unsigned year, unsigned month, unsigned day, unsigned hour = 0, unsigned minute = 0, unsigned seconds = 0, unsigned milliseconds = 0 ); - /// Constructs a date according to the values given - DateTime( unsigned year, unsigned month, unsigned day, unsigned hour = 0, unsigned minute = 0, unsigned seconds = 0, unsigned milliseconds = 0 ); + /// Constructs a date according to a unix timestamp value + DateTime( time_t unixtimestamp ); - /// Constructs a date according to a unix timestamp value - DateTime( time_t unixtimestamp ); + /// Copy constructor + DateTime( const DateTime & rhs ); - /// Copy constructor - DateTime( const DateTime & rhs ); + /// Assignment operator which makes a perfect copy of the DateTime object on the right hand side of the assignment operator + DateTime & operator =( const DateTime & rhs ); - /// Assignment operator which makes a perfect copy of the DateTime object on the right hand side of the assignment operator - DateTime & operator =( const DateTime & rhs ); + /// Assignment operator which makes a copy of the SYSTEMTIME object on the right hand side of the assignment operator + DateTime & operator =( const SYSTEMTIME & rhs ); - /// Assignment operator which makes a copy of the SYSTEMTIME object on the right hand side of the assignment operator - DateTime & operator =( const SYSTEMTIME & rhs ); + /// Explicit conversion to SYSTEMTIME + const SYSTEMTIME & getSystemTime(); - /// Explicit conversion to SYSTEMTIME - const SYSTEMTIME & getSystemTime(); + /// Stamps the time part of the DateTime and returns an object containing only DATE information (or the TIME information is all zeros) + DateTime date(); - /// Stamps the time part of the DateTime and returns an object containing only DATE information (or the TIME information is all zeros) - DateTime date(); + /// Static constructor creating a DateTime which will hold the Date and Time of the creation of the object + static DateTime now(); - /// Static constructor creating a DateTime which will hold the Date and Time of the creation of the object - static DateTime now(); + /// Static constructor creating the smallest possible value + static DateTime minValue(); - /// Static constructor creating the smallest possible value - static DateTime minValue(); + /// Converts the date to a string in the format "yyyy.MM.ddThh:mm:ss" + /** Example: "2005.12.29T23:11:52" + */ + tstring toString() const; - /// Converts the date to a string in the format "yyyy.MM.ddThh:mm:ss" - /** Example: "2005.12.29T23:11:52" - */ - tstring toString() const; + /// Returns a string containing only the Time of the object + /** The format must be in format of e.g. "hh.mm.ss" or "mm-ss/hh" etc where "hh" is hours, "mm" is minutes and "ss" is seconds. + */ + tstring toTimeString( const tstring & format ) const; - /// Returns a string containing only the Time of the object - /** The format must be in format of e.g. "hh.mm.ss" or "mm-ss/hh" etc where "hh" is hours, "mm" is minutes and "ss" is seconds. - */ - tstring toTimeString( const tstring & format ) const; + /// Returns only the date part of the date time structure in a string format + /** The format must be in format of e.g. "dd:MM-yyyy" or "yyyy:MM:dd" where "yyyy" is four digits year, "MM" is two digits months and "dd" is two digits day. + */ + tstring toDateString( const tstring & format ) const; - /// Returns only the date part of the date time structure in a string format - /** The format must be in format of e.g. "dd:MM-yyyy" or "yyyy:MM:dd" where "yyyy" is four digits year, "MM" is two digits months and "dd" is two digits day. - */ - tstring toDateString( const tstring & format ) const; + /// Converts the date to a unix timestamp + time_t toUnixTimestamp() const; +}; - /// Converts the date to a unix timestamp - time_t toUnixTimestamp() const; - }; +// TODO: Comments.... +DateTime operator +( const DateTime & date, const TimeSpan & time ); - // TODO: Comments.... - DateTime operator +( const DateTime & date, const TimeSpan & time ); +bool operator >( const DateTime & lhs, const DateTime & rhs ); - bool operator >( const DateTime & lhs, const DateTime & rhs ); +bool operator <( const DateTime & lhs, const DateTime & rhs ); - bool operator <( const DateTime & lhs, const DateTime & rhs ); +bool operator >=( const DateTime & lhs, const DateTime & rhs ); - bool operator >=( const DateTime & lhs, const DateTime & rhs ); +bool operator <=( const DateTime & lhs, const DateTime & rhs ); - bool operator <=( const DateTime & lhs, const DateTime & rhs ); +bool operator == ( const DateTime & lhs, const DateTime & rhs ); - bool operator == ( const DateTime & lhs, const DateTime & rhs ); +bool operator != ( const DateTime & lhs, const DateTime & rhs ); + +} } - bool operator != ( const DateTime & lhs, const DateTime & rhs ); -} - #endif Modified: dcplusplus/trunk/dwt/include/dwt/util/RegKey.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/util/RegKey.h 2008-04-14 20:24:38 UTC (rev 1154) +++ dcplusplus/trunk/dwt/include/dwt/util/RegKey.h 2008-04-14 20:28:35 UTC (rev 1155) @@ -37,122 +37,122 @@ #define DWT_RegKey_H #include "../WindowsHeaders.h" -#include "tstring.h" +#include "../tstring.h" #include "xCeptionSmartUtilities.h" -#include <shlwapi.h> #include <vector> /// Contains utility class for reading and editing the registry -namespace SmartUtil +namespace dwt { namespace util { + +class RegKey { - class RegKey - { - private: - HKEY m_hKeyHandle; - DWORD m_dwDisposition; - REGSAM m_pAccess; +private: + HKEY m_hKeyHandle; + DWORD m_dwDisposition; + REGSAM m_pAccess; - struct _REGKEYINFO { - TCHAR achClass[MAX_PATH]; // buffer for class name - DWORD cchClassName; // size of class string - DWORD cSubKeys; // number of subkeys - DWORD cbMaxSubKey; // longest subkey size - DWORD cchMaxClass; // longest class string - DWORD cValues; // number of values for key - DWORD cchMaxValue; // longest value name - DWORD cbMaxValueData; // longest value data - DWORD cbSecurityDescriptor; // size of security descriptor - FILETIME ftLastWriteTime; // last write time - } REGKEYINFO; - public: - /// Normal constructor - /** Constructs a new instanc of this class - */ - RegKey(void); + struct _REGKEYINFO { + TCHAR achClass[MAX_PATH]; // buffer for class name + DWORD cchClassName; // size of class string + DWORD cSubKeys; // number of subkeys + DWORD cbMaxSubKey; // longest subkey size + DWORD cchMaxClass; // longest class string + DWORD cValues; // number of values for key + DWORD cchMaxValue; // longest value name + DWORD cbMaxValueData; // longest value data + DWORD cbSecurityDescriptor; // size of security descriptor + FILETIME ftLastWriteTime; // last write time + } REGKEYINFO; +public: + /// Normal constructor + /** Constructs a new instanc of this class + */ + RegKey(void); - /// Constructor, with parameters to open/create a reg key - /** Constructor taking a hKey and SmartUtil::tstring to specify the key to open. <br> - * hKey could be HKEY_CLASSES_ROOT, HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE or HKEY_USERS - */ - RegKey(HKEY hKey, SmartUtil::tstring lpSubKey,REGSAM samDesired = KEY_ALL_ACCESS,bool createIfNotExists = false); + /// Constructor, with parameters to open/create a reg key + /** Constructor taking a hKey and tstring to specify the key to open. <br> + * hKey could be HKEY_CLASSES_ROOT, HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE or HKEY_USERS + */ + RegKey(HKEY hKey, tstring lpSubKey,REGSAM samDesired = KEY_ALL_ACCESS,bool createIfNotExists = false); - /// Deconstructor - /** Deconstructor, close keys if they are still open - */ - ~RegKey(void); + /// Deconstructor + /** Deconstructor, close keys if they are still open + */ + ~RegKey(void); - /// Open or create a reg key - /** Open a reg key or create before <br> - * hKey could be HKEY_CLASSES_ROOT, HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE or HKEY_USERS - */ - bool open(HKEY hKey, SmartUtil::tstring lpSubKey,REGSAM samDesired = KEY_ALL_ACCESS,bool createIfNotExists = false); + /// Open or create a reg key + /** Open a reg key or create before <br> + * hKey could be HKEY_CLASSES_ROOT, HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE or HKEY_USERS + */ + bool open(HKEY hKey, tstring lpSubKey,REGSAM samDesired = KEY_ALL_ACCESS,bool createIfNotExists = false); - /// Close open key - /** Close open key - */ - void close(void); + /// Close open key + /** Close open key + */ + void close(void); - /// Check for an open key - /** Check for an open key - */ - bool isOpen(void) { return (m_hKeyHandle != NULL); } + /// Check for an open key + /** Check for an open key + */ + bool isOpen(void) { return (m_hKeyHandle != NULL); } - /// Check for a new key - /** Call this if you are sure that you have an open key! - * It returns true if the open key was created by open or false if that key alredy exists. - */ - bool isNewKey(void) { return (m_dwDisposition == REG_CREATED_NEW_KEY); } + /// Check for a new key + /** Call this if you are sure that you have an open key! + * It returns true if the open key was created by open or false if that key alredy exists. + */ + bool isNewKey(void) { return (m_dwDisposition == REG_CREATED_NEW_KEY); } - /// Delete the specific subkey of the current open key - /** Delete the specific subkey of the current open key. The key must be empty or set recursiv=true to delete all content, too. - */ - bool deleteSubkey(SmartUtil::tstring lpSubKey, bool recursiv = false); + /// Delete the specific subkey of the current open key + /** Delete the specific subkey of the current open key. The key must be empty or set recursiv=true to delete all content, too. + */ + bool deleteSubkey(tstring lpSubKey, bool recursiv = false); - /// Delete the specific value of the current open key - /** Delete the specific value of the current open key - */ - bool deleteValue(SmartUtil::tstring lpValue); + /// Delete the specific value of the current... [truncated message content] |
From: <arn...@us...> - 2008-04-14 20:29:38
|
Revision: 1156 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1156&view=rev Author: arnetheduck Date: 2008-04-14 13:29:25 -0700 (Mon, 14 Apr 2008) Log Message: ----------- delayed share refresh isn't actually fixed yet Modified Paths: -------------- dcplusplus/trunk/changelog.txt Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-11 11:07:24.957000017 +0200 committer: Jacek Sieka <arn...@gm...> properties: branch-nick: dcplusplus + timestamp: 2008-04-11 17:30:57.875000000 +0200 committer: poy <po...@12...> properties: branch-nick: repo Name: bzr:file-ids - dwt/include/dwt/tstring.h 712@f586c4b0-9d0d-0410-bc51-f1fe239209fc:dcplusplus%2Ftrunk:smartwin%2FSmartUtil%2Ftstring.h dwt/include/dwt/util/tstream.h tstream.h-20080411080221-6gcjog2gf271jxh3-1 + Name: bzr:revision-id:v3-trunk1 - 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky 1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai 1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf 1114 po...@12...-20080405220250-8y09d0samsj8ja94 1115 po...@12...-20080406134101-4860ytb61sbu3yhg 1116 po...@12...-20080406155849-2wzxzuzs5m8zpk0g 1117 po...@12...-20080406164835-bv5dydhm3qqydsty 1118 arn...@gm...-20080406210237-c7tyfgiz2sjgv044 1119 po...@12...-20080407114423-4yajg1rffidq76bj 1120 arn...@gm...-20080407194826-c42t4bjzw4vflejn 1121 po...@12...-20080407214303-o7ul1bvcn6gvaoc9 1122 po...@12...-20080407220647-r7f3em92til5j67s 1123 po...@12...-20080408212439-54t3bqlhvw1nu4xc 1124 arn...@gm...-20080409193708-y6erfzwrcb1seet3 1125 arn...@gm...-20080409195827-ub6t2s3wdf28nfpz 1126 po...@12...-20080409215055-1zmqhhm2859878c1 1127 arn...@gm...-20080410102447-l4es4cbukkqwcnpc 1128 arn...@gm...-20080410214118-b70g50tl27cq9q29 1129 arn...@gm...-20080411074730-w1pu78qigtx87lx3 1130 arn...@gm...-20080411090724-kwdj9pg9hrv1xhwb + 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky 1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai 1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf 1114 po...@12...-20080405220250-8y09d0samsj8ja94 1115 po...@12...-20080406134101-4860ytb61sbu3yhg 1116 po...@12...-20080406155849-2wzxzuzs5m8zpk0g 1117 po...@12...-20080406164835-bv5dydhm3qqydsty 1118 arn...@gm...-20080406210237-c7tyfgiz2sjgv044 1119 po...@12...-20080407114423-4yajg1rffidq76bj 1120 arn...@gm...-20080407194826-c42t4bjzw4vflejn 1121 po...@12...-20080407214303-o7ul1bvcn6gvaoc9 1122 po...@12...-20080407220647-r7f3em92til5j67s 1123 po...@12...-20080408212439-54t3bqlhvw1nu4xc 1124 arn...@gm...-20080409193708-y6erfzwrcb1seet3 1125 arn...@gm...-20080409195827-ub6t2s3wdf28nfpz 1126 po...@12...-20080409215055-1zmqhhm2859878c1 1127 arn...@gm...-20080410102447-l4es4cbukkqwcnpc 1128 arn...@gm...-20080410214118-b70g50tl27cq9q29 1129 arn...@gm...-20080411074730-w1pu78qigtx87lx3 1130 arn...@gm...-20080411090724-kwdj9pg9hrv1xhwb 1131 po...@12...-20080411153057-tn7zhxqk0z7ceref Modified: dcplusplus/trunk/changelog.txt =================================================================== --- dcplusplus/trunk/changelog.txt 2008-04-14 20:28:35 UTC (rev 1155) +++ dcplusplus/trunk/changelog.txt 2008-04-14 20:29:25 UTC (rev 1156) @@ -18,7 +18,6 @@ * [L#208684] Made the Alt key work again for line history in hub window (poy) * [L#209684] Fixed parsing of non-XML hub lists (poy) * [L#205660] Readded hub column to transfers (thanks mikejj) -* Fixed file list refresh happening 1 minute later than expected (poy) * [L#209277] Fixed crash on bad translation (thanks poy) * More controls now use the font defined in settings (poy) * [L#211164] Fixed bug when a new tab row is created while DC++ is minimized (poy) @@ -28,7 +27,6 @@ * [L#211313] Fixed bad virtual name being loaded (thanks kulmegil) * [L#202801] Allow virtual folders to have the same name * Allow more characters in virtual names -* Fixed downloading multiple file lists with the enter key (poy) * Improved transfer speed averaging * [L#212411] Fixed downloading multiple file lists (poy) * Added filter already shared from search results (thanks smir) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arn...@us...> - 2008-04-14 20:34:21
|
Revision: 1157 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1157&view=rev Author: arnetheduck Date: 2008-04-14 13:33:46 -0700 (Mon, 14 Apr 2008) Log Message: ----------- merge file dialog patch Modified Paths: -------------- dcplusplus/trunk/changelog.txt dcplusplus/trunk/dwt/include/dwt/aspects/AspectFileFilter.h dcplusplus/trunk/dwt/include/dwt/widgets/LoadDialog.h dcplusplus/trunk/dwt/include/dwt/widgets/SaveDialog.h dcplusplus/trunk/dwt/src/widgets/LoadDialog.cpp dcplusplus/trunk/dwt/src/widgets/SaveDialog.cpp Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-11 17:30:57.875000000 +0200 committer: poy <po...@12...> properties: branch-nick: repo + timestamp: 2008-04-11 22:09:46.354000092 +0200 committer: Jacek Sieka <arn...@gm...> properties: branch-nick: dcplusplus Name: bzr:ancestry:v3-trunk1 - arn...@gm...-20080329054606-ubefm4h98xjgvif9 arn...@gm...-20080329220538-g3f1nvcfh1ycetw7 robert@smir-20080331181318-buvm17zqqym5ryct + arn...@gm...-20080329054606-ubefm4h98xjgvif9 arn...@gm...-20080329220538-g3f1nvcfh1ycetw7 robert@smir-20080331181318-buvm17zqqym5ryct po...@12...-20080411151741-4v1p7g8chsber07o Name: bzr:revision-id:v3-trunk1 - 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky 1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai 1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf 1114 po...@12...-20080405220250-8y09d0samsj8ja94 1115 po...@12...-20080406134101-4860ytb61sbu3yhg 1116 po...@12...-20080406155849-2wzxzuzs5m8zpk0g 1117 po...@12...-20080406164835-bv5dydhm3qqydsty 1118 arn...@gm...-20080406210237-c7tyfgiz2sjgv044 1119 po...@12...-20080407114423-4yajg1rffidq76bj 1120 arn...@gm...-20080407194826-c42t4bjzw4vflejn 1121 po...@12...-20080407214303-o7ul1bvcn6gvaoc9 1122 po...@12...-20080407220647-r7f3em92til5j67s 1123 po...@12...-20080408212439-54t3bqlhvw1nu4xc 1124 arn...@gm...-20080409193708-y6erfzwrcb1seet3 1125 arn...@gm...-20080409195827-ub6t2s3wdf28nfpz 1126 po...@12...-20080409215055-1zmqhhm2859878c1 1127 arn...@gm...-20080410102447-l4es4cbukkqwcnpc 1128 arn...@gm...-20080410214118-b70g50tl27cq9q29 1129 arn...@gm...-20080411074730-w1pu78qigtx87lx3 1130 arn...@gm...-20080411090724-kwdj9pg9hrv1xhwb 1131 po...@12...-20080411153057-tn7zhxqk0z7ceref + 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky 1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai 1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf 1114 po...@12...-20080405220250-8y09d0samsj8ja94 1115 po...@12...-20080406134101-4860ytb61sbu3yhg 1116 po...@12...-20080406155849-2wzxzuzs5m8zpk0g 1117 po...@12...-20080406164835-bv5dydhm3qqydsty 1118 arn...@gm...-20080406210237-c7tyfgiz2sjgv044 1119 po...@12...-20080407114423-4yajg1rffidq76bj 1120 arn...@gm...-20080407194826-c42t4bjzw4vflejn 1121 po...@12...-20080407214303-o7ul1bvcn6gvaoc9 1122 po...@12...-20080407220647-r7f3em92til5j67s 1123 po...@12...-20080408212439-54t3bqlhvw1nu4xc 1124 arn...@gm...-20080409193708-y6erfzwrcb1seet3 1125 arn...@gm...-20080409195827-ub6t2s3wdf28nfpz 1126 po...@12...-20080409215055-1zmqhhm2859878c1 1127 arn...@gm...-20080410102447-l4es4cbukkqwcnpc 1128 arn...@gm...-20080410214118-b70g50tl27cq9q29 1129 arn...@gm...-20080411074730-w1pu78qigtx87lx3 1130 arn...@gm...-20080411090724-kwdj9pg9hrv1xhwb 1131 po...@12...-20080411153057-tn7zhxqk0z7ceref 1132 arn...@gm...-20080411200946-ierqlg8v9vzj18n2 Modified: dcplusplus/trunk/changelog.txt =================================================================== --- dcplusplus/trunk/changelog.txt 2008-04-14 20:29:25 UTC (rev 1156) +++ dcplusplus/trunk/changelog.txt 2008-04-14 20:33:46 UTC (rev 1157) @@ -30,6 +30,7 @@ * Improved transfer speed averaging * [L#212411] Fixed downloading multiple file lists (poy) * Added filter already shared from search results (thanks smir) +* [L#206521] Fixed directory not being removable (thanks poy) -- 0.705 2008-03-14 -- * Several patches for better *nix compatibility of the core (thanks steven sheehy et al) Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectFileFilter.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/aspects/AspectFileFilter.h 2008-04-14 20:29:25 UTC (rev 1156) +++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectFileFilter.h 2008-04-14 20:33:46 UTC (rev 1157) @@ -52,6 +52,8 @@ template<typename WidgetType> class AspectFileFilter { + WidgetType& W() { return *static_cast<WidgetType*>(this); } + public: /// Adds a filter to the object. /** filterName is the friendly name of the filter, normally this would be e.g. @@ -64,7 +66,7 @@ itsFilter.push_back( '\0' ); itsFilter.insert( itsFilter.end(), filter.begin(), filter.end() ); itsFilter.push_back( '\0' ); - return *static_cast<WidgetType*>(this); + return W(); } /// Sets the active filter to the specified index @@ -79,12 +81,12 @@ throw x; } itsActiveFilter = filterNo; - return *static_cast<WidgetType*>(this); + return W(); } WidgetType& setDefaultExtension(const tstring& defExt) { itsDefExt = defExt; - return *static_cast<WidgetType*>(this); + return W(); } /// Returns the active filter of the object @@ -101,42 +103,52 @@ */ WidgetType& setInitialDirectory( const tstring& initialDir ) { itsInitialDir = initialDir; - return *static_cast<WidgetType*>(this); + return W(); } -protected: - Widget* itsParent; + bool open(tstring& file, unsigned flags = 0) { + // get the current directory and restore it later to avoid directory locks + TCHAR buf[MAX_PATH]; + ::GetCurrentDirectory(MAX_PATH, buf); - static const int PATH_BUFFER_SIZE = 32768; + OPENFILENAME ofn = { 0 }; + getOFN(ofn); + ofn.lpstrFile = const_cast<LPTSTR>(file.c_str()); + ofn.Flags = flags; - TCHAR szFile[PATH_BUFFER_SIZE]; - - HWND getParentHandle() { return itsParent ? itsParent->handle() : NULL; } + bool ret = W().openImpl(ofn); + if(ret) + file = ofn.lpstrFile; + ::SetCurrentDirectory(buf); + return ret; + } + +protected: AspectFileFilter(Widget* parent) : itsParent(parent), itsActiveFilter( 0 ) {} - // Fills out the common members of the OPENFILENAME struct. - // This is called for both LoadDialog and for SaveDialog Widgets - void fillOFN( OPENFILENAME & ofn, int flags ) { - ofn.hwndOwner = getParentHandle(); - + void getOFN(OPENFILENAME& ofn) { + ofn.lStructSize = sizeof(OPENFILENAME); + ofn.hwndOwner = itsParent ? itsParent->handle() : NULL; + ofn.lpstrFilter = ifNotEmpty(itsFilter); + ofn.nFilterIndex = this->getActiveFilter(); ofn.nMaxFile = PATH_BUFFER_SIZE; - ofn.lpstrFile = szFile; + ofn.lpstrInitialDir = ifNotEmpty(itsInitialDir); ofn.lpstrDefExt = ifNotEmpty(itsDefExt); - ofn.lpstrInitialDir = ifNotEmpty(itsInitialDir); - ofn.lpstrFilter = ifNotEmpty(itsFilter); - ofn.nFilterIndex = this->getActiveFilter(); - ofn.Flags = flags; } private: + static const int PATH_BUFFER_SIZE = 32768; + + Widget* itsParent; + unsigned int itsActiveFilter; tstring itsInitialDir; tstring itsFilter; tstring itsDefExt; - + static const TCHAR* ifNotEmpty(const tstring& str) { return str.empty() ? NULL : str.c_str(); } Modified: dcplusplus/trunk/dwt/include/dwt/widgets/LoadDialog.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/LoadDialog.h 2008-04-14 20:29:25 UTC (rev 1156) +++ dcplusplus/trunk/dwt/include/dwt/widgets/LoadDialog.h 2008-04-14 20:33:46 UTC (rev 1157) @@ -53,6 +53,9 @@ class LoadDialog : public AspectFileFilter<LoadDialog> { + typedef AspectFileFilter<LoadDialog> BaseType; + friend class AspectFileFilter<LoadDialog>; + public: /// Class type typedef LoadDialog ThisType; @@ -63,16 +66,6 @@ typedef ThisType ObjectType; /// Shows the dialog - /** Returns string() or "empty string" if user press cancel. <br> - * Returns a "file path" if user presses ok. <br> - * Use the inherited functions AspectFileFilter::addFilter and - * AspectFileFilter::activeFilter <br> - * before calling this function, if you wish the dialog to show only certain - * types of files. - */ - bool open(tstring& file); - - /// Shows the dialog /** Returns an empty vector if user press cancel. <br> * Returns a vector of "file paths" if user presses ok. <br> * Use the inherited functions AspectFileFilter::addFilter and @@ -80,13 +73,14 @@ * before calling this function, if you wish the dialog to show only certain * types of files. */ - bool open(std::vector<tstring>& files); + bool openMultiple(std::vector<tstring>& files, unsigned flags = 0); // Constructor Taking pointer to parent explicit LoadDialog( Widget * parent = 0 ); - ~LoadDialog() { } private: + // AspectFileFilter + bool openImpl(OPENFILENAME& ofn); }; /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -94,7 +88,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// inline LoadDialog::LoadDialog( Widget * parent ) - : AspectFileFilter<LoadDialog>( parent ) + : BaseType( parent ) {} } Modified: dcplusplus/trunk/dwt/include/dwt/widgets/SaveDialog.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/SaveDialog.h 2008-04-14 20:29:25 UTC (rev 1156) +++ dcplusplus/trunk/dwt/include/dwt/widgets/SaveDialog.h 2008-04-14 20:33:46 UTC (rev 1157) @@ -37,7 +37,6 @@ #define DWT_SaveDialog_h #include "../Widget.h" -#include "../tstring.h" #include "../aspects/AspectFileFilter.h" namespace dwt { @@ -52,6 +51,9 @@ class SaveDialog : public AspectFileFilter<SaveDialog> { + typedef AspectFileFilter<SaveDialog> BaseType; + friend class AspectFileFilter<SaveDialog>; + public: /// Class type typedef SaveDialog ThisType; @@ -61,19 +63,12 @@ */ typedef ThisType ObjectType; - /// Shows the dialog - /** Returns string() or "empty string" if user press cancel. <br> - * Returns a "file path" if user presses ok. - */ - bool open(tstring& target); - /// Constructor Taking pointer to parent explicit SaveDialog( Widget * parent = 0 ); - virtual ~SaveDialog() - {} - private: + // AspectFileFilter + bool openImpl(OPENFILENAME& ofn); }; /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -81,7 +76,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// inline SaveDialog::SaveDialog( Widget * parent ) - : AspectFileFilter<SaveDialog>( parent ) + : BaseType( parent ) { } Modified: dcplusplus/trunk/dwt/src/widgets/LoadDialog.cpp =================================================================== --- dcplusplus/trunk/dwt/src/widgets/LoadDialog.cpp 2008-04-14 20:29:25 UTC (rev 1156) +++ dcplusplus/trunk/dwt/src/widgets/LoadDialog.cpp 2008-04-14 20:33:46 UTC (rev 1157) @@ -33,22 +33,23 @@ namespace dwt { -bool LoadDialog::open(tstring& file) -{ - OPENFILENAME ofn = { sizeof(OPENFILENAME) }; // common dialog box structure - fillOFN( ofn, OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY ); - - if ( ::GetOpenFileName( & ofn ) ) { - file = ofn.lpstrFile; - return true; - } - return false; +bool LoadDialog::openImpl(OPENFILENAME& ofn) { + ofn.Flags |= OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY; + return ::GetOpenFileName(&ofn); } -bool LoadDialog::open(std::vector<tstring>& files) +bool LoadDialog::openMultiple(std::vector<tstring>& files, unsigned flags) { - OPENFILENAME ofn = { sizeof(OPENFILENAME) }; // common dialog box structure - fillOFN( ofn, OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY | OFN_ALLOWMULTISELECT ); + // get the current directory and restore it later to avoid directory locks + TCHAR buf[MAX_PATH]; + ::GetCurrentDirectory(MAX_PATH, buf); + + OPENFILENAME ofn; + getOFN(ofn); + ofn.lpstrFile = files.empty() ? 0 : const_cast<LPTSTR>(files[0].c_str()); + ofn.Flags = flags | OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY | OFN_ALLOWMULTISELECT; + + bool ret = false; if( ::GetOpenFileName(&ofn) ) { // If a single file is selected, the lpstrFile string is just the path terminated by TWO null bytes @@ -74,9 +75,11 @@ fileName = array_p; // fileName is substring from array_p to next null } } - return true; - } - return false; + ret = true; + } + + ::SetCurrentDirectory(buf); + return ret; } } Modified: dcplusplus/trunk/dwt/src/widgets/SaveDialog.cpp =================================================================== --- dcplusplus/trunk/dwt/src/widgets/SaveDialog.cpp 2008-04-14 20:29:25 UTC (rev 1156) +++ dcplusplus/trunk/dwt/src/widgets/SaveDialog.cpp 2008-04-14 20:33:46 UTC (rev 1157) @@ -33,15 +33,8 @@ namespace dwt { -bool SaveDialog::open(tstring& target) { - OPENFILENAME ofn = { sizeof(OPENFILENAME) }; // common dialog box structure - fillOFN( ofn, 0 ); - - if ( ::GetSaveFileName( & ofn ) ) { - target = ofn.lpstrFile; - return true; - } - return false; +bool SaveDialog::openImpl(OPENFILENAME& ofn) { + return ::GetSaveFileName(&ofn); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arn...@us...> - 2008-04-14 20:34:55
|
Revision: 1158 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1158&view=rev Author: arnetheduck Date: 2008-04-14 13:34:37 -0700 (Mon, 14 Apr 2008) Log Message: ----------- increase target segment time Modified Paths: -------------- dcplusplus/trunk/dcpp/QueueItem.cpp Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-11 22:09:46.354000092 +0200 committer: Jacek Sieka <arn...@gm...> properties: branch-nick: dcplusplus + timestamp: 2008-04-11 22:17:18.397000074 +0200 committer: Jacek Sieka <arn...@gm...> properties: branch-nick: dcplusplus Name: bzr:revision-id:v3-trunk1 - 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky 1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai 1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf 1114 po...@12...-20080405220250-8y09d0samsj8ja94 1115 po...@12...-20080406134101-4860ytb61sbu3yhg 1116 po...@12...-20080406155849-2wzxzuzs5m8zpk0g 1117 po...@12...-20080406164835-bv5dydhm3qqydsty 1118 arn...@gm...-20080406210237-c7tyfgiz2sjgv044 1119 po...@12...-20080407114423-4yajg1rffidq76bj 1120 arn...@gm...-20080407194826-c42t4bjzw4vflejn 1121 po...@12...-20080407214303-o7ul1bvcn6gvaoc9 1122 po...@12...-20080407220647-r7f3em92til5j67s 1123 po...@12...-20080408212439-54t3bqlhvw1nu4xc 1124 arn...@gm...-20080409193708-y6erfzwrcb1seet3 1125 arn...@gm...-20080409195827-ub6t2s3wdf28nfpz 1126 po...@12...-20080409215055-1zmqhhm2859878c1 1127 arn...@gm...-20080410102447-l4es4cbukkqwcnpc 1128 arn...@gm...-20080410214118-b70g50tl27cq9q29 1129 arn...@gm...-20080411074730-w1pu78qigtx87lx3 1130 arn...@gm...-20080411090724-kwdj9pg9hrv1xhwb 1131 po...@12...-20080411153057-tn7zhxqk0z7ceref 1132 arn...@gm...-20080411200946-ierqlg8v9vzj18n2 + 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn 1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn 1029 zouzou123gen-20080323221249-0su72zaj13e706mk 1030 arn...@gm...-20080324140623-muba1dl46m000o8c 1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6 1032 arn...@gm...-20080324153706-siidja05n84i00b1 1033 arn...@gm...-20080324153823-lhn3awurnu77riln 1034 arn...@gm...-20080324165650-zapppziji67yf5a2 1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2 1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3 1037 arn...@gm...-20080325100659-8fqy6q65itmghlep 1038 zouzou123gen-20080325175216-s297sdiucukfvijh 1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087 1040 arn...@gm...-20080325211747-nwwy1eb33r071sca 1041 arn...@gm...-20080326084110-qbselrjckku275xi 1042 zouzou123gen-20080326123631-35642mgbk2i4ty32 1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r 1044 arn...@gm...-20080326162031-il0nyms30w0mky43 1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv 1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g 1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv 1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q 1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz 1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf 1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd 1052 arn...@gm...-20080327120639-um3tukdt374rwvgm 1053 zouzou123gen-20080327130703-6vtek6uxy3vua543 1054 arn...@gm...-20080327215831-dmg5mkufskabwkro 1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf 1056 arn...@gm...-20080328085925-gceybsr53oml1p24 1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a 1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o 1059 arn...@gm...-20080329055630-braiir1dskv7a4qm 1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja 1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl 1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0 1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd 1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp 1065 arn...@gm...-20080329124926-2je1z18p0272zpua 1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp 1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r 1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5 1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql 1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q 1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux 1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd 1073 zouzou123gen-20080331124549-alyw7vugdn30piqy 1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm 1075 zouzou123gen-20080331140757-u94q52yccl5lsifk 1076 zouzou123gen-20080331152513-ue1x5qhigcw51348 1077 arn...@gm...-20080331184436-a8g6chibmg8nswls 1078 arn...@gm...-20080331220648-81485k28qmwruwz6 1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a 1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw 1081 zouzou123gen-20080401084117-24a454g8o0x656kg 1082 zouzou123gen-20080401133146-jabb5i8870fg6f66 1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6 1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f 1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk 1086 arn...@gm...-20080402084515-ofmnwihzv159jton 1087 arn...@gm...-20080402133105-y70soi38owzl76i9 1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae 1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0 1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8 1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh 1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5 1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h 1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46 1095 arn...@gm...-20080402193851-6mu64vgep6tijith 1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r 1097 arn...@gm...-20080402204331-so2e8n892o23pejr 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky 1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai 1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf 1114 po...@12...-20080405220250-8y09d0samsj8ja94 1115 po...@12...-20080406134101-4860ytb61sbu3yhg 1116 po...@12...-20080406155849-2wzxzuzs5m8zpk0g 1117 po...@12...-20080406164835-bv5dydhm3qqydsty 1118 arn...@gm...-20080406210237-c7tyfgiz2sjgv044 1119 po...@12...-20080407114423-4yajg1rffidq76bj 1120 arn...@gm...-20080407194826-c42t4bjzw4vflejn 1121 po...@12...-20080407214303-o7ul1bvcn6gvaoc9 1122 po...@12...-20080407220647-r7f3em92til5j67s 1123 po...@12...-20080408212439-54t3bqlhvw1nu4xc 1124 arn...@gm...-20080409193708-y6erfzwrcb1seet3 1125 arn...@gm...-20080409195827-ub6t2s3wdf28nfpz 1126 po...@12...-20080409215055-1zmqhhm2859878c1 1127 arn...@gm...-20080410102447-l4es4cbukkqwcnpc 1128 arn...@gm...-20080410214118-b70g50tl27cq9q29 1129 arn...@gm...-20080411074730-w1pu78qigtx87lx3 1130 arn...@gm...-20080411090724-kwdj9pg9hrv1xhwb 1131 po...@12...-20080411153057-tn7zhxqk0z7ceref 1132 arn...@gm...-20080411200946-ierqlg8v9vzj18n2 1133 arn...@gm...-20080411201718-ecshulwd7ic0wdci Modified: dcplusplus/trunk/dcpp/QueueItem.cpp =================================================================== --- dcplusplus/trunk/dcpp/QueueItem.cpp 2008-04-14 20:33:46 UTC (rev 1157) +++ dcplusplus/trunk/dcpp/QueueItem.cpp 2008-04-14 20:34:37 UTC (rev 1158) @@ -85,7 +85,7 @@ } // # ms we should aim for per segment -static const int64_t SEGMENT_TIME = 10*1000; +static const int64_t SEGMENT_TIME = 60*1000; Segment QueueItem::getNextSegment(int64_t blockSize, double lastSpeed, int64_t lastSize) const { if(getSize() == -1 || blockSize == 0) { @@ -97,10 +97,14 @@ int64_t targetSize = std::max(blockSize, lastSize); if(lastSpeed > 0) { double msecs = 1000 * targetSize / lastSpeed; - if(msecs < SEGMENT_TIME / 2) { + if(msecs < SEGMENT_TIME / 4) { targetSize *= 2; - } else if(msecs > SEGMENT_TIME * 2) { + } else if(msecs < SEGMENT_TIME / 1.25) { + targetSize += blockSize; + } else if(msecs > SEGMENT_TIME * 4) { targetSize = std::max(blockSize, targetSize / 2); + } else if(msecs > SEGMENT_TIME * 1.25) { + targetSize = std::max(blocksSize, targetSize - blockSize); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |