Menu
▾
▴
[Dcplusplus-commit] SF.net SVN: dcplusplus: [1181] dcplusplus/trunk
|
From: <arn...@us...> - 2008-04-24 13:10:33
|
Revision: 1181
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1181&view=rev
Author: arnetheduck
Date: 2008-04-24 06:10:28 -0700 (Thu, 24 Apr 2008)
Log Message:
-----------
clean up PropPage list methods, use dwt more
Modified Paths:
--------------
dcplusplus/trunk/win32/Advanced3Page.cpp
dcplusplus/trunk/win32/AdvancedPage.cpp
dcplusplus/trunk/win32/AdvancedPage.h
dcplusplus/trunk/win32/Appearance2Page.cpp
dcplusplus/trunk/win32/AppearancePage.cpp
dcplusplus/trunk/win32/AppearancePage.h
dcplusplus/trunk/win32/CertificatesPage.cpp
dcplusplus/trunk/win32/CertificatesPage.h
dcplusplus/trunk/win32/LogPage.cpp
dcplusplus/trunk/win32/LogPage.h
dcplusplus/trunk/win32/PropPage.cpp
dcplusplus/trunk/win32/PropPage.h
dcplusplus/trunk/win32/QueuePage.cpp
dcplusplus/trunk/win32/QueuePage.h
dcplusplus/trunk/win32/TabsPage.cpp
dcplusplus/trunk/win32/TabsPage.h
dcplusplus/trunk/win32/WindowsPage.cpp
dcplusplus/trunk/win32/WindowsPage.h
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-15 19:49:58.423000097 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
+ timestamp: 2008-04-15 20:29:42.640000105 +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
+ 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
Modified: dcplusplus/trunk/win32/Advanced3Page.cpp
===================================================================
--- dcplusplus/trunk/win32/Advanced3Page.cpp 2008-04-24 13:08:55 UTC (rev 1180)
+++ dcplusplus/trunk/win32/Advanced3Page.cpp 2008-04-24 13:10:28 UTC (rev 1181)
@@ -108,7 +108,7 @@
WinUtil::setHelpIds(this, helpItems);
PropPage::translate(handle(), texts);
- PropPage::read(handle(), items, 0, 0);
+ PropPage::read(handle(), items);
SpinnerPtr spinner = attachChild<Spinner>(IDC_SEARCH_HISTORY_SPIN);
spinner->setRange(0, 100);
@@ -131,7 +131,7 @@
}
void Advanced3Page::write() {
- PropPage::write(handle(), items, 0, 0);
+ PropPage::write(handle(), items);
SettingsManager* settings = SettingsManager::getInstance();
if(SETTING(SET_MINISLOT_SIZE) < 64)
Modified: dcplusplus/trunk/win32/AdvancedPage.cpp
===================================================================
--- dcplusplus/trunk/win32/AdvancedPage.cpp 2008-04-24 13:08:55 UTC (rev 1180)
+++ dcplusplus/trunk/win32/AdvancedPage.cpp 2008-04-24 13:10:28 UTC (rev 1181)
@@ -24,8 +24,6 @@
#include <dcpp/SettingsManager.h>
-PropPage::Item AdvancedPage::items[] = { { 0, 0, PropPage::T_END } };
-
AdvancedPage::ListItem AdvancedPage::listItems[] = {
{ SettingsManager::AUTO_AWAY, N_("Auto-away on minimize (and back on restore)") },
{ SettingsManager::AUTO_FOLLOW, N_("Automatically follow redirects") },
@@ -56,12 +54,13 @@
createDialog(IDD_ADVANCEDPAGE);
setHelpId(IDH_ADVANCEDPAGE);
- PropPage::read(handle(), items, listItems, ::GetDlgItem(handle(), IDC_ADVANCED_BOOLEANS));
+ attachChild(options, IDC_ADVANCED_BOOLEANS);
+ PropPage::read(listItems, options);
}
AdvancedPage::~AdvancedPage() {
}
void AdvancedPage::write() {
- PropPage::write(handle(), items, listItems, ::GetDlgItem(handle(), IDC_ADVANCED_BOOLEANS));
+ PropPage::write(listItems, options);
}
Modified: dcplusplus/trunk/win32/AdvancedPage.h
===================================================================
--- dcplusplus/trunk/win32/AdvancedPage.h 2008-04-24 13:08:55 UTC (rev 1180)
+++ dcplusplus/trunk/win32/AdvancedPage.h 2008-04-24 13:10:28 UTC (rev 1181)
@@ -30,8 +30,9 @@
virtual void write();
private:
- static Item items[];
static ListItem listItems[];
+
+ TablePtr options;
};
#endif // !defined(DCPLUSPLUS_WIN32_ADVANCED_PAGE_H)
Modified: dcplusplus/trunk/win32/Appearance2Page.cpp
===================================================================
--- dcplusplus/trunk/win32/Appearance2Page.cpp 2008-04-24 13:08:55 UTC (rev 1180)
+++ dcplusplus/trunk/win32/Appearance2Page.cpp 2008-04-24 13:10:28 UTC (rev 1181)
@@ -80,7 +80,7 @@
example->setFont(font);
attachChild(sounds, IDC_SOUNDS);
- PropPage::initList(sounds->handle());
+ PropPage::initList(sounds);
{
ButtonPtr button = attachChild<Button>(IDC_SELWINCOLOR);
Modified: dcplusplus/trunk/win32/AppearancePage.cpp
===================================================================
--- dcplusplus/trunk/win32/AppearancePage.cpp 2008-04-24 13:08:55 UTC (rev 1180)
+++ dcplusplus/trunk/win32/AppearancePage.cpp 2008-04-24 13:10:28 UTC (rev 1181)
@@ -74,10 +74,13 @@
WinUtil::setHelpIds(this, helpItems);
PropPage::translate(handle(), texts);
- PropPage::read(handle(), items, listItems, ::GetDlgItem(handle(), IDC_APPEARANCE_BOOLEANS));
+ PropPage::read(handle(), items);
- languages = attachChild<ComboBox>(IDC_LANGUAGE);
+ attachChild(options, IDC_APPEARANCE_BOOLEANS);
+ PropPage::read(listItems, options);
+ attachChild(languages, IDC_LANGUAGE);
+
StringList dirs = File::findFiles(Util::getLocalePath(), "*");
TStringList langs;
@@ -119,7 +122,8 @@
void AppearancePage::write()
{
- PropPage::write(handle(), items, listItems, ::GetDlgItem(handle(), IDC_APPEARANCE_BOOLEANS));
+ PropPage::write(handle(), items);
+ PropPage::write(listItems, options);
tstring lang = languages->getText();
Modified: dcplusplus/trunk/win32/AppearancePage.h
===================================================================
--- dcplusplus/trunk/win32/AppearancePage.h 2008-04-24 13:08:55 UTC (rev 1180)
+++ dcplusplus/trunk/win32/AppearancePage.h 2008-04-24 13:10:28 UTC (rev 1181)
@@ -34,7 +34,8 @@
static TextItem texts[];
static ListItem listItems[];
- ComboBox* languages;
+ TablePtr options;
+ ComboBoxPtr languages;
};
#endif // !defined(DCPLUSPLUS_WIN32_APPEARANCE_PAGE_H)
Modified: dcplusplus/trunk/win32/CertificatesPage.cpp
===================================================================
--- dcplusplus/trunk/win32/CertificatesPage.cpp 2008-04-24 13:08:55 UTC (rev 1180)
+++ dcplusplus/trunk/win32/CertificatesPage.cpp 2008-04-24 13:10:28 UTC (rev 1181)
@@ -67,7 +67,7 @@
WinUtil::setHelpIds(this, helpItems);
PropPage::translate(handle(), texts);
- PropPage::read(handle(), items, listItems, ::GetDlgItem(handle(), IDC_TLS_OPTIONS));
+ PropPage::read(handle(), items);
privateKeyFile = attachChild<TextBox>(IDC_TLS_PRIVATE_KEY_FILE);
attachChild<Button>(IDC_BROWSE_PRIVATE_KEY)->onClicked(std::tr1::bind(&CertificatesPage::handleBrowsePrivateKeyClicked, this));
@@ -79,13 +79,17 @@
attachChild<Button>(IDC_BROWSE_TRUSTED_PATH)->onClicked(std::tr1::bind(&CertificatesPage::handleBrowseTrustedPathClicked, this));
attachChild<Button>(IDC_GENERATE_CERTS)->onClicked(std::tr1::bind(&CertificatesPage::handleGenerateCertsClicked, this));
+
+ attachChild(options, IDC_TLS_OPTIONS);
+ PropPage::read(listItems, options);
}
CertificatesPage::~CertificatesPage() {
}
void CertificatesPage::write() {
- PropPage::write(handle(), items, listItems, ::GetDlgItem(handle(), IDC_TLS_OPTIONS));
+ PropPage::write(handle(), items);
+ PropPage::write(listItems, options);
}
void CertificatesPage::handleBrowsePrivateKeyClicked() {
Modified: dcplusplus/trunk/win32/CertificatesPage.h
===================================================================
--- dcplusplus/trunk/win32/CertificatesPage.h 2008-04-24 13:08:55 UTC (rev 1180)
+++ dcplusplus/trunk/win32/CertificatesPage.h 2008-04-24 13:10:28 UTC (rev 1181)
@@ -37,6 +37,7 @@
TextBoxPtr privateKeyFile;
TextBoxPtr certificateFile;
TextBoxPtr trustedCertificatesPath;
+ TablePtr options;
void handleBrowsePrivateKeyClicked();
void handleBrowseCertificateClicked();
Modified: dcplusplus/trunk/win32/LogPage.cpp
===================================================================
--- dcplusplus/trunk/win32/LogPage.cpp 2008-04-24 13:08:55 UTC (rev 1180)
+++ dcplusplus/trunk/win32/LogPage.cpp 2008-04-24 13:10:28 UTC (rev 1181)
@@ -65,34 +65,37 @@
WinUtil::setHelpIds(this, helpItems);
PropPage::translate(handle(), texts);
- PropPage::read(handle(), items, listItems, ::GetDlgItem(handle(), IDC_LOG_OPTIONS));
+ PropPage::read(handle(), items);
+ attachChild(options, IDC_LOG_OPTIONS);
+ PropPage::read(listItems, options);
+
for(int i = 0; i < LogManager::LAST; ++i) {
TStringPair pair;
pair.first = Text::toT(LogManager::getInstance()->getSetting(i, LogManager::FILE));
pair.second = Text::toT(LogManager::getInstance()->getSetting(i, LogManager::FORMAT));
- options.push_back(pair);
+ logOptions.push_back(pair);
}
attachChild<TextBox>(IDC_LOG_DIRECTORY);
attachChild<Button>(IDC_BROWSE_LOG)->onClicked(std::tr1::bind(&LogPage::handleBrowseClicked, this));
- attachChild(logOptions, IDC_LOG_OPTIONS);
- logOptions->onSelectionChanged(std::tr1::bind(&LogPage::handleSelectionChanged, this));
-
logFormat = attachChild<TextBox>(IDC_LOG_FORMAT);
logFormat->setEnabled(false);
logFile = attachChild<TextBox>(IDC_LOG_FILE);
logFile->setEnabled(false);
+
+ options->onSelectionChanged(std::tr1::bind(&LogPage::handleSelectionChanged, this));
}
LogPage::~LogPage() {
}
void LogPage::write() {
- PropPage::write(handle(), items, listItems, ::GetDlgItem(handle(), IDC_LOG_OPTIONS));
+ PropPage::write(handle(), items);
+ PropPage::write(listItems, options);
const string& s = SETTING(LOG_DIRECTORY);
if(s.length() > 0 && s[s.length() - 1] != '\\') {
@@ -105,12 +108,12 @@
getValues();
for(int i = 0; i < LogManager::LAST; ++i) {
- string tmp = Text::fromT(options[i].first);
+ string tmp = Text::fromT(logOptions[i].first);
if(Util::stricmp(Util::getFileExt(tmp), ".log") != 0)
tmp += ".log";
LogManager::getInstance()->saveSetting(i, LogManager::FILE, tmp);
- LogManager::getInstance()->saveSetting(i, LogManager::FORMAT, Text::fromT(options[i].second));
+ LogManager::getInstance()->saveSetting(i, LogManager::FORMAT, Text::fromT(logOptions[i].second));
}
}
@@ -124,15 +127,15 @@
void LogPage::handleSelectionChanged() {
getValues();
- int sel = logOptions->getSelected();
+ int sel = options->getSelected();
if(sel >= 0 && sel < LogManager::LAST) {
- bool checkState = logOptions->isChecked(sel);
+ bool checkState = options->isChecked(sel);
logFormat->setEnabled(checkState);
logFile->setEnabled(checkState);
- logFile->setText(options[sel].first);
- logFormat->setText(options[sel].second);
+ logFile->setText(logOptions[sel].first);
+ logFormat->setText(logOptions[sel].second);
//save the old selection so we know where to save the values
oldSelection = sel;
@@ -147,7 +150,7 @@
void LogPage::getValues() {
if(oldSelection >= 0) {
- options[oldSelection].first = logFile->getText();
- options[oldSelection].second = logFormat->getText();
+ logOptions[oldSelection].first = logFile->getText();
+ logOptions[oldSelection].second = logFormat->getText();
}
}
Modified: dcplusplus/trunk/win32/LogPage.h
===================================================================
--- dcplusplus/trunk/win32/LogPage.h 2008-04-24 13:08:55 UTC (rev 1180)
+++ dcplusplus/trunk/win32/LogPage.h 2008-04-24 13:10:28 UTC (rev 1181)
@@ -35,7 +35,7 @@
static TextItem texts[];
static ListItem listItems[];
- TablePtr logOptions;
+ TablePtr options;
TextBoxPtr logFormat;
TextBoxPtr logFile;
@@ -44,7 +44,7 @@
//store all log options here so we can discard them
//if the user cancels the dialog.
//.first is filename and .second is format
- TStringPairList options;
+ TStringPairList logOptions;
void handleBrowseClicked();
void handleSelectionChanged();
Modified: dcplusplus/trunk/win32/PropPage.cpp
===================================================================
--- dcplusplus/trunk/win32/PropPage.cpp 2008-04-24 13:08:55 UTC (rev 1180)
+++ dcplusplus/trunk/win32/PropPage.cpp 2008-04-24 13:10:28 UTC (rev 1181)
@@ -31,13 +31,9 @@
PropPage::~PropPage() {
}
-void PropPage::read(HWND page, Item const* items, ListItem* listItems /* = NULL */, HWND list /* = 0 */)
-{
- dcassert(page != NULL);
-
+void PropPage::read(HWND page, const Item* items) {
+ dcassert(page && items);
SettingsManager* settings = SettingsManager::getInstance();
-
- bool const useDef = true;
for(Item const* i = items; i->type != T_END; i++)
{
switch(i->type)
@@ -45,56 +41,47 @@
case T_STR:
if(!settings->isDefault(i->setting)) {
::SetDlgItemText(page, i->itemID,
- Text::toT(settings->get((SettingsManager::StrSetting)i->setting, useDef)).c_str());
+ Text::toT(settings->get((SettingsManager::StrSetting)i->setting, true)).c_str());
}
break;
case T_INT:
if(!settings->isDefault(i->setting)) {
::SetDlgItemInt(page, i->itemID,
- settings->get((SettingsManager::IntSetting)i->setting, useDef), FALSE);
+ settings->get((SettingsManager::IntSetting)i->setting, true), FALSE);
}
break;
case T_BOOL:
- if(settings->getBool((SettingsManager::IntSetting)i->setting, useDef))
+ if(settings->getBool((SettingsManager::IntSetting)i->setting, true))
::CheckDlgButton(page, i->itemID, BST_CHECKED);
else
::CheckDlgButton(page, i->itemID, BST_UNCHECKED);
}
}
+}
- if(listItems != NULL) {
- initList(list);
-
- LVITEM lvi = { LVIF_TEXT };
- for(int i = 0; listItems[i].setting != 0; i++) {
- tstring str = T_(listItems[i].desc);
- lvi.iItem = i;
- lvi.pszText = const_cast<TCHAR*>(str.c_str());
- ListView_InsertItem(list, &lvi);
- ListView_SetCheckState(list, i, settings->getBool(SettingsManager::IntSetting(listItems[i].setting), true));
- }
-
- ListView_SetColumnWidth(list, 0, LVSCW_AUTOSIZE);
+void PropPage::read(const ListItem* listItems, TablePtr list) {
+ dcassert(listItems && list);
+ initList(list);
+ SettingsManager* settings = SettingsManager::getInstance();
+ for(size_t i = 0; listItems[i].setting != 0; ++i) {
+ TStringList row;
+ row.push_back(T_(listItems[i].desc));
+ list->setChecked(list->insert(row), settings->getBool(SettingsManager::IntSetting(listItems[i].setting), true));
}
+ list->setColumnWidth(0, LVSCW_AUTOSIZE);
}
-void PropPage::initList(HWND list) {
- ListView_SetExtendedListViewStyle(list, LVS_EX_LABELTIP | LVS_EX_CHECKBOXES | LVS_EX_FULLROWSELECT);
+void PropPage::initList(TablePtr list) {
+ list->setTableStyle(LVS_EX_LABELTIP | LVS_EX_CHECKBOXES | LVS_EX_FULLROWSELECT);
- RECT rc;
- ::GetClientRect(list, &rc);
- LVCOLUMN lv = { LVCF_FMT | LVCF_WIDTH };
- lv.fmt = LVCFMT_LEFT;
- lv.cx = rc.right - rc.left;
- ListView_InsertColumn(list, 0, &lv);
+ TStringList dummy;
+ dummy.push_back(Util::emptyStringT);
+ list->createColumns(dummy);
}
-void PropPage::write(HWND page, Item const* items, ListItem* listItems /* = NULL */, HWND list /* = NULL */)
-{
- dcassert(page != NULL);
-
+void PropPage::write(HWND page, const Item* items) {
+ dcassert(page && items);
SettingsManager* settings = SettingsManager::getInstance();
-
tstring buf;
for(Item const* i = items; i->type != T_END; i++)
{
@@ -124,10 +111,13 @@
}
}
}
+}
- if(listItems)
- for(size_t i = 0; listItems[i].setting != 0; ++i)
- settings->set(SettingsManager::IntSetting(listItems[i].setting), ListView_GetCheckState(list, i) > 0);
+void PropPage::write(const ListItem* listItems, TablePtr list) {
+ dcassert(listItems && list);
+ SettingsManager* settings = SettingsManager::getInstance();
+ for(size_t i = 0; listItems[i].setting != 0; ++i)
+ settings->set(SettingsManager::IntSetting(listItems[i].setting), list->isChecked(i));
}
void PropPage::translate(HWND page, TextItem* items) {
Modified: dcplusplus/trunk/win32/PropPage.h
===================================================================
--- dcplusplus/trunk/win32/PropPage.h 2008-04-24 13:08:55 UTC (rev 1180)
+++ dcplusplus/trunk/win32/PropPage.h 2008-04-24 13:10:28 UTC (rev 1181)
@@ -42,6 +42,7 @@
struct ListItem {
int setting;
const char* desc;
+ unsigned helpId;
};
struct TextItem {
@@ -50,9 +51,11 @@
};
protected:
- void read(HWND page, Item const* items, ListItem* listItems = NULL, HWND list = NULL);
- void initList(HWND list);
- void write(HWND page, Item const* items, ListItem* listItems = NULL, HWND list = NULL);
+ void read(HWND page, const Item* items);
+ void read(const ListItem* listItems, TablePtr list);
+ void initList(TablePtr list);
+ void write(HWND page, const Item* items);
+ void write(const ListItem* listItems, TablePtr list);
void translate(HWND page, TextItem* items);
};
Modified: dcplusplus/trunk/win32/QueuePage.cpp
===================================================================
--- dcplusplus/trunk/win32/QueuePage.cpp 2008-04-24 13:08:55 UTC (rev 1180)
+++ dcplusplus/trunk/win32/QueuePage.cpp 2008-04-24 13:10:28 UTC (rev 1181)
@@ -119,9 +119,11 @@
WinUtil::setHelpIds(this, helpItems);
PropPage::translate(handle(), texts);
- PropPage::read(handle(), items, 0, 0);
- PropPage::read(handle(), items, optionItems, ::GetDlgItem(handle(), IDC_OTHER_QUEUE_OPTIONS));
+ PropPage::read(handle(), items);
+ attachChild(otherOptions, IDC_OTHER_QUEUE_OPTIONS);
+ PropPage::read(optionItems, otherOptions);
+
attachChild<TextBox>(IDC_PRIO_HIGHEST_SIZE);
attachChild<TextBox>(IDC_PRIO_NORMAL_SIZE);
attachChild<TextBox>(IDC_PRIO_HIGH_SIZE);
@@ -138,8 +140,8 @@
}
void QueuePage::write() {
- PropPage::write(handle(), items, 0, 0);
- PropPage::write(handle(), items, optionItems, ::GetDlgItem(handle(), IDC_OTHER_QUEUE_OPTIONS));
+ PropPage::write(handle(), items);
+ PropPage::write(optionItems, otherOptions);
SettingsManager* settings = SettingsManager::getInstance();
if(SETTING(AUTODROP_INTERVAL) < 1)
Modified: dcplusplus/trunk/win32/QueuePage.h
===================================================================
--- dcplusplus/trunk/win32/QueuePage.h 2008-04-24 13:08:55 UTC (rev 1180)
+++ dcplusplus/trunk/win32/QueuePage.h 2008-04-24 13:10:28 UTC (rev 1181)
@@ -34,6 +34,8 @@
static Item items[];
static TextItem texts[];
static ListItem optionItems[];
+
+ TablePtr otherOptions;
};
#endif // !defined(DCPLUSPLUS_WIN32_QUEUE_PAGE_H)
Modified: dcplusplus/trunk/win32/TabsPage.cpp
===================================================================
--- dcplusplus/trunk/win32/TabsPage.cpp 2008-04-24 13:08:55 UTC (rev 1180)
+++ dcplusplus/trunk/win32/TabsPage.cpp 2008-04-24 13:10:28 UTC (rev 1181)
@@ -24,10 +24,6 @@
#include <dcpp/SettingsManager.h>
-PropPage::Item TabsPage::items[] = {
- { 0, 0, PropPage::T_END }
-};
-
PropPage::TextItem TabsPage::texts[] = {
{ IDC_SETTINGS_BOLD_CONTENTS, N_("Tab highlight on content change") },
{ 0, 0 }
@@ -50,12 +46,14 @@
setHelpId(IDH_TABSPAGE);
PropPage::translate(handle(), texts);
- PropPage::read(handle(), items, listItems,::GetDlgItem(handle(), IDC_BOLD_BOOLEANS));
+
+ attachChild(options, IDC_BOLD_BOOLEANS);
+ PropPage::read(listItems, options);
}
TabsPage::~TabsPage() {
}
void TabsPage::write() {
- PropPage::write(handle(), items, listItems,::GetDlgItem(handle(), IDC_BOLD_BOOLEANS));
+ PropPage::write(listItems, options);
}
Modified: dcplusplus/trunk/win32/TabsPage.h
===================================================================
--- dcplusplus/trunk/win32/TabsPage.h 2008-04-24 13:08:55 UTC (rev 1180)
+++ dcplusplus/trunk/win32/TabsPage.h 2008-04-24 13:10:28 UTC (rev 1181)
@@ -32,8 +32,9 @@
private:
static TextItem texts[];
- static Item items[];
static ListItem listItems[];
+
+ TablePtr options;
};
#endif // !defined(DCPLUSPLUS_WIN32_TABS_PAGE_H)
Modified: dcplusplus/trunk/win32/WindowsPage.cpp
===================================================================
--- dcplusplus/trunk/win32/WindowsPage.cpp 2008-04-24 13:08:55 UTC (rev 1180)
+++ dcplusplus/trunk/win32/WindowsPage.cpp 2008-04-24 13:10:28 UTC (rev 1181)
@@ -24,8 +24,6 @@
#include <dcpp/SettingsManager.h>
-PropPage::Item WindowsPage::items[] = { { 0, 0, PropPage::T_END } };
-
PropPage::TextItem WindowsPage::textItem[] = {
{ IDC_SETTINGS_AUTO_OPEN, N_("Auto-open at startup") },
{ IDC_SETTINGS_WINDOWS_OPTIONS, N_("Window options") },
@@ -33,7 +31,7 @@
{ 0, 0 }
};
-WindowsPage::ListItem WindowsPage::listItems[] = {
+WindowsPage::ListItem WindowsPage::autoOpenItems[] = {
{ SettingsManager::OPEN_SYSTEM_LOG, N_("System Log") },
{ SettingsManager::OPEN_FAVORITE_USERS, N_("Favorite Users") },
{ SettingsManager::OPEN_QUEUE, N_("Download Queue") },
@@ -74,16 +72,22 @@
setHelpId(IDH_WINDOWSPAGE);
PropPage::translate(handle(), textItem);
- PropPage::read(handle(), items, listItems, ::GetDlgItem(handle(), IDC_WINDOWS_STARTUP));
- PropPage::read(handle(), items, optionItems, ::GetDlgItem(handle(), IDC_WINDOWS_OPTIONS));
- PropPage::read(handle(), items, confirmItems, ::GetDlgItem(handle(), IDC_CONFIRM_OPTIONS));
+
+ attachChild(autoOpen, IDC_WINDOWS_STARTUP);
+ PropPage::read(autoOpenItems, autoOpen);
+
+ attachChild(options, IDC_WINDOWS_OPTIONS);
+ PropPage::read(optionItems, options);
+
+ attachChild(confirm, IDC_CONFIRM_OPTIONS);
+ PropPage::read(confirmItems, confirm);
}
WindowsPage::~WindowsPage() {
}
void WindowsPage::write() {
- PropPage::write(handle(), items, listItems, ::GetDlgItem(handle(), IDC_WINDOWS_STARTUP));
- PropPage::write(handle(), items, optionItems, ::GetDlgItem(handle(), IDC_WINDOWS_OPTIONS));
- PropPage::write(handle(), items, confirmItems, ::GetDlgItem(handle(), IDC_CONFIRM_OPTIONS));
+ PropPage::write(autoOpenItems, autoOpen);
+ PropPage::write(optionItems, options);
+ PropPage::write(confirmItems, confirm);
}
Modified: dcplusplus/trunk/win32/WindowsPage.h
===================================================================
--- dcplusplus/trunk/win32/WindowsPage.h 2008-04-24 13:08:55 UTC (rev 1180)
+++ dcplusplus/trunk/win32/WindowsPage.h 2008-04-24 13:10:28 UTC (rev 1181)
@@ -32,10 +32,13 @@
private:
static TextItem textItem[];
- static Item items[];
- static ListItem listItems[];
+ static ListItem autoOpenItems[];
static ListItem optionItems[];
static ListItem confirmItems[];
+
+ TablePtr autoOpen;
+ TablePtr options;
+ TablePtr confirm;
};
#endif // !defined(DCPLUSPLUS_WIN32_WINDOWS_PAGE_H)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
