You can subscribe to this list here.
2006 |
Jan
|
Feb
(24) |
Mar
(9) |
Apr
(4) |
May
(7) |
Jun
(13) |
Jul
(19) |
Aug
(1) |
Sep
(12) |
Oct
(20) |
Nov
(1) |
Dec
(15) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2007 |
Jan
|
Feb
(6) |
Mar
(24) |
Apr
(1) |
May
(10) |
Jun
(30) |
Jul
(46) |
Aug
(20) |
Sep
(12) |
Oct
(27) |
Nov
(51) |
Dec
(58) |
2008 |
Jan
(40) |
Feb
(40) |
Mar
(78) |
Apr
(138) |
May
(4) |
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(5) |
Sep
|
Oct
|
Nov
|
Dec
|
2010 |
Jan
|
Feb
|
Mar
|
Apr
(3) |
May
|
Jun
(2) |
Jul
(10) |
Aug
(1) |
Sep
(11) |
Oct
(31) |
Nov
(7) |
Dec
(1) |
2011 |
Jan
(1) |
Feb
|
Mar
(3) |
Apr
|
May
(1) |
Jun
|
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2012 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
(2) |
Sep
|
Oct
|
Nov
(2) |
Dec
(2) |
2013 |
Jan
(3) |
Feb
(5) |
Mar
(1) |
Apr
|
May
|
Jun
(11) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(4) |
2014 |
Jan
(2) |
Feb
(3) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
2015 |
Jan
|
Feb
(2) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2025 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(4) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <arn...@us...> - 2008-04-24 14:16:18
|
Revision: 1212 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1212&view=rev Author: arnetheduck Date: 2008-04-24 07:15:36 -0700 (Thu, 24 Apr 2008) Log Message: ----------- Language file updates Modified Paths: -------------- dcplusplus/trunk/dcpp/po/ar.po dcplusplus/trunk/dcpp/po/bg.po dcplusplus/trunk/dcpp/po/bs.po dcplusplus/trunk/dcpp/po/ca.po dcplusplus/trunk/dcpp/po/cs.po dcplusplus/trunk/dcpp/po/da.po dcplusplus/trunk/dcpp/po/de.po dcplusplus/trunk/dcpp/po/el.po dcplusplus/trunk/dcpp/po/en_GB.po dcplusplus/trunk/dcpp/po/es.po dcplusplus/trunk/dcpp/po/fi.po dcplusplus/trunk/dcpp/po/fr.po dcplusplus/trunk/dcpp/po/gl.po dcplusplus/trunk/dcpp/po/he.po dcplusplus/trunk/dcpp/po/hr.po dcplusplus/trunk/dcpp/po/hu.po dcplusplus/trunk/dcpp/po/id.po dcplusplus/trunk/dcpp/po/is.po dcplusplus/trunk/dcpp/po/it.po dcplusplus/trunk/dcpp/po/ja.po dcplusplus/trunk/dcpp/po/km.po dcplusplus/trunk/dcpp/po/ko.po dcplusplus/trunk/dcpp/po/lt.po dcplusplus/trunk/dcpp/po/lv.po dcplusplus/trunk/dcpp/po/mk.po dcplusplus/trunk/dcpp/po/ms.po dcplusplus/trunk/dcpp/po/nb.po dcplusplus/trunk/dcpp/po/nl.po dcplusplus/trunk/dcpp/po/pl.po dcplusplus/trunk/dcpp/po/pt.po dcplusplus/trunk/dcpp/po/pt_BR.po dcplusplus/trunk/dcpp/po/ro.po dcplusplus/trunk/dcpp/po/ru.po dcplusplus/trunk/dcpp/po/sl.po dcplusplus/trunk/dcpp/po/sq.po dcplusplus/trunk/dcpp/po/sv.po dcplusplus/trunk/dcpp/po/tr.po dcplusplus/trunk/dcpp/po/uk.po dcplusplus/trunk/dcpp/po/zh_CN.po dcplusplus/trunk/dcpp/po/zh_TW.po dcplusplus/trunk/win32/po/ar.po dcplusplus/trunk/win32/po/bg.po dcplusplus/trunk/win32/po/bs.po dcplusplus/trunk/win32/po/ca.po dcplusplus/trunk/win32/po/cs.po dcplusplus/trunk/win32/po/da.po dcplusplus/trunk/win32/po/de.po dcplusplus/trunk/win32/po/el.po dcplusplus/trunk/win32/po/en_GB.po dcplusplus/trunk/win32/po/es.po dcplusplus/trunk/win32/po/fi.po dcplusplus/trunk/win32/po/fr.po dcplusplus/trunk/win32/po/gl.po dcplusplus/trunk/win32/po/he.po dcplusplus/trunk/win32/po/hr.po dcplusplus/trunk/win32/po/hu.po dcplusplus/trunk/win32/po/id.po dcplusplus/trunk/win32/po/is.po dcplusplus/trunk/win32/po/it.po dcplusplus/trunk/win32/po/ja.po dcplusplus/trunk/win32/po/km.po dcplusplus/trunk/win32/po/ko.po dcplusplus/trunk/win32/po/lt.po dcplusplus/trunk/win32/po/lv.po dcplusplus/trunk/win32/po/mk.po dcplusplus/trunk/win32/po/nb.po dcplusplus/trunk/win32/po/nl.po dcplusplus/trunk/win32/po/pl.po dcplusplus/trunk/win32/po/pt.po dcplusplus/trunk/win32/po/pt_BR.po dcplusplus/trunk/win32/po/ro.po dcplusplus/trunk/win32/po/ru.po dcplusplus/trunk/win32/po/sl.po dcplusplus/trunk/win32/po/sq.po dcplusplus/trunk/win32/po/sv.po dcplusplus/trunk/win32/po/tr.po dcplusplus/trunk/win32/po/uk.po dcplusplus/trunk/win32/po/zh_CN.po dcplusplus/trunk/win32/po/zh_TW.po Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-21 13:27:43.910000086 +0200 committer: Jacek Sieka <arn...@gm...> properties: branch-nick: dcplusplus + timestamp: 2008-04-21 14:20:35.400000095 +0200 committer: Jacek Sieka <arn...@gm...> properties: branch-nick: dcplusplus Name: bzr:file-ids - dwt/include/dwt/DWTException.h 712@f586c4b0-9d0d-0410-bc51-f1fe239209fc:dcplusplus%2Ftrunk:smartwin%2Finclude%2Fsmartwin%2FxCeption.h dwt/include/dwt/util/check.h check.h-20080421112644-f99r6p5ifproaii9-2 dwt/src/DWTException.cpp dwtexception.cpp-20080421112644-f99r6p5ifproaii9-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 1131 po...@12...-20080411153057-tn7zhxqk0z7ceref 1132 arn...@gm...-20080411200946-ierqlg8v9vzj18n2 1133 arn...@gm...-20080411201718-ecshulwd7ic0wdci 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 1166 arn...@gm...-20080416204550-0dx3qhxasdkdohx1 1167 arn...@gm...-20080416211510-3ilsym0bom7u2cer 1168 tom@athlon-20080417125238-0hhhchg951y7p83w 1169 arn...@gm...-20080418203137-e6szrje3fje5dgh9 1170 arn...@gm...-20080419164722-vyjrwwvglxr4yxuu 1171 arn...@gm...-20080419164802-o2boulbfrea4e0dx 1172 arn...@gm...-20080419165129-zj3axn731fo84vd5 1173 po...@12...-20080419172806-2qspfwerslo10rd2 1174 arn...@gm...-20080419212304-3wjafor82amtvik3 1175 arn...@gm...-20080419212347-t5oze1b59dk7vkiv 1176 arn...@gm...-20080420133104-h16loa3kvzrpkxiv 1177 po...@12...-20080420141642-z9mgyje16kkfy11z 1178 arn...@gm...-20080420173012-we22yoyvldt8u1az 1179 arn...@gm...-20080420173645-l296bgbr60wj267s 1180 arn...@gm...-20080420181134-ypu4ik21vc9ma1u9 1181 arn...@gm...-20080420192935-g59ddftmp35o6wdq 1182 arn...@gm...-20080420194530-qbyih90fixp3jevq 1183 arn...@gm...-20080420200905-mc0wa2egjt6k0783 1184 po...@12...-20080421110151-tm3apquwg3p4otyv 1185 po...@12...-20080421111032-2mwe6we5llzbqfj1 1186 arn...@gm...-20080421112743-av3pdgtq20m91f8c + 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 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 1166 arn...@gm...-20080416204550-0dx3qhxasdkdohx1 1167 arn...@gm...-20080416211510-3ilsym0bom7u2cer 1168 tom@athlon-20080417125238-0hhhchg951y7p83w 1169 arn...@gm...-20080418203137-e6szrje3fje5dgh9 1170 arn...@gm...-20080419164722-vyjrwwvglxr4yxuu 1171 arn...@gm...-20080419164802-o2boulbfrea4e0dx 1172 arn...@gm...-20080419165129-zj3axn731fo84vd5 1173 po...@12...-20080419172806-2qspfwerslo10rd2 1174 arn...@gm...-20080419212304-3wjafor82amtvik3 1175 arn...@gm...-20080419212347-t5oze1b59dk7vkiv 1176 arn...@gm...-20080420133104-h16loa3kvzrpkxiv 1177 po...@12...-20080420141642-z9mgyje16kkfy11z 1178 arn...@gm...-20080420173012-we22yoyvldt8u1az 1179 arn...@gm...-20080420173645-l296bgbr60wj267s 1180 arn...@gm...-20080420181134-ypu4ik21vc9ma1u9 1181 arn...@gm...-20080420192935-g59ddftmp35o6wdq 1182 arn...@gm...-20080420194530-qbyih90fixp3jevq 1183 arn...@gm...-20080420200905-mc0wa2egjt6k0783 1184 po...@12...-20080421110151-tm3apquwg3p4otyv 1185 po...@12...-20080421111032-2mwe6we5llzbqfj1 1186 arn...@gm...-20080421112743-av3pdgtq20m91f8c 1187 arn...@gm...-20080421122035-2ygc85ppjs7rhswn Modified: dcplusplus/trunk/dcpp/po/ar.po =================================================================== --- dcplusplus/trunk/dcpp/po/ar.po 2008-04-24 13:50:11 UTC (rev 1211) +++ dcplusplus/trunk/dcpp/po/ar.po 2008-04-24 14:15:36 UTC (rev 1212) @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: dcpp\n" "Report-Msgid-Bugs-To: dcp...@li...\n" -"POT-Creation-Date: 2008-03-18 22:52+0100\n" +"POT-Creation-Date: 2008-04-21 14:00+0200\n" "PO-Revision-Date: 2008-03-13 22:56+0000\n" "Last-Translator: Jacek Sieka <Unknown>\n" "Language-Team: LANGUAGE <LL...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2008-03-18 21:20+0000\n" +"X-Launchpad-Export-Date: 2008-04-21 11:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" #: dcpp/Util.cpp:381 @@ -63,7 +63,7 @@ "%1% not shared; calculated CRC32 does not match the one found in SFV file." msgstr "" -#: dcpp/QueueManager.cpp:325 +#: dcpp/QueueManager.cpp:332 #, boost-format msgid "%1% renamed to %2%" msgstr "" @@ -78,7 +78,7 @@ msgid "%1% was kicked: %2%" msgstr "" -#: dcpp/DownloadManager.cpp:530 +#: dcpp/DownloadManager.cpp:535 #, fuzzy, boost-format msgid "%1%: File not available" msgstr "الملف غير موجود" @@ -93,19 +93,19 @@ msgid "%s B" msgstr "" -#: dcpp/QueueManager.cpp:532 +#: dcpp/QueueManager.cpp:534 msgid "A file of equal or larger size already exists at the target location" msgstr "الملف بنفس الحجم أو أكبر موجود حاليا في المكان المقصود" -#: dcpp/QueueManager.cpp:475 +#: dcpp/QueueManager.cpp:477 msgid "A file with a different size already exists in the queue" msgstr "الملف ذو الحجم المختلف موجود حاليا في الطابور" -#: dcpp/QueueManager.cpp:478 +#: dcpp/QueueManager.cpp:480 msgid "A file with different tth root already exists in the queue" msgstr "الملف ذو \"تي تي إتش\" مختلف موجود حاليا في الطابور" -#: dcpp/QueueManager.cpp:442 +#: dcpp/QueueManager.cpp:449 msgid "A file with the same hash already exists in your share" msgstr "ملف بنفس الهاتش موجود حاليا" @@ -113,11 +113,11 @@ msgid "All download slots taken" msgstr "كل وصلات التحميل مأخوذة" -#: dcpp/DownloadManager.cpp:376 +#: dcpp/DownloadManager.cpp:381 msgid "CRC32 inconsistency (SFV-Check)" msgstr "CRC32 تضارب (SFV-فحص)" -#: dcpp/DownloadManager.cpp:374 +#: dcpp/DownloadManager.cpp:379 #, fuzzy, boost-format msgid "CRC32 inconsistency (SFV-Check) (File: %1%)" msgstr "CRC32 تضارب (SFV-فحص)" @@ -141,7 +141,7 @@ msgid "Could not open target file: %1%" msgstr "" -#: dcpp/ShareManager.cpp:418 +#: dcpp/ShareManager.cpp:422 msgid "Directory already shared" msgstr "المجلد مستخدم حاليا" @@ -153,7 +153,7 @@ msgid "Disconnected" msgstr "انفصل" -#: dcpp/UploadManager.cpp:450 +#: dcpp/UploadManager.cpp:453 #, boost-format msgid "Disconnected user leaving the hub: %1%" msgstr "" @@ -162,14 +162,14 @@ msgid "Download Queue" msgstr "طابور التحميل" -#: dcpp/ShareManager.cpp:741 +#: dcpp/ShareManager.cpp:802 #, boost-format msgid "" "Duplicate file will not be shared: %1%%2% (Size: %3% B) Dupe matched " "against: %4%%5%" msgstr "" -#: dcpp/QueueManager.cpp:545 dcpp/QueueManager.cpp:549 +#: dcpp/QueueManager.cpp:547 dcpp/QueueManager.cpp:551 #, boost-format msgid "Duplicate source: %1%" msgstr "" @@ -220,22 +220,22 @@ "port)" msgstr "(افحص عنوان السوكس و البورت) UDP فشل في عمل سوكس سيرفر لحدوث تبادل في" -#: dcpp/ShareManager.cpp:776 +#: dcpp/ShareManager.cpp:837 #, fuzzy, boost-format msgid "File list refresh failed: %1%" msgstr "تجديد قائمة الملفات انتهت" -#: dcpp/ShareManager.cpp:820 +#: dcpp/ShareManager.cpp:882 msgid "File list refresh finished" msgstr "تجديد قائمة الملفات انتهت" -#: dcpp/ShareManager.cpp:756 +#: dcpp/ShareManager.cpp:817 msgid "" "File list refresh in progress, please wait for it to finish before trying to " "refresh again" msgstr "" -#: dcpp/ShareManager.cpp:798 +#: dcpp/ShareManager.cpp:858 msgid "File list refresh initiated" msgstr "تجديد قائمة الملفات بدأت" @@ -253,7 +253,7 @@ msgid "Finished hashing: %1% (%2%/s)" msgstr "" -#: dcpp/DownloadManager.cpp:308 +#: dcpp/DownloadManager.cpp:310 msgid "Full tree does not match TTH root" msgstr "السلسلة المحملة لا تتوافق مع \"تي تي إتش\" الرئيسي" @@ -284,7 +284,7 @@ msgid "Invalid size" msgstr "" -#: dcpp/QueueManager.cpp:515 dcpp/QueueManager.cpp:523 +#: dcpp/QueueManager.cpp:517 dcpp/QueueManager.cpp:525 msgid "" "Invalid target file (missing directory, check default download directory " "setting)" @@ -303,24 +303,24 @@ msgid "Maximum command length exceeded" msgstr "" -#: dcpp/DownloadManager.cpp:280 +#: dcpp/DownloadManager.cpp:282 msgid "More data was sent than was expected" msgstr "معلومات أكثر قد أرسلت ، على غير المتوقع" -#: dcpp/ShareManager.cpp:403 +#: dcpp/ShareManager.cpp:409 msgid "No directory specified" msgstr "لم يتم تحديد مجلد معين" -#: dcpp/DownloadManager.cpp:419 +#: dcpp/DownloadManager.cpp:424 msgid "No slots available" msgstr "لا توجد وصلة خالية" -#: dcpp/AdcHub.cpp:577 +#: dcpp/AdcHub.cpp:573 #, boost-format msgid "Not listening for connections - please restart %1%" msgstr "" -#: dcpp/Transfer.cpp:63 dcpp/Transfer.cpp:67 dcpp/ClientManager.cpp:114 +#: dcpp/Transfer.cpp:81 dcpp/Transfer.cpp:85 dcpp/ClientManager.cpp:115 #: dcpp/SearchManager.cpp:267 dcpp/SearchManager.cpp:329 #: dcpp/SearchManager.cpp:331 msgid "Offline" @@ -330,7 +330,7 @@ msgid "Redirect user(s)" msgstr "تحويل المستخدمين" -#: dcpp/ShareManager.cpp:421 +#: dcpp/ShareManager.cpp:425 msgid "Remove all subdirectories before adding this one" msgstr "حذف كل المجلدات الثانوية قبل إضافة هذا" @@ -364,11 +364,11 @@ msgid "TTH inconsistency" msgstr "" -#: dcpp/QueueManager.cpp:510 dcpp/QueueManager.cpp:519 +#: dcpp/QueueManager.cpp:512 dcpp/QueueManager.cpp:521 msgid "Target filename too long" msgstr "الملف المقصود كبير جدا" -#: dcpp/QueueManager.cpp:798 +#: dcpp/QueueManager.cpp:800 msgid "Target removed" msgstr "" @@ -385,11 +385,11 @@ msgid "The socks server requires authentication" msgstr "هذا السوكس يحتاج إلى العريف بالهوية" -#: dcpp/ShareManager.cpp:407 +#: dcpp/ShareManager.cpp:413 msgid "The temporary download directory cannot be shared" msgstr "المجلد الموقت للتحميل لا يمكن استخدامه" -#: dcpp/QueueManager.cpp:465 +#: dcpp/QueueManager.cpp:469 msgid "This file is already queued" msgstr "" @@ -397,7 +397,7 @@ msgid "Unable to create thread" msgstr "عدم القدرة على خلق الوصلة" -#: dcpp/QueueManager.cpp:995 +#: dcpp/QueueManager.cpp:1002 #, boost-format msgid "Unable to open filelist: %1%" msgstr "" @@ -407,7 +407,7 @@ msgid "Unable to read hash data file" msgstr "عدم القدرة على خلق الوصلة" -#: dcpp/QueueManager.cpp:327 +#: dcpp/QueueManager.cpp:334 #, fuzzy, boost-format msgid "Unable to rename %1%: %2%" msgstr "عدم القدرة على خلق الوصلة" @@ -422,18 +422,17 @@ msgid "Unknown error: 0x%1$x" msgstr "" -#: dcpp/ShareManager.cpp:426 dcpp/ShareManager.cpp:468 -msgid "Virtual directory name already exists" -msgstr "اسم مجلد وهمي موجود حاليا" - -#: dcpp/QueueManager.cpp:412 dcpp/QueueManager.cpp:436 +#: dcpp/QueueManager.cpp:419 dcpp/QueueManager.cpp:443 msgid "You're trying to download from yourself!" msgstr "!أنت تحاول التحميل من عند نفسك" -#: dcpp/SettingsManager.cpp:156 +#: dcpp/SettingsManager.cpp:155 msgid "downloaded from" msgstr "" -#: dcpp/SettingsManager.cpp:157 +#: dcpp/SettingsManager.cpp:156 msgid "uploaded to" msgstr "" + +#~ msgid "Virtual directory name already exists" +#~ msgstr "اسم مجلد وهمي موجود حاليا" Modified: dcplusplus/trunk/dcpp/po/bg.po =================================================================== --- dcplusplus/trunk/dcpp/po/bg.po 2008-04-24 13:50:11 UTC (rev 1211) +++ dcplusplus/trunk/dcpp/po/bg.po 2008-04-24 14:15:36 UTC (rev 1212) @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: dcpp\n" "Report-Msgid-Bugs-To: dcp...@li...\n" -"POT-Creation-Date: 2008-03-18 22:52+0100\n" +"POT-Creation-Date: 2008-04-21 14:00+0200\n" "PO-Revision-Date: 2008-03-13 22:56+0000\n" "Last-Translator: Jacek Sieka <Unknown>\n" "Language-Team: LANGUAGE <LL...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2008-03-18 21:20+0000\n" +"X-Launchpad-Export-Date: 2008-04-21 11:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" #: dcpp/Util.cpp:381 @@ -63,7 +63,7 @@ "%1% not shared; calculated CRC32 does not match the one found in SFV file." msgstr "" -#: dcpp/QueueManager.cpp:325 +#: dcpp/QueueManager.cpp:332 #, boost-format msgid "%1% renamed to %2%" msgstr "" @@ -78,7 +78,7 @@ msgid "%1% was kicked: %2%" msgstr "" -#: dcpp/DownloadManager.cpp:530 +#: dcpp/DownloadManager.cpp:535 #, fuzzy, boost-format msgid "%1%: File not available" msgstr "Файлът не е достъпен." @@ -93,20 +93,20 @@ msgid "%s B" msgstr "" -#: dcpp/QueueManager.cpp:532 +#: dcpp/QueueManager.cpp:534 msgid "A file of equal or larger size already exists at the target location" msgstr "" "Файл със същата или по-голяма големина вече съществува в мястото - цел!" -#: dcpp/QueueManager.cpp:475 +#: dcpp/QueueManager.cpp:477 msgid "A file with a different size already exists in the queue" msgstr "Файл с различна големина вече съществува в опашката." -#: dcpp/QueueManager.cpp:478 +#: dcpp/QueueManager.cpp:480 msgid "A file with different tth root already exists in the queue" msgstr "Файл с различен TTH root вече съществува в опашката." -#: dcpp/QueueManager.cpp:442 +#: dcpp/QueueManager.cpp:449 msgid "A file with the same hash already exists in your share" msgstr "Файл със същия хеш вече съществува в споделеното от вас." @@ -114,11 +114,11 @@ msgid "All download slots taken" msgstr "Всички даунлоад-места са заети!" -#: dcpp/DownloadManager.cpp:376 +#: dcpp/DownloadManager.cpp:381 msgid "CRC32 inconsistency (SFV-Check)" msgstr "CRC32 грешка (SFV-Проверка)" -#: dcpp/DownloadManager.cpp:374 +#: dcpp/DownloadManager.cpp:379 #, fuzzy, boost-format msgid "CRC32 inconsistency (SFV-Check) (File: %1%)" msgstr "CRC32 грешка (SFV-Проверка)" @@ -142,7 +142,7 @@ msgid "Could not open target file: %1%" msgstr "" -#: dcpp/ShareManager.cpp:418 +#: dcpp/ShareManager.cpp:422 msgid "Directory already shared" msgstr "Папката вече е споделена!" @@ -154,7 +154,7 @@ msgid "Disconnected" msgstr "Изключен/Прекъснат" -#: dcpp/UploadManager.cpp:450 +#: dcpp/UploadManager.cpp:453 #, boost-format msgid "Disconnected user leaving the hub: %1%" msgstr "" @@ -163,14 +163,14 @@ msgid "Download Queue" msgstr "Опашка за сваляните файлове" -#: dcpp/ShareManager.cpp:741 +#: dcpp/ShareManager.cpp:802 #, boost-format msgid "" "Duplicate file will not be shared: %1%%2% (Size: %3% B) Dupe matched " "against: %4%%5%" msgstr "" -#: dcpp/QueueManager.cpp:545 dcpp/QueueManager.cpp:549 +#: dcpp/QueueManager.cpp:547 dcpp/QueueManager.cpp:551 #, boost-format msgid "Duplicate source: %1%" msgstr "" @@ -223,16 +223,16 @@ "Грешка при настройването на Socks сървъра за UDP relay (Провери адреса и " "порта на сървъра!)" -#: dcpp/ShareManager.cpp:776 +#: dcpp/ShareManager.cpp:837 #, fuzzy, boost-format msgid "File list refresh failed: %1%" msgstr "Опресняването на листата с файлове завърши." -#: dcpp/ShareManager.cpp:820 +#: dcpp/ShareManager.cpp:882 msgid "File list refresh finished" msgstr "Опресняването на листата с файлове завърши." -#: dcpp/ShareManager.cpp:756 +#: dcpp/ShareManager.cpp:817 msgid "" "File list refresh in progress, please wait for it to finish before trying to " "refresh again" @@ -240,7 +240,7 @@ "В момента тече опресняване на листата с файловете, моля изчакайте преди да " "изискате ново опресняване." -#: dcpp/ShareManager.cpp:798 +#: dcpp/ShareManager.cpp:858 msgid "File list refresh initiated" msgstr "Започва опресняване на листата с файлове." @@ -258,7 +258,7 @@ msgid "Finished hashing: %1% (%2%/s)" msgstr "" -#: dcpp/DownloadManager.cpp:308 +#: dcpp/DownloadManager.cpp:310 msgid "Full tree does not match TTH root" msgstr "Файловото дърво не съвпада с този TTH псевдоним" @@ -289,7 +289,7 @@ msgid "Invalid size" msgstr "" -#: dcpp/QueueManager.cpp:515 dcpp/QueueManager.cpp:523 +#: dcpp/QueueManager.cpp:517 dcpp/QueueManager.cpp:525 msgid "" "Invalid target file (missing directory, check default download directory " "setting)" @@ -310,24 +310,24 @@ msgid "Maximum command length exceeded" msgstr "" -#: dcpp/DownloadManager.cpp:280 +#: dcpp/DownloadManager.cpp:282 msgid "More data was sent than was expected" msgstr "Повечето данни бяха изпратени, отколкото се очакваше" -#: dcpp/ShareManager.cpp:403 +#: dcpp/ShareManager.cpp:409 msgid "No directory specified" msgstr "Не е определена папка" -#: dcpp/DownloadManager.cpp:419 +#: dcpp/DownloadManager.cpp:424 msgid "No slots available" msgstr "Няма слотове на разположение" -#: dcpp/AdcHub.cpp:577 +#: dcpp/AdcHub.cpp:573 #, boost-format msgid "Not listening for connections - please restart %1%" msgstr "" -#: dcpp/Transfer.cpp:63 dcpp/Transfer.cpp:67 dcpp/ClientManager.cpp:114 +#: dcpp/Transfer.cpp:81 dcpp/Transfer.cpp:85 dcpp/ClientManager.cpp:115 #: dcpp/SearchManager.cpp:267 dcpp/SearchManager.cpp:329 #: dcpp/SearchManager.cpp:331 msgid "Offline" @@ -337,7 +337,7 @@ msgid "Redirect user(s)" msgstr "Пренасочи потребител(и)" -#: dcpp/ShareManager.cpp:421 +#: dcpp/ShareManager.cpp:425 msgid "Remove all subdirectories before adding this one" msgstr "Премахни всички подпапки преди да добавиш тази" @@ -371,11 +371,11 @@ msgid "TTH inconsistency" msgstr "" -#: dcpp/QueueManager.cpp:510 dcpp/QueueManager.cpp:519 +#: dcpp/QueueManager.cpp:512 dcpp/QueueManager.cpp:521 msgid "Target filename too long" msgstr "Прекалено дълго име на файла-цел" -#: dcpp/QueueManager.cpp:798 +#: dcpp/QueueManager.cpp:800 msgid "Target removed" msgstr "" @@ -392,11 +392,11 @@ msgid "The socks server requires authentication" msgstr "Socks сървъра изисква автентикация (име и парола)." -#: dcpp/ShareManager.cpp:407 +#: dcpp/ShareManager.cpp:413 msgid "The temporary download directory cannot be shared" msgstr "Временната директория не може да бъде споделяна!" -#: dcpp/QueueManager.cpp:465 +#: dcpp/QueueManager.cpp:469 msgid "This file is already queued" msgstr "" @@ -404,7 +404,7 @@ msgid "Unable to create thread" msgstr "Грешка при thread-създаването" -#: dcpp/QueueManager.cpp:995 +#: dcpp/QueueManager.cpp:1002 #, boost-format msgid "Unable to open filelist: %1%" msgstr "" @@ -413,7 +413,7 @@ msgid "Unable to read hash data file" msgstr "Грешка при разчитането на файла с хешовете!" -#: dcpp/QueueManager.cpp:327 +#: dcpp/QueueManager.cpp:334 #, fuzzy, boost-format msgid "Unable to rename %1%: %2%" msgstr "Грешка при thread-създаването" @@ -428,18 +428,17 @@ msgid "Unknown error: 0x%1$x" msgstr "" -#: dcpp/ShareManager.cpp:426 dcpp/ShareManager.cpp:468 -msgid "Virtual directory name already exists" -msgstr "Съществува такова име на вирт. папка" - -#: dcpp/QueueManager.cpp:412 dcpp/QueueManager.cpp:436 +#: dcpp/QueueManager.cpp:419 dcpp/QueueManager.cpp:443 msgid "You're trying to download from yourself!" msgstr "Пробваш се да сваляш от самия себе си файлове!" -#: dcpp/SettingsManager.cpp:156 +#: dcpp/SettingsManager.cpp:155 msgid "downloaded from" msgstr "" -#: dcpp/SettingsManager.cpp:157 +#: dcpp/SettingsManager.cpp:156 msgid "uploaded to" msgstr "" + +#~ msgid "Virtual directory name already exists" +#~ msgstr "Съществува такова име на вирт. папка" Modified: dcplusplus/trunk/dcpp/po/bs.po =================================================================== --- dcplusplus/trunk/dcpp/po/bs.po 2008-04-24 13:50:11 UTC (rev 1211) +++ dcplusplus/trunk/dcpp/po/bs.po 2008-04-24 14:15:36 UTC (rev 1212) @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: dcpp\n" "Report-Msgid-Bugs-To: dcp...@li...\n" -"POT-Creation-Date: 2008-03-18 22:52+0100\n" +"POT-Creation-Date: 2008-04-21 14:00+0200\n" "PO-Revision-Date: 2008-03-13 23:00+0000\n" "Last-Translator: Jacek Sieka <Unknown>\n" "Language-Team: LANGUAGE <LL...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2008-03-18 21:20+0000\n" +"X-Launchpad-Export-Date: 2008-04-21 11:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" #: dcpp/Util.cpp:381 @@ -63,7 +63,7 @@ "%1% not shared; calculated CRC32 does not match the one found in SFV file." msgstr "" -#: dcpp/QueueManager.cpp:325 +#: dcpp/QueueManager.cpp:332 #, boost-format msgid "%1% renamed to %2%" msgstr "" @@ -78,7 +78,7 @@ msgid "%1% was kicked: %2%" msgstr "" -#: dcpp/DownloadManager.cpp:530 +#: dcpp/DownloadManager.cpp:535 #, fuzzy, boost-format msgid "%1%: File not available" msgstr "Fajl nije dostupan" @@ -93,19 +93,19 @@ msgid "%s B" msgstr "" -#: dcpp/QueueManager.cpp:532 +#: dcpp/QueueManager.cpp:534 msgid "A file of equal or larger size already exists at the target location" msgstr "Isti ili veci fajl vec postoji na ciljanoj lokaciji" -#: dcpp/QueueManager.cpp:475 +#: dcpp/QueueManager.cpp:477 msgid "A file with a different size already exists in the queue" msgstr "Fajl sa drugacijom velicinom vec postoji u listi cekanja" -#: dcpp/QueueManager.cpp:478 +#: dcpp/QueueManager.cpp:480 msgid "A file with different tth root already exists in the queue" msgstr "Fajl sa drugacijom TTH kodom vec postoji u listi cekanja" -#: dcpp/QueueManager.cpp:442 +#: dcpp/QueueManager.cpp:449 msgid "A file with the same hash already exists in your share" msgstr "Vec postoji fajl kod tebe sa istim TTH kljucem" @@ -113,11 +113,11 @@ msgid "All download slots taken" msgstr "Svi Slotovi za Download su zauzeti" -#: dcpp/DownloadManager.cpp:376 +#: dcpp/DownloadManager.cpp:381 msgid "CRC32 inconsistency (SFV-Check)" msgstr "CRC32 Neskladnost (SFV-Provjera)" -#: dcpp/DownloadManager.cpp:374 +#: dcpp/DownloadManager.cpp:379 #, fuzzy, boost-format msgid "CRC32 inconsistency (SFV-Check) (File: %1%)" msgstr "CRC32 Neskladnost (SFV-Provjera)" @@ -141,7 +141,7 @@ msgid "Could not open target file: %1%" msgstr "" -#: dcpp/ShareManager.cpp:418 +#: dcpp/ShareManager.cpp:422 msgid "Directory already shared" msgstr "Sadrzaj se vec dijeli" @@ -153,7 +153,7 @@ msgid "Disconnected" msgstr "Iskljucen" -#: dcpp/UploadManager.cpp:450 +#: dcpp/UploadManager.cpp:453 #, boost-format msgid "Disconnected user leaving the hub: %1%" msgstr "" @@ -162,14 +162,14 @@ msgid "Download Queue" msgstr "Lista za Download" -#: dcpp/ShareManager.cpp:741 +#: dcpp/ShareManager.cpp:802 #, boost-format msgid "" "Duplicate file will not be shared: %1%%2% (Size: %3% B) Dupe matched " "against: %4%%5%" msgstr "" -#: dcpp/QueueManager.cpp:545 dcpp/QueueManager.cpp:549 +#: dcpp/QueueManager.cpp:547 dcpp/QueueManager.cpp:551 #, boost-format msgid "Duplicate source: %1%" msgstr "" @@ -221,22 +221,22 @@ msgstr "" "Socks Server nemoze UDP Relay namjestiti (provjerite Adresu i Port Servera)" -#: dcpp/ShareManager.cpp:776 +#: dcpp/ShareManager.cpp:837 #, fuzzy, boost-format msgid "File list refresh failed: %1%" msgstr "Zavrseno obnavljanje fajlliste" -#: dcpp/ShareManager.cpp:820 +#: dcpp/ShareManager.cpp:882 msgid "File list refresh finished" msgstr "Zavrseno obnavljanje fajlliste" -#: dcpp/ShareManager.cpp:756 +#: dcpp/ShareManager.cpp:817 msgid "" "File list refresh in progress, please wait for it to finish before trying to " "refresh again" msgstr "" -#: dcpp/ShareManager.cpp:798 +#: dcpp/ShareManager.cpp:858 msgid "File list refresh initiated" msgstr "Poceto obnavljanje fajlliste" @@ -254,7 +254,7 @@ msgid "Finished hashing: %1% (%2%/s)" msgstr "" -#: dcpp/DownloadManager.cpp:308 +#: dcpp/DownloadManager.cpp:310 msgid "Full tree does not match TTH root" msgstr "Ucitano se ne slaze s TTH kodom" @@ -285,7 +285,7 @@ msgid "Invalid size" msgstr "" -#: dcpp/QueueManager.cpp:515 dcpp/QueueManager.cpp:523 +#: dcpp/QueueManager.cpp:517 dcpp/QueueManager.cpp:525 msgid "" "Invalid target file (missing directory, check default download directory " "setting)" @@ -306,24 +306,24 @@ msgid "Maximum command length exceeded" msgstr "" -#: dcpp/DownloadManager.cpp:280 +#: dcpp/DownloadManager.cpp:282 msgid "More data was sent than was expected" msgstr "Vise podataka je poslato nego sto se zahtijevalo" -#: dcpp/ShareManager.cpp:403 +#: dcpp/ShareManager.cpp:409 msgid "No directory specified" msgstr "Nije naveden direktorijum" -#: dcpp/DownloadManager.cpp:419 +#: dcpp/DownloadManager.cpp:424 msgid "No slots available" msgstr "Nema slobodnih slotova" -#: dcpp/AdcHub.cpp:577 +#: dcpp/AdcHub.cpp:573 #, boost-format msgid "Not listening for connections - please restart %1%" msgstr "" -#: dcpp/Transfer.cpp:63 dcpp/Transfer.cpp:67 dcpp/ClientManager.cpp:114 +#: dcpp/Transfer.cpp:81 dcpp/Transfer.cpp:85 dcpp/ClientManager.cpp:115 #: dcpp/SearchManager.cpp:267 dcpp/SearchManager.cpp:329 #: dcpp/SearchManager.cpp:331 msgid "Offline" @@ -333,7 +333,7 @@ msgid "Redirect user(s)" msgstr "Preusmeravanje korisnika" -#: dcpp/ShareManager.cpp:421 +#: dcpp/ShareManager.cpp:425 msgid "Remove all subdirectories before adding this one" msgstr "Skloniti sve poddirektorijume prije dodavanja ovog" @@ -368,11 +368,11 @@ msgid "TTH inconsistency" msgstr "" -#: dcpp/QueueManager.cpp:510 dcpp/QueueManager.cpp:519 +#: dcpp/QueueManager.cpp:512 dcpp/QueueManager.cpp:521 msgid "Target filename too long" msgstr "Trazeno ime je predugo" -#: dcpp/QueueManager.cpp:798 +#: dcpp/QueueManager.cpp:800 msgid "Target removed" msgstr "" @@ -389,11 +389,11 @@ msgid "The socks server requires authentication" msgstr "Socks Server potrazuje Autorizaciju" -#: dcpp/ShareManager.cpp:407 +#: dcpp/ShareManager.cpp:413 msgid "The temporary download directory cannot be shared" msgstr "Temporary Download Direktorij se nemoze otvoriti" -#: dcpp/QueueManager.cpp:465 +#: dcpp/QueueManager.cpp:469 msgid "This file is already queued" msgstr "" @@ -401,7 +401,7 @@ msgid "Unable to create thread" msgstr "Nemoguce napraviti thread" -#: dcpp/QueueManager.cpp:995 +#: dcpp/QueueManager.cpp:1002 #, boost-format msgid "Unable to open filelist: %1%" msgstr "" @@ -411,7 +411,7 @@ msgid "Unable to read hash data file" msgstr "Nemoguce napraviti thread" -#: dcpp/QueueManager.cpp:327 +#: dcpp/QueueManager.cpp:334 #, fuzzy, boost-format msgid "Unable to rename %1%: %2%" msgstr "Nemoguce napraviti thread" @@ -426,18 +426,17 @@ msgid "Unknown error: 0x%1$x" msgstr "" -#: dcpp/ShareManager.cpp:426 dcpp/ShareManager.cpp:468 -msgid "Virtual directory name already exists" -msgstr "Virtualna mapa s tim imenom vec postoji" - -#: dcpp/QueueManager.cpp:412 dcpp/QueueManager.cpp:436 +#: dcpp/QueueManager.cpp:419 dcpp/QueueManager.cpp:443 msgid "You're trying to download from yourself!" msgstr "Pokusavas da skines od sebe!" -#: dcpp/SettingsManager.cpp:156 +#: dcpp/SettingsManager.cpp:155 msgid "downloaded from" msgstr "" -#: dcpp/SettingsManager.cpp:157 +#: dcpp/SettingsManager.cpp:156 msgid "uploaded to" msgstr "" + +#~ msgid "Virtual directory name already exists" +#~ msgstr "Virtualna mapa s tim imenom vec postoji" Modified: dcplusplus/trunk/dcpp/po/ca.po =================================================================== --- dcplusplus/trunk/dcpp/po/ca.po 2008-04-24 13:50:11 UTC (rev 1211) +++ dcplusplus/trunk/dcpp/po/ca.po 2008-04-24 14:15:36 UTC (rev 1212) @@ -7,45 +7,45 @@ msgstr "" "Project-Id-Version: dcpp\n" "Report-Msgid-Bugs-To: dcp...@li...\n" -"POT-Creation-Date: 2008-03-18 22:52+0100\n" -"PO-Revision-Date: 2008-03-13 23:00+0000\n" -"Last-Translator: Jacek Sieka <Unknown>\n" +"POT-Creation-Date: 2008-04-21 14:00+0200\n" +"PO-Revision-Date: 2008-04-13 13:38+0000\n" +"Last-Translator: el_libre <el....@gm...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2008-03-18 21:20+0000\n" +"X-Launchpad-Export-Date: 2008-04-21 11:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" #: dcpp/Util.cpp:381 #, c-format, boost-format msgid "%'lld B" -msgstr "" +msgstr "%'lld B" #: dcpp/Util.cpp:343 #, c-format, boost-format msgid "%.02f GiB" -msgstr "" +msgstr "%.02f GiB" #: dcpp/Util.cpp:339 #, c-format, boost-format msgid "%.02f KiB" -msgstr "" +msgstr "%.02f KiB" #: dcpp/Util.cpp:341 #, c-format, boost-format msgid "%.02f MiB" -msgstr "" +msgstr "%.02f MiB" #: dcpp/Util.cpp:347 #, c-format, boost-format msgid "%.02f PiB" -msgstr "" +msgstr "%.02f PiB" #: dcpp/Util.cpp:345 #, c-format, boost-format msgid "%.02f TiB" -msgstr "" +msgstr "%.02f TiB" #: dcpp/AdcHub.cpp:139 #, boost-format @@ -55,7 +55,7 @@ #: dcpp/NmdcHub.cpp:281 #, boost-format msgid "%1% (Nick unknown)" -msgstr "" +msgstr "%1% (Pseudònim desconegut)" #: dcpp/HashManager.cpp:767 #, boost-format @@ -63,7 +63,7 @@ "%1% not shared; calculated CRC32 does not match the one found in SFV file." msgstr "" -#: dcpp/QueueManager.cpp:325 +#: dcpp/QueueManager.cpp:332 #, boost-format msgid "%1% renamed to %2%" msgstr "" @@ -78,7 +78,7 @@ msgid "%1% was kicked: %2%" msgstr "" -#: dcpp/DownloadManager.cpp:530 +#: dcpp/DownloadManager.cpp:535 #, fuzzy, boost-format msgid "%1%: File not available" msgstr "Fitxer no disponible" @@ -86,26 +86,26 @@ #: dcpp/Util.cpp:337 #, c-format, boost-format msgid "%d B" -msgstr "" +msgstr "%d B" #: dcpp/Util.cpp:377 #, c-format, boost-format msgid "%s B" -msgstr "" +msgstr "%s Oct" -#: dcpp/QueueManager.cpp:532 +#: dcpp/QueueManager.cpp:534 msgid "A file of equal or larger size already exists at the target location" msgstr "Un fitxer igual o més gran ja existeix al destí" -#: dcpp/QueueManager.cpp:475 +#: dcpp/QueueManager.cpp:477 msgid "A file with a different size already exists in the queue" msgstr "Un fitxer amb una mida diferent, ja existeix en la llista de tasques" -#: dcpp/QueueManager.cpp:478 +#: dcpp/QueueManager.cpp:480 msgid "A file with different tth root already exists in the queue" msgstr "Un fitxer amb un tth diferente ja existeix a la cua" -#: dcpp/QueueManager.cpp:442 +#: dcpp/QueueManager.cpp:449 msgid "A file with the same hash already exists in your share" msgstr "" "Un fitxer amb el mateix hash ja existeix entre els teus fitxers compartits" @@ -114,11 +114,11 @@ msgid "All download slots taken" msgstr "No hi han slots de descàrrega lliures" -#: dcpp/DownloadManager.cpp:376 +#: dcpp/DownloadManager.cpp:381 msgid "CRC32 inconsistency (SFV-Check)" msgstr "Inconsistencia CRC32 (Comprov-SFV)" -#: dcpp/DownloadManager.cpp:374 +#: dcpp/DownloadManager.cpp:379 #, fuzzy, boost-format msgid "CRC32 inconsistency (SFV-Check) (File: %1%)" msgstr "Inconsistencia CRC32 (Comprov-SFV)" @@ -142,19 +142,19 @@ msgid "Could not open target file: %1%" msgstr "" -#: dcpp/ShareManager.cpp:418 +#: dcpp/ShareManager.cpp:422 msgid "Directory already shared" msgstr "Aquest directori ja està compartit" #: dcpp/ADLSearch.h:281 msgid "Discard" -msgstr "" +msgstr "Descarta" #: dcpp/BufferedSocket.cpp:404 msgid "Disconnected" msgstr "Desconectat" -#: dcpp/UploadManager.cpp:450 +#: dcpp/UploadManager.cpp:453 #, boost-format msgid "Disconnected user leaving the hub: %1%" msgstr "" @@ -163,14 +163,14 @@ msgid "Download Queue" msgstr "Cua de descàrrega" -#: dcpp/ShareManager.cpp:741 +#: dcpp/ShareManager.cpp:802 #, boost-format msgid "" "Duplicate file will not be shared: %1%%2% (Size: %3% B) Dupe matched " "against: %4%%5%" msgstr "" -#: dcpp/QueueManager.cpp:545 dcpp/QueueManager.cpp:549 +#: dcpp/QueueManager.cpp:547 dcpp/QueueManager.cpp:551 #, boost-format msgid "Duplicate source: %1%" msgstr "" @@ -223,22 +223,22 @@ "Error al configurar el servidor socks per relay UDP (verifica adreça socks i " "port)" -#: dcpp/ShareManager.cpp:776 +#: dcpp/ShareManager.cpp:837 #, fuzzy, boost-format msgid "File list refresh failed: %1%" msgstr "S'ha acabt la actualització de la llista de fitxers" -#: dcpp/ShareManager.cpp:820 +#: dcpp/ShareManager.cpp:882 msgid "File list refresh finished" msgstr "S'ha acabt la actualització de la llista de fitxers" -#: dcpp/ShareManager.cpp:756 +#: dcpp/ShareManager.cpp:817 msgid "" "File list refresh in progress, please wait for it to finish before trying to " "refresh again" msgstr "" -#: dcpp/ShareManager.cpp:798 +#: dcpp/ShareManager.cpp:858 msgid "File list refresh initiated" msgstr "S'ha iniciat la actualizació de la llista de fitxers" @@ -256,7 +256,7 @@ msgid "Finished hashing: %1% (%2%/s)" msgstr "" -#: dcpp/DownloadManager.cpp:308 +#: dcpp/DownloadManager.cpp:310 msgid "Full tree does not match TTH root" msgstr "L'arbre descarregat no coincideix amb l'arrel TTH" @@ -285,9 +285,9 @@ #: dcpp/DownloadManager.cpp:220 msgid "Invalid size" -msgstr "" +msgstr "La mida és invàlida" -#: dcpp/QueueManager.cpp:515 dcpp/QueueManager.cpp:523 +#: dcpp/QueueManager.cpp:517 dcpp/QueueManager.cpp:525 msgid "" "Invalid target file (missing directory, check default download directory " "setting)" @@ -308,24 +308,24 @@ msgid "Maximum command length exceeded" msgstr "" -#: dcpp/DownloadManager.cpp:280 +#: dcpp/DownloadManager.cpp:282 msgid "More data was sent than was expected" msgstr "S'ha enviado més dades que les esperades" -#: dcpp/ShareManager.cpp:403 +#: dcpp/ShareManager.cpp:409 msgid "No directory specified" msgstr "Directori no especificat" -#: dcpp/DownloadManager.cpp:419 +#: dcpp/DownloadManager.cpp:424 msgid "No slots available" msgstr "No queden slots disponibles" -#: dcpp/AdcHub.cpp:577 +#: dcpp/AdcHub.cpp:573 #, boost-format msgid "Not listening for connections - please restart %1%" msgstr "" -#: dcpp/Transfer.cpp:63 dcpp/Transfer.cpp:67 dcpp/ClientManager.cpp:114 +#: dcpp/Transfer.cpp:81 dcpp/Transfer.cpp:85 dcpp/ClientManager.cpp:115 #: dcpp/SearchManager.cpp:267 dcpp/SearchManager.cpp:329 #: dcpp/SearchManager.cpp:331 msgid "Offline" @@ -335,7 +335,7 @@ msgid "Redirect user(s)" msgstr "Redireccionar usuari(s)" -#: dcpp/ShareManager.cpp:421 +#: dcpp/ShareManager.cpp:425 msgid "Remove all subdirectories before adding this one" msgstr "Eliminar tots els subdirectoris avans d'agregar aquest" @@ -370,11 +370,11 @@ msgid "TTH inconsistency" msgstr "" -#: dcpp/QueueManager.cpp:510 dcpp/QueueManager.cpp:519 +#: dcpp/QueueManager.cpp:512 dcpp/QueueManager.cpp:521 msgid "Target filename too long" msgstr "El nom del fitxer de destí es massa llarg" -#: dcpp/QueueManager.cpp:798 +#: dcpp/QueueManager.cpp:800 msgid "Target removed" msgstr "" @@ -391,11 +391,11 @@ msgid "The socks server requires authentication" msgstr "el servidor socks nescessita autentificació" -#: dcpp/ShareManager.cpp:407 +#: dcpp/ShareManager.cpp:413 msgid "The temporary download directory cannot be shared" msgstr "El directorio de descàrregues temporals no es pot compartir" -#: dcpp/QueueManager.cpp:465 +#: dcpp/QueueManager.cpp:469 msgid "This file is already queued" msgstr "" @@ -403,7 +403,7 @@ msgid "Unable to create thread" msgstr "No es pot crear la tasca" -#: dcpp/QueueManager.cpp:995 +#: dcpp/QueueManager.cpp:1002 #, boost-format msgid "Unable to open filelist: %1%" msgstr "" @@ -413,7 +413,7 @@ msgid "Unable to read hash data file" msgstr "No es pot crear la tasca" -#: dcpp/QueueManager.cpp:327 +#: dcpp/QueueManager.cpp:334 #, fuzzy, boost-format msgid "Unable to rename %1%: %2%" msgstr "No es pot crear la tasca" @@ -428,18 +428,17 @@ msgid "Unknown error: 0x%1$x" msgstr "" -#: dcpp/ShareManager.cpp:426 dcpp/ShareManager.cpp:468 -msgid "Virtual directory name already exists" -msgstr "El nom de la carpeta virtual ja existeix" - -#: dcpp/QueueManager.cpp:412 dcpp/QueueManager.cpp:436 +#: dcpp/QueueManager.cpp:419 dcpp/QueueManager.cpp:443 msgid "You're trying to download from yourself!" msgstr "Estás intentant descarregar de tu mateix!" -#: dcpp/SettingsManager.cpp:156 +#: dcpp/SettingsManager.cpp:155 msgid "downloaded from" msgstr "" -#: dcpp/SettingsManager.cpp:157 +#: dcpp/SettingsManager.cpp:156 msgid "uploaded to" msgstr "" + +#~ msgid "Virtual directory name already exists" +#~ msgstr "El nom de la carpeta virtual ja existeix" Modified: dcplusplus/trunk/dcpp/po/cs.po =================================================================== --- dcplusplus/trunk/dcpp/po/cs.po 2008-04-24 13:50:11 UTC (rev 1211) +++ dcplusplus/trunk/dcpp/po/cs.po 2008-04-24 14:15:36 UTC (rev 1212) @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: dcplusplus\n" "Report-Msgid-Bugs-To: dcp...@li...\n" -"POT-Creation-Date: 2008-03-18 22:52+0100\n" +"POT-Creation-Date: 2008-04-21 14:00+0200\n" "PO-Revision-Date: 2008-03-13 23:00+0000\n" "Last-Translator: marek.tomass <mar...@gm...>\n" "Language-Team: Czech <cs...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2008-03-18 21:20+0000\n" +"X-Launchpad-Export-Date: 2008-04-21 11:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" #: dcpp/Util.cpp:381 @@ -63,7 +63,7 @@ "%1% not shared; calculated CRC32 does not match the one found in SFV file." msgstr "" -#: dcpp/QueueManager.cpp:325 +#: dcpp/QueueManager.cpp:332 #, boost-format msgid "%1% renamed to %2%" msgstr "%1% přejmenovat na %2%" @@ -78,7 +78,7 @@ msgid "%1% was kicked: %2%" msgstr "" -#: dcpp/DownloadManager.cpp:530 +#: dcpp/DownloadManager.cpp:535 #, boost-format msgid "%1%: File not available" msgstr "%1%: Soubor není dostupný" @@ -86,29 +86,27 @@ #: dcpp/Util.cpp:337 #, c-format, boost-format msgid "%d B" -msgstr "" -"Copy text \t\r\n" -"%d B" +msgstr "%d B" #: dcpp/Util.cpp:377 #, c-format, boost-format msgid "%s B" msgstr "%s B" -#: dcpp/QueueManager.cpp:532 +#: dcpp/QueueManager.cpp:534 msgid "A file of equal or larger size already exists at the target location" msgstr "" "Soubor se stejnou nebo vetsi velikosti je uz na miste kam chcete stahovat" -#: dcpp/QueueManager.cpp:475 +#: dcpp/QueueManager.cpp:477 msgid "A file with a different size already exists in the queue" msgstr "Stejny soubor z jinou velkosti je uz ve fronte" -#: dcpp/QueueManager.cpp:478 +#: dcpp/QueueManager.cpp:480 msgid "A file with different tth root already exists in the queue" msgstr "Stejny soubor s jinym tth indexom (tth root) je uz ve fronte" -#: dcpp/QueueManager.cpp:442 +#: dcpp/QueueManager.cpp:449 msgid "A file with the same hash already exists in your share" msgstr "Soubor se stejnym hashem uz sdilite" @@ -116,11 +114,11 @@ msgid "All download slots taken" msgstr "Vsechny upload sloty obsazene" -#: dcpp/DownloadManager.cpp:376 +#: dcpp/DownloadManager.cpp:381 msgid "CRC32 inconsistency (SFV-Check)" msgstr "CRC32 nesuhlasi (SFV kontrola)" -#: dcpp/DownloadManager.cpp:374 +#: dcpp/DownloadManager.cpp:379 #, boost-format msgid "CRC32 inconsistency (SFV-Check) (File: %1%)" msgstr "" @@ -144,7 +142,7 @@ msgid "Could not open target file: %1%" msgstr "" -#: dcpp/ShareManager.cpp:418 +#: dcpp/ShareManager.cpp:422 msgid "Directory already shared" msgstr "Slozka je uz sdilena" @@ -156,7 +154,7 @@ msgid "Disconnected" msgstr "Odpojeny" -#: dcpp/UploadManager.cpp:450 +#: dcpp/UploadManager.cpp:453 #, boost-format msgid "Disconnected user leaving the hub: %1%" msgstr "" @@ -165,14 +163,14 @@ msgid "Download Queue" msgstr "Fronta souboru k stahnuti" -#: dcpp/ShareManager.cpp:741 +#: dcpp/ShareManager.cpp:802 #, boost-format msgid "" "Duplicate file will not be shared: %1%%2% (Size: %3% B) Dupe matched " "against: %4%%5%" msgstr "" -#: dcpp/QueueManager.cpp:545 dcpp/QueueManager.cpp:549 +#: dcpp/QueueManager.cpp:547 dcpp/QueueManager.cpp:551 #, boost-format msgid "Duplicate source: %1%" msgstr "" @@ -225,22 +223,22 @@ "Nespravne nastaveni Socket Serveru pro zaisteni UDP (otevrte adresu Socket " "Serveru a port)" -#: dcpp/ShareManager.cpp:776 +#: dcpp/ShareManager.cpp:837 #, boost-format msgid "File list refresh failed: %1%" msgstr "" -#: dcpp/ShareManager.cpp:820 +#: dcpp/ShareManager.cpp:882 msgid "File list refresh finished" msgstr "Dokonceni obnoveni seznamu souboru" -#: dcpp/ShareManager.cpp:756 +#: dcpp/ShareManager.cpp:817 msgid "" "File list refresh in progress, please wait for it to finish before trying to " "refresh again" msgstr "Cekejte prosim, az sa dokonci obnova seznamu souboru" -#: dcpp/ShareManager.cpp:798 +#: dcpp/ShareManager.cpp:858 msgid "File list refresh initiated" msgstr "Zahajeni obnoveni seznamu souboru" @@ -258,7 +256,7 @@ msgid "Finished hashing: %1% (%2%/s)" msgstr "" -#: dcpp/DownloadManager.cpp:308 +#: dcpp/DownloadManager.cpp:310 msgid "Full tree does not match TTH root" msgstr "Stahnuty strom neodpoveda porovnavanemu TTH zakladu (TTH root)" @@ -289,7 +287,7 @@ msgid "Invalid size" msgstr "" -#: dcpp/QueueManager.cpp:515 dcpp/QueueManager.cpp:523 +#: dcpp/QueueManager.cpp:517 dcpp/QueueManager.cpp:525 msgid "" "Invalid target file (missing directory, check default download directory " "setting)" @@ -310,24 +308,24 @@ msgid "Maximum command length exceeded" msgstr "" -#: dcpp/DownloadManager.cpp:280 +#: dcpp/DownloadManager.cpp:282 msgid "More data was sent than was expected" msgstr "Bylo odoslane vic dat nez bylo ocekavane" -#: dcpp/ShareManager.cpp:403 +#: dcpp/ShareManager.cpp:409 msgid "No directory specified" msgstr "Nebyla zvolena slozka" -#: dcpp/DownloadManager.cpp:419 +#: dcpp/DownloadManager.cpp:424 msgid "No slots available" msgstr "Nejsou volne zadne sloty" -#: dcpp/AdcHub.cpp:577 +#: dcpp/AdcHub.cpp:573 #, boost-format msgid "Not listening for connections - please restart %1%" msgstr "" -#: dcpp/Transfer.cpp:63 dcpp/Transfer.cpp:67 dcpp/ClientManager.cpp:114 +#: dcpp/Transfer.cpp:81 dcpp/Transfer.cpp:85 dcpp/ClientManager.cpp:115 #: dcpp/SearchManager.cpp:267 dcpp/SearchManager.cpp:329 #: dcpp/SearchManager.cpp:331 msgid "Offline" @@ -337,7 +335,7 @@ msgid "Redirect user(s)" msgstr "Presmerovat uzivatele" -#: dcpp/ShareManager.cpp:421 +#: dcpp/ShareManager.cpp:425 msgid "Remove all subdirectories before adding this one" msgstr "Odeberte vsecky podslozky, nez pridate tuto" @@ -370,11 +368,11 @@ msgid "TTH inconsistency" msgstr "" -#: dcpp/QueueManager.cpp:510 dcpp/QueueManager.cpp:519 +#: dcpp/QueueManager.cpp:512 dcpp/QueueManager.cpp:521 msgid "Target filename too long" msgstr "Cilove jmeno souboru je prilis dlouhe" -#: dcpp/Queu... [truncated message content] |
From: <arn...@us...> - 2008-04-24 13:50:21
|
Revision: 1211 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1211&view=rev Author: arnetheduck Date: 2008-04-24 06:50:11 -0700 (Thu, 24 Apr 2008) Log Message: ----------- Rename exceptions, convert some exceptions to asserts Modified Paths: -------------- dcplusplus/trunk/dwt/include/dwt/Application.h dcplusplus/trunk/dwt/include/dwt/ClipBoard.h dcplusplus/trunk/dwt/include/dwt/LibraryLoader.h dcplusplus/trunk/dwt/include/dwt/aspects/AspectFileFilter.h dcplusplus/trunk/dwt/include/dwt/aspects/AspectScrollable.h dcplusplus/trunk/dwt/include/dwt/aspects/AspectSizable.h dcplusplus/trunk/dwt/include/dwt/resources/Font.h dcplusplus/trunk/dwt/include/dwt/widgets/ComboBox.h dcplusplus/trunk/dwt/include/dwt/widgets/CoolBar.h dcplusplus/trunk/dwt/include/dwt/widgets/DateTime.h dcplusplus/trunk/dwt/include/dwt/widgets/MDIParent.h dcplusplus/trunk/dwt/include/dwt/widgets/Menu.h dcplusplus/trunk/dwt/include/dwt/widgets/Spinner.h dcplusplus/trunk/dwt/include/dwt/widgets/StatusBar.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/WidgetListViewEditBox.h dcplusplus/trunk/dwt/src/Application.cpp dcplusplus/trunk/dwt/src/CanvasClasses.cpp dcplusplus/trunk/dwt/src/ImageList.cpp dcplusplus/trunk/dwt/src/LibraryLoader.cpp dcplusplus/trunk/dwt/src/Widget.cpp dcplusplus/trunk/dwt/src/WindowClass.cpp dcplusplus/trunk/dwt/src/widgets/CoolBar.cpp dcplusplus/trunk/dwt/src/widgets/MDIChild.cpp dcplusplus/trunk/dwt/src/widgets/MDIParent.cpp dcplusplus/trunk/dwt/src/widgets/Menu.cpp dcplusplus/trunk/dwt/src/widgets/ModalDialog.cpp dcplusplus/trunk/dwt/src/widgets/ModelessDialog.cpp dcplusplus/trunk/dwt/src/widgets/RichTextBox.cpp dcplusplus/trunk/dwt/src/widgets/TabView.cpp dcplusplus/trunk/dwt/src/widgets/Table.cpp dcplusplus/trunk/dwt/src/widgets/ToolBar.cpp dcplusplus/trunk/dwt/src/widgets/ToolTip.cpp dcplusplus/trunk/win32/WinUtil.cpp dcplusplus/trunk/win32/main.cpp Added Paths: ----------- dcplusplus/trunk/dwt/include/dwt/DWTException.h dcplusplus/trunk/dwt/include/dwt/util/check.h dcplusplus/trunk/dwt/src/DWTException.cpp Removed Paths: ------------- dcplusplus/trunk/dwt/include/dwt/xCeption.h Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-21 13:10:32.687999964 +0200 committer: poy <po...@12...> properties: branch-nick: repo + timestamp: 2008-04-21 13:27:43.910000086 +0200 committer: Jacek Sieka <arn...@gm...> properties: branch-nick: dcplusplus Name: bzr:file-ids - + dwt/include/dwt/DWTException.h 712@f586c4b0-9d0d-0410-bc51-f1fe239209fc:dcplusplus%2Ftrunk:smartwin%2Finclude%2Fsmartwin%2FxCeption.h dwt/include/dwt/util/check.h check.h-20080421112644-f99r6p5ifproaii9-2 dwt/src/DWTException.cpp dwtexception.cpp-20080421112644-f99r6p5ifproaii9-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 1131 po...@12...-20080411153057-tn7zhxqk0z7ceref 1132 arn...@gm...-20080411200946-ierqlg8v9vzj18n2 1133 arn...@gm...-20080411201718-ecshulwd7ic0wdci 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 1166 arn...@gm...-20080416204550-0dx3qhxasdkdohx1 1167 arn...@gm...-20080416211510-3ilsym0bom7u2cer 1168 tom@athlon-20080417125238-0hhhchg951y7p83w 1169 arn...@gm...-20080418203137-e6szrje3fje5dgh9 1170 arn...@gm...-20080419164722-vyjrwwvglxr4yxuu 1171 arn...@gm...-20080419164802-o2boulbfrea4e0dx 1172 arn...@gm...-20080419165129-zj3axn731fo84vd5 1173 po...@12...-20080419172806-2qspfwerslo10rd2 1174 arn...@gm...-20080419212304-3wjafor82amtvik3 1175 arn...@gm...-20080419212347-t5oze1b59dk7vkiv 1176 arn...@gm...-20080420133104-h16loa3kvzrpkxiv 1177 po...@12...-20080420141642-z9mgyje16kkfy11z 1178 arn...@gm...-20080420173012-we22yoyvldt8u1az 1179 arn...@gm...-20080420173645-l296bgbr60wj267s 1180 arn...@gm...-20080420181134-ypu4ik21vc9ma1u9 1181 arn...@gm...-20080420192935-g59ddftmp35o6wdq 1182 arn...@gm...-20080420194530-qbyih90fixp3jevq 1183 arn...@gm...-20080420200905-mc0wa2egjt6k0783 1184 po...@12...-20080421110151-tm3apquwg3p4otyv 1185 po...@12...-20080421111032-2mwe6we5llzbqfj1 + 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 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 1166 arn...@gm...-20080416204550-0dx3qhxasdkdohx1 1167 arn...@gm...-20080416211510-3ilsym0bom7u2cer 1168 tom@athlon-20080417125238-0hhhchg951y7p83w 1169 arn...@gm...-20080418203137-e6szrje3fje5dgh9 1170 arn...@gm...-20080419164722-vyjrwwvglxr4yxuu 1171 arn...@gm...-20080419164802-o2boulbfrea4e0dx 1172 arn...@gm...-20080419165129-zj3axn731fo84vd5 1173 po...@12...-20080419172806-2qspfwerslo10rd2 1174 arn...@gm...-20080419212304-3wjafor82amtvik3 1175 arn...@gm...-20080419212347-t5oze1b59dk7vkiv 1176 arn...@gm...-20080420133104-h16loa3kvzrpkxiv 1177 po...@12...-20080420141642-z9mgyje16kkfy11z 1178 arn...@gm...-20080420173012-we22yoyvldt8u1az 1179 arn...@gm...-20080420173645-l296bgbr60wj267s 1180 arn...@gm...-20080420181134-ypu4ik21vc9ma1u9 1181 arn...@gm...-20080420192935-g59ddftmp35o6wdq 1182 arn...@gm...-20080420194530-qbyih90fixp3jevq 1183 arn...@gm...-20080420200905-mc0wa2egjt6k0783 1184 po...@12...-20080421110151-tm3apquwg3p4otyv 1185 po...@12...-20080421111032-2mwe6we5llzbqfj1 1186 arn...@gm...-20080421112743-av3pdgtq20m91f8c Modified: dcplusplus/trunk/dwt/include/dwt/Application.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/Application.h 2008-04-24 13:45:26 UTC (rev 1210) +++ dcplusplus/trunk/dwt/include/dwt/Application.h 2008-04-24 13:50:11 UTC (rev 1211) @@ -60,7 +60,6 @@ // Forward declaration of friends class Widget; -class xCeption; namespace Policies { class ModelessDialog; @@ -151,11 +150,6 @@ */ static void checkCorruptOrMemleak( bool & corruptMemMemLeak ); - /// Shows the xCeption. - /** Used if an exception occurs in the message loop in WinMain. - */ - static unsigned int reportErr( xCeption & err, bool corruptMemMemLeak ); - /// Returns the command line object /** The command line object contains the parameters given to the process during * startup. <br> Modified: dcplusplus/trunk/dwt/include/dwt/ClipBoard.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/ClipBoard.h 2008-04-24 13:45:26 UTC (rev 1210) +++ dcplusplus/trunk/dwt/include/dwt/ClipBoard.h 2008-04-24 13:50:11 UTC (rev 1211) @@ -38,6 +38,7 @@ #include "WindowsHeaders.h" #include "tstring.h" +#include "DWTException.h" namespace dwt { @@ -123,24 +124,17 @@ void setClipBoardData( const tstring & str, const Widget * owner ) { if ( !::OpenClipboard( owner->handle() ) ) - throw dwt::xCeption( _T( "Couldn't open the clipboard" ) ); - try - { - ::EmptyClipboard(); - HGLOBAL handle = ::GlobalAlloc( GMEM_MOVEABLE, sizeof( TCHAR ) * str.size() + 1 ); - if ( 0 == handle ) - throw dwt::xCeption( _T( "Couldn't allocate memory to hold clipboard data" ) ); - TCHAR * buffer = reinterpret_cast< TCHAR * >( GlobalLock( handle ) ); - memcpy( buffer, str.c_str(), sizeof( TCHAR ) * str.size() ); - GlobalUnlock( handle ); - SetClipboardData( CF_TEXT, handle ); - CloseClipboard(); - } - catch ( ... ) - { - ::CloseClipboard(); - throw; - } + throw Win32Excepction( "Couldn't open the clipboard" ); + + ::EmptyClipboard(); + HGLOBAL handle = ::GlobalAlloc( GMEM_MOVEABLE, sizeof( TCHAR ) * str.size() + 1 ); + if ( 0 == handle ) + throw Win32Exception( "Couldn't allocate memory to hold clipboard data" ); + TCHAR * buffer = reinterpret_cast< TCHAR * >( GlobalLock( handle ) ); + memcpy( buffer, str.c_str(), sizeof( TCHAR ) * str.size() ); + GlobalUnlock( handle ); + SetClipboardData( CF_TEXT, handle ); + CloseClipboard(); } /// Retrieves clipboard data from the clipboard (assumes clipboard format is string) Copied: dcplusplus/trunk/dwt/include/dwt/DWTException.h (from rev 1210, dcplusplus/trunk/dwt/include/dwt/xCeption.h) =================================================================== --- dcplusplus/trunk/dwt/include/dwt/DWTException.h (rev 0) +++ dcplusplus/trunk/dwt/include/dwt/DWTException.h 2008-04-24 13:50:11 UTC (rev 1211) @@ -0,0 +1,87 @@ +/* + 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. +*/ + +#ifndef DWT_EXCEPTION_H +#define DWT_EXCEPTION_H + +#include "WindowsHeaders.h" + +#include <string> +#include <stdexcept> + +namespace dwt { + +/// Exception class used in SmartWin +/** All exceptions thrown by SmartWin will be either of this class or derived from + * this class. <br> + * You should derive from this class yourself if you throw exceptions inside your + * event handlers. <br> + * Otherwise SmartWin may not be able to respond correctly to the Exception. + */ +class DWTException : public std::runtime_error { +public: + + DWTException( const std::string& err ) : std::runtime_error(err) { + + } + + virtual ~DWTException() throw() { + }; + +private: +}; + +/// Utility class for handling win32 errors - don't use it directly... +class Win32Exception : public DWTException { +public: + Win32Exception() : DWTException(translateLastError()), code(::GetLastError()) { + + } + + Win32Exception(const std::string& msg) : DWTException(msg + " (" + translateLastError() + ")"), code(::GetLastError()) { + + } + + DWORD getCode() { return code; } + +private: + DWORD code; + + static std::string translateLastError(); +}; + +} + +#endif Modified: dcplusplus/trunk/dwt/include/dwt/LibraryLoader.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/LibraryLoader.h 2008-04-24 13:45:26 UTC (rev 1210) +++ dcplusplus/trunk/dwt/include/dwt/LibraryLoader.h 2008-04-24 13:50:11 UTC (rev 1211) @@ -38,7 +38,6 @@ #include "WindowsHeaders.h" #include "tstring.h" -#include "xCeption.h" #include <boost/noncopyable.hpp> Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectFileFilter.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/aspects/AspectFileFilter.h 2008-04-24 13:45:26 UTC (rev 1210) +++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectFileFilter.h 2008-04-24 13:50:11 UTC (rev 1211) @@ -38,7 +38,7 @@ #include "../WindowsHeaders.h" #include "../tstring.h" -#include "../xCeption.h" +#include "../util/check.h" namespace dwt { @@ -75,10 +75,9 @@ * filter used when first showing the dialog. */ WidgetType& setActiveFilter( unsigned filterNo ) { - if ( filterNo >= itsFilter.size() ) - { - xCeption x( _T( "Tried to set active filter to more than number of filters in filter..." ) ); - throw x; + if ( filterNo >= itsFilter.size() ) { + dwtDebugFail( "Tried to set active filter to more than number of filters in filter..." ); + return W(); } itsActiveFilter = filterNo; return W(); Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectScrollable.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/aspects/AspectScrollable.h 2008-04-24 13:45:26 UTC (rev 1210) +++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectScrollable.h 2008-04-24 13:50:11 UTC (rev 1211) @@ -38,6 +38,7 @@ #include "../Dispatchers.h" #include "../Message.h" +#include "../util/check.h" namespace dwt { @@ -90,7 +91,7 @@ { SCROLLINFO scrollInfo = { sizeof(SCROLLINFO), SIF_RANGE | SIF_PAGE | SIF_POS }; BOOL ret = ::GetScrollInfo(static_cast<WidgetType*>(this)->handle(), SB_VERT, &scrollInfo); - xAssert(ret != FALSE, _T("Can't get scroll info in scrollIsAtEnd")); + dwtassert(ret != FALSE, _T("Can't get scroll info in scrollIsAtEnd")); return (scrollInfo.nPos == static_cast<int>(scrollInfo.nMax - std::max(scrollInfo.nPage - 1, 0u))); } Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectSizable.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/aspects/AspectSizable.h 2008-04-24 13:45:26 UTC (rev 1210) +++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectSizable.h 2008-04-24 13:50:11 UTC (rev 1211) @@ -38,7 +38,7 @@ #include "../Widget.h" #include "../Place.h" -#include "../xCeption.h" +#include "../util/check.h" #include "../Dispatchers.h" #include "../Events.h" @@ -250,37 +250,20 @@ virtual ~AspectSizable() { } }; -/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -// Implementation of class -/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// template< class WidgetType > -void AspectSizable< WidgetType >::setBounds( const Rectangle & rect, bool updateWindow ) -{ - if ( ::MoveWindow( H(), - rect.x(), rect.y(), rect.width(), rect.height(), updateWindow ? TRUE : FALSE ) == 0 ) - { - xCeption err( _T( "Couldn't reposition windows" ) ); - throw err; - } +void AspectSizable< WidgetType >::setBounds( const Rectangle & rect, bool updateWindow) { + setBounds(rect.x(), rect.y(), rect.width(), rect.height(), updateWindow); } template< class WidgetType > -void AspectSizable< WidgetType >::setBounds( const Point & newPos, const Point & newSize, bool updateWindow ) -{ - if ( ::MoveWindow( H(), newPos.x, newPos.y, newSize.x, newSize.y, updateWindow ? TRUE : FALSE ) == 0 ) - { - xCeption err( _T( "Couldn't reposition windows" ) ); - throw err; - } +void AspectSizable< WidgetType >::setBounds( const Point & newPos, const Point & newSize, bool updateWindow ) { + setBounds(newPos.x, newPos.y, newSize.x, newSize.y, updateWindow); } template< class WidgetType > -void AspectSizable< WidgetType >::setBounds( int x, int y, int width, int height, bool updateWindow ) -{ - if ( ::MoveWindow( H(), x, y, width, height, updateWindow ? TRUE : FALSE ) == 0 ) - { - xCeption err( _T( "Couldn't reposition windows" ) ); - throw err; +void AspectSizable< WidgetType >::setBounds( int x, int y, int width, int height, bool updateWindow ) { + if ( ::MoveWindow( H(), x, y, width, height, updateWindow ? TRUE : FALSE ) == 0 ) { + dwtDebugFail("Couldn't reposition windows"); } } Modified: dcplusplus/trunk/dwt/include/dwt/resources/Font.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/resources/Font.h 2008-04-24 13:45:26 UTC (rev 1210) +++ dcplusplus/trunk/dwt/include/dwt/resources/Font.h 2008-04-24 13:50:11 UTC (rev 1211) @@ -38,7 +38,6 @@ #include "../WindowsHeaders.h" #include "../tstring.h" -#include "../xCeption.h" #include "Handle.h" namespace dwt { Added: dcplusplus/trunk/dwt/include/dwt/util/check.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/util/check.h (rev 0) +++ dcplusplus/trunk/dwt/include/dwt/util/check.h 2008-04-24 13:50:11 UTC (rev 1211) @@ -0,0 +1,21 @@ +#ifndef CHECK_H_ +#define CHECK_H_ + +namespace dwt { namespace util { + +#ifdef _DEBUG + +#define dwtDebugFail(m) assert( (false && (m)) ) + +#else + +#define dwtDebugFail(m) + +#endif + +#define dwtassert(x, m) assert( (x) && (m) ) + +#define dwtWin32DebugFail(m) dwtDebugFail(m) + +} } +#endif /*CHECK_H_*/ Modified: dcplusplus/trunk/dwt/include/dwt/widgets/ComboBox.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/ComboBox.h 2008-04-24 13:45:26 UTC (rev 1210) +++ dcplusplus/trunk/dwt/include/dwt/widgets/ComboBox.h 2008-04-24 13:50:11 UTC (rev 1211) @@ -86,7 +86,6 @@ /// Object type typedef ThisType* ObjectType; - /// 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 @@ -129,9 +128,8 @@ void create( const Seed & cs = Seed() ); protected: - /// Constructor Taking pointer to parent - explicit ComboBox( Widget * parent ); - + ComboBox(Widget* parent); + // Protected to avoid direct instantiation, you can inherit and use // WidgetFactory class which is friend virtual ~ComboBox() @@ -200,8 +198,7 @@ int newIdx = ComboBox_AddString( handle(), ( TCHAR * ) val.c_str() ); if ( newIdx == CB_ERR ) { - xCeption x( _T( "Error while trying to add string into ComboBox" ) ); - throw x; + dwtWin32DebugFail("Error while trying to add string into ComboBox"); } return newIdx; } @@ -211,8 +208,7 @@ int newIdx = ComboBox_InsertString( handle(), pos, ( TCHAR * ) val.c_str() ); if ( newIdx == CB_ERR ) { - xCeption x( _T( "Error while trying to insert string into ComboBox" ) ); - throw x; + dwtWin32DebugFail("Error while trying to insert string into ComboBox"); } return newIdx; } @@ -221,9 +217,9 @@ return static_cast<size_t>(ComboBox_GetCount( handle() )); // Number of items present. } -inline ComboBox::ComboBox( Widget * parent ) - : BaseType( parent ) -{ + +inline ComboBox::ComboBox( Widget* parent ) : BaseType(parent) { + } } Modified: dcplusplus/trunk/dwt/include/dwt/widgets/CoolBar.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/CoolBar.h 2008-04-24 13:45:26 UTC (rev 1210) +++ dcplusplus/trunk/dwt/include/dwt/widgets/CoolBar.h 2008-04-24 13:50:11 UTC (rev 1211) @@ -45,7 +45,7 @@ #include "../aspects/AspectRaw.h" #include "../aspects/AspectSizable.h" #include "../aspects/AspectVisible.h" -#include "../xCeption.h" +#include "../util/check.h" namespace dwt { @@ -142,24 +142,17 @@ : BaseType( parent ) { // Can't have a text box without a parent... - xAssert( parent, _T( "Can't have a Button without a parent..." ) ); + dwtassert( parent, _T( "Can't have a Button without a parent..." ) ); } -inline void CoolBar::refresh() -{ +inline void CoolBar::refresh() { // This might look a bit stupid, but Windows API have some minor flaws. One of // those flaws is that a Coolbar (and a Toolbar) control must be "resized" with // a dummy value to make sure the Coolbar (&& the Toolbar) fills up the // complete area of the container Widget... - - // HC comment: sorry ;( but no smiley faces ;) anywhere, not even in comments. - // They mess up with my macros to check delimiters ... - Rectangle rect; - if ( ::MoveWindow( this->handle(), - rect.x(), rect.y(), rect.width(), rect.height(), TRUE ) == 0 ) - { - xCeption err( _T( "Couldn't reposition windows" ) ); - throw err; + + if ( ::MoveWindow( this->handle(), 0, 0, 0, 0, TRUE ) == 0 ) { + dwtWin32DebugFail("Couldn't reposition windows"); } } Modified: dcplusplus/trunk/dwt/include/dwt/widgets/DateTime.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/DateTime.h 2008-04-24 13:45:26 UTC (rev 1210) +++ dcplusplus/trunk/dwt/include/dwt/widgets/DateTime.h 2008-04-24 13:50:11 UTC (rev 1211) @@ -240,7 +240,7 @@ : BaseType( parent ) { // Can't have a text box without a parent... - xAssert( parent, _T( "Can't have a TextBox without a parent..." ) ); + dwtassert( parent, _T( "Can't have a TextBox without a parent..." ) ); } inline void DateTime::setBackgroundColor( COLORREF color ) Modified: dcplusplus/trunk/dwt/include/dwt/widgets/MDIParent.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/MDIParent.h 2008-04-24 13:45:26 UTC (rev 1210) +++ dcplusplus/trunk/dwt/include/dwt/widgets/MDIParent.h 2008-04-24 13:50:11 UTC (rev 1211) @@ -148,7 +148,7 @@ : BaseType( parent ) { // Can't have a text box without a parent... - xAssert( parent, _T( "Can't have a MDIParent without a parent..." ) ); + dwtassert( parent, _T( "Can't have a MDIParent without a parent..." ) ); } // end namespace dwt Modified: dcplusplus/trunk/dwt/include/dwt/widgets/Menu.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/Menu.h 2008-04-24 13:45:26 UTC (rev 1210) +++ dcplusplus/trunk/dwt/include/dwt/widgets/Menu.h 2008-04-24 13:50:11 UTC (rev 1211) @@ -186,7 +186,7 @@ void attach(HMENU hMenu, const Seed& cs); - bool setMenu(); + void setMenu(); /// Appends a popup to the menu /** Everything you "append" to a menu is added sequentially to the menu <br> @@ -261,16 +261,16 @@ * this number should be unique across the application. */ - bool appendItem(unsigned int id, const tstring & text, BitmapPtr image = BitmapPtr()); + void appendItem(unsigned int id, const tstring & text, BitmapPtr image = BitmapPtr()); template<typename DispatcherType> - bool appendItem(unsigned int id, const tstring & text, const typename DispatcherType::F& f, BitmapPtr image = BitmapPtr()) { + void appendItem(unsigned int id, const tstring & text, const typename DispatcherType::F& f, BitmapPtr image = BitmapPtr()) { itsParent->setCallback(Message(WM_COMMAND, id), DispatcherType(f)); - return appendItem(id, text, image); + appendItem(id, text, image); } - bool appendItem(unsigned int id, const tstring & text, const IdDispatcher::F& f, BitmapPtr image = BitmapPtr()) { - return appendItem<IdDispatcher>(id, text, f, image); + void appendItem(unsigned int id, const tstring & text, const IdDispatcher::F& f, BitmapPtr image = BitmapPtr()) { + appendItem<IdDispatcher>(id, text, f, image); } /// Removes specified item from this menu @@ -350,7 +350,7 @@ * parameter. <br> * If the "value" parameter is true the item becomes enabled, otherwise disabled */ - bool setItemEnabled( unsigned id, bool byPosition = false, bool value = true ); + void setItemEnabled( unsigned id, bool byPosition = false, bool value = true ); UINT getMenuState(UINT id, bool byPosition = false); @@ -363,7 +363,7 @@ /// Return true if the menu item is enabled (not grey and not disabled) bool isEnabled(UINT id, bool byPosition = false); - bool setDefaultItem(UINT id, bool byPosition = false); + void setDefaultItem(UINT id, bool byPosition = false); /// Returns true if menu is "system menu" (icon in top left of window) bool isSystemMenu() @@ -381,7 +381,7 @@ /** Which menu item you wish to set the text is defined by the "id" * parameter of the function. */ - bool setText( unsigned id, const tstring& text ); + void setText( unsigned id, const tstring& text ); ObjectType getChild(UINT position); Modified: dcplusplus/trunk/dwt/include/dwt/widgets/Spinner.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/Spinner.h 2008-04-24 13:45:26 UTC (rev 1210) +++ dcplusplus/trunk/dwt/include/dwt/widgets/Spinner.h 2008-04-24 13:50:11 UTC (rev 1211) @@ -152,8 +152,7 @@ LRESULT retVal = ::SendMessage( this->handle(), UDM_GETPOS, 0, 0 ); if ( HIWORD( retVal ) != 0 ) { - xCeption err( _T( " Something went wrong while trying to retrieve value if Spinner" ) ); - throw err; + dwtWin32DebugFail(" Something went wrong while trying to retrieve value if Spinner"); } return LOWORD( retVal ); #else Modified: dcplusplus/trunk/dwt/include/dwt/widgets/StatusBar.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/StatusBar.h 2008-04-24 13:45:26 UTC (rev 1210) +++ dcplusplus/trunk/dwt/include/dwt/widgets/StatusBar.h 2008-04-24 13:50:11 UTC (rev 1211) @@ -161,12 +161,9 @@ // 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. - dwt::Rectangle rect; - if ( ::MoveWindow( this->handle(), - rect.x(), rect.y(), rect.width(), rect.height(), TRUE ) == 0 ) + if ( ::MoveWindow( this->handle(), 0, 0, 0, 0, TRUE ) == 0 ) { - xCeption err( _T( "Couldn't reposition windows" ) ); - throw err; + dwtWin32DebugFail("Couldn't reposition windows"); } } Modified: dcplusplus/trunk/dwt/include/dwt/widgets/Table.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/Table.h 2008-04-24 13:45:26 UTC (rev 1210) +++ dcplusplus/trunk/dwt/include/dwt/widgets/Table.h 2008-04-24 13:50:11 UTC (rev 1211) @@ -231,7 +231,7 @@ /// Change the current icon of an item /** Sets a new icon for a given item */ - bool setIcon( unsigned row, int newIconIndex ); + void setIcon( unsigned row, int newIconIndex ); /// Returns a boolean indicating if the Grid is in "read only" mode or not /** If the return value is true the Grid is in "read only" mode and cannot be @@ -302,7 +302,7 @@ * width of the list which is quite useful to make the Data Grid fill its whole * client area. */ - bool setColumnWidth( unsigned columnNo, int width ); + void setColumnWidth( unsigned columnNo, int width ); /// Returns the checked state of the given row /** A list view can have checkboxes in each row, if the checkbox for the given @@ -433,7 +433,7 @@ /// Force redraw of a range of items. /** You may want to call invalidateWidget after the this call to force repaint. */ - bool redraw( int firstRow = 0, int lastRow = -1 ); + void redraw( int firstRow = 0, int lastRow = -1 ); void setTableStyle(int style); @@ -733,12 +733,14 @@ } inline void Table::eraseColumn( unsigned columnNo ) { - xAssert( columnNo != 0, _T( "Can't delete the leftmost column" ) ); + dwtassert( columnNo != 0, _T( "Can't delete the leftmost column" ) ); ListView_DeleteColumn( this->handle(), columnNo ); } -inline bool Table::setColumnWidth( unsigned columnNo, int width ) { - return ListView_SetColumnWidth( this->handle(), columnNo, width ); +inline void Table::setColumnWidth( unsigned columnNo, int width ) { + if ( ListView_SetColumnWidth( this->handle(), columnNo, width ) == FALSE ) { + dwtWin32DebugFail("Couldn't resize columns of Table"); + } } inline void Table::clearImpl() { Modified: dcplusplus/trunk/dwt/include/dwt/widgets/TextBox.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/TextBox.h 2008-04-24 13:45:26 UTC (rev 1210) +++ dcplusplus/trunk/dwt/include/dwt/widgets/TextBox.h 2008-04-24 13:50:11 UTC (rev 1211) @@ -371,7 +371,7 @@ : BaseType( parent ) { // Can't have a text box without a parent... - xAssert( parent, _T( "Cant have a TextBox without a parent..." ) ); + dwtassert( parent, _T( "Cant have a TextBox without a parent..." ) ); } inline TextBox::TextBox( Widget * parent ) Modified: dcplusplus/trunk/dwt/include/dwt/widgets/ToolBar.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/ToolBar.h 2008-04-24 13:45:26 UTC (rev 1210) +++ dcplusplus/trunk/dwt/include/dwt/widgets/ToolBar.h 2008-04-24 13:50:11 UTC (rev 1211) @@ -42,6 +42,7 @@ #include "../aspects/AspectFocus.h" #include "../aspects/AspectFont.h" #include "../resources/ImageList.h" +#include "../DWTException.h" #include "Control.h" #include <vector> @@ -203,8 +204,7 @@ if ( this->sendMessage(TB_SETBUTTONSIZE, 0, static_cast< LPARAM >( MAKELONG( width, height ) ) ) != TRUE || this->sendMessage(TB_SETBITMAPSIZE, 0, static_cast< LPARAM >( MAKELONG( width, height ) ) ) != TRUE ) { - xCeption x( _T( "Error while trying to set toolbar button size..." ) ); - throw x; + throw Win32Exception( "Error while trying to set toolbar button size..."); } } Modified: dcplusplus/trunk/dwt/include/dwt/widgets/ToolTip.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/ToolTip.h 2008-04-24 13:45:26 UTC (rev 1210) +++ dcplusplus/trunk/dwt/include/dwt/widgets/ToolTip.h 2008-04-24 13:50:11 UTC (rev 1211) @@ -37,6 +37,7 @@ #include "../aspects/AspectFont.h" #include "../aspects/AspectRaw.h" #include "../aspects/AspectVisible.h" +#include "../util/check.h" namespace dwt { @@ -115,7 +116,7 @@ : BaseType( parent ) { // Can't have a text box without a parent... - xAssert( parent, _T( "Can't have a ToolTip without a parent..." ) ); + dwtassert( parent, _T( "Can't have a ToolTip without a parent..." ) ); } inline void ToolTip::setMaxTipWidth(int width) { Modified: dcplusplus/trunk/dwt/include/dwt/widgets/WidgetListViewEditBox.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/WidgetListViewEditBox.h 2008-04-24 13:45:26 UTC (rev 1210) +++ dcplusplus/trunk/dwt/include/dwt/widgets/WidgetListViewEditBox.h 2008-04-24 13:50:11 UTC (rev 1211) @@ -70,7 +70,7 @@ : TextBox( parent ) { // Can't have a text box without a parent... - xAssert( parent, _T( "Cant have a TextBox without a parent..." ) ); + dwtassert( parent, _T( "Cant have a TextBox without a parent..." ) ); } #ifdef PORT_ME Deleted: dcplusplus/trunk/dwt/include/dwt/xCeption.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/xCeption.h 2008-04-24 13:45:26 UTC (rev 1210) +++ dcplusplus/trunk/dwt/include/dwt/xCeption.h 2008-04-24 13:50:11 UTC (rev 1211) @@ -1,148 +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. -*/ - -#ifndef DWT_xCeption_h -#define DWT_xCeption_h - -#include "WindowsHeaders.h" -#include "tstring.h" -#include "util/StringConversion.h" -#include <stdexcept> - -namespace dwt { - -/// Exception class used in SmartWin -/** All exceptions thrown by SmartWin will be either of this class or derived from - * this class. <br> - * You should derive from this class yourself if you throw exceptions inside your - * event handlers. <br> - * Otherwise SmartWin may not be able to respond correctly to the Exception. - */ -class xCeption : public std::exception -{ -public: - /// Constructor taking a const char pointer - /** The TCHAR * will contain the description returned from the virtual member - * function called what() - */ - xCeption( const TCHAR * err ) throw() - : std::exception(), - itsAsciiErrorMsg( util::AsciiGuaranteed::doConvert( err, util::ConversionCodepage::ANSI ) ), - itsFormatWndMessage( 0 ) - { - errId = ::GetLastError(); - } - - /// Overloaded Constructor basically doing the same as the const TCHAR * version - /** See the const TCHAR * err overloaded version - */ - xCeption( const tstring & err ) throw() - : std::exception(), - itsAsciiErrorMsg( util::AsciiGuaranteed::doConvert( err, util::ConversionCodepage::ANSI ) ), - itsFormatWndMessage( 0 ) - { - errId = ::GetLastError(); - } - - /// Returns a descriptive error message explaining what went wrong - /** Overridden from the std::exception::what()<br> - * Related Members<br> - * <ul> - * <li>getErrorCode()</li> - * <li>whatWndMsg()</li> - * </ul> - * This function will ALWAYS return a char * string since it must be compliant - * with std::exception::what() function - */ - virtual const char * what() const throw() - { - return itsAsciiErrorMsg.c_str(); - } - - /// Returns a DWORD defining what went wrong, basically just a GetErrorCode - /// call from Windows API called in the Constructor - /** Returns the Windows Error code which is a DWORD, can be used in combination - * with FormatMessage from the <br> - * Windows API to get a descriptive Windows Error code explaining what went - * wrong (if it was a windows error) <br> - * You should in most cases rather use whatWndMsg to get a formatted message - * from Windows API. <br> - * Related Members <br> - * - what() - * - whatWndMsg() - */ - virtual DWORD getErrorCode() const - { - return errId; - } - - /// Returns a descriptive windows error message explaining what went wrong. - /** Returns the formatted Windows Error message<br> - * Related Members<br> - * - what() - * - getErrorCode() - */ - virtual const TCHAR * whatWndMsg() const - { - ::FormatMessage( FORMAT_MESSAGE_ALLOCATE_BUFFER | - FORMAT_MESSAGE_FROM_SYSTEM | - FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, - errId, - MAKELANGID( LANG_NEUTRAL, SUBLANG_DEFAULT ), - ( LPTSTR ) & itsFormatWndMessage, - 0, - NULL ); - return itsFormatWndMessage; - } - - virtual ~xCeption() throw() - { - ::LocalFree( itsFormatWndMessage ); - }; - -private: - std::string itsAsciiErrorMsg; - DWORD errId; - mutable TCHAR * itsFormatWndMessage; -}; - -/// Contains a wrapper around assert/xception which will toss out an assertion if -/// we're in debug mode but anyway throw an exception -#define xAssert( x, y ) do{ if( !(x) ) { assert(false&&(y)); throw xCeption((y)); } } while(false); - -} - -#endif Modified: dcplusplus/trunk/dwt/src/Application.cpp =================================================================== --- dcplusplus/trunk/dwt/src/Application.cpp 2008-04-24 13:45:26 UTC (rev 1210) +++ dcplusplus/trunk/dwt/src/Application.cpp 2008-04-24 13:50:11 UTC (rev 1211) @@ -35,9 +35,8 @@ #include <dwt/Application.h> #include <dwt/tstring.h> -#include <dwt/xCeption.h> +#include <dwt/DWTException.h> - extern int SmartWinMain( dwt::Application & app ); namespace dwt { @@ -101,35 +100,6 @@ #endif } -unsigned int Application::reportErr( xCeption & err, bool corruptMemMemLeak ) -{ - unsigned int retVal; - - if ( corruptMemMemLeak ) - retVal = 0xdeadbeef; - else - retVal = err.getErrorCode(); - -#ifdef _MSC_VER -#ifndef WINCE -#ifdef _DEBUG - _RPT0( _CRT_WARN, "\r\n" ); - _RPT0( _CRT_WARN, "*** ERROR ***\r\n" ); - _RPT0( _CRT_WARN, err.what() ); - _RPT0( _CRT_WARN, "\r\n" ); - if ( ! corruptMemMemLeak ) - { - _RPT0( _CRT_WARN, err.whatWndMsg() ); - _RPT0( _CRT_WARN, "\r\n" ); - } - _RPT0( _CRT_WARN, "*** END OF ERROR ***" ); - _RPT0( _CRT_WARN, "\r\n" ); -#endif -#endif -#endif - return retVal; -} - Application::Application( int nCmdShow ) : itsCmdShow(nCmdShow) { @@ -307,11 +277,11 @@ } else if ( dwWaitResult < WAIT_ABANDONED_0 + itsVHEvents.size() ) { - throw xCeption( _T( "Application::run : Encountered an abandoned wait mutex object ") ); + throw Win32Exception("Mutex abandoned"); } else if ( dwWaitResult != WAIT_TIMEOUT ) { - throw xCeption( _T( "Application::run : MsgWaitForMultipleObjects() failed!" ) ); + throw Win32Exception("Application::run : MsgWaitForMultipleObjects() failed!" ); } } return static_cast< int >( msg.wParam ); @@ -353,14 +323,12 @@ bool corruptMemMemLeak = false; dwt::Application::init( nCmdShow ); - try { - retVal = SmartWinMain( dwt::Application::instance() ); // Call library user's startup function. - dwt::Application::uninit(); + + retVal = SmartWinMain( dwt::Application::instance() ); // Call library user's startup function. - dwt::Application::checkCorruptOrMemleak( corruptMemMemLeak ); - } catch ( dwt::xCeption & err ) { - retVal = dwt::Application::reportErr( err, corruptMemMemLeak ); - } + dwt::Application::uninit(); + dwt::Application::checkCorruptOrMemleak( corruptMemMemLeak ); + return retVal; } Modified: dcplusplus/trunk/dwt/src/CanvasClasses.cpp =================================================================== --- dcplusplus/trunk/dwt/src/CanvasClasses.cpp 2008-04-24 13:45:26 UTC (rev 1210) +++ dcplusplus/trunk/dwt/src/CanvasClasses.cpp 2008-04-24 13:50:11 UTC (rev 1211) @@ -30,7 +30,7 @@ */ #include <dwt/CanvasClasses.h> -#include <dwt/xCeption.h> +#include <dwt/util/check.h> #include <dwt/resources/Brush.h> namespace dwt { @@ -47,10 +47,8 @@ void Canvas::moveTo( int x, int y ) { - if ( !::MoveToEx( itsHdc, x, y, 0 ) ) - { - xCeption x( _T( "Error in CanvasClasses moveTo" ) ); - throw x; + if ( !::MoveToEx( itsHdc, x, y, 0 ) ) { + dwtWin32DebugFail("Error in CanvasClasses moveTo"); } } @@ -61,15 +59,12 @@ void Canvas::lineTo( int x, int y ) { - if ( !::LineTo( itsHdc, x, y ) ) - { - xCeption x( _T( "Error in CanvasClasses lineTo" ) ); - throw x; + if ( !::LineTo( itsHdc, x, y ) ) { + dwtWin32DebugFail("Error in CanvasClasses lineTo"); } } -void Canvas::lineTo( const Point & coord ) -{ +void Canvas::lineTo( const Point & coord ) { lineTo( coord.x, coord.y ); } @@ -98,37 +93,29 @@ void Canvas::polygon( const Point points[], unsigned count ) { - if ( !::Polygon( itsHdc, reinterpret_cast< POINT * >( const_cast < Point * >( & points[0] ) ), count ) ) - { - xCeption x( _T( "Error in CanvasClasses polygon" ) ); - throw x; + if ( !::Polygon( itsHdc, reinterpret_cast< POINT * >( const_cast < Point * >( & points[0] ) ), count ) ) { + dwtWin32DebugFail("Error in CanvasClasses polygon"); } } void Canvas::polygon( POINT points[], unsigned count ) { - if ( !::Polygon( itsHdc, points, count ) ) - { - xCeption x( _T( "Error in CanvasClasses polygon" ) ); - throw x; + if ( !::Polygon( itsHdc, points, count ) ) { + dwtWin32DebugFail("Error in CanvasClasses polygon" ); } } void Canvas::ellipse( int left, int top, int right, int bottom ) { - if ( ! ::Ellipse( itsHdc, left, top, right, bottom ) ) - { - xCeption x( _T( "Error in CanvasClasses ellipse" ) ); - throw x; + if ( ! ::Ellipse( itsHdc, left, top, right, bottom ) ) { + dwtWin32DebugFail("Error in CanvasClasses ellipse"); } } void Canvas::rectangle( int left, int top, int right, int bottom ) { - if ( ! ::Rectangle( itsHdc, left, top, right, bottom ) ) - { - xCeption x( _T( "Error in CanvasClasses Rectangle" ) ); - throw x; + if ( ! ::Rectangle( itsHdc, left, top, right, bottom ) ) { + dwtWin32DebugFail("Error in CanvasClasses Rectangle"); } } @@ -142,10 +129,8 @@ void Canvas::ellipse( const dwt::Rectangle & rect ) { - if ( ! ::Ellipse( itsHdc, rect.left(), rect.top(), rect.right(), rect.bottom() ) ) - { - xCeption x( _T( "Error in CanvasClasses ellipse" ) ); - throw x; + if ( ! ::Ellipse( itsHdc, rect.left(), rect.top(), rect.right(), rect.bottom() ) ) { + dwtWin32DebugFail("Error in CanvasClasses ellipse"); } } @@ -195,18 +180,15 @@ int retVal = ::DrawText( itsHdc, text.c_str(), ( int ) text.length(), & rc, format ); if ( 0 == retVal ) { - xCeption x( _T( "Error while trying to draw text to canvas" ) ); - throw x; + dwtWin32DebugFail("Error while trying to draw text to canvas"); } return retVal; } void Canvas::extTextOut( const tstring & text, unsigned x, unsigned y ) { - if ( 0 == ::ExtTextOut( itsHdc, x, y, 0, NULL, text.c_str(), ( unsigned ) text.length(), 0 ) ) - { - xCeption xc( _T( "Error while trying to do TextOut operation" ) ); - throw xc; + if ( 0 == ::ExtTextOut( itsHdc, x, y, 0, NULL, text.c_str(), ( unsigned ) text.length(), 0 ) ) { + dwtWin32DebugFail("Error while trying to do TextOut operation"); } } Added: dcplusplus/trunk/dwt/src/DWTException.cpp =================================================================== --- dcplusplus/trunk/dwt/src/DWTException.cpp (rev 0) +++ dcplusplus/trunk/dwt/src/DWTException.cpp 2008-04-24 13:50:11 UTC (rev 1211) @@ -0,0 +1,68 @@ +/* + 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 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 <dwt/DWTException.h> + +namespace dwt { + +std::string Win32Exception::translateLastError() { + DWORD code = ::GetLastError(); + + LPSTR lpMsgBuf = 0; + DWORD chars = FormatMessageA( + FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, + code, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language + (LPSTR) &lpMsgBuf, + 0, + NULL + ); + + if(chars == 0) { + ::LocalFree( lpMsgBuf ); + return std::string(); + } + std::string tmp(lpMsgBuf, chars); + // Free the buffer. + ::LocalFree( lpMsgBuf ); + std::string::size_type i = 0; + + while( (i = tmp.find_first_of("\r\n", i)) != std::string::npos) { + tmp.erase(i, 1); + } + return tmp; + +} + +} Modified: dcplusplus/trunk/dwt/src/ImageList.cpp =================================================================== --- dcplusplus/trunk/dwt/src/ImageList.cpp 2008-04-24 13:45:26 UTC (rev 1210) +++ dcplusplus/trunk/dwt/src/ImageList.cpp 2008-04-24 13:50:11 UTC (rev 1211) @@ -34,7 +34,8 @@ */ #include <dwt/resources/ImageList.... [truncated message content] |
From: <arn...@us...> - 2008-04-24 13:45:31
|
Revision: 1210 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1210&view=rev Author: arnetheduck Date: 2008-04-24 06:45:26 -0700 (Thu, 24 Apr 2008) Log Message: ----------- give the main window its own help id since it now has its help page Modified Paths: -------------- dcplusplus/trunk/win32/MainWindow.cpp Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-21 13:01:51.312999964 +0200 committer: poy <po...@12...> properties: branch-nick: repo + timestamp: 2008-04-21 13:10:32.687999964 +0200 committer: poy <po...@12...> properties: branch-nick: repo 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 1133 arn...@gm...-20080411201718-ecshulwd7ic0wdci 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 1166 arn...@gm...-20080416204550-0dx3qhxasdkdohx1 1167 arn...@gm...-20080416211510-3ilsym0bom7u2cer 1168 tom@athlon-20080417125238-0hhhchg951y7p83w 1169 arn...@gm...-20080418203137-e6szrje3fje5dgh9 1170 arn...@gm...-20080419164722-vyjrwwvglxr4yxuu 1171 arn...@gm...-20080419164802-o2boulbfrea4e0dx 1172 arn...@gm...-20080419165129-zj3axn731fo84vd5 1173 po...@12...-20080419172806-2qspfwerslo10rd2 1174 arn...@gm...-20080419212304-3wjafor82amtvik3 1175 arn...@gm...-20080419212347-t5oze1b59dk7vkiv 1176 arn...@gm...-20080420133104-h16loa3kvzrpkxiv 1177 po...@12...-20080420141642-z9mgyje16kkfy11z 1178 arn...@gm...-20080420173012-we22yoyvldt8u1az 1179 arn...@gm...-20080420173645-l296bgbr60wj267s 1180 arn...@gm...-20080420181134-ypu4ik21vc9ma1u9 1181 arn...@gm...-20080420192935-g59ddftmp35o6wdq 1182 arn...@gm...-20080420194530-qbyih90fixp3jevq 1183 arn...@gm...-20080420200905-mc0wa2egjt6k0783 1184 po...@12...-20080421110151-tm3apquwg3p4otyv + 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 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 1166 arn...@gm...-20080416204550-0dx3qhxasdkdohx1 1167 arn...@gm...-20080416211510-3ilsym0bom7u2cer 1168 tom@athlon-20080417125238-0hhhchg951y7p83w 1169 arn...@gm...-20080418203137-e6szrje3fje5dgh9 1170 arn...@gm...-20080419164722-vyjrwwvglxr4yxuu 1171 arn...@gm...-20080419164802-o2boulbfrea4e0dx 1172 arn...@gm...-20080419165129-zj3axn731fo84vd5 1173 po...@12...-20080419172806-2qspfwerslo10rd2 1174 arn...@gm...-20080419212304-3wjafor82amtvik3 1175 arn...@gm...-20080419212347-t5oze1b59dk7vkiv 1176 arn...@gm...-20080420133104-h16loa3kvzrpkxiv 1177 po...@12...-20080420141642-z9mgyje16kkfy11z 1178 arn...@gm...-20080420173012-we22yoyvldt8u1az 1179 arn...@gm...-20080420173645-l296bgbr60wj267s 1180 arn...@gm...-20080420181134-ypu4ik21vc9ma1u9 1181 arn...@gm...-20080420192935-g59ddftmp35o6wdq 1182 arn...@gm...-20080420194530-qbyih90fixp3jevq 1183 arn...@gm...-20080420200905-mc0wa2egjt6k0783 1184 po...@12...-20080421110151-tm3apquwg3p4otyv 1185 po...@12...-20080421111032-2mwe6we5llzbqfj1 Modified: dcplusplus/trunk/win32/MainWindow.cpp =================================================================== --- dcplusplus/trunk/win32/MainWindow.cpp 2008-04-24 13:44:17 UTC (rev 1209) +++ dcplusplus/trunk/win32/MainWindow.cpp 2008-04-24 13:45:26 UTC (rev 1210) @@ -171,7 +171,7 @@ cs.background = (HBRUSH)(COLOR_3DFACE + 1); create(cs); - setHelpId(IDH_STARTPAGE); + setHelpId(IDH_MAIN); paned = addChild(WidgetHPaned::Seed(0.7)); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arn...@us...> - 2008-04-24 13:44:39
|
Revision: 1209 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1209&view=rev Author: arnetheduck Date: 2008-04-24 06:44:17 -0700 (Thu, 24 Apr 2008) Log Message: ----------- remove some exceptions in Menu and Table Modified Paths: -------------- dcplusplus/trunk/dwt/include/dwt/widgets/Menu.h dcplusplus/trunk/dwt/include/dwt/widgets/Table.h dcplusplus/trunk/dwt/src/widgets/Menu.cpp dcplusplus/trunk/dwt/src/widgets/Table.cpp Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-20 22:09:05.279999971 +0200 committer: Jacek Sieka <arn...@gm...> properties: branch-nick: dcplusplus + timestamp: 2008-04-21 13:01:51.312999964 +0200 committer: poy <po...@12...> properties: branch-nick: repo 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 1133 arn...@gm...-20080411201718-ecshulwd7ic0wdci 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 1166 arn...@gm...-20080416204550-0dx3qhxasdkdohx1 1167 arn...@gm...-20080416211510-3ilsym0bom7u2cer 1168 tom@athlon-20080417125238-0hhhchg951y7p83w 1169 arn...@gm...-20080418203137-e6szrje3fje5dgh9 1170 arn...@gm...-20080419164722-vyjrwwvglxr4yxuu 1171 arn...@gm...-20080419164802-o2boulbfrea4e0dx 1172 arn...@gm...-20080419165129-zj3axn731fo84vd5 1173 po...@12...-20080419172806-2qspfwerslo10rd2 1174 arn...@gm...-20080419212304-3wjafor82amtvik3 1175 arn...@gm...-20080419212347-t5oze1b59dk7vkiv 1176 arn...@gm...-20080420133104-h16loa3kvzrpkxiv 1177 po...@12...-20080420141642-z9mgyje16kkfy11z 1178 arn...@gm...-20080420173012-we22yoyvldt8u1az 1179 arn...@gm...-20080420173645-l296bgbr60wj267s 1180 arn...@gm...-20080420181134-ypu4ik21vc9ma1u9 1181 arn...@gm...-20080420192935-g59ddftmp35o6wdq 1182 arn...@gm...-20080420194530-qbyih90fixp3jevq 1183 arn...@gm...-20080420200905-mc0wa2egjt6k0783 + 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 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 1166 arn...@gm...-20080416204550-0dx3qhxasdkdohx1 1167 arn...@gm...-20080416211510-3ilsym0bom7u2cer 1168 tom@athlon-20080417125238-0hhhchg951y7p83w 1169 arn...@gm...-20080418203137-e6szrje3fje5dgh9 1170 arn...@gm...-20080419164722-vyjrwwvglxr4yxuu 1171 arn...@gm...-20080419164802-o2boulbfrea4e0dx 1172 arn...@gm...-20080419165129-zj3axn731fo84vd5 1173 po...@12...-20080419172806-2qspfwerslo10rd2 1174 arn...@gm...-20080419212304-3wjafor82amtvik3 1175 arn...@gm...-20080419212347-t5oze1b59dk7vkiv 1176 arn...@gm...-20080420133104-h16loa3kvzrpkxiv 1177 po...@12...-20080420141642-z9mgyje16kkfy11z 1178 arn...@gm...-20080420173012-we22yoyvldt8u1az 1179 arn...@gm...-20080420173645-l296bgbr60wj267s 1180 arn...@gm...-20080420181134-ypu4ik21vc9ma1u9 1181 arn...@gm...-20080420192935-g59ddftmp35o6wdq 1182 arn...@gm...-20080420194530-qbyih90fixp3jevq 1183 arn...@gm...-20080420200905-mc0wa2egjt6k0783 1184 po...@12...-20080421110151-tm3apquwg3p4otyv Modified: dcplusplus/trunk/dwt/include/dwt/widgets/Menu.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/Menu.h 2008-04-24 13:41:54 UTC (rev 1208) +++ dcplusplus/trunk/dwt/include/dwt/widgets/Menu.h 2008-04-24 13:44:17 UTC (rev 1209) @@ -39,8 +39,8 @@ #include "../resources/Bitmap.h" #include "../resources/Font.h" +#include "../CanvasClasses.h" #include "../Dispatchers.h" -#include "../CanvasClasses.h" #include <memory> #include <vector> @@ -186,7 +186,7 @@ void attach(HMENU hMenu, const Seed& cs); - void setMenu(); + bool setMenu(); /// Appends a popup to the menu /** Everything you "append" to a menu is added sequentially to the menu <br> @@ -261,16 +261,16 @@ * this number should be unique across the application. */ - void appendItem(unsigned int id, const tstring & text, BitmapPtr image = BitmapPtr()); + bool appendItem(unsigned int id, const tstring & text, BitmapPtr image = BitmapPtr()); template<typename DispatcherType> - void appendItem(unsigned int id, const tstring & text, const typename DispatcherType::F& f, BitmapPtr image = BitmapPtr()) { - appendItem(id, text, image); + bool appendItem(unsigned int id, const tstring & text, const typename DispatcherType::F& f, BitmapPtr image = BitmapPtr()) { itsParent->setCallback(Message(WM_COMMAND, id), DispatcherType(f)); + return appendItem(id, text, image); } - void appendItem(unsigned int id, const tstring & text, const IdDispatcher::F& f, BitmapPtr image = BitmapPtr()) { - appendItem<IdDispatcher>(id, text, f, image); + bool appendItem(unsigned int id, const tstring & text, const IdDispatcher::F& f, BitmapPtr image = BitmapPtr()) { + return appendItem<IdDispatcher>(id, text, f, image); } /// Removes specified item from this menu @@ -350,7 +350,7 @@ * parameter. <br> * If the "value" parameter is true the item becomes enabled, otherwise disabled */ - void setItemEnabled( unsigned id, bool byPosition = false, bool value = true ); + bool setItemEnabled( unsigned id, bool byPosition = false, bool value = true ); UINT getMenuState(UINT id, bool byPosition = false); @@ -363,7 +363,7 @@ /// Return true if the menu item is enabled (not grey and not disabled) bool isEnabled(UINT id, bool byPosition = false); - void setDefaultItem(UINT id, bool byPosition = false); + bool setDefaultItem(UINT id, bool byPosition = false); /// Returns true if menu is "system menu" (icon in top left of window) bool isSystemMenu() @@ -381,7 +381,7 @@ /** Which menu item you wish to set the text is defined by the "id" * parameter of the function. */ - void setText( unsigned id, const tstring& text ); + bool setText( unsigned id, const tstring& text ); ObjectType getChild(UINT position); Modified: dcplusplus/trunk/dwt/include/dwt/widgets/Table.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/Table.h 2008-04-24 13:41:54 UTC (rev 1208) +++ dcplusplus/trunk/dwt/include/dwt/widgets/Table.h 2008-04-24 13:44:17 UTC (rev 1209) @@ -231,7 +231,7 @@ /// Change the current icon of an item /** Sets a new icon for a given item */ - void setIcon( unsigned row, int newIconIndex ); + bool setIcon( unsigned row, int newIconIndex ); /// Returns a boolean indicating if the Grid is in "read only" mode or not /** If the return value is true the Grid is in "read only" mode and cannot be @@ -302,7 +302,7 @@ * width of the list which is quite useful to make the Data Grid fill its whole * client area. */ - void setColumnWidth( unsigned columnNo, int width ); + bool setColumnWidth( unsigned columnNo, int width ); /// Returns the checked state of the given row /** A list view can have checkboxes in each row, if the checkbox for the given @@ -433,7 +433,7 @@ /// Force redraw of a range of items. /** You may want to call invalidateWidget after the this call to force repaint. */ - void redraw( int firstRow = 0, int lastRow = -1 ); + bool redraw( int firstRow = 0, int lastRow = -1 ); void setTableStyle(int style); @@ -737,12 +737,8 @@ ListView_DeleteColumn( this->handle(), columnNo ); } -inline void Table::setColumnWidth( unsigned columnNo, int width ) { - if ( ListView_SetColumnWidth( this->handle(), columnNo, width ) == FALSE ) - { - xCeption x( _T( "Couldn't resize columns of Table" ) ); - throw x; - } +inline bool Table::setColumnWidth( unsigned columnNo, int width ) { + return ListView_SetColumnWidth( this->handle(), columnNo, width ); } inline void Table::clearImpl() { Modified: dcplusplus/trunk/dwt/src/widgets/Menu.cpp =================================================================== --- dcplusplus/trunk/dwt/src/widgets/Menu.cpp 2008-04-24 13:41:54 UTC (rev 1208) +++ dcplusplus/trunk/dwt/src/widgets/Menu.cpp 2008-04-24 13:44:17 UTC (rev 1209) @@ -120,27 +120,26 @@ // set flags info.fMask = MIIM_FTYPE | MIIM_DATA; - if(::GetMenuItemInfo(itsHandle, i, TRUE, &info)) { - info.fMask |= MIIM_DATA; - info.fType |= MFT_OWNERDRAW; + BOOL ret = ::GetMenuItemInfo(itsHandle, i, TRUE, &info); + assert(ret); - // create item data wrapper - ItemDataWrapper * wrapper = new ItemDataWrapper( this, i ); - info.dwItemData = reinterpret_cast< ULONG_PTR >( wrapper ); + info.fMask |= MIIM_DATA; + info.fType |= MFT_OWNERDRAW; - if(::SetMenuItemInfo(itsHandle, i, TRUE, &info)) - itsItemData.push_back( wrapper ); - else - throw xCeption( _T( "SetMenuItemInfo in Menu::attach fizzled..." ) ); - } else - throw xCeption( _T( "GetMenuItemInfo in Menu::attach fizzled..." ) ); + // create item data wrapper + ItemDataWrapper * wrapper = new ItemDataWrapper( this, i ); + info.dwItemData = reinterpret_cast< ULONG_PTR >( wrapper ); + + ret = ::SetMenuItemInfo(itsHandle, i, TRUE, &info); + assert(ret); + + itsItemData.push_back( wrapper ); } } } -void Menu::setMenu() { - if ( ::SetMenu( itsParent->handle(), itsHandle ) == FALSE ) - throw xCeption( _T( "SetMenu in Menu::setMenu fizzled..." ) ); +bool Menu::setMenu() { + return ::SetMenu( itsParent->handle(), itsHandle ); } Menu::ObjectType Menu::appendPopup( const tstring & text ) @@ -256,13 +255,9 @@ ::CheckMenuItem( handle(), id, value ? MF_CHECKED : MF_UNCHECKED ); } -void Menu::setItemEnabled( unsigned id, bool byPosition, bool value ) +bool Menu::setItemEnabled( unsigned id, bool byPosition, bool value ) { - if ( ::EnableMenuItem( handle(), id, (byPosition ? MF_BYPOSITION : MF_BYCOMMAND) | (value ? MF_ENABLED : MF_GRAYED) ) == - 1 ) - { - xCeption x( _T( "Couldn't enable/disable the menu item, item doesn't exist" ) ); - throw x; - } + return ::EnableMenuItem( handle(), id, (byPosition ? MF_BYPOSITION : MF_BYCOMMAND) | (value ? MF_ENABLED : MF_GRAYED) ) != - 1; } UINT Menu::getMenuState( UINT id, bool byPosition ) @@ -290,9 +285,9 @@ return !(getMenuState(id, byPosition) & (MF_DISABLED | MF_GRAYED)); } -void Menu::setDefaultItem( UINT id, bool byPosition ) +bool Menu::setDefaultItem( UINT id, bool byPosition ) { - ::SetMenuDefaultItem(handle(), id, byPosition); + return ::SetMenuDefaultItem(handle(), id, byPosition); } tstring Menu::getText( unsigned id, bool byPosition ) @@ -302,17 +297,17 @@ // set flag mi.fMask = MIIM_STRING; - if ( ::GetMenuItemInfo( itsHandle, id, byPosition, & mi ) == FALSE ) - throw xCeption( _T( "Couldn't get item info in Menu::getText" ) ); + BOOL ret = ::GetMenuItemInfo( itsHandle, id, byPosition, & mi ); + assert(ret); boost::scoped_array< TCHAR > buffer( new TCHAR[++mi.cch] ); mi.dwTypeData = buffer.get(); - if ( ::GetMenuItemInfo( itsHandle, id, byPosition, & mi ) == FALSE ) - throw xCeption( _T( "Couldn't get item info in Menu::getText" ) ); + ret = ::GetMenuItemInfo( itsHandle, id, byPosition, & mi ); + assert(ret); return mi.dwTypeData; } -void Menu::setText( unsigned id, const tstring& text ) +bool Menu::setText( unsigned id, const tstring& text ) { MENUITEMINFO mi = { sizeof(MENUITEMINFO) }; @@ -320,8 +315,7 @@ mi.fMask = MIIM_STRING; mi.dwTypeData = (TCHAR*) text.c_str(); - if ( ::SetMenuItemInfo( itsHandle, id, FALSE, & mi ) == FALSE ) - throw xCeption( _T( "Couldn't set item info in Menu::setText" ) ); + return ::SetMenuItemInfo( itsHandle, id, FALSE, & mi ); } void Menu::setTitle( const tstring & title, bool drawSidebar /* = false */) @@ -374,7 +368,7 @@ // get item data wrapper ItemDataWrapper * wrapper = reinterpret_cast< ItemDataWrapper * >( drawInfo->itemData ); - xAssert( wrapper != 0, _T( "Unsupported menu item in drawItem()" ) ); + assert(wrapper); // if processing menu bar const bool isMenuBar = ::GetMenu( wrapper->menu->getParent()->handle() ) == wrapper->menu->handle(); @@ -385,11 +379,11 @@ // set flags info.fMask = MIIM_CHECKMARKS | MIIM_FTYPE | MIIM_DATA | MIIM_STATE | MIIM_STRING; - if ( ::GetMenuItemInfo( wrapper->menu->handle(), wrapper->index, TRUE, & info ) == FALSE ) - throw xCeption ( _T( "Couldn't get menu item info in drawItem()" ) ); + BOOL ret = ::GetMenuItemInfo( wrapper->menu->handle(), wrapper->index, TRUE, & info ); + assert(ret); // check if item is owner drawn - xAssert( ( info.fType & MFT_OWNERDRAW ) != 0, _T( "Not a owner - drawn item in drawItem()" ) ); + assert(info.fType & MFT_OWNERDRAW); // get state info bool isGrayed = ( drawInfo->itemState & ODS_GRAYED ) == ODS_GRAYED; @@ -701,7 +695,7 @@ // get item data wrapper ItemDataWrapper * wrapper = reinterpret_cast< ItemDataWrapper * >( measureInfo->itemData ); - xAssert( wrapper != 0, _T( "Unsupported menu item type in measureItem()" ) ); + assert(wrapper); // this will contain item size UINT & itemWidth = measureInfo->itemWidth; @@ -714,11 +708,11 @@ info.fMask = MIIM_FTYPE | MIIM_DATA | MIIM_CHECKMARKS | MIIM_STRING; // try to get item info - if ( ::GetMenuItemInfo( wrapper->menu->handle(), wrapper->index, TRUE, & info ) == FALSE ) - throw xCeption ( _T( "Couldn't get item info in measureItem()" ) ); + BOOL ret = ::GetMenuItemInfo( wrapper->menu->handle(), wrapper->index, TRUE, & info ); + assert(ret); // check if item is owner drawn - xAssert( ( info.fType & MFT_OWNERDRAW ) != 0, _T( "Not owner - drawn item encountered in measureItem()" ) ); + assert(info.fType & MFT_OWNERDRAW); // check if separator if ( info.fType & MFT_SEPARATOR ) @@ -850,38 +844,36 @@ HMENU popup = ::GetSubMenu( itsHandle, itemIndex ); // try to remove item - if ( ::RemoveMenu( itsHandle, itemIndex, MF_BYPOSITION ) ) - { - if(ownerDrawn) { - ItemDataWrapper * wrapper = 0; - int itemRemoved = -1; + BOOL ret = ::RemoveMenu( itsHandle, itemIndex, MF_BYPOSITION ); + assert(ret); - for(size_t i = 0; i < itsItemData.size(); ++i) { - // get current data wrapper - wrapper = itsItemData[i]; + if(ownerDrawn) { + ItemDataWrapper * wrapper = 0; + int itemRemoved = -1; - if ( wrapper->index == int(itemIndex) ) // if found - { - itemRemoved = int(i); - delete wrapper; - itsItemData[i] = 0; - } - else if ( wrapper->index > int(itemIndex) ) - --wrapper->index; // adjust succeeding item indices - } + for(size_t i = 0; i < itsItemData.size(); ++i) { + // get current data wrapper + wrapper = itsItemData[i]; - if( itemRemoved != -1 ) - itsItemData.erase( itsItemData.begin() + itemRemoved ); + if ( wrapper->index == int(itemIndex) ) // if found + { + itemRemoved = int(i); + delete wrapper; + itsItemData[i] = 0; + } + else if ( wrapper->index > int(itemIndex) ) + --wrapper->index; // adjust succeeding item indices } - // remove sub menus if any - if(popup) - for(size_t i = 0; i < itsChildren.size(); ++i) - if(itsChildren[i]->handle() == popup) - itsChildren[i].reset(); + if( itemRemoved != -1 ) + itsItemData.erase( itsItemData.begin() + itemRemoved ); } - else - throw xCeption( _T( "Couldn't remove item in removeItem()" ) ); + + // remove sub menus if any + if(popup) + for(size_t i = 0; i < itsChildren.size(); ++i) + if(itsChildren[i]->handle() == popup) + itsChildren[i].reset(); } void Menu::removeAllItems() @@ -895,13 +887,10 @@ int Menu::getCount() const { - int count = ::GetMenuItemCount( itsHandle ); - if( count == -1 ) - throw xCeption( _T( "Couldn't get item count in getCount()" ) ); - return count; + return ::GetMenuItemCount( itsHandle ); } -void Menu::appendItem(unsigned int id, const tstring & text, BitmapPtr image) +bool Menu::appendItem(unsigned int id, const tstring & text, BitmapPtr image) { // init structure for new item MENUITEMINFO info = { sizeof(MENUITEMINFO) }; @@ -938,9 +927,9 @@ { if(ownerDrawn) itsItemData.push_back( wrapper ); + return true; } - else - throw xCeption( _T( "Couldn't insert/update item in Menu::appendItem" ) ); + return false; } unsigned Menu::trackPopupMenu( const ScreenCoordinate& sc, unsigned flags ) Modified: dcplusplus/trunk/dwt/src/widgets/Table.cpp =================================================================== --- dcplusplus/trunk/dwt/src/widgets/Table.cpp 2008-04-24 13:41:54 UTC (rev 1208) +++ dcplusplus/trunk/dwt/src/widgets/Table.cpp 2008-04-24 13:44:17 UTC (rev 1209) @@ -165,11 +165,8 @@ ++idx, ++x ) { lvColumn.pszText = const_cast < TCHAR * >( idx->c_str() ); - if ( ListView_InsertColumn( this->handle(), x, & lvColumn ) == - 1 ) - { - xCeption x( _T( "Error while trying to create Columns in list view" ) ); - throw x; - } + bool ret = ListView_InsertColumn( this->handle(), x, & lvColumn ) != - 1; + assert(ret); } } @@ -187,19 +184,15 @@ lvi.pszText = const_cast < TCHAR * >(row[0].c_str() ); lvi.lParam = lPar; lvi.iItem = index; - if ( ListView_InsertItem( this->handle(), & lvi ) == - 1) { - xCeption x( _T( "Error while trying to insert row in Table" )); - throw x; - } + bool ret = ListView_InsertItem( this->handle(), & lvi ) != - 1; + assert(ret); lvi.mask = LVIF_TEXT; lvi.iSubItem = 1; for (std::vector< tstring >::const_iterator idx = row.begin() + 1; idx != row.end(); ++idx ) { lvi.pszText = const_cast < TCHAR * >(idx->c_str() ); lvi.cchTextMax = static_cast< int >(idx->size() ); - if ( !ListView_SetItem( this->handle(), & lvi )) { - xCeption x( _T( "Error while trying to insert row in Table" )); - throw x; - } + ret = ListView_SetItem( this->handle(), & lvi ); + assert(ret); lvi.iSubItem++; } return index; @@ -309,15 +302,12 @@ ListView_SetItem(handle(), &item); } -void Table::setIcon( unsigned row, int newIconIndex ) { +bool Table::setIcon( unsigned row, int newIconIndex ) { LVITEM it = { LVIF_IMAGE }; it.iItem = row; it.iImage = newIconIndex; //Set item - if(ListView_SetItem( this->handle(), &it) != TRUE) { - xCeption err( _T( "Something went wrong while trying to change the selected item of the Table" ) ); - throw err; - } + return ListView_SetItem( this->handle(), &it); } void Table::setNormalImageList( ImageListPtr imageList ) { @@ -349,14 +339,11 @@ } } -void Table::redraw( int firstRow, int lastRow ) { +bool Table::redraw( int firstRow, int lastRow ) { if(lastRow == -1) { lastRow = size(); } - if( ListView_RedrawItems( this->handle(), firstRow, lastRow ) == FALSE ) - { - throw xCeption( _T( "Error while redrawing items in Table" ) ); - } + return ListView_RedrawItems( this->handle(), firstRow, lastRow ); } template<typename T> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arn...@us...> - 2008-04-24 13:42:26
|
Revision: 1208 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1208&view=rev Author: arnetheduck Date: 2008-04-24 06:41:54 -0700 (Thu, 24 Apr 2008) Log Message: ----------- Move include Modified Paths: -------------- dcplusplus/trunk/dwt/include/dwt/Application.h dcplusplus/trunk/dwt/src/Application.cpp Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-20 21:45:30.634999990 +0200 committer: Jacek Sieka <arn...@gm...> properties: branch-nick: dcplusplus + timestamp: 2008-04-20 22:09:05.279999971 +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 1133 arn...@gm...-20080411201718-ecshulwd7ic0wdci 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 1166 arn...@gm...-20080416204550-0dx3qhxasdkdohx1 1167 arn...@gm...-20080416211510-3ilsym0bom7u2cer 1168 tom@athlon-20080417125238-0hhhchg951y7p83w 1169 arn...@gm...-20080418203137-e6szrje3fje5dgh9 1170 arn...@gm...-20080419164722-vyjrwwvglxr4yxuu 1171 arn...@gm...-20080419164802-o2boulbfrea4e0dx 1172 arn...@gm...-20080419165129-zj3axn731fo84vd5 1173 po...@12...-20080419172806-2qspfwerslo10rd2 1174 arn...@gm...-20080419212304-3wjafor82amtvik3 1175 arn...@gm...-20080419212347-t5oze1b59dk7vkiv 1176 arn...@gm...-20080420133104-h16loa3kvzrpkxiv 1177 po...@12...-20080420141642-z9mgyje16kkfy11z 1178 arn...@gm...-20080420173012-we22yoyvldt8u1az 1179 arn...@gm...-20080420173645-l296bgbr60wj267s 1180 arn...@gm...-20080420181134-ypu4ik21vc9ma1u9 1181 arn...@gm...-20080420192935-g59ddftmp35o6wdq 1182 arn...@gm...-20080420194530-qbyih90fixp3jevq + 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 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 1166 arn...@gm...-20080416204550-0dx3qhxasdkdohx1 1167 arn...@gm...-20080416211510-3ilsym0bom7u2cer 1168 tom@athlon-20080417125238-0hhhchg951y7p83w 1169 arn...@gm...-20080418203137-e6szrje3fje5dgh9 1170 arn...@gm...-20080419164722-vyjrwwvglxr4yxuu 1171 arn...@gm...-20080419164802-o2boulbfrea4e0dx 1172 arn...@gm...-20080419165129-zj3axn731fo84vd5 1173 po...@12...-20080419172806-2qspfwerslo10rd2 1174 arn...@gm...-20080419212304-3wjafor82amtvik3 1175 arn...@gm...-20080419212347-t5oze1b59dk7vkiv 1176 arn...@gm...-20080420133104-h16loa3kvzrpkxiv 1177 po...@12...-20080420141642-z9mgyje16kkfy11z 1178 arn...@gm...-20080420173012-we22yoyvldt8u1az 1179 arn...@gm...-20080420173645-l296bgbr60wj267s 1180 arn...@gm...-20080420181134-ypu4ik21vc9ma1u9 1181 arn...@gm...-20080420192935-g59ddftmp35o6wdq 1182 arn...@gm...-20080420194530-qbyih90fixp3jevq 1183 arn...@gm...-20080420200905-mc0wa2egjt6k0783 Modified: dcplusplus/trunk/dwt/include/dwt/Application.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/Application.h 2008-04-24 13:40:21 UTC (rev 1207) +++ dcplusplus/trunk/dwt/include/dwt/Application.h 2008-04-24 13:41:54 UTC (rev 1208) @@ -40,7 +40,6 @@ #include "tstring.h" #include "CommandLine.h" #include "ApplicationPlatform.h" -#include "xCeption.h" #include <vector> #include <list> #include <functional> @@ -61,6 +60,7 @@ // Forward declaration of friends class Widget; +class xCeption; namespace Policies { class ModelessDialog; Modified: dcplusplus/trunk/dwt/src/Application.cpp =================================================================== --- dcplusplus/trunk/dwt/src/Application.cpp 2008-04-24 13:40:21 UTC (rev 1207) +++ dcplusplus/trunk/dwt/src/Application.cpp 2008-04-24 13:41:54 UTC (rev 1208) @@ -35,7 +35,9 @@ #include <dwt/Application.h> #include <dwt/tstring.h> +#include <dwt/xCeption.h> + extern int SmartWinMain( dwt::Application & app ); namespace dwt { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arn...@us...> - 2008-04-24 13:40:39
|
Revision: 1207 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1207&view=rev Author: arnetheduck Date: 2008-04-24 06:40:21 -0700 (Thu, 24 Apr 2008) Log Message: ----------- Small transfer view fixes Modified Paths: -------------- dcplusplus/trunk/win32/TransferView.cpp Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-20 21:29:35.769999981 +0200 committer: Jacek Sieka <arn...@gm...> properties: branch-nick: dcplusplus + timestamp: 2008-04-20 21:45:30.634999990 +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 1133 arn...@gm...-20080411201718-ecshulwd7ic0wdci 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 1166 arn...@gm...-20080416204550-0dx3qhxasdkdohx1 1167 arn...@gm...-20080416211510-3ilsym0bom7u2cer 1168 tom@athlon-20080417125238-0hhhchg951y7p83w 1169 arn...@gm...-20080418203137-e6szrje3fje5dgh9 1170 arn...@gm...-20080419164722-vyjrwwvglxr4yxuu 1171 arn...@gm...-20080419164802-o2boulbfrea4e0dx 1172 arn...@gm...-20080419165129-zj3axn731fo84vd5 1173 po...@12...-20080419172806-2qspfwerslo10rd2 1174 arn...@gm...-20080419212304-3wjafor82amtvik3 1175 arn...@gm...-20080419212347-t5oze1b59dk7vkiv 1176 arn...@gm...-20080420133104-h16loa3kvzrpkxiv 1177 po...@12...-20080420141642-z9mgyje16kkfy11z 1178 arn...@gm...-20080420173012-we22yoyvldt8u1az 1179 arn...@gm...-20080420173645-l296bgbr60wj267s 1180 arn...@gm...-20080420181134-ypu4ik21vc9ma1u9 1181 arn...@gm...-20080420192935-g59ddftmp35o6wdq + 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 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 1166 arn...@gm...-20080416204550-0dx3qhxasdkdohx1 1167 arn...@gm...-20080416211510-3ilsym0bom7u2cer 1168 tom@athlon-20080417125238-0hhhchg951y7p83w 1169 arn...@gm...-20080418203137-e6szrje3fje5dgh9 1170 arn...@gm...-20080419164722-vyjrwwvglxr4yxuu 1171 arn...@gm...-20080419164802-o2boulbfrea4e0dx 1172 arn...@gm...-20080419165129-zj3axn731fo84vd5 1173 po...@12...-20080419172806-2qspfwerslo10rd2 1174 arn...@gm...-20080419212304-3wjafor82amtvik3 1175 arn...@gm...-20080419212347-t5oze1b59dk7vkiv 1176 arn...@gm...-20080420133104-h16loa3kvzrpkxiv 1177 po...@12...-20080420141642-z9mgyje16kkfy11z 1178 arn...@gm...-20080420173012-we22yoyvldt8u1az 1179 arn...@gm...-20080420173645-l296bgbr60wj267s 1180 arn...@gm...-20080420181134-ypu4ik21vc9ma1u9 1181 arn...@gm...-20080420192935-g59ddftmp35o6wdq 1182 arn...@gm...-20080420194530-qbyih90fixp3jevq Modified: dcplusplus/trunk/win32/TransferView.cpp =================================================================== --- dcplusplus/trunk/win32/TransferView.cpp 2008-04-24 13:39:17 UTC (rev 1206) +++ dcplusplus/trunk/win32/TransferView.cpp 2008-04-24 13:40:21 UTC (rev 1207) @@ -337,7 +337,6 @@ int oldMode = ::SetBkMode(hdc, TRANSPARENT); textRect.left += 6; - textRect.right -= 6; long left = textRect.left; @@ -350,7 +349,7 @@ ::ExtTextOut(hdc, left, top, ETO_CLIPPED, &textRect, text.c_str(), text.size(), NULL); textRect.left = textRect.right; - textRect.right = rcItem.right() - 6; + textRect.right = rcItem.right(); ::SetTextColor(hdc, WinUtil::textColor); ::ExtTextOut(hdc, left, top, ETO_CLIPPED, &textRect, text.c_str(), text.size(), NULL); @@ -375,32 +374,34 @@ if(cd->nmcd.hdr.hwndFrom == connections->handle() && column == CONNECTION_COLUMN_STATUS) { HDC hdc = cd->nmcd.hdc; ConnectionInfo* ci = reinterpret_cast<ConnectionInfo*>(cd->nmcd.lItemlParam); - const tstring& text = ci->columns[column]; - - RECT r; - ListView_GetSubItemRect( connections->handle(), item, column, LVIR_BOUNDS, &r ); - - int64_t chunk = ci->chunk == 0 ? 1 : ci->chunk; - double pos = static_cast<double>(ci->chunkPos) / chunk; - drawProgress(hdc, r, item, column, text, pos, ci->download ? SETTING(DOWNLOAD_BAR_COLOR) : SETTING(UPLOAD_BAR_COLOR)); - - return CDRF_SKIPDEFAULT; - } - if(cd->nmcd.hdr.hwndFrom == downloads->handle() && column == DOWNLOAD_COLUMN_STATUS) { + if(ci->status == ConnectionInfo::STATUS_RUNNING && ci->chunk > 0 && ci->chunkPos >= 0) { + const tstring& text = ci->columns[column]; + + RECT r; + ListView_GetSubItemRect( connections->handle(), item, column, LVIR_BOUNDS, &r ); + + double pos = static_cast<double>(ci->chunkPos) / ci->chunk; + + drawProgress(hdc, r, item, column, text, pos, ci->download ? SETTING(DOWNLOAD_BAR_COLOR) : SETTING(UPLOAD_BAR_COLOR)); + + return CDRF_SKIPDEFAULT; + } + } else if(cd->nmcd.hdr.hwndFrom == downloads->handle() && column == DOWNLOAD_COLUMN_STATUS) { HDC hdc = cd->nmcd.hdc; DownloadInfo* di = reinterpret_cast<DownloadInfo*>(cd->nmcd.lItemlParam); - const tstring& text = di->columns[column]; - - RECT r; - ListView_GetSubItemRect( downloads->handle(), item, column, LVIR_BOUNDS, &r ); - - int64_t size = di->size == 0 ? 1 : di->size; - double pos = static_cast<double>(di->done) / size; - - drawProgress(hdc, r, item, column, text, pos, SETTING(DOWNLOAD_BAR_COLOR)); - - return CDRF_SKIPDEFAULT; + if(di->size > 0 && di->done >= 0) { + const tstring& text = di->columns[column]; + + RECT r; + ListView_GetSubItemRect( downloads->handle(), item, column, LVIR_BOUNDS, &r ); + + double pos = static_cast<double>(di->done) / di->size; + + drawProgress(hdc, r, item, column, text, pos, SETTING(DOWNLOAD_BAR_COLOR)); + + return CDRF_SKIPDEFAULT; + } } // Fall through default: @@ -536,7 +537,9 @@ transfered(0), lastTransfered(0), queued(0), - speed(0) + speed(0), + chunk(0), + chunkPos(0) { columns[CONNECTION_COLUMN_USER] = WinUtil::getNicks(u); columns[CONNECTION_COLUMN_HUB] = WinUtil::getHubNames(u).first; @@ -608,6 +611,7 @@ path(target), done(QueueManager::getInstance()->getPos(target)), size(size_), + bps(0), users(1), tth(tth_) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arn...@us...> - 2008-04-24 13:39:30
|
Revision: 1206 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1206&view=rev Author: arnetheduck Date: 2008-04-24 06:39:17 -0700 (Thu, 24 Apr 2008) Log Message: ----------- version update Modified Paths: -------------- dcplusplus/trunk/dcpp/version.h dcplusplus/trunk/win32/DCPlusPlus.rc Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-20 20:11:34.371999979 +0200 committer: Jacek Sieka <arn...@gm...> properties: branch-nick: dcplusplus + timestamp: 2008-04-20 21:29:35.769999981 +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 1133 arn...@gm...-20080411201718-ecshulwd7ic0wdci 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 1166 arn...@gm...-20080416204550-0dx3qhxasdkdohx1 1167 arn...@gm...-20080416211510-3ilsym0bom7u2cer 1168 tom@athlon-20080417125238-0hhhchg951y7p83w 1169 arn...@gm...-20080418203137-e6szrje3fje5dgh9 1170 arn...@gm...-20080419164722-vyjrwwvglxr4yxuu 1171 arn...@gm...-20080419164802-o2boulbfrea4e0dx 1172 arn...@gm...-20080419165129-zj3axn731fo84vd5 1173 po...@12...-20080419172806-2qspfwerslo10rd2 1174 arn...@gm...-20080419212304-3wjafor82amtvik3 1175 arn...@gm...-20080419212347-t5oze1b59dk7vkiv 1176 arn...@gm...-20080420133104-h16loa3kvzrpkxiv 1177 po...@12...-20080420141642-z9mgyje16kkfy11z 1178 arn...@gm...-20080420173012-we22yoyvldt8u1az 1179 arn...@gm...-20080420173645-l296bgbr60wj267s 1180 arn...@gm...-20080420181134-ypu4ik21vc9ma1u9 + 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 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 1166 arn...@gm...-20080416204550-0dx3qhxasdkdohx1 1167 arn...@gm...-20080416211510-3ilsym0bom7u2cer 1168 tom@athlon-20080417125238-0hhhchg951y7p83w 1169 arn...@gm...-20080418203137-e6szrje3fje5dgh9 1170 arn...@gm...-20080419164722-vyjrwwvglxr4yxuu 1171 arn...@gm...-20080419164802-o2boulbfrea4e0dx 1172 arn...@gm...-20080419165129-zj3axn731fo84vd5 1173 po...@12...-20080419172806-2qspfwerslo10rd2 1174 arn...@gm...-20080419212304-3wjafor82amtvik3 1175 arn...@gm...-20080419212347-t5oze1b59dk7vkiv 1176 arn...@gm...-20080420133104-h16loa3kvzrpkxiv 1177 po...@12...-20080420141642-z9mgyje16kkfy11z 1178 arn...@gm...-20080420173012-we22yoyvldt8u1az 1179 arn...@gm...-20080420173645-l296bgbr60wj267s 1180 arn...@gm...-20080420181134-ypu4ik21vc9ma1u9 1181 arn...@gm...-20080420192935-g59ddftmp35o6wdq Modified: dcplusplus/trunk/dcpp/version.h =================================================================== --- dcplusplus/trunk/dcpp/version.h 2008-04-24 13:38:27 UTC (rev 1205) +++ dcplusplus/trunk/dcpp/version.h 2008-04-24 13:39:17 UTC (rev 1206) @@ -17,7 +17,7 @@ */ #define APPNAME "DC++" -#define VERSIONSTRING "0.705" -#define VERSIONFLOAT 0.705 +#define VERSIONSTRING "0.706" +#define VERSIONFLOAT 0.706 /* Update the .rc file as well... */ Modified: dcplusplus/trunk/win32/DCPlusPlus.rc =================================================================== --- dcplusplus/trunk/win32/DCPlusPlus.rc 2008-04-24 13:38:27 UTC (rev 1205) +++ dcplusplus/trunk/win32/DCPlusPlus.rc 2008-04-24 13:39:17 UTC (rev 1206) @@ -828,8 +828,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,7,0,5 - PRODUCTVERSION 0,7,0,5 + FILEVERSION 0,7,0,6 + PRODUCTVERSION 0,7,0,6 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -846,12 +846,12 @@ BEGIN VALUE "Comments", "http://dcplusplus.sourceforge.net" VALUE "FileDescription", "DC++" - VALUE "FileVersion", "0, 7, 0, 5" + VALUE "FileVersion", "0, 7, 0, 6" VALUE "InternalName", "DC++" VALUE "LegalCopyright", "Copyright 2001-2008 Jacek Sieka" VALUE "OriginalFilename", "DCPlusPlus.exe" VALUE "ProductName", "DC++" - VALUE "ProductVersion", "0, 7, 0, 5" + VALUE "ProductVersion", "0, 7, 0, 6" END END BLOCK "VarFileInfo" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arn...@us...> - 2008-04-24 13:38:32
|
Revision: 1205 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1205&view=rev Author: arnetheduck Date: 2008-04-24 06:38:27 -0700 (Thu, 24 Apr 2008) Log Message: ----------- recreate other shared folders with same vname as removed one Modified Paths: -------------- dcplusplus/trunk/changelog.txt dcplusplus/trunk/dcpp/ShareManager.cpp Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-20 19:36:45.513999939 +0200 committer: Jacek Sieka <arn...@gm...> properties: branch-nick: dcplusplus + timestamp: 2008-04-20 20:11:34.371999979 +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 1133 arn...@gm...-20080411201718-ecshulwd7ic0wdci 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 1166 arn...@gm...-20080416204550-0dx3qhxasdkdohx1 1167 arn...@gm...-20080416211510-3ilsym0bom7u2cer 1168 tom@athlon-20080417125238-0hhhchg951y7p83w 1169 arn...@gm...-20080418203137-e6szrje3fje5dgh9 1170 arn...@gm...-20080419164722-vyjrwwvglxr4yxuu 1171 arn...@gm...-20080419164802-o2boulbfrea4e0dx 1172 arn...@gm...-20080419165129-zj3axn731fo84vd5 1173 po...@12...-20080419172806-2qspfwerslo10rd2 1174 arn...@gm...-20080419212304-3wjafor82amtvik3 1175 arn...@gm...-20080419212347-t5oze1b59dk7vkiv 1176 arn...@gm...-20080420133104-h16loa3kvzrpkxiv 1177 po...@12...-20080420141642-z9mgyje16kkfy11z 1178 arn...@gm...-20080420173012-we22yoyvldt8u1az 1179 arn...@gm...-20080420173645-l296bgbr60wj267s + 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 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 1166 arn...@gm...-20080416204550-0dx3qhxasdkdohx1 1167 arn...@gm...-20080416211510-3ilsym0bom7u2cer 1168 tom@athlon-20080417125238-0hhhchg951y7p83w 1169 arn...@gm...-20080418203137-e6szrje3fje5dgh9 1170 arn...@gm...-20080419164722-vyjrwwvglxr4yxuu 1171 arn...@gm...-20080419164802-o2boulbfrea4e0dx 1172 arn...@gm...-20080419165129-zj3axn731fo84vd5 1173 po...@12...-20080419172806-2qspfwerslo10rd2 1174 arn...@gm...-20080419212304-3wjafor82amtvik3 1175 arn...@gm...-20080419212347-t5oze1b59dk7vkiv 1176 arn...@gm...-20080420133104-h16loa3kvzrpkxiv 1177 po...@12...-20080420141642-z9mgyje16kkfy11z 1178 arn...@gm...-20080420173012-we22yoyvldt8u1az 1179 arn...@gm...-20080420173645-l296bgbr60wj267s 1180 arn...@gm...-20080420181134-ypu4ik21vc9ma1u9 Modified: dcplusplus/trunk/changelog.txt =================================================================== --- dcplusplus/trunk/changelog.txt 2008-04-24 13:37:11 UTC (rev 1204) +++ dcplusplus/trunk/changelog.txt 2008-04-24 13:38:27 UTC (rev 1205) @@ -42,6 +42,9 @@ * Removed unused rollback option (thanks mikejj) * Fixed PM history not showing the last line (poy) * Queued field in connections no longer counts paused items +* [L#185722] Fix missing progress bars (no longer optional) +* Fix a crash when adding a favorite hub that already existed +* Renamed smartwin to dwt since by now it's very different from its roots -- 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-24 13:37:11 UTC (rev 1204) +++ dcplusplus/trunk/dcpp/ShareManager.cpp 2008-04-24 13:38:27 UTC (rev 1205) @@ -505,7 +505,7 @@ return; } - const std::string& vName = i->second; + std::string vName = i->second; for(DirList::iterator j = directories.begin(); j != directories.end(); ) { if(Util::stricmp((*j)->getName(), vName) == 0) { delete *j; @@ -516,6 +516,15 @@ } shares.erase(i); + + // Readd all directories with the same vName + for(i = shares.begin(); i != shares.end(); ++i) { + if(Util::stricmp(i->second, vName) == 0) { + Directory* dp = buildTree(i->first, 0); + dp->setName(i->second); + merge(dp); + } + } rebuildIndices(); setDirty(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arn...@us...> - 2008-04-24 13:37:15
|
Revision: 1204 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1204&view=rev Author: arnetheduck Date: 2008-04-24 06:37:11 -0700 (Thu, 24 Apr 2008) Log Message: ----------- fix crash when trying to add fav hub that already exists Modified Paths: -------------- dcplusplus/trunk/win32/FavHubsFrame.cpp Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-20 19:30:12.788000107 +0200 committer: Jacek Sieka <arn...@gm...> properties: branch-nick: dcplusplus + timestamp: 2008-04-20 19:36:45.513999939 +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 1133 arn...@gm...-20080411201718-ecshulwd7ic0wdci 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 1166 arn...@gm...-20080416204550-0dx3qhxasdkdohx1 1167 arn...@gm...-20080416211510-3ilsym0bom7u2cer 1168 tom@athlon-20080417125238-0hhhchg951y7p83w 1169 arn...@gm...-20080418203137-e6szrje3fje5dgh9 1170 arn...@gm...-20080419164722-vyjrwwvglxr4yxuu 1171 arn...@gm...-20080419164802-o2boulbfrea4e0dx 1172 arn...@gm...-20080419165129-zj3axn731fo84vd5 1173 po...@12...-20080419172806-2qspfwerslo10rd2 1174 arn...@gm...-20080419212304-3wjafor82amtvik3 1175 arn...@gm...-20080419212347-t5oze1b59dk7vkiv 1176 arn...@gm...-20080420133104-h16loa3kvzrpkxiv 1177 po...@12...-20080420141642-z9mgyje16kkfy11z 1178 arn...@gm...-20080420173012-we22yoyvldt8u1az + 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 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 1166 arn...@gm...-20080416204550-0dx3qhxasdkdohx1 1167 arn...@gm...-20080416211510-3ilsym0bom7u2cer 1168 tom@athlon-20080417125238-0hhhchg951y7p83w 1169 arn...@gm...-20080418203137-e6szrje3fje5dgh9 1170 arn...@gm...-20080419164722-vyjrwwvglxr4yxuu 1171 arn...@gm...-20080419164802-o2boulbfrea4e0dx 1172 arn...@gm...-20080419165129-zj3axn731fo84vd5 1173 po...@12...-20080419172806-2qspfwerslo10rd2 1174 arn...@gm...-20080419212304-3wjafor82amtvik3 1175 arn...@gm...-20080419212347-t5oze1b59dk7vkiv 1176 arn...@gm...-20080420133104-h16loa3kvzrpkxiv 1177 po...@12...-20080420141642-z9mgyje16kkfy11z 1178 arn...@gm...-20080420173012-we22yoyvldt8u1az 1179 arn...@gm...-20080420173645-l296bgbr60wj267s Modified: dcplusplus/trunk/win32/FavHubsFrame.cpp =================================================================== --- dcplusplus/trunk/win32/FavHubsFrame.cpp 2008-04-24 13:36:15 UTC (rev 1203) +++ dcplusplus/trunk/win32/FavHubsFrame.cpp 2008-04-24 13:37:11 UTC (rev 1204) @@ -165,9 +165,9 @@ void FavHubsFrame::handleAdd() { FavoriteHubEntry e; - FavHubProperties dlg(this, &e); while(true) { + FavHubProperties dlg(this, &e); if(dlg.run() == IDOK) { if(FavoriteManager::getInstance()->isFavoriteHub(e.getServer())) { createMessageBox().show(T_("Hub already exists as a favorite"), _T(APPNAME) _T(" ") _T(VERSIONSTRING), MessageBox::BOX_OK, MessageBox::BOX_ICONEXCLAMATION); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arn...@us...> - 2008-04-24 13:36:22
|
Revision: 1203 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1203&view=rev Author: arnetheduck Date: 2008-04-24 06:36:15 -0700 (Thu, 24 Apr 2008) Log Message: ----------- Move mdiframe tryfire and make it work like tabview Modified Paths: -------------- dcplusplus/trunk/dwt/include/dwt/Policies.h dcplusplus/trunk/dwt/include/dwt/aspects/AspectActivate.h dcplusplus/trunk/dwt/include/dwt/widgets/MDIFrame.h dcplusplus/trunk/dwt/include/dwt/widgets/MDIParent.h dcplusplus/trunk/dwt/src/widgets/MDIChild.cpp dcplusplus/trunk/dwt/src/widgets/MDIFrame.cpp Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-20 16:16:42.842999935 +0200 committer: poy <po...@12...> properties: branch-nick: repo + timestamp: 2008-04-20 19:30:12.788000107 +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 1133 arn...@gm...-20080411201718-ecshulwd7ic0wdci 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 1166 arn...@gm...-20080416204550-0dx3qhxasdkdohx1 1167 arn...@gm...-20080416211510-3ilsym0bom7u2cer 1168 tom@athlon-20080417125238-0hhhchg951y7p83w 1169 arn...@gm...-20080418203137-e6szrje3fje5dgh9 1170 arn...@gm...-20080419164722-vyjrwwvglxr4yxuu 1171 arn...@gm...-20080419164802-o2boulbfrea4e0dx 1172 arn...@gm...-20080419165129-zj3axn731fo84vd5 1173 po...@12...-20080419172806-2qspfwerslo10rd2 1174 arn...@gm...-20080419212304-3wjafor82amtvik3 1175 arn...@gm...-20080419212347-t5oze1b59dk7vkiv 1176 arn...@gm...-20080420133104-h16loa3kvzrpkxiv 1177 po...@12...-20080420141642-z9mgyje16kkfy11z + 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 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 1166 arn...@gm...-20080416204550-0dx3qhxasdkdohx1 1167 arn...@gm...-20080416211510-3ilsym0bom7u2cer 1168 tom@athlon-20080417125238-0hhhchg951y7p83w 1169 arn...@gm...-20080418203137-e6szrje3fje5dgh9 1170 arn...@gm...-20080419164722-vyjrwwvglxr4yxuu 1171 arn...@gm...-20080419164802-o2boulbfrea4e0dx 1172 arn...@gm...-20080419165129-zj3axn731fo84vd5 1173 po...@12...-20080419172806-2qspfwerslo10rd2 1174 arn...@gm...-20080419212304-3wjafor82amtvik3 1175 arn...@gm...-20080419212347-t5oze1b59dk7vkiv 1176 arn...@gm...-20080420133104-h16loa3kvzrpkxiv 1177 po...@12...-20080420141642-z9mgyje16kkfy11z 1178 arn...@gm...-20080420173012-we22yoyvldt8u1az Modified: dcplusplus/trunk/dwt/include/dwt/Policies.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/Policies.h 2008-04-24 13:34:49 UTC (rev 1202) +++ dcplusplus/trunk/dwt/include/dwt/Policies.h 2008-04-24 13:36:15 UTC (rev 1203) @@ -308,8 +308,7 @@ protected: MDIFrame(Widget* parent) : Normal(parent) { } - LRESULT returnUnhandled( HWND hWnd, UINT msg, WPARAM wPar, LPARAM lPar ) - { + LRESULT returnUnhandled( HWND hWnd, UINT msg, WPARAM wPar, LPARAM lPar ) { WidgetType* This = static_cast<WidgetType*>(this); if(This->getMDIParent()) { return ::DefFrameProc( hWnd, This->getMDIParent()->handle(), msg, wPar, lPar ); @@ -317,17 +316,6 @@ return Normal::returnUnhandled(hWnd, msg, wPar, lPar); } - virtual bool tryFire(const MSG& msg, LRESULT& retVal) { - bool handled = Normal::tryFire(msg, retVal); - WidgetType* This = static_cast<WidgetType*>(this); - if(!handled && msg.message == WM_COMMAND && This->getMDIParent()) { - Widget* active = hwnd_cast<Widget*>(This->getMDIParent()->getActive()); - if(active) { - handled = active->tryFire(msg, retVal); - } - } - return handled; - } }; #endif //! WINCE Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectActivate.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/aspects/AspectActivate.h 2008-04-24 13:34:49 UTC (rev 1202) +++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectActivate.h 2008-04-24 13:36:15 UTC (rev 1203) @@ -73,7 +73,7 @@ /** Use this function to check if the Widget is active or not. <br> * If the Widget is active this function will return true. */ - bool getActive() const; + bool isActive() const; /// \ingroup EventHandlersAspectActivate /// Setting the member event handler for the "activated" event @@ -101,7 +101,7 @@ } template< class WidgetType > -bool AspectActivate< WidgetType >::getActive() const +bool AspectActivate< WidgetType >::isActive() const { return ::GetActiveWindow() == H(); } Modified: dcplusplus/trunk/dwt/include/dwt/widgets/MDIFrame.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/MDIFrame.h 2008-04-24 13:34:49 UTC (rev 1202) +++ dcplusplus/trunk/dwt/include/dwt/widgets/MDIFrame.h 2008-04-24 13:36:15 UTC (rev 1203) @@ -85,6 +85,8 @@ void create( const Seed& cs = Seed() ); MDIParent* getMDIParent() { return mdi; } + + virtual bool tryFire( const MSG & msg, LRESULT & retVal ); protected: // Protected since this Widget we HAVE to inherit from explicit MDIFrame( Widget * parent = 0 ); Modified: dcplusplus/trunk/dwt/include/dwt/widgets/MDIParent.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/MDIParent.h 2008-04-24 13:34:49 UTC (rev 1202) +++ dcplusplus/trunk/dwt/include/dwt/widgets/MDIParent.h 2008-04-24 13:36:15 UTC (rev 1203) @@ -111,8 +111,8 @@ this->sendMessage(WM_MDIICONARRANGE); } - HWND getActive() { - return reinterpret_cast<HWND>(this->sendMessage(WM_MDIGETACTIVE)); + Widget* getActive() { + return hwnd_cast<Widget*>(reinterpret_cast<HWND>(this->sendMessage(WM_MDIGETACTIVE))); } bool isActiveMaximized() { Modified: dcplusplus/trunk/dwt/src/widgets/MDIChild.cpp =================================================================== --- dcplusplus/trunk/dwt/src/widgets/MDIChild.cpp 2008-04-24 13:34:49 UTC (rev 1202) +++ dcplusplus/trunk/dwt/src/widgets/MDIChild.cpp 2008-04-24 13:36:15 UTC (rev 1203) @@ -75,7 +75,7 @@ if(msg.message == WM_SIZE) // client area { - if((msg.wParam == SIZE_MAXIMIZED || msg.wParam == SIZE_RESTORED) && getParent()->getActive() == handle()) // active and maximized + if((msg.wParam == SIZE_MAXIMIZED || msg.wParam == SIZE_RESTORED) && getParent()->getActive() == this) // active and maximized return BaseType::tryFire(msg, retVal); sendMessage(WM_SETREDRAW, FALSE); @@ -89,8 +89,8 @@ } void MDIChild::activate() { - HWND prev = getParent()->getActive(); - if(prev == handle()) + Widget* prev = getParent()->getActive(); + if(prev == this) return; if(::IsIconic(handle())) { Modified: dcplusplus/trunk/dwt/src/widgets/MDIFrame.cpp =================================================================== --- dcplusplus/trunk/dwt/src/widgets/MDIFrame.cpp 2008-04-24 13:34:49 UTC (rev 1202) +++ dcplusplus/trunk/dwt/src/widgets/MDIFrame.cpp 2008-04-24 13:36:15 UTC (rev 1203) @@ -48,4 +48,13 @@ mdi = WidgetCreator<MDIParent>::create(this); } +bool MDIFrame::tryFire(const MSG& msg, LRESULT& retVal) { + bool handled = BaseType::tryFire(msg, retVal); + + if(!handled && msg.message == WM_COMMAND && getMDIParent()->getActive()) { + // Forward commands to the active tab + handled = getMDIParent()->getActive()->tryFire(msg, retVal); + } + return handled; } +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arn...@us...> - 2008-04-24 13:34:53
|
Revision: 1202 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1202&view=rev Author: arnetheduck Date: 2008-04-24 06:34:49 -0700 (Thu, 24 Apr 2008) Log Message: ----------- fix progress text vertical pos & add to the "Connections" tab Modified Paths: -------------- dcplusplus/trunk/win32/TransferView.cpp Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-20 15:31:04.163000107 +0200 committer: Jacek Sieka <arn...@gm...> properties: branch-nick: dcplusplus + timestamp: 2008-04-20 16:16:42.842999935 +0200 committer: poy <po...@12...> properties: branch-nick: repo 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 1133 arn...@gm...-20080411201718-ecshulwd7ic0wdci 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 1166 arn...@gm...-20080416204550-0dx3qhxasdkdohx1 1167 arn...@gm...-20080416211510-3ilsym0bom7u2cer 1168 tom@athlon-20080417125238-0hhhchg951y7p83w 1169 arn...@gm...-20080418203137-e6szrje3fje5dgh9 1170 arn...@gm...-20080419164722-vyjrwwvglxr4yxuu 1171 arn...@gm...-20080419164802-o2boulbfrea4e0dx 1172 arn...@gm...-20080419165129-zj3axn731fo84vd5 1173 po...@12...-20080419172806-2qspfwerslo10rd2 1174 arn...@gm...-20080419212304-3wjafor82amtvik3 1175 arn...@gm...-20080419212347-t5oze1b59dk7vkiv 1176 arn...@gm...-20080420133104-h16loa3kvzrpkxiv + 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 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 1166 arn...@gm...-20080416204550-0dx3qhxasdkdohx1 1167 arn...@gm...-20080416211510-3ilsym0bom7u2cer 1168 tom@athlon-20080417125238-0hhhchg951y7p83w 1169 arn...@gm...-20080418203137-e6szrje3fje5dgh9 1170 arn...@gm...-20080419164722-vyjrwwvglxr4yxuu 1171 arn...@gm...-20080419164802-o2boulbfrea4e0dx 1172 arn...@gm...-20080419165129-zj3axn731fo84vd5 1173 po...@12...-20080419172806-2qspfwerslo10rd2 1174 arn...@gm...-20080419212304-3wjafor82amtvik3 1175 arn...@gm...-20080419212347-t5oze1b59dk7vkiv 1176 arn...@gm...-20080420133104-h16loa3kvzrpkxiv 1177 po...@12...-20080420141642-z9mgyje16kkfy11z Modified: dcplusplus/trunk/win32/TransferView.cpp =================================================================== --- dcplusplus/trunk/win32/TransferView.cpp 2008-04-24 13:34:10 UTC (rev 1201) +++ dcplusplus/trunk/win32/TransferView.cpp 2008-04-24 13:34:49 UTC (rev 1202) @@ -114,6 +114,7 @@ connections->onContextMenu(std::tr1::bind(&TransferView::handleConnectionsMenu, this, _1)); connections->onKeyDown(std::tr1::bind(&TransferView::handleKeyDown, this, _1)); connections->onDblClicked(std::tr1::bind(&TransferView::handleDblClicked, this)); + connections->onRaw(std::tr1::bind(&TransferView::handleCustomDraw, this, _1, _2), dwt::Message(WM_NOTIFY, NM_CUSTOMDRAW)); } { @@ -340,14 +341,19 @@ long left = textRect.left; + // todo use dwt's canvas and put this there + TEXTMETRIC tm; + ::GetTextMetrics(hdc, &tm); + long top = textRect.top + (textRect.bottom - textRect.top - tm.tmHeight) / 2; + ::SetTextColor(hdc, RGB(255, 255, 255)); - ::ExtTextOut(hdc, left, textRect.top, ETO_CLIPPED, &textRect, text.c_str(), text.size(), NULL); + ::ExtTextOut(hdc, left, top, ETO_CLIPPED, &textRect, text.c_str(), text.size(), NULL); textRect.left = textRect.right; textRect.right = rcItem.right() - 6; ::SetTextColor(hdc, WinUtil::textColor); - ::ExtTextOut(hdc, left, textRect.top, ETO_CLIPPED, &textRect, text.c_str(), text.size(), NULL); + ::ExtTextOut(hdc, left, top, ETO_CLIPPED, &textRect, text.c_str(), text.size(), NULL); ::SetBkMode(hdc, oldMode); } @@ -366,8 +372,22 @@ case CDDS_SUBITEM | CDDS_ITEMPREPAINT: // Let's draw a box if needed... - if(column == DOWNLOAD_COLUMN_STATUS) { + if(cd->nmcd.hdr.hwndFrom == connections->handle() && column == CONNECTION_COLUMN_STATUS) { + HDC hdc = cd->nmcd.hdc; + ConnectionInfo* ci = reinterpret_cast<ConnectionInfo*>(cd->nmcd.lItemlParam); + const tstring& text = ci->columns[column]; + + RECT r; + ListView_GetSubItemRect( connections->handle(), item, column, LVIR_BOUNDS, &r ); + + int64_t chunk = ci->chunk == 0 ? 1 : ci->chunk; + double pos = static_cast<double>(ci->chunkPos) / chunk; + drawProgress(hdc, r, item, column, text, pos, ci->download ? SETTING(DOWNLOAD_BAR_COLOR) : SETTING(UPLOAD_BAR_COLOR)); + + return CDRF_SKIPDEFAULT; + } + if(cd->nmcd.hdr.hwndFrom == downloads->handle() && column == DOWNLOAD_COLUMN_STATUS) { HDC hdc = cd->nmcd.hdc; DownloadInfo* di = reinterpret_cast<DownloadInfo*>(cd->nmcd.lItemlParam); const tstring& text = di->columns[column]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arn...@us...> - 2008-04-24 13:34:15
|
Revision: 1201 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1201&view=rev Author: arnetheduck Date: 2008-04-24 06:34:10 -0700 (Thu, 24 Apr 2008) Log Message: ----------- use exttextout as drawtext gives problems Modified Paths: -------------- dcplusplus/trunk/win32/TransferView.cpp Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-19 23:23:47.709000111 +0200 committer: Jacek Sieka <arn...@gm...> properties: branch-nick: dcplusplus + timestamp: 2008-04-20 15:31:04.163000107 +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 po...@12...-20080411151741-4v1p7g8chsber07o po...@12...-20080412010859-rirxtkww5ilq2pj5 + arn...@gm...-20080329054606-ubefm4h98xjgvif9 arn...@gm...-20080329220538-g3f1nvcfh1ycetw7 robert@smir-20080331181318-buvm17zqqym5ryct po...@12...-20080411151741-4v1p7g8chsber07o po...@12...-20080412010859-rirxtkww5ilq2pj5 po...@12...-20080419222854-371z9fmpkfaj26qs 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 1133 arn...@gm...-20080411201718-ecshulwd7ic0wdci 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 1166 arn...@gm...-20080416204550-0dx3qhxasdkdohx1 1167 arn...@gm...-20080416211510-3ilsym0bom7u2cer 1168 tom@athlon-20080417125238-0hhhchg951y7p83w 1169 arn...@gm...-20080418203137-e6szrje3fje5dgh9 1170 arn...@gm...-20080419164722-vyjrwwvglxr4yxuu 1171 arn...@gm...-20080419164802-o2boulbfrea4e0dx 1172 arn...@gm...-20080419165129-zj3axn731fo84vd5 1173 po...@12...-20080419172806-2qspfwerslo10rd2 1174 arn...@gm...-20080419212304-3wjafor82amtvik3 1175 arn...@gm...-20080419212347-t5oze1b59dk7vkiv + 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 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 1166 arn...@gm...-20080416204550-0dx3qhxasdkdohx1 1167 arn...@gm...-20080416211510-3ilsym0bom7u2cer 1168 tom@athlon-20080417125238-0hhhchg951y7p83w 1169 arn...@gm...-20080418203137-e6szrje3fje5dgh9 1170 arn...@gm...-20080419164722-vyjrwwvglxr4yxuu 1171 arn...@gm...-20080419164802-o2boulbfrea4e0dx 1172 arn...@gm...-20080419165129-zj3axn731fo84vd5 1173 po...@12...-20080419172806-2qspfwerslo10rd2 1174 arn...@gm...-20080419212304-3wjafor82amtvik3 1175 arn...@gm...-20080419212347-t5oze1b59dk7vkiv 1176 arn...@gm...-20080420133104-h16loa3kvzrpkxiv Modified: dcplusplus/trunk/win32/TransferView.cpp =================================================================== --- dcplusplus/trunk/win32/TransferView.cpp 2008-04-24 13:33:15 UTC (rev 1200) +++ dcplusplus/trunk/win32/TransferView.cpp 2008-04-24 13:34:10 UTC (rev 1201) @@ -318,7 +318,7 @@ ::Rectangle(hdc, rc.left(), rc.top(), rc.right(), rc.bottom()); - RECT clipRect = rc; + RECT textRect = rc; // draw progressbar highlight if(rc.width()>2) { @@ -333,35 +333,23 @@ ::DeleteObject(::SelectObject(hdc, oldpen)); ::DeleteObject(::SelectObject(hdc, oldbr)); - dwt::Rectangle rcText = rcItem; - rcText.pos.x += 6; - rcText.size.x -= 6; + int oldMode = ::SetBkMode(hdc, TRANSPARENT); - HRGN clipRgn = ::CreateRectRgnIndirect(&clipRect); - - ::SelectClipRgn(hdc, clipRgn); + textRect.left += 6; + textRect.right -= 6; + + long left = textRect.left; + ::SetTextColor(hdc, RGB(255, 255, 255)); - RECT textRect = rcText; - - int oldMode = ::SetBkMode(hdc, TRANSPARENT); - - ::DrawText(hdc, text.c_str(), text.size(), &textRect, DT_LEFT | DT_VCENTER | DT_SINGLELINE); - - clipRect.left = clipRect.right; - clipRect.right = rcItem.right(); - - ::DeleteObject(clipRgn); - clipRgn = ::CreateRectRgnIndirect(&clipRect); + ::ExtTextOut(hdc, left, textRect.top, ETO_CLIPPED, &textRect, text.c_str(), text.size(), NULL); + + textRect.left = textRect.right; + textRect.right = rcItem.right() - 6; + ::SetTextColor(hdc, WinUtil::textColor); - - ::SelectClipRgn(hdc, clipRgn); - ::DrawText(hdc, text.c_str(), text.size(), &textRect, DT_LEFT | DT_VCENTER | DT_SINGLELINE); + ::ExtTextOut(hdc, left, textRect.top, ETO_CLIPPED, &textRect, text.c_str(), text.size(), NULL); ::SetBkMode(hdc, oldMode); - ::DeleteObject(clipRgn); - - ::SelectClipRgn(hdc, NULL); - } LRESULT TransferView::handleCustomDraw(WPARAM wParam, LPARAM lParam) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arn...@us...> - 2008-04-24 13:33:18
|
Revision: 1200 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1200&view=rev Author: arnetheduck Date: 2008-04-24 06:33:15 -0700 (Thu, 24 Apr 2008) Log Message: ----------- remove progress bar option Modified Paths: -------------- dcplusplus/trunk/dcpp/SettingsManager.cpp dcplusplus/trunk/dcpp/SettingsManager.h dcplusplus/trunk/win32/AdvancedPage.cpp dcplusplus/trunk/win32/TransferView.cpp Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-19 23:23:04.540999889 +0200 committer: Jacek Sieka <arn...@gm...> properties: branch-nick: dcplusplus + timestamp: 2008-04-19 23:23:47.709000111 +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 1133 arn...@gm...-20080411201718-ecshulwd7ic0wdci 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 1166 arn...@gm...-20080416204550-0dx3qhxasdkdohx1 1167 arn...@gm...-20080416211510-3ilsym0bom7u2cer 1168 tom@athlon-20080417125238-0hhhchg951y7p83w 1169 arn...@gm...-20080418203137-e6szrje3fje5dgh9 1170 arn...@gm...-20080419164722-vyjrwwvglxr4yxuu 1171 arn...@gm...-20080419164802-o2boulbfrea4e0dx 1172 arn...@gm...-20080419165129-zj3axn731fo84vd5 1173 po...@12...-20080419172806-2qspfwerslo10rd2 1174 arn...@gm...-20080419212304-3wjafor82amtvik3 + 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 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 1166 arn...@gm...-20080416204550-0dx3qhxasdkdohx1 1167 arn...@gm...-20080416211510-3ilsym0bom7u2cer 1168 tom@athlon-20080417125238-0hhhchg951y7p83w 1169 arn...@gm...-20080418203137-e6szrje3fje5dgh9 1170 arn...@gm...-20080419164722-vyjrwwvglxr4yxuu 1171 arn...@gm...-20080419164802-o2boulbfrea4e0dx 1172 arn...@gm...-20080419165129-zj3axn731fo84vd5 1173 po...@12...-20080419172806-2qspfwerslo10rd2 1174 arn...@gm...-20080419212304-3wjafor82amtvik3 1175 arn...@gm...-20080419212347-t5oze1b59dk7vkiv Modified: dcplusplus/trunk/dcpp/SettingsManager.cpp =================================================================== --- dcplusplus/trunk/dcpp/SettingsManager.cpp 2008-04-24 13:31:59 UTC (rev 1199) +++ dcplusplus/trunk/dcpp/SettingsManager.cpp 2008-04-24 13:33:15 UTC (rev 1200) @@ -58,7 +58,7 @@ "UseSystemIcons", "PopupPMs", "MinUploadSpeed", "GetUserInfo", "UrlHandler", "MainWindowState", "MainWindowSizeX", "MainWindowSizeY", "MainWindowPosX", "MainWindowPosY", "AutoAway", "SocksPort", "SocksResolve", "KeepLists", "AutoKick", "QueueFrameShowTree", - "CompressTransfers", "ShowProgressBars", "SFVCheck", + "CompressTransfers", "SFVCheck", "MaxCompression", "NoAwayMsgToBots", "SkipZeroByte", "AdlsBreakOnFirst", "HubUserCommands", "AutoSearchAutoMatch", "DownloadBarColor", "UploadBarColor", "LogSystem", "LogFilelistTransfers", "SendUnknownCommands", "MaxHashSpeed", "OpenUserCmdHelp", @@ -175,7 +175,6 @@ setDefault(AUTO_KICK, false); setDefault(QUEUEFRAME_SHOW_TREE, true); setDefault(COMPRESS_TRANSFERS, true); - setDefault(SHOW_PROGRESS_BARS, true); setDefault(SFV_CHECK, true); setDefault(DEFAULT_AWAY_MESSAGE, "I'm away. State your business and I might answer later if you're lucky."); setDefault(TIME_STAMPS_FORMAT, "%H:%M"); Modified: dcplusplus/trunk/dcpp/SettingsManager.h =================================================================== --- dcplusplus/trunk/dcpp/SettingsManager.h 2008-04-24 13:31:59 UTC (rev 1199) +++ dcplusplus/trunk/dcpp/SettingsManager.h 2008-04-24 13:33:15 UTC (rev 1200) @@ -71,7 +71,7 @@ USE_SYSTEM_ICONS, POPUP_PMS, MIN_UPLOAD_SPEED, GET_USER_INFO, URL_HANDLER, MAIN_WINDOW_STATE, MAIN_WINDOW_SIZE_X, MAIN_WINDOW_SIZE_Y, MAIN_WINDOW_POS_X, MAIN_WINDOW_POS_Y, AUTO_AWAY, SOCKS_PORT, SOCKS_RESOLVE, KEEP_LISTS, AUTO_KICK, QUEUEFRAME_SHOW_TREE, - COMPRESS_TRANSFERS, SHOW_PROGRESS_BARS, SFV_CHECK, + COMPRESS_TRANSFERS, SFV_CHECK, MAX_COMPRESSION, NO_AWAYMSG_TO_BOTS, SKIP_ZERO_BYTE, ADLS_BREAK_ON_FIRST, HUB_USER_COMMANDS, AUTO_SEARCH_AUTO_MATCH, UPLOAD_BAR_COLOR, DOWNLOAD_BAR_COLOR, LOG_SYSTEM, LOG_FILELIST_TRANSFERS, SEND_UNKNOWN_COMMANDS, MAX_HASH_SPEED, OPEN_USER_CMD_HELP, Modified: dcplusplus/trunk/win32/AdvancedPage.cpp =================================================================== --- dcplusplus/trunk/win32/AdvancedPage.cpp 2008-04-24 13:31:59 UTC (rev 1199) +++ dcplusplus/trunk/win32/AdvancedPage.cpp 2008-04-24 13:33:15 UTC (rev 1200) @@ -33,7 +33,6 @@ { SettingsManager::MAGNET_REGISTER, N_("Register with Windows to handle magnet: URI links"), IDH_SETTINGS_ADVANCED_MAGNET_REGISTER }, { SettingsManager::KEEP_LISTS, N_("Don't delete file lists when exiting"), IDH_SETTINGS_ADVANCED_KEEP_LISTS }, { SettingsManager::AUTO_KICK, N_("Automatically disconnect users who leave the hub"), IDH_SETTINGS_ADVANCED_AUTO_KICK }, -// TODO { SettingsManager::SHOW_PROGRESS_BARS, N_("Show progress bars for transfers"), IDH_SETTINGS_ADVANCED_SHOW_PROGRESS_BARS }, { SettingsManager::SFV_CHECK, N_("Enable automatic SFV checking"), IDH_SETTINGS_ADVANCED_SFV_CHECK }, { SettingsManager::NO_AWAYMSG_TO_BOTS, N_("Don't send the away message to bots"), IDH_SETTINGS_ADVANCED_NO_AWAYMSG_TO_BOTS }, { SettingsManager::ADLS_BREAK_ON_FIRST, N_("Break on first ADLSearch match"), IDH_SETTINGS_ADVANCED_ADLS_BREAK_ON_FIRST }, Modified: dcplusplus/trunk/win32/TransferView.cpp =================================================================== --- dcplusplus/trunk/win32/TransferView.cpp 2008-04-24 13:31:59 UTC (rev 1199) +++ dcplusplus/trunk/win32/TransferView.cpp 2008-04-24 13:33:15 UTC (rev 1200) @@ -365,10 +365,6 @@ } LRESULT TransferView::handleCustomDraw(WPARAM wParam, LPARAM lParam) { - if(!BOOLSETTING(SHOW_PROGRESS_BARS)) { - return 0; - } - LPNMLVCUSTOMDRAW cd = (LPNMLVCUSTOMDRAW)lParam; int item = (int)cd->nmcd.dwItemSpec; int column = cd->iSubItem; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arn...@us...> - 2008-04-24 13:32:02
|
Revision: 1199 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1199&view=rev Author: arnetheduck Date: 2008-04-24 06:31:59 -0700 (Thu, 24 Apr 2008) Log Message: ----------- Fix message forwarding to child widgets Modified Paths: -------------- dcplusplus/trunk/dwt/src/widgets/TabView.cpp Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-19 19:28:06.015000105 +0200 committer: poy <po...@12...> properties: branch-nick: repo + timestamp: 2008-04-19 23:23:04.540999889 +0200 committer: Jacek Sieka <arn...@gm...> properties: branch-nick: dcplusplus Name: bzr:file-ids - help/window_main.html window_main.html-20080419171016-1ou8eeg9vnx3tgh3-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 1131 po...@12...-20080411153057-tn7zhxqk0z7ceref 1132 arn...@gm...-20080411200946-ierqlg8v9vzj18n2 1133 arn...@gm...-20080411201718-ecshulwd7ic0wdci 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 1166 arn...@gm...-20080416204550-0dx3qhxasdkdohx1 1167 arn...@gm...-20080416211510-3ilsym0bom7u2cer 1168 tom@athlon-20080417125238-0hhhchg951y7p83w 1169 arn...@gm...-20080418203137-e6szrje3fje5dgh9 1170 arn...@gm...-20080419164722-vyjrwwvglxr4yxuu 1171 arn...@gm...-20080419164802-o2boulbfrea4e0dx 1172 arn...@gm...-20080419165129-zj3axn731fo84vd5 1173 po...@12...-20080419172806-2qspfwerslo10rd2 + 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 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 1166 arn...@gm...-20080416204550-0dx3qhxasdkdohx1 1167 arn...@gm...-20080416211510-3ilsym0bom7u2cer 1168 tom@athlon-20080417125238-0hhhchg951y7p83w 1169 arn...@gm...-20080418203137-e6szrje3fje5dgh9 1170 arn...@gm...-20080419164722-vyjrwwvglxr4yxuu 1171 arn...@gm...-20080419164802-o2boulbfrea4e0dx 1172 arn...@gm...-20080419165129-zj3axn731fo84vd5 1173 po...@12...-20080419172806-2qspfwerslo10rd2 1174 arn...@gm...-20080419212304-3wjafor82amtvik3 Modified: dcplusplus/trunk/dwt/src/widgets/TabView.cpp =================================================================== --- dcplusplus/trunk/dwt/src/widgets/TabView.cpp 2008-04-24 13:30:58 UTC (rev 1198) +++ dcplusplus/trunk/dwt/src/widgets/TabView.cpp 2008-04-24 13:31:59 UTC (rev 1199) @@ -555,6 +555,12 @@ return true; } + + if(!handled && msg.message == WM_COMMAND && getActive()) { + // Forward commands to the active tab + handled = getActive()->tryFire(msg, retVal); + } + return handled; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arn...@us...> - 2008-04-24 13:31:10
|
Revision: 1198 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1198&view=rev Author: arnetheduck Date: 2008-04-24 06:30:58 -0700 (Thu, 24 Apr 2008) Log Message: ----------- cshelp for toolbar buttons Modified Paths: -------------- dcplusplus/trunk/dwt/include/dwt/widgets/ToolBar.h dcplusplus/trunk/dwt/src/widgets/ToolBar.cpp dcplusplus/trunk/help/DCPlusPlus.hhp dcplusplus/trunk/help/cshelp.h dcplusplus/trunk/help/index.html dcplusplus/trunk/help/resource.h dcplusplus/trunk/help/toc.hhc dcplusplus/trunk/win32/MainWindow.cpp Added Paths: ----------- dcplusplus/trunk/help/window_main.html Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-19 18:51:29.880000114 +0200 committer: Jacek Sieka <arn...@gm...> properties: branch-nick: dcplusplus + timestamp: 2008-04-19 19:28:06.015000105 +0200 committer: poy <po...@12...> properties: branch-nick: repo Name: bzr:file-ids - + help/window_main.html window_main.html-20080419171016-1ou8eeg9vnx3tgh3-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 1131 po...@12...-20080411153057-tn7zhxqk0z7ceref 1132 arn...@gm...-20080411200946-ierqlg8v9vzj18n2 1133 arn...@gm...-20080411201718-ecshulwd7ic0wdci 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 1166 arn...@gm...-20080416204550-0dx3qhxasdkdohx1 1167 arn...@gm...-20080416211510-3ilsym0bom7u2cer 1168 tom@athlon-20080417125238-0hhhchg951y7p83w 1169 arn...@gm...-20080418203137-e6szrje3fje5dgh9 1170 arn...@gm...-20080419164722-vyjrwwvglxr4yxuu 1171 arn...@gm...-20080419164802-o2boulbfrea4e0dx 1172 arn...@gm...-20080419165129-zj3axn731fo84vd5 + 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 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 1166 arn...@gm...-20080416204550-0dx3qhxasdkdohx1 1167 arn...@gm...-20080416211510-3ilsym0bom7u2cer 1168 tom@athlon-20080417125238-0hhhchg951y7p83w 1169 arn...@gm...-20080418203137-e6szrje3fje5dgh9 1170 arn...@gm...-20080419164722-vyjrwwvglxr4yxuu 1171 arn...@gm...-20080419164802-o2boulbfrea4e0dx 1172 arn...@gm...-20080419165129-zj3axn731fo84vd5 1173 po...@12...-20080419172806-2qspfwerslo10rd2 Modified: dcplusplus/trunk/dwt/include/dwt/widgets/ToolBar.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/ToolBar.h 2008-04-24 13:29:27 UTC (rev 1197) +++ dcplusplus/trunk/dwt/include/dwt/widgets/ToolBar.h 2008-04-24 13:30:58 UTC (rev 1198) @@ -109,7 +109,7 @@ */ void appendSeparator(); - void appendItem(int image, const tstring& toolTip, const Dispatcher::F& f = Dispatcher::F()); + void appendItem(int image, const tstring& toolTip, DWORD_PTR data = 0, const Dispatcher::F& f = Dispatcher::F()); /// Set the image list with the normal button images. /** normalImageList is the image list that contains the images @@ -156,7 +156,9 @@ bool getButtonChecked( unsigned int id ); int size(); - + + int hitTest(const ScreenCoordinate& pt); + /// Actually creates the Toolbar /** You should call WidgetFactory::createToolbar if you instantiate class * directly. <br> @@ -174,6 +176,7 @@ {} virtual bool tryFire( const MSG & msg, LRESULT & retVal ); + private: // Keep references ImageListPtr itsNormalImageList; @@ -181,6 +184,9 @@ ImageListPtr itsDisabledImageList; std::vector<Dispatcher::F> commands; + + // AspectHelp + void helpImpl(unsigned& id); }; /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -254,9 +260,7 @@ inline bool ToolBar::getButtonVisible( unsigned int id ) { - TBBUTTONINFO tb = { sizeof( TBBUTTONINFO ) }; - tb.dwMask = TBIF_STATE; - tb.idCommand = id; + TBBUTTONINFO tb = { sizeof(TBBUTTONINFO), TBIF_STATE, id }; this->sendMessage(TB_GETBUTTONINFO, id, reinterpret_cast< LPARAM >( & tb ) ); return ( tb.fsState & TBSTATE_HIDDEN ) == 0; } @@ -268,24 +272,14 @@ inline bool ToolBar::getButtonEnabled( unsigned int id ) { - TBBUTTONINFO tb = - {0 - }; - tb.cbSize = sizeof( TBBUTTONINFO ); - tb.dwMask = TBIF_STATE; - tb.idCommand = id; + TBBUTTONINFO tb = { sizeof(TBBUTTONINFO), TBIF_STATE, id }; this->sendMessage(TB_GETBUTTONINFO, id, reinterpret_cast< LPARAM >( & tb ) ); return ( tb.fsState & TBSTATE_ENABLED ) == TBSTATE_ENABLED; } inline bool ToolBar::getButtonChecked( unsigned int id ) { - TBBUTTONINFO tb = - {0 - }; - tb.cbSize = sizeof( TBBUTTONINFO ); - tb.dwMask = TBIF_STATE; - tb.idCommand = id; + TBBUTTONINFO tb = { sizeof(TBBUTTONINFO), TBIF_STATE, id }; this->sendMessage(TB_GETBUTTONINFO, id, reinterpret_cast< LPARAM >( & tb ) ); return ( tb.fsState & TBSTATE_CHECKED ) == TBSTATE_CHECKED; } Modified: dcplusplus/trunk/dwt/src/widgets/ToolBar.cpp =================================================================== --- dcplusplus/trunk/dwt/src/widgets/ToolBar.cpp 2008-04-24 13:29:27 UTC (rev 1197) +++ dcplusplus/trunk/dwt/src/widgets/ToolBar.cpp 2008-04-24 13:30:58 UTC (rev 1198) @@ -59,7 +59,7 @@ } } -void ToolBar::appendItem( int image, const tstring& toolTip, const Dispatcher::F& f) +void ToolBar::appendItem(int image, const tstring& toolTip, DWORD_PTR data, const Dispatcher::F& f) { int id = -1; @@ -81,6 +81,7 @@ tb.idCommand = id; tb.fsState = TBSTATE_ENABLED; tb.fsStyle = BTNS_AUTOSIZE; + tb.dwData = data; tb.iString = reinterpret_cast<INT_PTR>(toolTip.c_str()); if ( this->sendMessage(TB_ADDBUTTONS, 1, reinterpret_cast< LPARAM >( &tb ) ) == FALSE ) { @@ -89,6 +90,11 @@ } } +int ToolBar::hitTest(const ScreenCoordinate& pt) { + POINT point = ClientCoordinate(pt, this).getPoint(); + return sendMessage(TB_HITTEST, 0, reinterpret_cast<LPARAM>(&point)); +} + bool ToolBar::tryFire( const MSG & msg, LRESULT & retVal ) { if(msg.message == WM_COMMAND && msg.lParam == reinterpret_cast<LPARAM>(handle())) { size_t id = LOWORD(msg.wParam); @@ -100,4 +106,15 @@ return PolicyType::tryFire(msg, retVal); } +void ToolBar::helpImpl(unsigned& id) { + // we have the help id of the whole toolbar; convert to the one of the specific button the user just clicked on + int index = hitTest(ScreenCoordinate(Point::fromLParam(::GetMessagePos()))); + if(index >= 0) { + // assume the extra info associated with the button is the help id + TBBUTTONINFO tb = { sizeof(TBBUTTONINFO), TBIF_BYINDEX | TBIF_LPARAM }; + sendMessage(TB_GETBUTTONINFO, index, reinterpret_cast<LPARAM>(&tb)); + id = tb.lParam; + } } + +} Modified: dcplusplus/trunk/help/DCPlusPlus.hhp =================================================================== --- dcplusplus/trunk/help/DCPlusPlus.hhp 2008-04-24 13:29:27 UTC (rev 1197) +++ dcplusplus/trunk/help/DCPlusPlus.hhp 2008-04-24 13:30:58 UTC (rev 1198) @@ -38,6 +38,7 @@ plusplus_tag.html netiquette.html credits.html +window_main.html window_hub.html window_pm.html window_file_list.html @@ -80,6 +81,7 @@ IDH_STARTPAGE=index.html IDH_CHANGELOG=changelog.html IDH_KEYBOARD=faq_keyboard_commands.html +IDH_MAIN=window_main.html IDH_HUB=window_hub.html IDH_PM=window_pm.html IDH_FILE_LIST=window_file_list.html Modified: dcplusplus/trunk/help/cshelp.h =================================================================== --- dcplusplus/trunk/help/cshelp.h 2008-04-24 13:29:27 UTC (rev 1197) +++ dcplusplus/trunk/help/cshelp.h 2008-04-24 13:30:58 UTC (rev 1198) @@ -459,33 +459,65 @@ #define IDH_HUB_FILTER 11227 -#define IDH_PM_CHAT 11228 +#define IDH_TOOLBAR_PUBLIC_HUBS 11228 -#define IDH_PM_MESSAGE 11229 +#define IDH_TOOLBAR_RECONNECT 11229 -#define IDH_PUBLIC_HUBS_FILTER 11230 +#define IDH_TOOLBAR_FOLLOW 11230 -#define IDH_PUBLIC_HUBS_LISTS 11231 +#define IDH_TOOLBAR_FAVORITE_HUBS 11231 -#define IDH_PUBLIC_HUBS_REFRESH 11232 +#define IDH_TOOLBAR_FAVORITE_USERS 11232 -#define IDH_SEARCH_SEARCH_FOR 11233 +#define IDH_TOOLBAR_QUEUE 11233 -#define IDH_SEARCH_PURGE 11234 +#define IDH_TOOLBAR_FINISHED_DL 11234 -#define IDH_SEARCH_SEARCH 11235 +#define IDH_TOOLBAR_WAITING_USERS 11235 -#define IDH_SEARCH_SIZE 11236 +#define IDH_TOOLBAR_FINISHED_UL 11236 -#define IDH_SEARCH_TYPE 11237 +#define IDH_TOOLBAR_SEARCH 11237 -#define IDH_SEARCH_SLOTS 11238 +#define IDH_TOOLBAR_ADL_SEARCH 11238 -#define IDH_SEARCH_SHARE 11239 +#define IDH_TOOLBAR_SEARCH_SPY 11239 -#define IDH_SEARCH_HUBS 11240 +#define IDH_TOOLBAR_FILE_LIST 11240 -#define IDH_SPY_IGNORE_TTH 11241 +#define IDH_TOOLBAR_SETTINGS 11241 +#define IDH_TOOLBAR_NOTEPAD 11242 +#define IDH_TOOLBAR_WHATS_THIS 11243 + +#define IDH_PM_CHAT 11244 + +#define IDH_PM_MESSAGE 11245 + +#define IDH_PUBLIC_HUBS_FILTER 11246 + +#define IDH_PUBLIC_HUBS_LISTS 11247 + +#define IDH_PUBLIC_HUBS_REFRESH 11248 + +#define IDH_SEARCH_SEARCH_FOR 11249 + +#define IDH_SEARCH_PURGE 11250 + +#define IDH_SEARCH_SEARCH 11251 + +#define IDH_SEARCH_SIZE 11252 + +#define IDH_SEARCH_TYPE 11253 + +#define IDH_SEARCH_SLOTS 11254 + +#define IDH_SEARCH_SHARE 11255 + +#define IDH_SEARCH_HUBS 11256 + +#define IDH_SPY_IGNORE_TTH 11257 + + #endif Modified: dcplusplus/trunk/help/index.html =================================================================== --- dcplusplus/trunk/help/index.html 2008-04-24 13:29:27 UTC (rev 1197) +++ dcplusplus/trunk/help/index.html 2008-04-24 13:30:58 UTC (rev 1198) @@ -35,6 +35,7 @@ <br> <h2>Windows</h2> <div style="margin-left: 40px;"> +<a href="window_main.html">Main DC++ window</a><br> <a href="window_hub.html">Hub</a><br> <a href="window_pm.html">Private Message</a><br> <a href="window_file_list.html">File List</a><br> Modified: dcplusplus/trunk/help/resource.h =================================================================== --- dcplusplus/trunk/help/resource.h 2008-04-24 13:29:27 UTC (rev 1197) +++ dcplusplus/trunk/help/resource.h 2008-04-24 13:30:58 UTC (rev 1198) @@ -10,24 +10,25 @@ #define IDH_KEYBOARD 10002 // windows -#define IDH_HUB 10100 -#define IDH_PM 10101 -#define IDH_FILE_LIST 10102 -#define IDH_PUBLIC_HUBS 10103 -#define IDH_FAVORITE_HUBS 10104 -#define IDH_FAVUSERS 10105 -#define IDH_QUEUE 10106 -#define IDH_FINISHED_DL 10107 -#define IDH_WAITING_USERS 10108 -#define IDH_FINISHED_UL 10109 -#define IDH_SEARCH 10110 -#define IDH_ADL_SEARCH 10111 -#define IDH_SEARCH_SPY 10112 -#define IDH_NOTEPAD 10113 -#define IDH_SYSTEM_LOG 10114 -#define IDH_NET_STATS 10115 -#define IDH_CONNECTIONS 10116 -#define IDH_DOWNLOADS 10117 +#define IDH_MAIN 10100 +#define IDH_HUB 10101 +#define IDH_PM 10102 +#define IDH_FILE_LIST 10103 +#define IDH_PUBLIC_HUBS 10104 +#define IDH_FAVORITE_HUBS 10105 +#define IDH_FAVUSERS 10106 +#define IDH_QUEUE 10107 +#define IDH_FINISHED_DL 10108 +#define IDH_WAITING_USERS 10109 +#define IDH_FINISHED_UL 10110 +#define IDH_SEARCH 10111 +#define IDH_ADL_SEARCH 10112 +#define IDH_SEARCH_SPY 10113 +#define IDH_NOTEPAD 10114 +#define IDH_SYSTEM_LOG 10115 +#define IDH_NET_STATS 10116 +#define IDH_CONNECTIONS 10117 +#define IDH_DOWNLOADS 10118 // dialogs #define IDH_HASH_PROGRESS 10200 Modified: dcplusplus/trunk/help/toc.hhc =================================================================== --- dcplusplus/trunk/help/toc.hhc 2008-04-24 13:29:27 UTC (rev 1197) +++ dcplusplus/trunk/help/toc.hhc 2008-04-24 13:30:58 UTC (rev 1198) @@ -25,6 +25,10 @@ </OBJECT> <UL> <LI> <OBJECT type="text/sitemap"> + <param name="Name" value="Main DC++ window"> + <param name="Local" value="window_main.html"> + </OBJECT> + <LI> <OBJECT type="text/sitemap"> <param name="Name" value="Hub"> <param name="Local" value="window_hub.html"> </OBJECT> Added: dcplusplus/trunk/help/window_main.html =================================================================== --- dcplusplus/trunk/help/window_main.html (rev 0) +++ dcplusplus/trunk/help/window_main.html 2008-04-24 13:30:58 UTC (rev 1198) @@ -0,0 +1,62 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> +<head> + <meta content="text/html; charset=us-ascii" http-equiv="content-type"> + <link type="text/css" rel="stylesheet" href="office11.css"> + <title>Main DC++ window</title> +</head> +<body> +<h1>Main DC++ window</h1> +<h2>Menus (top)</h2> +... +<h2>Toolbar (top, icons below menus)</h2> +From left to right: +<dl style="margin-left: 40px;"> +<dt>Public Hubs</dt> +<dd cshelp=IDH_TOOLBAR_PUBLIC_HUBS>Open the <a href="window_public_hubs.html">Public Hubs</a> window.</dd> +<dt>Reconnect</dt> +<dd cshelp=IDH_TOOLBAR_RECONNECT>Reconnect (disconnect and connect again) the hub which is currently in the foreground.</dd> +<dt>Follow last redirect</dt> +<dd cshelp=IDH_TOOLBAR_FOLLOW>Follow the redirection offered by the hub which is currently in the foreground.</dd> +<dt>Favorite Hubs</dt> +<dd cshelp=IDH_TOOLBAR_FAVORITE_HUBS>Open the <a href="window_favorite_hubs.html">Favorite Hubs</a> window.</dd> +<dt>Favorite Users</dt> +<dd cshelp=IDH_TOOLBAR_FAVORITE_USERS>Open the <a href="window_favorite_users.html">Favorite Users</a> window.</dd> +<dt>Download Queue</dt> +<dd cshelp=IDH_TOOLBAR_QUEUE>Open the <a href="window_download_queue.html">Download Queue</a> window.</dd> +<dt>Finished Downloads</dt> +<dd cshelp=IDH_TOOLBAR_FINISHED_DL>Open the <a href="window_finished_downloads.html">Finished Downloads</a> window.</dd> +<dt>Waiting Users</dt> +<dd cshelp=IDH_TOOLBAR_WAITING_USERS>Open the <a href="window_waiting_users.html">Waiting Users</a> window.</dd> +<dt>Finished Uploads</dt> +<dd cshelp=IDH_TOOLBAR_FINISHED_UL>Open the <a href="window_finished_uploads.html">Finished Uploads</a> window.</dd> +<dt>Search</dt> +<dd cshelp=IDH_TOOLBAR_SEARCH>Open the <a href="window_search.html">Search</a> window.</dd> +<dt>ADL Search</dt> +<dd cshelp=IDH_TOOLBAR_ADL_SEARCH>Open the <a href="window_adlsearch.html">ADL Search</a> window.</dd> +<dt>Search Spy</dt> +<dd cshelp=IDH_TOOLBAR_SEARCH_SPY>Open the <a href="window_search_spy.html">Search Spy</a> window.</dd> +<dt>Open file list...</dt> +<dd cshelp=IDH_TOOLBAR_FILE_LIST>Open a file list previously saved on your disk (a dialog will appear so you can pick the one you wish to open).</dd> +<dt>Settings</dt> +<dd cshelp=IDH_TOOLBAR_SETTINGS>Open the Settings dialog.</dd> +<dt>Notepad</dt> +<dd cshelp=IDH_TOOLBAR_NOTEPAD>Open the <a href="window_notepad.html">Notepad</a> window, where you can store random text.</dd> +<dt>What's This?</dt> +<dd cshelp=IDH_TOOLBAR_WHATS_THIS>You can get help on specific parts of DC++ by using the "What's This?" help button: click it once, and your mouse cursor will change into a help cursor; then click on the control you wish to get help for.</dd> +</dl> +<h2>Tabs</h2> +Ctrl+Tab, switching, drag&drop, related options (open in background)... +<h2>Status bar (bottom)</h2> +<dl style="margin-left: 40px;"> +<dt>Messages</dt> +<dd>...</dd> +<dt>Away</dt> +<dd>...</dd> +<dt>Hubs</dt> +<dd>...</dd> +<dt>Slots</dt> +<dd>...</dd> +</dl> +</body> +</html> Modified: dcplusplus/trunk/win32/MainWindow.cpp =================================================================== --- dcplusplus/trunk/win32/MainWindow.cpp 2008-04-24 13:29:27 UTC (rev 1197) +++ dcplusplus/trunk/win32/MainWindow.cpp 2008-04-24 13:30:58 UTC (rev 1198) @@ -281,33 +281,35 @@ } int image = 0; - toolbar->appendItem(image++, T_("Public Hubs"), std::tr1::bind(&MainWindow::handleOpenWindow, this, IDC_PUBLIC_HUBS)); + toolbar->appendItem(image++, T_("Public Hubs"), IDH_TOOLBAR_PUBLIC_HUBS, std::tr1::bind(&MainWindow::handleOpenWindow, this, IDC_PUBLIC_HUBS)); toolbar->appendSeparator(); - toolbar->appendItem(image++, T_("Reconnect"), std::tr1::bind(&MainWindow::handleForward, this, IDC_RECONNECT)); - toolbar->appendItem(image++, T_("Follow last redirect"), std::tr1::bind(&MainWindow::handleForward, this, IDC_FOLLOW)); + toolbar->appendItem(image++, T_("Reconnect"), IDH_TOOLBAR_RECONNECT, std::tr1::bind(&MainWindow::handleForward, this, IDC_RECONNECT)); + toolbar->appendItem(image++, T_("Follow last redirect"), IDH_TOOLBAR_FOLLOW, std::tr1::bind(&MainWindow::handleForward, this, IDC_FOLLOW)); toolbar->appendSeparator(); - toolbar->appendItem(image++, T_("Favorite Hubs"), std::tr1::bind(&MainWindow::handleOpenWindow, this, IDC_FAVORITE_HUBS)); - toolbar->appendItem(image++, T_("Favorite Users"), std::tr1::bind(&MainWindow::handleOpenWindow, this, IDC_FAVUSERS)); + toolbar->appendItem(image++, T_("Favorite Hubs"), IDH_TOOLBAR_FAVORITE_HUBS, std::tr1::bind(&MainWindow::handleOpenWindow, this, IDC_FAVORITE_HUBS)); + toolbar->appendItem(image++, T_("Favorite Users"), IDH_TOOLBAR_FAVORITE_USERS, std::tr1::bind(&MainWindow::handleOpenWindow, this, IDC_FAVUSERS)); toolbar->appendSeparator(); - toolbar->appendItem(image++, T_("Download Queue"), std::tr1::bind(&MainWindow::handleOpenWindow, this, IDC_QUEUE)); - toolbar->appendItem(image++, T_("Finished Downloads"), std::tr1::bind(&MainWindow::handleOpenWindow, this, IDC_FINISHED_DL)); - toolbar->appendItem(image++, T_("Waiting Users"), std::tr1::bind(&MainWindow::handleOpenWindow, this, IDC_WAITING_USERS)); - toolbar->appendItem(image++, T_("Finished Uploads"), std::tr1::bind(&MainWindow::handleOpenWindow, this, IDC_FINISHED_UL)); + toolbar->appendItem(image++, T_("Download Queue"), IDH_TOOLBAR_QUEUE, std::tr1::bind(&MainWindow::handleOpenWindow, this, IDC_QUEUE)); + toolbar->appendItem(image++, T_("Finished Downloads"), IDH_TOOLBAR_FINISHED_DL, std::tr1::bind(&MainWindow::handleOpenWindow, this, IDC_FINISHED_DL)); + toolbar->appendItem(image++, T_("Waiting Users"), IDH_TOOLBAR_WAITING_USERS, std::tr1::bind(&MainWindow::handleOpenWindow, this, IDC_WAITING_USERS)); + toolbar->appendItem(image++, T_("Finished Uploads"), IDH_TOOLBAR_FINISHED_UL, std::tr1::bind(&MainWindow::handleOpenWindow, this, IDC_FINISHED_UL)); toolbar->appendSeparator(); - toolbar->appendItem(image++, T_("Search"), std::tr1::bind(&MainWindow::handleOpenWindow, this, IDC_SEARCH)); - toolbar->appendItem(image++, T_("ADL Search"), std::tr1::bind(&MainWindow::handleOpenWindow, this, IDC_ADL_SEARCH)); - toolbar->appendItem(image++, T_("Search Spy"), std::tr1::bind(&MainWindow::handleOpenWindow, this, IDC_SEARCH_SPY)); + toolbar->appendItem(image++, T_("Search"), IDH_TOOLBAR_SEARCH, std::tr1::bind(&MainWindow::handleOpenWindow, this, IDC_SEARCH)); + toolbar->appendItem(image++, T_("ADL Search"), IDH_TOOLBAR_ADL_SEARCH, std::tr1::bind(&MainWindow::handleOpenWindow, this, IDC_ADL_SEARCH)); + toolbar->appendItem(image++, T_("Search Spy"), IDH_TOOLBAR_SEARCH_SPY, std::tr1::bind(&MainWindow::handleOpenWindow, this, IDC_SEARCH_SPY)); toolbar->appendSeparator(); - toolbar->appendItem(image++, T_("Open file list..."), std::tr1::bind(&MainWindow::handleOpenFileList, this)); + toolbar->appendItem(image++, T_("Open file list..."), IDH_TOOLBAR_FILE_LIST, std::tr1::bind(&MainWindow::handleOpenFileList, this)); toolbar->appendSeparator(); - 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->appendItem(image++, T_("Settings"), IDH_TOOLBAR_SETTINGS, std::tr1::bind(&MainWindow::handleSettings, this)); + toolbar->appendItem(image++, T_("Notepad"), IDH_TOOLBAR_NOTEPAD, std::tr1::bind(&MainWindow::handleOpenWindow, this, IDC_NOTEPAD)); toolbar->appendSeparator(); 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)); + ), IDH_TOOLBAR_WHATS_THIS, std::tr1::bind(&MainWindow::handleWhatsThis, this)); + + toolbar->onHelp(std::tr1::bind(&WinUtil::help, _1, _2)); } void MainWindow::initStatusBar() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arn...@us...> - 2008-04-24 13:29:42
|
Revision: 1197 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1197&view=rev Author: arnetheduck Date: 2008-04-24 06:29:27 -0700 (Thu, 24 Apr 2008) Log Message: ----------- add lower bound on last chunk sizes Modified Paths: -------------- dcplusplus/trunk/dcpp/QueueItem.cpp Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-19 18:48:02.542000055 +0200 committer: Jacek Sieka <arn...@gm...> properties: branch-nick: dcplusplus + timestamp: 2008-04-19 18:51:29.880000114 +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 1133 arn...@gm...-20080411201718-ecshulwd7ic0wdci 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 1166 arn...@gm...-20080416204550-0dx3qhxasdkdohx1 1167 arn...@gm...-20080416211510-3ilsym0bom7u2cer 1168 tom@athlon-20080417125238-0hhhchg951y7p83w 1169 arn...@gm...-20080418203137-e6szrje3fje5dgh9 1170 arn...@gm...-20080419164722-vyjrwwvglxr4yxuu 1171 arn...@gm...-20080419164802-o2boulbfrea4e0dx + 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 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 1166 arn...@gm...-20080416204550-0dx3qhxasdkdohx1 1167 arn...@gm...-20080416211510-3ilsym0bom7u2cer 1168 tom@athlon-20080417125238-0hhhchg951y7p83w 1169 arn...@gm...-20080418203137-e6szrje3fje5dgh9 1170 arn...@gm...-20080419164722-vyjrwwvglxr4yxuu 1171 arn...@gm...-20080419164802-o2boulbfrea4e0dx 1172 arn...@gm...-20080419165129-zj3axn731fo84vd5 Modified: dcplusplus/trunk/dcpp/QueueItem.cpp =================================================================== --- dcplusplus/trunk/dcpp/QueueItem.cpp 2008-04-24 13:28:24 UTC (rev 1196) +++ dcplusplus/trunk/dcpp/QueueItem.cpp 2008-04-24 13:29:27 UTC (rev 1197) @@ -101,7 +101,7 @@ double done = static_cast<double>(getDownloadedBytes()) / getSize(); // We want smaller blocks at the end of the transfer, squaring gives a nice curve... - targetSize = wantedSize * (1. - (done * done)); + targetSize = wantedSize * std::max(0.25, (1. - (done * done))); if(targetSize > blockSize) { // Round off to nearest block size This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arn...@us...> - 2008-04-24 13:28:41
|
Revision: 1196 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1196&view=rev Author: arnetheduck Date: 2008-04-24 06:28:24 -0700 (Thu, 24 Apr 2008) Log Message: ----------- initial progress bars, at some point they should probably be moved to dwt Modified Paths: -------------- dcplusplus/trunk/win32/TransferView.cpp dcplusplus/trunk/win32/TransferView.h 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-19 18:47:22.151999950 +0200 committer: Jacek Sieka <arn...@gm...> properties: branch-nick: dcplusplus + timestamp: 2008-04-19 18:48:02.542000055 +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 1133 arn...@gm...-20080411201718-ecshulwd7ic0wdci 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 1166 arn...@gm...-20080416204550-0dx3qhxasdkdohx1 1167 arn...@gm...-20080416211510-3ilsym0bom7u2cer 1168 tom@athlon-20080417125238-0hhhchg951y7p83w 1169 arn...@gm...-20080418203137-e6szrje3fje5dgh9 1170 arn...@gm...-20080419164722-vyjrwwvglxr4yxuu + 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 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 1166 arn...@gm...-20080416204550-0dx3qhxasdkdohx1 1167 arn...@gm...-20080416211510-3ilsym0bom7u2cer 1168 tom@athlon-20080417125238-0hhhchg951y7p83w 1169 arn...@gm...-20080418203137-e6szrje3fje5dgh9 1170 arn...@gm...-20080419164722-vyjrwwvglxr4yxuu 1171 arn...@gm...-20080419164802-o2boulbfrea4e0dx Modified: dcplusplus/trunk/win32/TransferView.cpp =================================================================== --- dcplusplus/trunk/win32/TransferView.cpp 2008-04-24 13:27:20 UTC (rev 1195) +++ dcplusplus/trunk/win32/TransferView.cpp 2008-04-24 13:28:24 UTC (rev 1196) @@ -127,6 +127,7 @@ downloads->setSmallImageList(WinUtil::fileImages); downloads->onContextMenu(std::tr1::bind(&TransferView::handleDownloadsMenu, this, _1)); + downloads->onRaw(std::tr1::bind(&TransferView::handleCustomDraw, this, _1, _2), dwt::Message(WM_NOTIFY, NM_CUSTOMDRAW)); } connectionsWindow->onSized(std::tr1::bind(&fills, connectionsWindow, connections)); @@ -282,113 +283,126 @@ } } -#ifdef PORT_ME -LRESULT TransferView::onCustomDraw(int /*idCtrl*/, LPNMHDR pnmh, BOOL& bHandled) { - if(!BOOLSETTING(SHOW_PROGRESS_BARS)) { - bHandled = FALSE; - return 0; - } +static inline void drawProgress(HDC hdc, const dwt::Rectangle& rcItem, int item, int column, const tstring& text, double pos, COLORREF fgColor) { + // draw something nice... + COLORREF barBase = fgColor; + COLORREF bgBase = WinUtil::bgColor; + int mod = (HLS_L(RGB2HLS(bgBase)) >= 128) ? -30 : 30; + + // Dark, medium and light shades + COLORREF barPal[3] = { HLS_TRANSFORM(barBase, -40, 50), barBase, HLS_TRANSFORM(barBase, 40, -30) }; + + // Two shades of the background color + COLORREF bgPal[2] = { HLS_TRANSFORM(bgBase, mod, 0), HLS_TRANSFORM(bgBase, mod/2, 0) }; - CRect rc; - LPNMLVCUSTOMDRAW cd = (LPNMLVCUSTOMDRAW)pnmh; + dwt::Rectangle rc = rcItem; - switch(cd->nmcd.dwDrawStage) { - case CDDS_PREPAINT: - return CDRF_NOTIFYITEMDRAW; + // draw background + HGDIOBJ oldbr = ::SelectObject(hdc, ::CreateSolidBrush(bgPal[1])); + HGDIOBJ oldpen = ::SelectObject(hdc, ::CreatePen(PS_SOLID, 0, bgPal[0])); + + // TODO Don't draw where the finished part will be drawn + ::Rectangle(hdc, rc.left(), rc.top() - 1, rc.right(), rc.bottom()); + + rc.pos.x += 1; + rc.size.x -= 2; + rc.size.y -= 1; + + long w = rc.width(); + + ::DeleteObject(::SelectObject(hdc, ::CreateSolidBrush(barPal[1]))); + ::DeleteObject(::SelectObject(hdc, ::CreatePen(PS_SOLID, 0, barPal[0]))); + + // "Finished" part + rc.size.x = (int) (w * pos); - case CDDS_ITEMPREPAINT: - return CDRF_NOTIFYSUBITEMDRAW; + ::Rectangle(hdc, rc.left(), rc.top(), rc.right(), rc.bottom()); - case CDDS_SUBITEM | CDDS_ITEMPREPAINT: - // Let's draw a box if needed... - if(cd->iSubItem == COLUMN_STATUS) { - ConnectionInfo* ii = (ConnectionInfo*)cd->nmcd.lItemlParam; - if(ii->status == ConnectionInfo::STATUS_RUNNING) { - // draw something nice... - TCHAR buf[256]; - COLORREF barBase = ii->download ? SETTING(DOWNLOAD_BAR_COLOR) : SETTING(UPLOAD_BAR_COLOR); - COLORREF bgBase = WinUtil::bgColor; - int mod = (HLS_L(RGB2HLS(bgBase)) >= 128) ? -30 : 30; - COLORREF barPal[3] = { HLS_TRANSFORM(barBase, -40, 50), barBase, HLS_TRANSFORM(barBase, 40, -30) }; - COLORREF bgPal[2] = { HLS_TRANSFORM(bgBase, mod, 0), HLS_TRANSFORM(bgBase, mod/2, 0) }; + RECT clipRect = rc; - connections->GetItemText((int)cd->nmcd.dwItemSpec, COLUMN_STATUS, buf, 255); - buf[255] = 0; + // draw progressbar highlight + if(rc.width()>2) { + ::DeleteObject(::SelectObject(hdc, ::CreatePen(PS_SOLID, 1, barPal[2]))); - connections->GetSubItemRect((int)cd->nmcd.dwItemSpec, COLUMN_STATUS, LVIR_BOUNDS, rc); - CRect rc2 = rc; - rc2.left += 6; + rc.pos.y += 2; + ::MoveToEx(hdc, rc.left()+1, rc.top(), (LPPOINT)NULL); + ::LineTo(hdc, rc.right()-2, rc.top()); + } - // draw background - HGDIOBJ oldpen = ::SelectObject(cd->nmcd.hdc, CreatePen(PS_SOLID,0,bgPal[0])); - HGDIOBJ oldbr = ::SelectObject(cd->nmcd.hdc, CreateSolidBrush(bgPal[1])); - ::Rectangle(cd->nmcd.hdc, rc.left, rc.top - 1, rc.right, rc.bottom); - rc.DeflateRect(1, 0, 1, 1); + // draw status text + ::DeleteObject(::SelectObject(hdc, oldpen)); + ::DeleteObject(::SelectObject(hdc, oldbr)); - LONG left = rc.left; - int64_t w = rc.Width(); - // draw start part - if(ii->size == 0) - ii->size = 1; - rc.right = left + (int) (w * ii->start / ii->size); - DeleteObject(SelectObject(cd->nmcd.hdc, CreateSolidBrush(barPal[0]))); - DeleteObject(SelectObject(cd->nmcd.hdc, CreatePen(PS_SOLID,0,barPal[0]))); + dwt::Rectangle rcText = rcItem; + rcText.pos.x += 6; + rcText.size.x -= 6; - ::Rectangle(cd->nmcd.hdc, rc.left, rc.top, rc.right, rc.bottom); + HRGN clipRgn = ::CreateRectRgnIndirect(&clipRect); + + ::SelectClipRgn(hdc, clipRgn); + ::SetTextColor(hdc, RGB(255, 255, 255)); + RECT textRect = rcText; + + int oldMode = ::SetBkMode(hdc, TRANSPARENT); + + ::DrawText(hdc, text.c_str(), text.size(), &textRect, DT_LEFT | DT_VCENTER | DT_SINGLELINE); + + clipRect.left = clipRect.right; + clipRect.right = rcItem.right(); + + ::DeleteObject(clipRgn); + clipRgn = ::CreateRectRgnIndirect(&clipRect); + ::SetTextColor(hdc, WinUtil::textColor); + + ::SelectClipRgn(hdc, clipRgn); + ::DrawText(hdc, text.c_str(), text.size(), &textRect, DT_LEFT | DT_VCENTER | DT_SINGLELINE); - // Draw actual part - rc.left = rc.right; - rc.right = left + (int) (w * ii->actual / ii->size); - DeleteObject(SelectObject(cd->nmcd.hdc, CreateSolidBrush(barPal[1]))); + ::SetBkMode(hdc, oldMode); + ::DeleteObject(clipRgn); + + ::SelectClipRgn(hdc, NULL); - ::Rectangle(cd->nmcd.hdc, rc.left, rc.top, rc.right, rc.bottom); +} - // And the effective part... - if(ii->pos > ii->actual) { - rc.left = rc.right - 1; - rc.right = left + (int) (w * ii->pos / ii->size); - DeleteObject(SelectObject(cd->nmcd.hdc, CreateSolidBrush(barPal[2]))); +LRESULT TransferView::handleCustomDraw(WPARAM wParam, LPARAM lParam) { + if(!BOOLSETTING(SHOW_PROGRESS_BARS)) { + return 0; + } + + LPNMLVCUSTOMDRAW cd = (LPNMLVCUSTOMDRAW)lParam; + int item = (int)cd->nmcd.dwItemSpec; + int column = cd->iSubItem; + + switch(cd->nmcd.dwDrawStage) { + case CDDS_PREPAINT: + return CDRF_NOTIFYITEMDRAW; - ::Rectangle(cd->nmcd.hdc, rc.left, rc.top, rc.right, rc.bottom); + case CDDS_ITEMPREPAINT: + return CDRF_NOTIFYSUBITEMDRAW; - } - rc.left = left; - // draw progressbar highlight - if(rc.Width()>2) { - DeleteObject(SelectObject(cd->nmcd.hdc, CreatePen(PS_SOLID,1,barPal[2]))); + case CDDS_SUBITEM | CDDS_ITEMPREPAINT: + // Let's draw a box if needed... + if(column == DOWNLOAD_COLUMN_STATUS) { + + HDC hdc = cd->nmcd.hdc; + DownloadInfo* di = reinterpret_cast<DownloadInfo*>(cd->nmcd.lItemlParam); + const tstring& text = di->columns[column]; - rc.top += 2; - ::MoveToEx(cd->nmcd.hdc,rc.left+1,rc.top,(LPPOINT)NULL); - ::LineTo(cd->nmcd.hdc,rc.right-2,rc.top); - } + RECT r; + ListView_GetSubItemRect( downloads->handle(), item, column, LVIR_BOUNDS, &r ); - // draw status text - DeleteObject(::SelectObject(cd->nmcd.hdc, oldpen)); - DeleteObject(::SelectObject(cd->nmcd.hdc, oldbr)); - - LONG right = rc2.right; - left = rc2.left; - rc2.right = rc.right; - LONG top = rc2.top + (rc2.Height() - WinUtil::getTextHeight(cd->nmcd.hdc) - 1)/2; - SetTextColor(cd->nmcd.hdc, RGB(255, 255, 255)); - ::ExtTextOut(cd->nmcd.hdc, left, top, ETO_CLIPPED, rc2, buf, _tcslen(buf), NULL); - //::DrawText(cd->nmcd.hdc, buf, strlen(buf), rc2, DT_LEFT | DT_NOPREFIX | DT_SINGLELINE | DT_VCENTER); - - rc2.left = rc2.right; - rc2.right = right; - - SetTextColor(cd->nmcd.hdc, WinUtil::textColor); - ::ExtTextOut(cd->nmcd.hdc, left, top, ETO_CLIPPED, rc2, buf, _tcslen(buf), NULL); - - return CDRF_SKIPDEFAULT; - } + int64_t size = di->size == 0 ? 1 : di->size; + double pos = static_cast<double>(di->done) / size; + + drawProgress(hdc, r, item, column, text, pos, SETTING(DOWNLOAD_BAR_COLOR)); + + return CDRF_SKIPDEFAULT; } // Fall through default: return CDRF_DODEFAULT; } } -#endif void TransferView::handleDblClicked() { ConnectionInfo* ii = connections->getSelectedData(); Modified: dcplusplus/trunk/win32/TransferView.h =================================================================== --- dcplusplus/trunk/win32/TransferView.h 2008-04-24 13:27:20 UTC (rev 1195) +++ dcplusplus/trunk/win32/TransferView.h 2008-04-24 13:28:24 UTC (rev 1196) @@ -296,9 +296,7 @@ void onTransferComplete(Transfer* aTransfer, bool isDownload); void starting(UpdateInfo* ui, Transfer* t); -#ifdef PORT_ME - LRESULT onCustomDraw(int /*idCtrl*/, LPNMHDR pnmh, BOOL& bHandled); -#endif + LRESULT handleCustomDraw(WPARAM wParam, LPARAM lParam); }; #endif // !defined(TRANSFER_VIEW_H) Modified: dcplusplus/trunk/win32/WinUtil.cpp =================================================================== --- dcplusplus/trunk/win32/WinUtil.cpp 2008-04-24 13:27:20 UTC (rev 1195) +++ dcplusplus/trunk/win32/WinUtil.cpp 2008-04-24 13:28:24 UTC (rev 1196) @@ -596,6 +596,19 @@ #define COMPILE_MULTIMON_STUBS 1 #include <MultiMon.h> +void WinUtil::splitTokens(int* array, const string& tokens, int maxItems /* = -1 */) throw() { + StringTokenizer<string> t(tokens, _T(',')); + StringList& l = t.getTokens(); + if(maxItems == -1) + maxItems = l.size(); + + int k = 0; + for(StringList::const_iterator i = l.begin(); i != l.end() && k < maxItems; ++i, ++k) { + array[k] = Util::toInt(*i); + } +} +#endif + HLSCOLOR RGB2HLS (COLORREF rgb) { unsigned char minval = min(GetRValue(rgb), min(GetGValue(rgb), GetBValue(rgb))); unsigned char maxval = max(GetRValue(rgb), max(GetGValue(rgb), GetBValue(rgb))); @@ -621,7 +634,7 @@ return HLS ((hue*255)/360, luminance*255, saturation*255); } -static BYTE _ToRGB (float rm1, float rm2, float rh) { +static inline BYTE _ToRGB (float rm1, float rm2, float rh) { if (rh > 360.0f) rh -= 360.0f; else if (rh < 0.0f) rh += 360.0f; @@ -671,19 +684,6 @@ return HLS2RGB (HLS(h, l, s)); } -void WinUtil::splitTokens(int* array, const string& tokens, int maxItems /* = -1 */) throw() { - StringTokenizer<string> t(tokens, _T(',')); - StringList& l = t.getTokens(); - if(maxItems == -1) - maxItems = l.size(); - - int k = 0; - for(StringList::const_iterator i = l.begin(); i != l.end() && k < maxItems; ++i, ++k) { - array[k] = Util::toInt(*i); - } -} -#endif - void WinUtil::registerDchubHandler() { HKEY hk; TCHAR Buf[512]; Modified: dcplusplus/trunk/win32/WinUtil.h =================================================================== --- dcplusplus/trunk/win32/WinUtil.h 2008-04-24 13:27:20 UTC (rev 1195) +++ dcplusplus/trunk/win32/WinUtil.h 2008-04-24 13:28:24 UTC (rev 1196) @@ -25,7 +25,6 @@ #include <dcpp/MerkleTree.h> #include "WidgetFactory.h" -#ifdef PORT_ME // Some utilities for handling HLS colors, taken from Jean-Michel LE FOL's codeproject // article on WTL OfficeXP Menus typedef DWORD HLSCOLOR; @@ -39,8 +38,6 @@ COLORREF HLS_TRANSFORM (COLORREF rgb, int percent_L, int percent_S); -#endif - class MainWindow; class WinUtil { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arn...@us...> - 2008-04-24 13:27:31
|
Revision: 1195 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1195&view=rev Author: arnetheduck Date: 2008-04-24 06:27:20 -0700 (Thu, 24 Apr 2008) Log Message: ----------- use smaller blocks at the end of the transfer Modified Paths: -------------- dcplusplus/trunk/dcpp/QueueItem.cpp dcplusplus/trunk/dcpp/UserConnection.cpp Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-18 22:31:37.430000067 +0200 committer: Jacek Sieka <arn...@gm...> properties: branch-nick: dcplusplus + timestamp: 2008-04-19 18:47:22.151999950 +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 1133 arn...@gm...-20080411201718-ecshulwd7ic0wdci 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 1166 arn...@gm...-20080416204550-0dx3qhxasdkdohx1 1167 arn...@gm...-20080416211510-3ilsym0bom7u2cer 1168 tom@athlon-20080417125238-0hhhchg951y7p83w 1169 arn...@gm...-20080418203137-e6szrje3fje5dgh9 + 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 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 1166 arn...@gm...-20080416204550-0dx3qhxasdkdohx1 1167 arn...@gm...-20080416211510-3ilsym0bom7u2cer 1168 tom@athlon-20080417125238-0hhhchg951y7p83w 1169 arn...@gm...-20080418203137-e6szrje3fje5dgh9 1170 arn...@gm...-20080419164722-vyjrwwvglxr4yxuu Modified: dcplusplus/trunk/dcpp/QueueItem.cpp =================================================================== --- dcplusplus/trunk/dcpp/QueueItem.cpp 2008-04-24 13:26:29 UTC (rev 1194) +++ dcplusplus/trunk/dcpp/QueueItem.cpp 2008-04-24 13:27:20 UTC (rev 1195) @@ -98,9 +98,14 @@ int64_t targetSize; if(BOOLSETTING(SEGMENTED_DL)) { - if(wantedSize > blockSize) { + double done = static_cast<double>(getDownloadedBytes()) / getSize(); + + // We want smaller blocks at the end of the transfer, squaring gives a nice curve... + targetSize = wantedSize * (1. - (done * done)); + + if(targetSize > blockSize) { // Round off to nearest block size - targetSize = ((wantedSize + (blockSize / 2)) / blockSize) * blockSize; + targetSize = ((targetSize + (blockSize / 2)) / blockSize) * blockSize; } else { targetSize = blockSize; } Modified: dcplusplus/trunk/dcpp/UserConnection.cpp =================================================================== --- dcplusplus/trunk/dcpp/UserConnection.cpp 2008-04-24 13:26:29 UTC (rev 1194) +++ dcplusplus/trunk/dcpp/UserConnection.cpp 2008-04-24 13:27:20 UTC (rev 1195) @@ -205,7 +205,7 @@ } // # ms we should aim for per segment -static const int64_t SEGMENT_TIME = 60*1000; +static const int64_t SEGMENT_TIME = 120*1000; static const int64_t MIN_CHUNK_SIZE = 64*1024; void UserConnection::updateChunkSize(int64_t leafSize, int64_t lastChunk, uint64_t ticks) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arn...@us...> - 2008-04-24 13:26:39
|
Revision: 1194 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1194&view=rev Author: arnetheduck Date: 2008-04-24 06:26:29 -0700 (Thu, 24 Apr 2008) Log Message: ----------- Move chunk size logic where it belongs Modified Paths: -------------- 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/UserConnection.cpp dcplusplus/trunk/dcpp/UserConnection.h Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-17 14:52:38.842999935 +0200 committer: tom <tom@ATHLON> properties: branch-nick: dcplusplus + timestamp: 2008-04-18 22:31:37.430000067 +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 1133 arn...@gm...-20080411201718-ecshulwd7ic0wdci 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 1166 arn...@gm...-20080416204550-0dx3qhxasdkdohx1 1167 arn...@gm...-20080416211510-3ilsym0bom7u2cer 1168 tom@athlon-20080417125238-0hhhchg951y7p83w + 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 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 1166 arn...@gm...-20080416204550-0dx3qhxasdkdohx1 1167 arn...@gm...-20080416211510-3ilsym0bom7u2cer 1168 tom@athlon-20080417125238-0hhhchg951y7p83w 1169 arn...@gm...-20080418203137-e6szrje3fje5dgh9 Modified: dcplusplus/trunk/dcpp/Download.cpp =================================================================== --- dcplusplus/trunk/dcpp/Download.cpp 2008-04-24 13:25:00 UTC (rev 1193) +++ dcplusplus/trunk/dcpp/Download.cpp 2008-04-24 13:26:29 UTC (rev 1194) @@ -46,7 +46,7 @@ if(qi.getSize() != -1) { if(HashManager::getInstance()->getTree(getTTH(), getTigerTree())) { setTreeValid(true); - setSegment(qi.getNextSegment(getTigerTree().getBlockSize(), conn.getSpeed(), conn.getChunkSize())); + setSegment(qi.getNextSegment(getTigerTree().getBlockSize(), 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(), 0, 0)); + setSegment(qi.getNextSegment(getTigerTree().getBlockSize(), 0)); } if(getType() == TYPE_FILE) { Modified: dcplusplus/trunk/dcpp/DownloadManager.cpp =================================================================== --- dcplusplus/trunk/dcpp/DownloadManager.cpp 2008-04-24 13:25:00 UTC (rev 1193) +++ dcplusplus/trunk/dcpp/DownloadManager.cpp 2008-04-24 13:26:29 UTC (rev 1194) @@ -327,9 +327,7 @@ } aSource->setSpeed(d->getAverageSpeed()); - if(aSource->getChunkSize() < d->getSize()) { - aSource->setChunkSize(d->getSize()); - } + aSource->updateChunkSize(d->getTigerTree().getBlockSize(), d->getSize(), GET_TICK() - d->getStart()); dcdebug("Download finished: %s, size " I64_FMT ", downloaded " I64_FMT "\n", d->getPath().c_str(), d->getSize(), d->getPos()); Modified: dcplusplus/trunk/dcpp/QueueItem.cpp =================================================================== --- dcplusplus/trunk/dcpp/QueueItem.cpp 2008-04-24 13:25:00 UTC (rev 1193) +++ dcplusplus/trunk/dcpp/QueueItem.cpp 2008-04-24 13:26:29 UTC (rev 1194) @@ -84,10 +84,8 @@ return tempTarget; } -// # ms we should aim for per segment -static const int64_t SEGMENT_TIME = 60*1000; -Segment QueueItem::getNextSegment(int64_t blockSize, double lastSpeed, int64_t lastSize) const { +Segment QueueItem::getNextSegment(int64_t blockSize, int64_t wantedSize) const { if(getSize() == -1 || blockSize == 0) { return Segment(0, -1); } @@ -100,22 +98,12 @@ int64_t targetSize; if(BOOLSETTING(SEGMENTED_DL)) { - targetSize = std::max(blockSize, lastSize); - if(lastSpeed > 0) { - double msecs = 1000 * targetSize / lastSpeed; - if(msecs < SEGMENT_TIME / 4) { - targetSize *= 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(blockSize, targetSize - blockSize); - } + if(wantedSize > blockSize) { + // Round off to nearest block size + targetSize = ((wantedSize + (blockSize / 2)) / blockSize) * blockSize; + } else { + targetSize = blockSize; } - - // Round off to nearest block size - targetSize = ((targetSize + blockSize / 2) / blockSize) * blockSize; } else { targetSize = remaining; } Modified: dcplusplus/trunk/dcpp/QueueItem.h =================================================================== --- dcplusplus/trunk/dcpp/QueueItem.h 2008-04-24 13:25:00 UTC (rev 1193) +++ dcplusplus/trunk/dcpp/QueueItem.h 2008-04-24 13:26:29 UTC (rev 1194) @@ -155,7 +155,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, double lastSpeed, int64_t lastSize) const; + Segment getNextSegment(int64_t blockSize, int64_t wantedSize) const; void addSegment(const Segment& segment); Modified: dcplusplus/trunk/dcpp/QueueManager.cpp =================================================================== --- dcplusplus/trunk/dcpp/QueueManager.cpp 2008-04-24 13:25:00 UTC (rev 1193) +++ dcplusplus/trunk/dcpp/QueueManager.cpp 2008-04-24 13:26:29 UTC (rev 1194) @@ -192,7 +192,7 @@ } } -QueueItem* QueueManager::UserQueue::getNext(const UserPtr& aUser, QueueItem::Priority minPrio, double lastSpeed, int64_t lastSize) { +QueueItem* QueueManager::UserQueue::getNext(const UserPtr& aUser, QueueItem::Priority minPrio, int64_t wantedSize) { 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, lastSpeed, lastSize).getSize() == 0) { + if(qi->getNextSegment(blockSize, wantedSize).getSize() == 0) { dcdebug("No segment for %s in %s, block " I64_FMT "\n", aUser->getCID().toBase32().c_str(), qi->getTarget().c_str(), blockSize); continue; } @@ -736,7 +736,7 @@ return new Download(aSource, pi->second); } - QueueItem* q = userQueue.getNext(aUser); + QueueItem* q = userQueue.getNext(aUser, QueueItem::LOWEST, aSource.getChunkSize()); if(!q) { dcdebug("none\n"); Modified: dcplusplus/trunk/dcpp/QueueManager.h =================================================================== --- dcplusplus/trunk/dcpp/QueueManager.h 2008-04-24 13:25:00 UTC (rev 1193) +++ dcplusplus/trunk/dcpp/QueueManager.h 2008-04-24 13:26:29 UTC (rev 1194) @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#if !defined(QUEUE_MANAGER_H) -#define QUEUE_MANAGER_H +#ifndef DCPLUSPLUS_DCPP_QUEUE_MANAGER_H +#define DCPLUSPLUS_DCPP_QUEUE_MANAGER_H #include "TimerManager.h" @@ -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, double lastSpeed = 0, int64_t lastSize = 0); + QueueItem* getNext(const UserPtr& aUser, QueueItem::Priority minPrio = QueueItem::LOWEST, int64_t wantedSize = 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-24 13:25:00 UTC (rev 1193) +++ dcplusplus/trunk/dcpp/Transfer.cpp 2008-04-24 13:26:29 UTC (rev 1194) @@ -39,6 +39,8 @@ void Transfer::tick() { Lock l(cs); + uint64_t t = GET_TICK(); + if(samples.size() >= 1) { int64_t tdiff = samples.back().first - samples.front().first; if((tdiff / 1000) > MIN_SECS) { @@ -46,9 +48,18 @@ samples.pop_front(); } } + } - samples.push_back(std::make_pair(GET_TICK(), pos)); + if(samples.size() > 1) { + if(samples.back().second == pos) { + // Position hasn't changed, just update the time + samples.back().first = t; + return; + } + } + + samples.push_back(std::make_pair(t, pos)); } double Transfer::getAverageSpeed() const { Modified: dcplusplus/trunk/dcpp/UserConnection.cpp =================================================================== --- dcplusplus/trunk/dcpp/UserConnection.cpp 2008-04-24 13:25:00 UTC (rev 1193) +++ dcplusplus/trunk/dcpp/UserConnection.cpp 2008-04-24 13:26:29 UTC (rev 1194) @@ -204,4 +204,43 @@ delete this; } +// # ms we should aim for per segment +static const int64_t SEGMENT_TIME = 60*1000; +static const int64_t MIN_CHUNK_SIZE = 64*1024; + +void UserConnection::updateChunkSize(int64_t leafSize, int64_t lastChunk, uint64_t ticks) { + + if(chunkSize == 0) { + chunkSize = std::max((int64_t)64*1024, std::min(lastChunk, (int64_t)1024*1024)); + return; + } + + if(ticks <= 10) { + // Can't rely on such fast transfers - double + chunkSize *= 2; + return; + } + + double lastSpeed = (1000. * lastChunk) / ticks; + + int64_t targetSize = chunkSize; + + // How long current chunk size would take with the last speed... + double msecs = 1000 * targetSize / lastSpeed; + + if(msecs < SEGMENT_TIME / 4) { + targetSize *= 2; + } else if(msecs < SEGMENT_TIME / 1.25) { + targetSize += leafSize; + } else if(msecs < SEGMENT_TIME * 1.25) { + // We're close to our target size - don't change it + } else if(msecs < SEGMENT_TIME * 4) { + targetSize = std::max(MIN_CHUNK_SIZE, targetSize - chunkSize); + } else { + targetSize = std::max(MIN_CHUNK_SIZE, targetSize / 2); + } + + chunkSize = targetSize; +} + } // namespace dcpp Modified: dcplusplus/trunk/dcpp/UserConnection.h =================================================================== --- dcplusplus/trunk/dcpp/UserConnection.h 2008-04-24 13:25:00 UTC (rev 1193) +++ dcplusplus/trunk/dcpp/UserConnection.h 2008-04-24 13:26:29 UTC (rev 1194) @@ -162,14 +162,17 @@ // Ignore any other ADC commands for now template<typename T> void handle(T , const AdcCommand& ) { } + int64_t getChunkSize() const { return chunkSize; } + void updateChunkSize(int64_t leafSize, int64_t lastChunk, uint64_t ticks); + GETSET(string, hubUrl, HubUrl); GETSET(string, token, Token); GETSET(string, encoding, Encoding); GETSET(States, state, State); GETSET(uint64_t, lastActivity, LastActivity); GETSET(double, speed, Speed); - GETSET(int64_t, chunkSize, ChunkSize); private: + int64_t chunkSize; BufferedSocket* socket; bool secure; UserPtr user; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arn...@us...> - 2008-04-24 13:25:07
|
Revision: 1193 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1193&view=rev Author: arnetheduck Date: 2008-04-24 06:25:00 -0700 (Thu, 24 Apr 2008) Log Message: ----------- Cert & Uploadpage alignment/length fixes for translation Modified Paths: -------------- dcplusplus/trunk/win32/DCPlusPlus.rc Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-16 23:15:10.411000013 +0200 committer: Jacek Sieka <arn...@gm...> properties: branch-nick: dcplusplus + timestamp: 2008-04-17 14:52:38.842999935 +0200 committer: tom <tom@ATHLON> 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 1133 arn...@gm...-20080411201718-ecshulwd7ic0wdci 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 1166 arn...@gm...-20080416204550-0dx3qhxasdkdohx1 1167 arn...@gm...-20080416211510-3ilsym0bom7u2cer + 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 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 1166 arn...@gm...-20080416204550-0dx3qhxasdkdohx1 1167 arn...@gm...-20080416211510-3ilsym0bom7u2cer 1168 tom@athlon-20080417125238-0hhhchg951y7p83w Modified: dcplusplus/trunk/win32/DCPlusPlus.rc =================================================================== --- dcplusplus/trunk/win32/DCPlusPlus.rc 2008-04-24 13:24:19 UTC (rev 1192) +++ dcplusplus/trunk/win32/DCPlusPlus.rc 2008-04-24 13:25:00 UTC (rev 1193) @@ -180,7 +180,7 @@ GROUPBOX "Shared directories",IDC_SETTINGS_SHARED_DIRECTORIES,7,7,261,179 CONTROL "List1",IDC_DIRECTORIES,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,14,17,247,120,WS_EX_ACCEPTFILES LTEXT "Note; New files are added to the share only when they've been hashed!",IDC_SETTINGS_ONLY_HASHED,14,142,226,8 - CONTROL "Share hidden files",IDC_SHAREHIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,156,72,10 + CONTROL "Share hidden files",IDC_SHAREHIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,156,92,10 LTEXT "Total size:",IDC_SETTINGS_SHARE_SIZE,14,170,33,8 LTEXT "0 B",IDC_TOTAL,50,170,41,8 PUSHBUTTON "&Rename",IDC_RENAME,119,166,44,14,WS_DISABLED @@ -544,13 +544,13 @@ CAPTION "Security Certificates" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Private key file",IDC_SETTINGS_PRIVATE_KEY_FILE,50,10,48,8 + RTEXT "Private key file",IDC_SETTINGS_PRIVATE_KEY_FILE,7,10,90,8 EDITTEXT IDC_TLS_PRIVATE_KEY_FILE,102,7,141,14,ES_AUTOHSCROLL PUSHBUTTON "...",IDC_BROWSE_PRIVATE_KEY,247,7,21,14 - LTEXT "Own certificate file",IDC_SETTINGS_CERTIFICATE_FILE,37,27,61,8 + RTEXT "Own certificate file",IDC_SETTINGS_CERTIFICATE_FILE,7,27,90,8 EDITTEXT IDC_TLS_CERTIFICATE_FILE,102,24,141,14,ES_AUTOHSCROLL PUSHBUTTON "...",IDC_BROWSE_CERTIFICATE,247,24,21,14 - LTEXT "Trusted certificates path",IDC_SETTINGS_TRUSTED_CERTIFICATES_PATH,18,45,80,8 + RTEXT "Trusted certificates path",IDC_SETTINGS_TRUSTED_CERTIFICATES_PATH,7,45,90,8 EDITTEXT IDC_TLS_TRUSTED_CERTIFICATES_PATH,102,42,141,14,ES_AUTOHSCROLL PUSHBUTTON "...",IDC_BROWSE_TRUSTED_PATH,247,42,21,14 PUSHBUTTON "Generate certificates",IDC_GENERATE_CERTS,184,62,84,14 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arn...@us...> - 2008-04-24 13:24:25
|
Revision: 1192 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1192&view=rev Author: arnetheduck Date: 2008-04-24 06:24:19 -0700 (Thu, 24 Apr 2008) Log Message: ----------- remove debug statement Modified Paths: -------------- dcplusplus/trunk/dcpp/ShareManager.cpp Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-16 22:45:50.865999937 +0200 committer: Jacek Sieka <arn...@gm...> properties: branch-nick: dcplusplus + timestamp: 2008-04-16 23:15:10.411000013 +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 1133 arn...@gm...-20080411201718-ecshulwd7ic0wdci 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 1166 arn...@gm...-20080416204550-0dx3qhxasdkdohx1 + 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 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 1166 arn...@gm...-20080416204550-0dx3qhxasdkdohx1 1167 arn...@gm...-20080416211510-3ilsym0bom7u2cer Modified: dcplusplus/trunk/dcpp/ShareManager.cpp =================================================================== --- dcplusplus/trunk/dcpp/ShareManager.cpp 2008-04-24 13:23:22 UTC (rev 1191) +++ dcplusplus/trunk/dcpp/ShareManager.cpp 2008-04-24 13:24:19 UTC (rev 1192) @@ -383,7 +383,6 @@ for(DirList::const_iterator i = directories.begin(); i != directories.end(); ++i) { Directory* d = *i; updateIndices(*d); - dcdebug("Loaded %s in %ul files and %ul dirs from cached %s\n", Util::formatBytes(d->size).c_str(), d->files.size(), d->directories.size(), d->getName().c_str()); } return true; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arn...@us...> - 2008-04-24 13:23:48
|
Revision: 1191 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1191&view=rev Author: arnetheduck Date: 2008-04-24 06:23:22 -0700 (Thu, 24 Apr 2008) Log Message: ----------- fix share, fix queued Modified Paths: -------------- dcplusplus/trunk/changelog.txt dcplusplus/trunk/dcpp/QueueManager.cpp dcplusplus/trunk/dcpp/ShareManager.cpp Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-16 22:09:41.562000036 +0200 committer: poy <po...@12...> properties: branch-nick: repo + timestamp: 2008-04-16 22:45:50.865999937 +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 1133 arn...@gm...-20080411201718-ecshulwd7ic0wdci 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 + 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 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 1166 arn...@gm...-20080416204550-0dx3qhxasdkdohx1 Modified: dcplusplus/trunk/changelog.txt =================================================================== --- dcplusplus/trunk/changelog.txt 2008-04-24 13:22:14 UTC (rev 1190) +++ dcplusplus/trunk/changelog.txt 2008-04-24 13:23:22 UTC (rev 1191) @@ -41,6 +41,7 @@ * [L#195209] Changed tab order in hub windows (poy) * Removed unused rollback option (thanks mikejj) * Fixed PM history not showing the last line (poy) +* Queued field in connections no longer counts paused items -- 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-24 13:22:14 UTC (rev 1190) +++ dcplusplus/trunk/dcpp/QueueManager.cpp 2008-04-24 13:23:22 UTC (rev 1191) @@ -254,7 +254,7 @@ int64_t QueueManager::UserQueue::getQueued(const UserPtr& aUser) const { int64_t total = 0; - for(size_t i = 0; i < QueueItem::LAST; ++i) { + for(size_t i = QueueItem::LOWEST; i < QueueItem::LAST; ++i) { const QueueItem::UserListMap& ulm = userQueue[i]; QueueItem::UserListMap::const_iterator iulm = ulm.find(aUser); if(iulm == ulm.end()) { Modified: dcplusplus/trunk/dcpp/ShareManager.cpp =================================================================== --- dcplusplus/trunk/dcpp/ShareManager.cpp 2008-04-24 13:22:14 UTC (rev 1190) +++ dcplusplus/trunk/dcpp/ShareManager.cpp 2008-04-24 13:23:22 UTC (rev 1191) @@ -294,6 +294,9 @@ const string& virtualName = aXml.getChildAttrib("Virtual"); string vName = validateVirtual(virtualName.empty() ? Util::getLastDir(realPath) : virtualName); shares.insert(std::make_pair(realPath, vName)); + if(getByVirtual(vName) == directories.end()) { + directories.push_back(new Directory(vName, 0)); + } } aXml.stepOut(); } @@ -378,7 +381,9 @@ SimpleXMLReader(&loader).fromXML(txt); for(DirList::const_iterator i = directories.begin(); i != directories.end(); ++i) { - updateIndices(**i); + Directory* d = *i; + updateIndices(*d); + dcdebug("Loaded %s in %ul files and %ul dirs from cached %s\n", Util::formatBytes(d->size).c_str(), d->files.size(), d->directories.size(), d->getName().c_str()); } return true; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arn...@us...> - 2008-04-24 13:22:31
|
Revision: 1190 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1190&view=rev Author: arnetheduck Date: 2008-04-24 06:22:14 -0700 (Thu, 24 Apr 2008) Log Message: ----------- re-fix PM history Modified Paths: -------------- dcplusplus/trunk/win32/PrivateFrame.cpp Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-16 22:07:00.707000017 +0200 committer: Jacek Sieka <arn...@gm...> properties: branch-nick: dcplusplus + timestamp: 2008-04-16 22:09:41.562000036 +0200 committer: poy <po...@12...> properties: branch-nick: repo 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 1133 arn...@gm...-20080411201718-ecshulwd7ic0wdci 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u + 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 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 Modified: dcplusplus/trunk/win32/PrivateFrame.cpp =================================================================== --- dcplusplus/trunk/win32/PrivateFrame.cpp 2008-04-24 13:21:35 UTC (rev 1189) +++ dcplusplus/trunk/win32/PrivateFrame.cpp 2008-04-24 13:22:14 UTC (rev 1190) @@ -194,7 +194,7 @@ try { File f(path, File::READ, File::OPEN); if(f.getSize() > 32*1024) { - f.setEndPos(32*1024); + f.setEndPos(- 32*1024 + 1); } lines = StringTokenizer<string>(f.read(32*1024), "\r\n").getTokens(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arn...@us...> - 2008-04-24 13:21:40
|
Revision: 1189 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1189&view=rev Author: arnetheduck Date: 2008-04-24 06:21:35 -0700 (Thu, 24 Apr 2008) Log Message: ----------- play some with flicker Modified Paths: -------------- dcplusplus/trunk/dwt/src/widgets/TabView.cpp dcplusplus/trunk/win32/MDIChildFrame.h Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-16 20:36:03.164999962 +0200 committer: Jacek Sieka <arn...@gm...> properties: branch-nick: dcplusplus + timestamp: 2008-04-16 22:07:00.707000017 +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 1133 arn...@gm...-20080411201718-ecshulwd7ic0wdci 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd + 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 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u Modified: dcplusplus/trunk/dwt/src/widgets/TabView.cpp =================================================================== --- dcplusplus/trunk/dwt/src/widgets/TabView.cpp 2008-04-24 13:20:31 UTC (rev 1188) +++ dcplusplus/trunk/dwt/src/widgets/TabView.cpp 2008-04-24 13:21:35 UTC (rev 1189) @@ -156,28 +156,36 @@ } void TabView::remove(Container* w) { - if(viewOrder.size() > 1 && viewOrder.back() == w) { - setActive(*(--(--viewOrder.end()))); + int i = findTab(w); + if(i == -1) { + return; } - Container* cur = getTabInfo(getSelected())->w; + int cur = getSelected(); + if(viewOrder.size() > 1 && i == cur) { + next(); + } + viewOrder.remove(w); if(w == dragging) dragging = 0; - int i = findTab(w); - if(i != -1) { - delete getTabInfo(i); - erase(i); - layout(); + delete getTabInfo(i); + erase(i); + + if(size() == 0) { + active = -1; + if(titleChangedFunction) + titleChangedFunction(tstring()); + } else { + if(i < cur) { + active--; + } } - active = findTab(cur); - // when no tab is opened - if(titleChangedFunction && (active == -1)) - titleChangedFunction(tstring()); + layout(); } tstring TabView::getTabText(Container* w) { Modified: dcplusplus/trunk/win32/MDIChildFrame.h =================================================================== --- dcplusplus/trunk/win32/MDIChildFrame.h 2008-04-24 13:20:31 UTC (rev 1188) +++ dcplusplus/trunk/win32/MDIChildFrame.h 2008-04-24 13:21:35 UTC (rev 1189) @@ -45,8 +45,7 @@ reallyClose(false) { typename ThisType::Seed cs; - if(!activate) - cs.style &= ~WS_VISIBLE; + cs.style &= ~WS_VISIBLE; cs.caption = title; cs.background = (HBRUSH)(COLOR_3DFACE + 1); cs.icon = icon; @@ -57,6 +56,11 @@ setHelpId(helpId); tabView->add(this, icon); + + if(activate) { + tabView->setActive(this); + } + this->onTabContextMenu(std::tr1::bind(&ThisType::handleContextMenu, this, _1)); onClosing(std::tr1::bind(&ThisType::handleClosing, this)); @@ -65,6 +69,7 @@ onActivate(std::tr1::bind(&ThisType::handleActivate, this, _1)); onCommand(std::tr1::bind(&ThisType::close, this, true), IDC_CLOSE_WINDOW); addDlgCodeMessage(this); + } virtual ~MDIChildFrame() { @@ -195,6 +200,10 @@ bool handleClosing() { if(reallyClose) { static_cast<T*>(this)->postClosing(); + if(getParent()->getActive() == this) { + // Prevent flicker by selecting the next tab - WM_DESTROY would already be too late + getParent()->next(); + } return true; } else if(static_cast<T*>(this)->preClosing()) { reallyClose = true; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arn...@us...> - 2008-04-24 13:20:45
|
Revision: 1188 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1188&view=rev Author: arnetheduck Date: 2008-04-24 06:20:31 -0700 (Thu, 24 Apr 2008) Log Message: ----------- Remove menus from factory Modified Paths: -------------- dcplusplus/trunk/dwt/include/dwt/WidgetFactory.h dcplusplus/trunk/dwt/include/dwt/WidgetFactoryPlatformSmartWinDesktop.h dcplusplus/trunk/dwt/include/dwt/widgets/Composite.h dcplusplus/trunk/dwt/include/dwt/widgets/Menu.h dcplusplus/trunk/dwt/src/widgets/Menu.cpp dcplusplus/trunk/win32/ADLSearchFrame.cpp dcplusplus/trunk/win32/DirectoryListingFrame.cpp dcplusplus/trunk/win32/FavHubsFrame.cpp dcplusplus/trunk/win32/FinishedFrameBase.h dcplusplus/trunk/win32/HubFrame.cpp dcplusplus/trunk/win32/MDIChildFrame.h dcplusplus/trunk/win32/MainWindow.cpp dcplusplus/trunk/win32/PrivateFrame.cpp dcplusplus/trunk/win32/PublicHubsFrame.cpp dcplusplus/trunk/win32/QueueFrame.cpp dcplusplus/trunk/win32/SearchFrame.cpp dcplusplus/trunk/win32/SpyFrame.cpp dcplusplus/trunk/win32/TransferView.cpp dcplusplus/trunk/win32/UsersFrame.cpp dcplusplus/trunk/win32/WaitingUsersFrame.cpp Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-16 20:16:26.703000069 +0200 committer: poy <po...@12...> properties: branch-nick: repo + timestamp: 2008-04-16 20:36:03.164999962 +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 1133 arn...@gm...-20080411201718-ecshulwd7ic0wdci 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l + 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 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd Modified: dcplusplus/trunk/dwt/include/dwt/WidgetFactory.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/WidgetFactory.h 2008-04-24 13:17:49 UTC (rev 1187) +++ dcplusplus/trunk/dwt/include/dwt/WidgetFactory.h 2008-04-24 13:20:31 UTC (rev 1188) @@ -66,7 +66,7 @@ * delete <br> * this is with purpose to make the library easier to use and more transparent for * C#, Java and newbie developers. <br> - * Some functions returns stack objects, e.g. createMenu which returns a + * Some functions returns stack objects, e.g. addChild which returns a * std::tr1::shared_ptr and createMessageBox which returns a stack object, these also * should just get to "live their own life" and should not be tampered with in any * "memory ways". Modified: dcplusplus/trunk/dwt/include/dwt/WidgetFactoryPlatformSmartWinDesktop.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/WidgetFactoryPlatformSmartWinDesktop.h 2008-04-24 13:17:49 UTC (rev 1187) +++ dcplusplus/trunk/dwt/include/dwt/WidgetFactoryPlatformSmartWinDesktop.h 2008-04-24 13:20:31 UTC (rev 1188) @@ -53,12 +53,6 @@ : public ContainerWidgetType { public: - /// Menu class type. - typedef dwt::Menu Menu; - - /// Menu object type. - typedef typename Menu::ObjectType MenuPtr; - /// ChooseFont class and object type. typedef dwt::FontDialog FontDialog; @@ -76,21 +70,6 @@ FontDialog createFontDialog() { return FontDialog( this ); } - - /// Creates a Menu - /** The returned object is of type std::tr1::shared_ptr< Menu >, but - * you should use the typedef MenuPtr and not <br> - * the shared_ptr itself since this may change in future releases. - */ - MenuPtr createMenu(const typename Menu::Seed& cs = Menu::Seed()) - { - return WidgetCreator< Menu >::create( this, cs ); - } - - MenuPtr attachMenu(HMENU hMenu, const typename Menu::Seed& cs = Menu::Seed()) - { - return WidgetCreator< Menu >::attach( this, cs, hMenu ); - } }; } Modified: dcplusplus/trunk/dwt/include/dwt/widgets/Composite.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/Composite.h 2008-04-24 13:17:49 UTC (rev 1187) +++ dcplusplus/trunk/dwt/include/dwt/widgets/Composite.h 2008-04-24 13:20:31 UTC (rev 1188) @@ -72,7 +72,7 @@ // 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... + // Note; only widgets that can be created with addChild should be here typedef dwt::Button Button; typedef dwt::ButtonPtr ButtonPtr; typedef dwt::CheckBox CheckBox; @@ -89,6 +89,8 @@ typedef dwt::GroupBoxPtr GroupBoxPtr; typedef dwt::Label Label; typedef dwt::LabelPtr LabelPtr; + typedef dwt::Menu Menu; + typedef dwt::MenuPtr MenuPtr; typedef dwt::ProgressBar ProgressBar; typedef dwt::ProgressBarPtr ProgressBarPtr; typedef dwt::RadioButton RadioButton; Modified: dcplusplus/trunk/dwt/include/dwt/widgets/Menu.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/Menu.h 2008-04-24 13:17:49 UTC (rev 1187) +++ dcplusplus/trunk/dwt/include/dwt/widgets/Menu.h 2008-04-24 13:20:31 UTC (rev 1188) @@ -113,6 +113,8 @@ typedef std::tr1::shared_ptr<Menu> ObjectType; struct Seed { + typedef ThisType WidgetType; + Seed(bool ownerDrawn_ = true, const MenuColorInfo& colorInfo_ = MenuColorInfo(), FontPtr font_ = 0); bool popup; bool ownerDrawn; @@ -264,7 +266,7 @@ template<typename DispatcherType> void appendItem(unsigned int id, const tstring & text, const typename DispatcherType::F& f, BitmapPtr image = BitmapPtr()) { appendItem(id, text, image); - callbacks.insert(std::make_pair(id, DispatcherType(f))); + itsParent->setCallback(Message(WM_COMMAND, id), DispatcherType(f)); } void appendItem(unsigned int id, const tstring & text, const IdDispatcher::F& f, BitmapPtr image = BitmapPtr()) { @@ -462,13 +464,8 @@ // if true title is drawn as sidebar bool drawSidebar; - typedef std::tr1::unordered_map<unsigned, Widget::CallbackType> CallbackMap; - CallbackMap callbacks; - void createHelper(const Seed& cs); - void addCommands(); - // Returns item index in the menu item list // If no item with specified id is found, - 1 is returned int getItemIndex( unsigned int id ); Modified: dcplusplus/trunk/dwt/src/widgets/Menu.cpp =================================================================== --- dcplusplus/trunk/dwt/src/widgets/Menu.cpp 2008-04-24 13:17:49 UTC (rev 1187) +++ dcplusplus/trunk/dwt/src/widgets/Menu.cpp 2008-04-24 13:20:31 UTC (rev 1188) @@ -139,7 +139,6 @@ } void Menu::setMenu() { - addCommands(); if ( ::SetMenu( itsParent->handle(), itsHandle ) == FALSE ) throw xCeption( _T( "SetMenu in Menu::setMenu fizzled..." ) ); } @@ -207,15 +206,6 @@ } #endif -void Menu::addCommands() { - for(CallbackMap::iterator i = callbacks.begin(); i != callbacks.end(); ++i) { - itsParent->setCallback(Message(WM_COMMAND, i->first), i->second); - } - for(std::vector< ObjectType >::iterator i = itsChildren.begin(); i != itsChildren.end(); ++i) { - (*i)->addCommands(); - } -} - int Menu::getItemIndex( unsigned int id ) { int index = 0; @@ -955,8 +945,6 @@ unsigned Menu::trackPopupMenu( const ScreenCoordinate& sc, unsigned flags ) { - addCommands(); - long x = sc.getPoint().x, y = sc.getPoint().y; if ( x == - 1 && y == - 1 ) Modified: dcplusplus/trunk/win32/ADLSearchFrame.cpp =================================================================== --- dcplusplus/trunk/win32/ADLSearchFrame.cpp 2008-04-24 13:17:49 UTC (rev 1187) +++ dcplusplus/trunk/win32/ADLSearchFrame.cpp 2008-04-24 13:20:31 UTC (rev 1188) @@ -288,7 +288,7 @@ pt = items->getContextMenuPos(); } - MenuPtr contextMenu = createMenu(WinUtil::Seeds::menu); + MenuPtr contextMenu = addChild(WinUtil::Seeds::menu); contextMenu->appendItem(IDC_ADD, T_("&New..."), std::tr1::bind(&ADLSearchFrame::handleAdd, this)); contextMenu->appendItem(IDC_EDIT, T_("&Properties"), std::tr1::bind(&ADLSearchFrame::handleProperties, this)); contextMenu->appendItem(IDC_REMOVE, T_("&Remove"), std::tr1::bind(&ADLSearchFrame::handleRemove, this)); Modified: dcplusplus/trunk/win32/DirectoryListingFrame.cpp =================================================================== --- dcplusplus/trunk/win32/DirectoryListingFrame.cpp 2008-04-24 13:17:49 UTC (rev 1187) +++ dcplusplus/trunk/win32/DirectoryListingFrame.cpp 2008-04-24 13:20:31 UTC (rev 1188) @@ -309,7 +309,7 @@ } DirectoryListingFrame::MenuPtr DirectoryListingFrame::makeSingleMenu(ItemInfo* ii) { - MenuPtr menu = createMenu(WinUtil::Seeds::menu); + MenuPtr menu = addChild(WinUtil::Seeds::menu); menu->appendItem(IDC_DOWNLOAD, T_("&Download"), std::tr1::bind(&DirectoryListingFrame::handleDownload, this)); addTargets(menu, ii); @@ -334,7 +334,7 @@ } DirectoryListingFrame::MenuPtr DirectoryListingFrame::makeMultiMenu() { - MenuPtr menu = createMenu(WinUtil::Seeds::menu); + MenuPtr menu = addChild(WinUtil::Seeds::menu); menu->appendItem(IDC_DOWNLOAD, T_("&Download"), std::tr1::bind(&DirectoryListingFrame::handleDownload, this)); addTargets(menu); @@ -346,7 +346,7 @@ } DirectoryListingFrame::MenuPtr DirectoryListingFrame::makeDirMenu() { - MenuPtr menu = createMenu(WinUtil::Seeds::menu); + MenuPtr menu = addChild(WinUtil::Seeds::menu); menu->appendItem(IDC_DOWNLOAD, T_("&Download"), std::tr1::bind(&DirectoryListingFrame::handleDownload, this)); addTargets(menu); @@ -411,7 +411,7 @@ if(!path.empty() && (File::getSize(path) != -1)) { Menu::Seed cs = WinUtil::Seeds::menu; cs.ownerDrawn = false; - MenuPtr menu = createMenu(cs); + MenuPtr menu = addChild(cs); CShellContextMenu shellMenu; shellMenu.SetPath(Text::utf8ToWide(path)); shellMenu.ShowContextMenu(menu, pt); Modified: dcplusplus/trunk/win32/FavHubsFrame.cpp =================================================================== --- dcplusplus/trunk/win32/FavHubsFrame.cpp 2008-04-24 13:17:49 UTC (rev 1187) +++ dcplusplus/trunk/win32/FavHubsFrame.cpp 2008-04-24 13:20:31 UTC (rev 1188) @@ -279,7 +279,7 @@ pt = hubs->getContextMenuPos(); } - MenuPtr menu = createMenu(WinUtil::Seeds::menu); + MenuPtr menu = addChild(WinUtil::Seeds::menu); menu->appendItem(IDC_CONNECT, T_("&Connect"), std::tr1::bind(&FavHubsFrame::openSelected, this)); menu->appendSeparatorItem(); menu->appendItem(IDC_ADD, T_("&New..."), std::tr1::bind(&FavHubsFrame::handleAdd, this)); Modified: dcplusplus/trunk/win32/FinishedFrameBase.h =================================================================== --- dcplusplus/trunk/win32/FinishedFrameBase.h 2008-04-24 13:17:49 UTC (rev 1187) +++ dcplusplus/trunk/win32/FinishedFrameBase.h 2008-04-24 13:20:31 UTC (rev 1188) @@ -220,7 +220,7 @@ typename T::Menu::Seed cs = WinUtil::Seeds::menu; cs.ownerDrawn = false; - typename T::MenuPtr pShellMenu = this->createMenu(cs); + typename T::MenuPtr pShellMenu = this->addChild(cs); pShellMenu->appendItem(IDC_VIEW_AS_TEXT, T_("&View as text"), std::tr1::bind(&ThisType::handleViewAsText, this)); pShellMenu->appendItem(IDC_OPEN_FILE, T_("&Open"), std::tr1::bind(&ThisType::handleOpenFile, this)); pShellMenu->appendItem(IDC_OPEN_FOLDER, T_("Open &folder"), std::tr1::bind(&ThisType::handleOpenFolder, this)); @@ -236,7 +236,7 @@ } } - typename T::MenuPtr contextMenu = this->createMenu(WinUtil::Seeds::menu); + typename T::MenuPtr contextMenu = this->addChild(WinUtil::Seeds::menu); contextMenu->appendItem(IDC_VIEW_AS_TEXT, T_("&View as text"), std::tr1::bind(&ThisType::handleViewAsText, this)); contextMenu->appendItem(IDC_OPEN_FILE, T_("&Open"), std::tr1::bind(&ThisType::handleOpenFile, this)); contextMenu->appendItem(IDC_OPEN_FOLDER, T_("Open &folder"), std::tr1::bind(&ThisType::handleOpenFolder, this)); Modified: dcplusplus/trunk/win32/HubFrame.cpp =================================================================== --- dcplusplus/trunk/win32/HubFrame.cpp 2008-04-24 13:17:49 UTC (rev 1187) +++ dcplusplus/trunk/win32/HubFrame.cpp 2008-04-24 13:20:31 UTC (rev 1188) @@ -1165,7 +1165,7 @@ pt = users->getContextMenuPos(); } - MenuPtr menu = createMenu(WinUtil::Seeds::menu); + MenuPtr menu = addChild(WinUtil::Seeds::menu); appendUserItems(getParent(), menu); menu->appendItem(IDC_COPY_NICK, T_("Copy &nick to clipboard"), std::tr1::bind(&HubFrame::handleCopyNick, this)); @@ -1181,7 +1181,7 @@ } bool HubFrame::handleTabContextMenu(const dwt::ScreenCoordinate& pt) { - MenuPtr menu = createMenu(WinUtil::Seeds::menu); + MenuPtr menu = addChild(WinUtil::Seeds::menu); menu->setTitle(getParent()->getTabText(this)); Modified: dcplusplus/trunk/win32/MDIChildFrame.h =================================================================== --- dcplusplus/trunk/win32/MDIChildFrame.h 2008-04-24 13:17:49 UTC (rev 1187) +++ dcplusplus/trunk/win32/MDIChildFrame.h 2008-04-24 13:20:31 UTC (rev 1188) @@ -185,7 +185,7 @@ } bool handleContextMenu(const dwt::ScreenCoordinate& pt) { - dwt::Menu::ObjectType menu = createMenu(WinUtil::Seeds::menu); + dwt::Menu::ObjectType menu = addChild(WinUtil::Seeds::menu); menu->setTitle(getParent()->getTabText(this)); menu->appendItem(IDC_CLOSE_WINDOW, T_("&Close"), std::tr1::bind(&ThisType::close, this, true), dwt::BitmapPtr(new dwt::Bitmap(IDB_EXIT))); menu->trackPopupMenu(pt, TPM_LEFTALIGN | TPM_RIGHTBUTTON); Modified: dcplusplus/trunk/win32/MainWindow.cpp =================================================================== --- dcplusplus/trunk/win32/MainWindow.cpp 2008-04-24 13:17:49 UTC (rev 1187) +++ dcplusplus/trunk/win32/MainWindow.cpp 2008-04-24 13:20:31 UTC (rev 1188) @@ -182,7 +182,7 @@ { Menu::Seed cs = WinUtil::Seeds::menu; cs.popup = false; - mainMenu = createMenu(cs); + mainMenu = addChild(cs); } { @@ -1001,7 +1001,7 @@ handleRestore(); } else if(lParam == WM_RBUTTONDOWN || lParam == WM_CONTEXTMENU) { dwt::ScreenCoordinate pt; - MenuPtr trayMenu = createMenu(WinUtil::Seeds::menu); + MenuPtr trayMenu = addChild(WinUtil::Seeds::menu); trayMenu->appendItem(IDC_TRAY_SHOW, T_("Show"), std::tr1::bind(&MainWindow::handleRestore, this)); trayMenu->appendItem(IDC_TRAY_QUIT, T_("Exit"), std::tr1::bind(&MainWindow::close, this, true)); trayMenu->appendItem(IDC_OPEN_DOWNLOADS, T_("Open downloads directory")); Modified: dcplusplus/trunk/win32/PrivateFrame.cpp =================================================================== --- dcplusplus/trunk/win32/PrivateFrame.cpp 2008-04-24 13:17:49 UTC (rev 1187) +++ dcplusplus/trunk/win32/PrivateFrame.cpp 2008-04-24 13:20:31 UTC (rev 1188) @@ -364,7 +364,7 @@ } bool PrivateFrame::handleTabContextMenu(const dwt::ScreenCoordinate& pt) { - MenuPtr menu = createMenu(WinUtil::Seeds::menu); + MenuPtr menu = addChild(WinUtil::Seeds::menu); menu->setTitle(getParent()->getTabText(this)); Modified: dcplusplus/trunk/win32/PublicHubsFrame.cpp =================================================================== --- dcplusplus/trunk/win32/PublicHubsFrame.cpp 2008-04-24 13:17:49 UTC (rev 1187) +++ dcplusplus/trunk/win32/PublicHubsFrame.cpp 2008-04-24 13:20:31 UTC (rev 1188) @@ -449,7 +449,7 @@ pt = hubs->getContextMenuPos(); } - MenuPtr menu = createMenu(WinUtil::Seeds::menu); + MenuPtr menu = addChild(WinUtil::Seeds::menu); menu->appendItem(IDC_CONNECT, T_("&Connect"), std::tr1::bind(&PublicHubsFrame::handleConnect, this)); menu->appendItem(IDC_ADD, T_("Add To &Favorites"), std::tr1::bind(&PublicHubsFrame::handleAdd, this), dwt::BitmapPtr(new dwt::Bitmap(IDB_FAVORITE_HUBS))); menu->appendItem(IDC_COPY_HUB, T_("Copy &address to clipboard"), std::tr1::bind(&PublicHubsFrame::handleCopyHub, this)); Modified: dcplusplus/trunk/win32/QueueFrame.cpp =================================================================== --- dcplusplus/trunk/win32/QueueFrame.cpp 2008-04-24 13:17:49 UTC (rev 1187) +++ dcplusplus/trunk/win32/QueueFrame.cpp 2008-04-24 13:20:31 UTC (rev 1188) @@ -940,7 +940,7 @@ } QueueFrame::MenuPtr QueueFrame::makeSingleMenu(QueueItemInfo* qii) { - MenuPtr menu = createMenu(WinUtil::Seeds::menu); + MenuPtr menu = addChild(WinUtil::Seeds::menu); WinUtil::addHashItems(menu, qii->getTTH(), Text::toT(Util::getFileName(qii->getTarget()))); menu->appendItem(IDC_MOVE, T_("&Move/Rename"), std::tr1::bind(&QueueFrame::handleMove, this)); @@ -957,7 +957,7 @@ } QueueFrame::MenuPtr QueueFrame::makeMultiMenu() { - MenuPtr menu = createMenu(WinUtil::Seeds::menu); + MenuPtr menu = addChild(WinUtil::Seeds::menu); addPriorityMenu(menu); @@ -968,7 +968,7 @@ } QueueFrame::MenuPtr QueueFrame::makeDirMenu() { - MenuPtr menu = createMenu(WinUtil::Seeds::menu); + MenuPtr menu = addChild(WinUtil::Seeds::menu); addPriorityMenu(menu); menu->appendItem(IDC_MOVE, T_("&Move/Rename"), std::tr1::bind(&QueueFrame::handleMove, this)); Modified: dcplusplus/trunk/win32/SearchFrame.cpp =================================================================== --- dcplusplus/trunk/win32/SearchFrame.cpp 2008-04-24 13:17:49 UTC (rev 1187) +++ dcplusplus/trunk/win32/SearchFrame.cpp 2008-04-24 13:20:31 UTC (rev 1188) @@ -754,7 +754,7 @@ } SearchFrame::MenuPtr SearchFrame::makeMenu() { - MenuPtr menu = createMenu(WinUtil::Seeds::menu); + MenuPtr menu = addChild(WinUtil::Seeds::menu); StringPairList favoriteDirs = FavoriteManager::getInstance()->getFavoriteDirs(); SearchInfo::CheckTTH checkTTH = results->forEachSelectedT(SearchInfo::CheckTTH()); Modified: dcplusplus/trunk/win32/SpyFrame.cpp =================================================================== --- dcplusplus/trunk/win32/SpyFrame.cpp 2008-04-24 13:17:49 UTC (rev 1187) +++ dcplusplus/trunk/win32/SpyFrame.cpp 2008-04-24 13:20:31 UTC (rev 1188) @@ -179,7 +179,7 @@ pt = searches->getContextMenuPos(); } - MenuPtr contextMenu = createMenu(WinUtil::Seeds::menu); + MenuPtr contextMenu = addChild(WinUtil::Seeds::menu); contextMenu->appendItem<Menu::SimpleDispatcher>(IDC_SEARCH, T_("&Search"), std::tr1::bind(&SpyFrame::handleSearch, this, searches->getText(searches->getSelected(), COLUMN_STRING)), dwt::BitmapPtr(new dwt::Bitmap(IDB_SEARCH))); contextMenu->trackPopupMenu(pt, TPM_LEFTALIGN | TPM_RIGHTBUTTON); Modified: dcplusplus/trunk/win32/TransferView.cpp =================================================================== --- dcplusplus/trunk/win32/TransferView.cpp 2008-04-24 13:17:49 UTC (rev 1187) +++ dcplusplus/trunk/win32/TransferView.cpp 2008-04-24 13:20:31 UTC (rev 1188) @@ -175,7 +175,7 @@ } TransferView::MenuPtr TransferView::makeContextMenu(ConnectionInfo* ii) { - MenuPtr menu = createMenu(WinUtil::Seeds::menu); + MenuPtr menu = addChild(WinUtil::Seeds::menu); appendUserItems(mdi, menu); menu->appendSeparatorItem(); @@ -210,7 +210,7 @@ pt = downloads->getContextMenuPos(); } - MenuPtr menu = createMenu(WinUtil::Seeds::menu); + MenuPtr menu = addChild(WinUtil::Seeds::menu); DownloadInfo* di = downloads->getSelectedData(); WinUtil::addHashItems(menu, di->tth, di->columns[DOWNLOAD_COLUMN_FILE]); menu->trackPopupMenu(pt, TPM_LEFTALIGN | TPM_RIGHTBUTTON); Modified: dcplusplus/trunk/win32/UsersFrame.cpp =================================================================== --- dcplusplus/trunk/win32/UsersFrame.cpp 2008-04-24 13:17:49 UTC (rev 1187) +++ dcplusplus/trunk/win32/UsersFrame.cpp 2008-04-24 13:20:31 UTC (rev 1188) @@ -179,7 +179,7 @@ pt = users->getContextMenuPos(); } - MenuPtr menu = createMenu(WinUtil::Seeds::menu); + MenuPtr menu = addChild(WinUtil::Seeds::menu); appendUserItems(getParent(), menu); menu->appendSeparatorItem(); menu->appendItem(IDC_EDIT, T_("&Description"), std::tr1::bind(&UsersFrame::handleDescription, this)); Modified: dcplusplus/trunk/win32/WaitingUsersFrame.cpp =================================================================== --- dcplusplus/trunk/win32/WaitingUsersFrame.cpp 2008-04-24 13:17:49 UTC (rev 1187) +++ dcplusplus/trunk/win32/WaitingUsersFrame.cpp 2008-04-24 13:20:31 UTC (rev 1188) @@ -75,7 +75,7 @@ if(pt.x() == -1 || pt.y() == -1) { pt = queued->getContextMenuPos(); } - MenuPtr menu = createMenu(WinUtil::Seeds::menu); + MenuPtr menu = addChild(WinUtil::Seeds::menu); menu->appendItem(IDC_GETLIST, T_("&Get file list"), std::tr1::bind(&WaitingUsersFrame::onGetList, this)); menu->appendItem(IDC_COPY_FILENAME, T_("Copy Filename"), std::tr1::bind(&WaitingUsersFrame::onCopyFilename, this)); menu->appendItem(IDC_REMOVE, T_("&Remove"), std::tr1::bind(&WaitingUsersFrame::onRemove, this)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |