Menu
▾
▴
[Dcplusplus-commit] SF.net SVN: dcplusplus: [1231] dcplusplus/trunk
|
From: <arn...@us...> - 2008-04-29 19:12:26
|
Revision: 1231
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1231&view=rev
Author: arnetheduck
Date: 2008-04-29 12:12:13 -0700 (Tue, 29 Apr 2008)
Log Message:
-----------
search frame menu fixes, avoid dupe users, filter user menu options
Modified Paths:
--------------
dcplusplus/trunk/win32/SearchFrame.cpp
dcplusplus/trunk/win32/TransferView.cpp
dcplusplus/trunk/win32/UserInfoBase.h
dcplusplus/trunk/win32/WaitingUsersFrame.cpp
dcplusplus/trunk/win32/WinUtil.cpp
dcplusplus/trunk/win32/resource.h
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-28 21:56:45.924000025 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
+ timestamp: 2008-04-28 23:08:12.582000017 +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
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
1188 arn...@gm...-20080421194323-clug9p9pkjkgc0cw
1189 arn...@gm...-20080422063343-blx6k6y2ydxtbkjy
1190 po...@12...-20080422102607-kb3rl7h4i6alv3oo
1191 po...@12...-20080422143053-gsqp7dlvq1vwkahf
1192 arn...@gm...-20080423181453-79vl70wtqix7zxhf
1193 arn...@gm...-20080423184105-mp2f385vndp22m8f
1194 arn...@gm...-20080423185140-vz1vp66h0xzrxv6m
1195 arn...@gm...-20080423191309-bxflhitmwd36vix3
1196 arn...@gm...-20080423191718-3sc2ek2axdtc0b6e
1197 po...@12...-20080423223740-naz9ch6wp525yonb
1198 administrator@user315-m-20080424114244-eu0vcezrvqz7sf8t
1199 administrator@user315-m-20080424121241-ta23vg7isv4346qw
1200 po...@12...-20080424210032-97omp80p01ag7tlr
1201 arn...@gm...-20080424212827-v52bn9nu74id6fjx
1202 emtee-20080425102810-x4gbuupquvl3vja0
1203 arn...@gm...-20080426140033-767pxugmoex9ptgd
1204 arn...@gm...-20080426214311-qzauudh2fifjcir1
1205 arn...@gm...-20080428195645-md01wfba2gn27ckq
+ 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
1188 arn...@gm...-20080421194323-clug9p9pkjkgc0cw
1189 arn...@gm...-20080422063343-blx6k6y2ydxtbkjy
1190 po...@12...-20080422102607-kb3rl7h4i6alv3oo
1191 po...@12...-20080422143053-gsqp7dlvq1vwkahf
1192 arn...@gm...-20080423181453-79vl70wtqix7zxhf
1193 arn...@gm...-20080423184105-mp2f385vndp22m8f
1194 arn...@gm...-20080423185140-vz1vp66h0xzrxv6m
1195 arn...@gm...-20080423191309-bxflhitmwd36vix3
1196 arn...@gm...-20080423191718-3sc2ek2axdtc0b6e
1197 po...@12...-20080423223740-naz9ch6wp525yonb
1198 administrator@user315-m-20080424114244-eu0vcezrvqz7sf8t
1199 administrator@user315-m-20080424121241-ta23vg7isv4346qw
1200 po...@12...-20080424210032-97omp80p01ag7tlr
1201 arn...@gm...-20080424212827-v52bn9nu74id6fjx
1202 emtee-20080425102810-x4gbuupquvl3vja0
1203 arn...@gm...-20080426140033-767pxugmoex9ptgd
1204 arn...@gm...-20080426214311-qzauudh2fifjcir1
1205 arn...@gm...-20080428195645-md01wfba2gn27ckq
1206 arn...@gm...-20080428210812-4wt9pd4wjxzjy2m0
Modified: dcplusplus/trunk/win32/SearchFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/SearchFrame.cpp 2008-04-29 19:11:07 UTC (rev 1230)
+++ dcplusplus/trunk/win32/SearchFrame.cpp 2008-04-29 19:12:13 UTC (rev 1231)
@@ -25,6 +25,7 @@
#include <dcpp/QueueManager.h>
#include <dcpp/ClientManager.h>
#include <dcpp/ShareManager.h>
+#include <set>
int SearchFrame::columnIndexes[] = { COLUMN_FILENAME, COLUMN_NICK, COLUMN_TYPE, COLUMN_SIZE,
COLUMN_PATH, COLUMN_SLOTS, COLUMN_CONNECTION, COLUMN_HUB, COLUMN_EXACT_SIZE, COLUMN_IP, COLUMN_TTH, COLUMN_CID };
@@ -541,6 +542,7 @@
columns[COLUMN_TYPE].erase(0, 1);
columns[COLUMN_SIZE] = Text::toT(Util::formatBytes(sr->getSize()));
columns[COLUMN_EXACT_SIZE] = Text::toT(Util::formatExactSize(sr->getSize()));
+ columns[COLUMN_TTH] = Text::toT(sr->getTTH().toBase32());
} else {
columns[COLUMN_FILENAME] = Text::toT(sr->getFileName());
columns[COLUMN_PATH] = Text::toT(sr->getFile());
@@ -552,24 +554,29 @@
}
if(srs.size() > 1) {
columns[COLUMN_NICK] = str(TFN_("%1% user", "%1% users", srs.size()) % srs.size());
+ columns[COLUMN_CONNECTION].clear();
+ columns[COLUMN_IP].clear();
+ columns[COLUMN_CID].clear();
+
+ std::set<std::string> hubs;
+ for(SearchResultList::const_iterator i = srs.begin(), iend = srs.end(); i != iend; ++i) {
+ hubs.insert((*i)->getHubName());
+ }
+ columns[COLUMN_HUB] = Text::toT(Util::toString(StringList(hubs.begin(), hubs.end())));
} else {
columns[COLUMN_NICK] = WinUtil::getNicks(sr->getUser());
+ columns[COLUMN_CONNECTION] = Text::toT(ClientManager::getInstance()->getConnection(sr->getUser()->getCID()));
+ columns[COLUMN_SLOTS] = Text::toT(sr->getSlotString());
+ columns[COLUMN_IP] = Text::toT(sr->getIP());
+ if (!columns[COLUMN_IP].empty()) {
+ // Only attempt to grab a country mapping if we actually have an IP address
+ tstring tmpCountry = Text::toT(Util::getIpCountry(sr->getIP()));
+ if(!tmpCountry.empty())
+ columns[COLUMN_IP] = tmpCountry + _T(" (") + columns[COLUMN_IP] + _T(")");
+ }
+ columns[COLUMN_HUB] = Text::toT(sr->getHubName());
+ columns[COLUMN_CID] = Text::toT(sr->getUser()->getCID().toBase32());
}
- columns[COLUMN_CONNECTION] = Text::toT(ClientManager::getInstance()->getConnection(sr->getUser()->getCID()));
- // TODO Join hubs of all users
- columns[COLUMN_HUB] = Text::toT(sr->getHubName());
- columns[COLUMN_SLOTS] = Text::toT(sr->getSlotString());
- columns[COLUMN_IP] = Text::toT(sr->getIP());
- if (!columns[COLUMN_IP].empty()) {
- // Only attempt to grab a country mapping if we actually have an IP address
- tstring tmpCountry = Text::toT(Util::getIpCountry(sr->getIP()));
- if(!tmpCountry.empty())
- columns[COLUMN_IP] = tmpCountry + _T(" (") + columns[COLUMN_IP] + _T(")");
- }
- if(sr->getType() == SearchResult::TYPE_FILE) {
- columns[COLUMN_TTH] = Text::toT(sr->getTTH().toBase32());
- }
- columns[COLUMN_CID] = Text::toT(sr->getUser()->getCID().toBase32());
}
LRESULT SearchFrame::handleSpeaker(WPARAM wParam, LPARAM lParam) {
@@ -797,7 +804,8 @@
void operator()(T* si) {
for(SearchResultList::const_iterator i = si->srs.begin(), iend = si->srs.end(); i != iend; ++i) {
const SearchResultPtr& sr = *i;
- users.push_back(sr->getUser());
+ if(std::find(users.begin(), users.end(), sr->getUser()) == users.end())
+ users.push_back(sr->getUser());
}
}
UserList users;
Modified: dcplusplus/trunk/win32/TransferView.cpp
===================================================================
--- dcplusplus/trunk/win32/TransferView.cpp 2008-04-29 19:11:07 UTC (rev 1230)
+++ dcplusplus/trunk/win32/TransferView.cpp 2008-04-29 19:12:13 UTC (rev 1231)
@@ -186,7 +186,7 @@
menu->appendItem(IDC_COPY_NICK, T_("Copy &nick to clipboard"), std::tr1::bind(&TransferView::handleCopyNick, this));
menu->appendSeparatorItem();
menu->appendItem(IDC_REMOVE, T_("&Disconnect"), std::tr1::bind(&TransferView::handleDisconnect, this));
- menu->setDefaultItem(IDC_PRIVATEMESSAGE);
+ menu->setDefaultItem(IDC_PM);
return menu;
}
Modified: dcplusplus/trunk/win32/UserInfoBase.h
===================================================================
--- dcplusplus/trunk/win32/UserInfoBase.h 2008-04-29 19:11:07 UTC (rev 1230)
+++ dcplusplus/trunk/win32/UserInfoBase.h 2008-04-29 19:12:13 UTC (rev 1231)
@@ -96,7 +96,7 @@
if(traits.adcOnly)
menu->appendItem(IDC_BROWSELIST, T_("&Browse file list"), std::tr1::bind(&T::handleBrowseList, This));
menu->appendItem(IDC_MATCH_QUEUE, T_("&Match queue"), std::tr1::bind(&T::handleMatchQueue, This));
- menu->appendItem(IDC_PRIVATEMESSAGE, T_("&Send private message"), std::tr1::bind(&T::handlePrivateMessage, This, parent));
+ menu->appendItem(IDC_PM, T_("&Send private message"), std::tr1::bind(&T::handlePrivateMessage, This, parent));
if(!traits.favOnly)
menu->appendItem(IDC_ADD_TO_FAVORITES, T_("Add To &Favorites"), std::tr1::bind(&T::handleAddFavorite, This), dwt::BitmapPtr(new dwt::Bitmap(IDB_FAVORITE_USERS)));
menu->appendItem(IDC_GRANTSLOT, T_("Grant &extra slot"), std::tr1::bind(&T::handleGrantSlot, This));
Modified: dcplusplus/trunk/win32/WaitingUsersFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/WaitingUsersFrame.cpp 2008-04-29 19:11:07 UTC (rev 1230)
+++ dcplusplus/trunk/win32/WaitingUsersFrame.cpp 2008-04-29 19:12:13 UTC (rev 1231)
@@ -81,7 +81,7 @@
menu->appendItem(IDC_REMOVE, T_("&Remove"), std::tr1::bind(&WaitingUsersFrame::onRemove, this));
menu->appendItem(IDC_GRANTSLOT, T_("Grant &extra slot"), std::tr1::bind(&WaitingUsersFrame::onGrantSlot, this));
menu->appendItem(IDC_ADD_TO_FAVORITES, T_("Add To &Favorites"), std::tr1::bind(&WaitingUsersFrame::onAddToFavorites, this));
- menu->appendItem(IDC_PRIVATEMESSAGE, T_("&Send private message"), std::tr1::bind(&WaitingUsersFrame::onPrivateMessage, this));
+ menu->appendItem(IDC_PM, T_("&Send private message"), std::tr1::bind(&WaitingUsersFrame::onPrivateMessage, this));
menu->trackPopupMenu(pt, TPM_LEFTALIGN | TPM_RIGHTBUTTON);
return true;
}
Modified: dcplusplus/trunk/win32/WinUtil.cpp
===================================================================
--- dcplusplus/trunk/win32/WinUtil.cpp 2008-04-29 19:11:07 UTC (rev 1230)
+++ dcplusplus/trunk/win32/WinUtil.cpp 2008-04-29 19:12:13 UTC (rev 1231)
@@ -1067,22 +1067,45 @@
}
static void addUsers(bool addSub, dwt::MenuPtr menu, const tstring& text, int id, const UserList& users, const UserFunction& f) {
+ if(users.empty())
+ return;
if(addSub) {
menu = menu->appendPopup(text);
}
+
if(users.size() > 1) {
menu->appendItem(id, T_("All"), std::tr1::bind(&eachUser, users, f), dwt::BitmapPtr());
+ menu->appendSeparatorItem();
+
for(size_t i = 0, iend = users.size(); i < iend; ++i) {
menu->appendItem(id + i + 1, WinUtil::getNicks(users[i]),
std::tr1::bind(&eachUser, UserList(1, users[i]), f), dwt::BitmapPtr());
}
} else {
- menu->appendItem(id, text, std::tr1::bind(&eachUser, users, f), dwt::BitmapPtr());
+ menu->appendItem(id, addSub ? WinUtil::getNicks(users[0]) : text, std::tr1::bind(&eachUser, users, f), dwt::BitmapPtr());
}
}
+template<typename F>
+UserList filter(const UserList& l, F f) {
+ UserList ret;
+ for(UserList::const_iterator i = l.begin(), iend = l.end(); i != iend; ++i) {
+ if(f(*i)) {
+ ret.push_back(*i);
+ }
+ }
+ return ret;
+}
+
+static bool isAdc(const UserPtr& u) {
+ return !u->isSet(User::NMDC);
+}
+static bool isFav(const UserPtr& u) {
+ return !FavoriteManager::getInstance()->isFavoriteUser(u);
+}
+
void WinUtil::addUserItems(dwt::MenuPtr menu, const UserList& users, dwt::TabViewPtr parent, const std::string& dir) {
bool addSub = users.size() > 1;
@@ -1091,16 +1114,16 @@
addUsers(addSub, menu, T_("&Get file list"), IDC_GETLIST, users,
std::tr1::bind(&QueueManager::addList, qm, _1, QueueItem::FLAG_CLIENT_VIEW, dir));
- addUsers(addSub, menu, T_("&Browse file list"), IDC_BROWSELIST, users,
+ addUsers(addSub, menu, T_("&Browse file list"), IDC_BROWSELIST, filter(users, &isAdc),
std::tr1::bind(&QueueManager::addPfs, qm, _1, dir));
addUsers(addSub, menu, T_("&Match queue"), IDC_MATCH_QUEUE, users,
std::tr1::bind(&QueueManager::addList, qm, _1, QueueItem::FLAG_MATCH_QUEUE, std::string()));
- addUsers(addSub, menu, T_("&Send private message"), IDC_PRIVATEMESSAGE, users,
+ addUsers(addSub, menu, T_("&Send private message"), IDC_PM, users,
std::tr1::bind(&PrivateFrame::openWindow, parent, _1, tstring()));
- addUsers(addSub, menu, T_("Add To &Favorites"), IDC_ADD_TO_FAVORITES, users,
+ addUsers(addSub, menu, T_("Add To &Favorites"), IDC_ADD_TO_FAVORITES, filter(users, &isFav),
std::tr1::bind(&FavoriteManager::addFavoriteUser, FavoriteManager::getInstance(), _1));
addUsers(addSub, menu, T_("Grant &extra slot"), IDC_GRANTSLOT, users,
Modified: dcplusplus/trunk/win32/resource.h
===================================================================
--- dcplusplus/trunk/win32/resource.h 2008-04-29 19:11:07 UTC (rev 1230)
+++ dcplusplus/trunk/win32/resource.h 2008-04-29 19:12:13 UTC (rev 1231)
@@ -87,11 +87,7 @@
#define IDC_VIEW_TOOLBAR 1007
#define IDC_VIEW_TRANSFER_VIEW 1008
#define IDC_PUBLIC_HUBS 1009
-#define IDC_GETLIST 1011
#define IDC_COPY_FILENAME 1012
-#define IDC_GRANTSLOT 1013
-#define IDC_ADD_TO_FAVORITES 1014
-#define IDC_PRIVATEMESSAGE 1015
#define IDC_ADL_SEARCH 1016
#define IDC_PRIORITY_PAUSED 1017
#define IDC_PRIORITY_LOWEST 1018
@@ -108,7 +104,6 @@
#define IDC_VIEW_AS_TEXT 1029
#define IDC_OPEN_FILE 1030
#define IDC_OPEN_FOLDER 1031
-#define IDC_REMOVE_ALL 1032
#define IDC_SETTINGS 1033
#define IDC_SEARCH_SPY 1034
#define IDC_DOWNLOAD 1035
@@ -137,7 +132,6 @@
#define IDC_HELP_REQUEST_FEATURE 1067
#define IDC_HELP_REPORT_BUG 1068
#define IDC_HELP_DONATE 1069
-#define IDC_MATCH_QUEUE 1070
#define IDC_COPY_HUB 1071
#define IDC_CLOSE_WINDOW 1072
#define IDC_TRAY_SHOW 1073
@@ -456,6 +450,13 @@
#define IDC_DOWNLOAD_WHOLE_FAVORITE_DIRS 4800
#define IDC_DOWNLOAD_WHOLE_TARGET 5000
#define IDC_USER_COMMAND 5200
+#define IDC_GETLIST 5400
+#define IDC_MATCH_QUEUE 5600
+#define IDC_ADD_TO_FAVORITES 5800
+#define IDC_GRANTSLOT 6000
+#define IDC_REMOVE_ALL 6200
+
+
#define ID_SHELLCONTEXTMENU_MIN 7000
#define ID_SHELLCONTEXTMENU_MAX 7999
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
