Menu
▾
▴
dcplusplus-commit
|
From: <arn...@us...> - 2008-04-14 20:35:56
|
Revision: 1159
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1159&view=rev
Author: arnetheduck
Date: 2008-04-14 13:35:32 -0700 (Mon, 14 Apr 2008)
Log Message:
-----------
Typo fix
Modified Paths:
--------------
dcplusplus/trunk/dcpp/QueueItem.cpp
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-11 22:17:18.397000074 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
+ timestamp: 2008-04-11 22:40:47.565000057 +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
+ 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
Modified: dcplusplus/trunk/dcpp/QueueItem.cpp
===================================================================
--- dcplusplus/trunk/dcpp/QueueItem.cpp 2008-04-14 20:34:37 UTC (rev 1158)
+++ dcplusplus/trunk/dcpp/QueueItem.cpp 2008-04-14 20:35:32 UTC (rev 1159)
@@ -104,7 +104,7 @@
} else if(msecs > SEGMENT_TIME * 4) {
targetSize = std::max(blockSize, targetSize / 2);
} else if(msecs > SEGMENT_TIME * 1.25) {
- targetSize = std::max(blocksSize, targetSize - blockSize);
+ targetSize = std::max(blockSize, targetSize - blockSize);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2008-04-14 20:38:28
|
Revision: 1160
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1160&view=rev
Author: arnetheduck
Date: 2008-04-14 13:38:17 -0700 (Mon, 14 Apr 2008)
Log Message:
-----------
Rename widgetmenu
Modified Paths:
--------------
dcplusplus/trunk/dwt/include/dwt/WidgetFactoryPlatformSmartWinDesktop.h
dcplusplus/trunk/dwt/include/dwt/doxygen.h
dcplusplus/trunk/dwt/include/dwt/forward.h
dcplusplus/trunk/win32/ADLSearchFrame.cpp
dcplusplus/trunk/win32/DirectoryListingFrame.cpp
dcplusplus/trunk/win32/DirectoryListingFrame.h
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/MainWindow.h
dcplusplus/trunk/win32/PrivateFrame.cpp
dcplusplus/trunk/win32/PublicHubsFrame.cpp
dcplusplus/trunk/win32/QueueFrame.cpp
dcplusplus/trunk/win32/QueueFrame.h
dcplusplus/trunk/win32/SearchFrame.cpp
dcplusplus/trunk/win32/SearchFrame.h
dcplusplus/trunk/win32/ShellContextMenu.cpp
dcplusplus/trunk/win32/ShellContextMenu.h
dcplusplus/trunk/win32/SpyFrame.cpp
dcplusplus/trunk/win32/TextBox.cpp
dcplusplus/trunk/win32/TextBox.h
dcplusplus/trunk/win32/TransferView.cpp
dcplusplus/trunk/win32/TransferView.h
dcplusplus/trunk/win32/UsersFrame.cpp
dcplusplus/trunk/win32/WaitingUsersFrame.cpp
dcplusplus/trunk/win32/WinUtil.cpp
dcplusplus/trunk/win32/WinUtil.h
Added Paths:
-----------
dcplusplus/trunk/dwt/include/dwt/widgets/Menu.h
dcplusplus/trunk/dwt/src/widgets/Menu.cpp
Removed Paths:
-------------
dcplusplus/trunk/dwt/include/dwt/widgets/WidgetMenu.h
dcplusplus/trunk/dwt/src/widgets/WidgetMenu.cpp
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-11 22:40:47.565000057 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
+ timestamp: 2008-04-11 22:54:45.322000027 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
Name: bzr:file-ids
-
+ dwt/include/dwt/widgets/Menu.h 1003@f586c4b0-9d0d-0410-bc51-f1fe239209fc:dcplusplus%2Ftrunk:smartwin%2Finclude%2Fsmartwin%2Fwidgets%2FWidgetMenu.h
dwt/src/widgets/Menu.cpp 1003@f586c4b0-9d0d-0410-bc51-f1fe239209fc:dcplusplus%2Ftrunk:smartwin%2Fsource%2Fwidgets%2FWidgetMenu.cpp
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
+ 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
Modified: dcplusplus/trunk/dwt/include/dwt/WidgetFactoryPlatformSmartWinDesktop.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/WidgetFactoryPlatformSmartWinDesktop.h 2008-04-14 20:35:32 UTC (rev 1159)
+++ dcplusplus/trunk/dwt/include/dwt/WidgetFactoryPlatformSmartWinDesktop.h 2008-04-14 20:38:17 UTC (rev 1160)
@@ -39,7 +39,7 @@
#include "WidgetFactoryPlatformCommon.h"
#include "widgets/FontDialog.h"
-#include "widgets/WidgetMenu.h"
+#include "widgets/Menu.h"
#include "WidgetCreator.h"
namespace dwt {
@@ -54,10 +54,10 @@
{
public:
/// Menu class type.
- typedef dwt::WidgetMenu WidgetMenu;
+ typedef dwt::Menu Menu;
/// Menu object type.
- typedef typename WidgetMenu::ObjectType WidgetMenuPtr;
+ typedef typename Menu::ObjectType MenuPtr;
/// ChooseFont class and object type.
typedef dwt::FontDialog FontDialog;
@@ -78,18 +78,18 @@
}
/// Creates a Menu
- /** The returned object is of type std::tr1::shared_ptr< WidgetMenu >, but
- * you should use the typedef WidgetMenuPtr and not <br>
+ /** 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.
*/
- WidgetMenuPtr createMenu(const typename WidgetMenu::Seed& cs = WidgetMenu::Seed())
+ MenuPtr createMenu(const typename Menu::Seed& cs = Menu::Seed())
{
- return WidgetCreator< WidgetMenu >::create( this, cs );
+ return WidgetCreator< Menu >::create( this, cs );
}
- WidgetMenuPtr attachMenu(HMENU hMenu, const typename WidgetMenu::Seed& cs = WidgetMenu::Seed())
+ MenuPtr attachMenu(HMENU hMenu, const typename Menu::Seed& cs = Menu::Seed())
{
- return WidgetCreator< WidgetMenu >::attach( this, cs, hMenu );
+ return WidgetCreator< Menu >::attach( this, cs, hMenu );
}
};
Modified: dcplusplus/trunk/dwt/include/dwt/doxygen.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/doxygen.h 2008-04-14 20:35:32 UTC (rev 1159)
+++ dcplusplus/trunk/dwt/include/dwt/doxygen.h 2008-04-14 20:38:17 UTC (rev 1160)
@@ -100,7 +100,7 @@
* \EventHandlerGenericInfo
*/
-/** \defgroup EventHandlersWidgetMenu Event Handlers for WidgetMenu
+/** \defgroup EventHandlersMenu Event Handlers for Menu
* \EventHandlerGenericInfo
*/
Modified: dcplusplus/trunk/dwt/include/dwt/forward.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/forward.h 2008-04-14 20:35:32 UTC (rev 1159)
+++ dcplusplus/trunk/dwt/include/dwt/forward.h 2008-04-14 20:38:17 UTC (rev 1160)
@@ -32,6 +32,10 @@
#ifndef DWT_FORWARD_H_
#define DWT_FORWARD_H_
+namespace std { namespace tr1 {
+template<class T> class shared_ptr;
+} }
+
namespace dwt {
template< class WidgetType >
@@ -61,6 +65,9 @@
class Label;
typedef Label* LabelPtr;
+class Menu;
+typedef std::tr1::shared_ptr<Menu> MenuPtr;
+
class MDIChild;
typedef MDIChild* MDIChildPtr;
Copied: dcplusplus/trunk/dwt/include/dwt/widgets/Menu.h (from rev 1159, dcplusplus/trunk/dwt/include/dwt/widgets/WidgetMenu.h)
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/Menu.h (rev 0)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/Menu.h 2008-04-14 20:38:17 UTC (rev 1160)
@@ -0,0 +1,518 @@
+/*
+ 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 WINCE
+#ifndef DWT_Menu_h
+#define DWT_Menu_h
+
+#include "../resources/Bitmap.h"
+#include "../resources/Font.h"
+#include "../Dispatchers.h"
+#include "../CanvasClasses.h"
+
+#include <memory>
+#include <vector>
+#include <map>
+
+namespace dwt {
+
+/// Contains information about menu item
+struct MenuItemData
+{
+ /// Menu item text color
+ COLORREF TextColor;
+
+ /// Menu item image
+ BitmapPtr Image;
+
+ /// Creates new menu item with specified data
+ MenuItemData(
+ BitmapPtr image = BitmapPtr( new Bitmap( ( HBITMAP ) NULL ) ), // defaults to empty bitmap
+ COLORREF textColor = ::GetSysColor( COLOR_MENUTEXT ) )
+ : TextColor( textColor ),
+ Image( image )
+ {}
+};
+
+/// \ingroup GlobalStuff
+// MenuItemDataPtr type, contains rendering data for e.g. Menu
+/** Helps easily create color values and so on for a Menu item! <br>
+* Each Menu Item can have different colors and so on, use this smart pointer to set
+* those values!
+*/
+typedef std::tr1::shared_ptr< MenuItemData > MenuItemDataPtr;
+
+/// Struct for coloring different areas of Menu
+/** Contains the different color settings of the Menu <br>
+* Default values to constructor makes menu look roughly like MSVC++7.1 menus
+*/
+struct MenuColorInfo
+{
+ /// Menu color
+ COLORREF colorMenu;
+
+ /// Strip bar color
+ COLORREF colorStrip;
+
+ /// Highlighted menu item color
+ COLORREF colorHighlight;
+
+ /// Text of highlighted menu item color
+ COLORREF colorHighlightText;
+
+ /// Title text color
+ COLORREF colorTitleText;
+
+ /// Item image background color, used for transparency effects
+ COLORREF colorImageBackground;
+
+ /// Constructs MenuColorInfo objects
+ /** If all the default arguments are used it will construct an object making
+ * menus look roughly like they do in MSVC++ 7.1 <br>
+ * Pass your own arguments to construct other color effects
+ */
+ MenuColorInfo( COLORREF menuColor = ColorUtilities::darkenColor( ::GetSysColor( COLOR_WINDOW ), 0.02 ),
+ COLORREF stripColor = ColorUtilities::darkenColor( ::GetSysColor( COLOR_3DFACE ), 0.02 ),
+ COLORREF highlightColor = ::GetSysColor( COLOR_HIGHLIGHT ),
+ COLORREF highlightTextColor = ::GetSysColor( COLOR_HIGHLIGHTTEXT ),
+ COLORREF titleTextColor = ::GetSysColor( COLOR_MENUTEXT ),
+ COLORREF imageBackground = RGB( 0, 0, 0 ) ) // black
+ : colorMenu( menuColor ),
+ colorStrip( stripColor ),
+ colorHighlight( highlightColor ),
+ colorHighlightText( highlightTextColor ),
+ colorTitleText( titleTextColor ),
+ colorImageBackground( imageBackground )
+ {}
+};
+
+/// Menu class
+/** \ingroup WidgetControls
+* \WidgetUsageInfo
+* \image html menu.png
+* Class for creating a Menu Control which then can be attached to e.g. a
+* Window. <br>
+* Note for Desktop version only! <br>
+*/
+class Menu : public boost::noncopyable
+{
+ // friends
+ friend class WidgetCreator< Menu >;
+
+public:
+ /// Type of object
+ typedef Menu ThisType;
+
+ /// Object type
+ typedef std::tr1::shared_ptr<Menu> ObjectType;
+
+ struct Seed {
+ Seed(bool ownerDrawn_ = true, const MenuColorInfo& colorInfo_ = MenuColorInfo(), FontPtr font_ = 0);
+ bool popup;
+ bool ownerDrawn;
+ MenuColorInfo colorInfo;
+ FontPtr font;
+ };
+
+ struct IdDispatcher
+ {
+ typedef std::tr1::function<void (unsigned)> F;
+
+ IdDispatcher(const F& f_) : f(f_) { }
+
+ bool operator()(const MSG& msg, LRESULT& ret) {
+ f(LOWORD(msg.wParam));
+ return true;
+ }
+
+ F f;
+ };
+
+ typedef Dispatchers::VoidVoid<> SimpleDispatcher;
+
+ struct DrawItemDispatcher {
+ typedef std::tr1::function<bool (int, LPDRAWITEMSTRUCT)> F;
+
+ DrawItemDispatcher(const F& f_) : f(f_) { }
+
+ bool operator()(const MSG& msg, LRESULT& ret) {
+ return f(msg.wParam, reinterpret_cast<LPDRAWITEMSTRUCT>(msg.lParam));
+ }
+
+ F f;
+ };
+
+ struct MeasureItemDispatcher {
+ typedef std::tr1::function<bool (LPMEASUREITEMSTRUCT)> F;
+
+ MeasureItemDispatcher(const F& f_) : f(f_) { }
+
+ bool operator()(const MSG& msg, LRESULT& ret) {
+ return f(reinterpret_cast<LPMEASUREITEMSTRUCT>(msg.lParam));
+ }
+
+ F f;
+ };
+
+ /// Rendering settting settings
+ static const int borderGap; /// Gap between the border and item
+ static const int pointerGap; /// Gap between item text and sub - menu pointer
+ static const int textIconGap; /// Gap between text and icon
+ static const int textBorderGap; /// Gap between text and rectangel border
+ static const int separatorHeight; /// Defines default height for rectangle containing separator
+ static const int minSysMenuItemWidth; /// Minimum width for system menu items
+ static Point defaultImageSize; /// Default image size, used when no image is available
+
+ HMENU handle() const {
+ return itsHandle;
+ }
+
+ Widget* getParent() const {
+ return itsParent;
+ }
+
+ /// Actually creates the menu
+ /** Creates the menu, the menu will be created initially empty!
+ */
+ void create(const Seed& cs);
+
+ void attach(HMENU hMenu, const Seed& cs);
+
+ void setMenu();
+
+ /// Appends a popup to the menu
+ /** Everything you "append" to a menu is added sequentially to the menu <br>
+ * This specific "append" function appends a "popup" menu which is a menu
+ * containing other menus. <br>
+ * With other words a menu which is not an "option" but rather a new "subgroup".
+ * <br>
+ * The "File" menu of most application is for instance a "popup" menu while the
+ * File/Print is often NOT a popup. <br>
+ * To append items to the popup created call one of the appendItem overloaded
+ * functions on the returned value of this function. <br>
+ * Also, although references to all menu objects must be kept ( since they're
+ * not collected automatically like other Widgets ) <br>
+ * you don't have to keep a reference to the return value of this function since
+ * it's being added as a reference to the children list of the "this" object.
+ * <br>
+ * A popup is basically another branch in the menu hierarchy <br>
+ * See the Menu project for a demonstration.
+ */
+ ObjectType appendPopup( const tstring & text, MenuItemDataPtr itemData = MenuItemDataPtr(new MenuItemData()) );
+
+ /// Returns the "System Menu"
+ /** The system menu is a special menu that ( normally ) is accessed by pressing
+ * the "window icon" at the top left of the window. <br>
+ * In SmartWin++ this menu can ALSO be easily manipulated and added items to
+ * etc... <br>
+ * Also, although references to all menu objects must be kept ( since they're
+ * not collected automatically like other Widgets ) <br>
+ * you don't have to keep a reference to the return value of this function since
+ * it's being added as a reference to the children list <br>
+ * of the "this" object. <br>
+ * See the Menu sample project for a demonstration.
+ */
+ ObjectType getSystemMenu();
+
+ /// Setting event handler for Draw Item Event
+ /** The Draw Item Event will be raised when the menu needs to draw itself, if you
+ * wish to truly be creative and be 100% in control you must handle this Event
+ * and do the actualy drawing of the Menu yourself, but for most people it will
+ * be enough to just manipulate the background colors etc of the MenuItemData
+ * given to the menu in the appendItem function <br>
+ * Note! <br>
+ * If this event is handled you also MUST handle the Measure Item Event!!
+ */
+ bool handleDrawItem(int id, LPDRAWITEMSTRUCT drawInfo);
+
+ /// Setting event handler for Measure Item Event
+ /** The Measure Item Event is nessecary to handle if you want to draw the menu
+ * yourself since it is inside this Event Handler you're telling the system how
+ * much space you need to actually do the drawing <br>
+ * Note! <br>
+ * If this event is handled you also MUST handle the Draw Item Event!!
+ */
+ bool handleMeasureItem(LPMEASUREITEMSTRUCT measureInfo);
+
+ /// Appends a separator item to the menu
+ /** A menu separator is basically just "air" between menu items.< br >
+ * A separator cannot be "clicked" or "chosen".
+ */
+ void appendSeparatorItem();
+
+ /// Appends a Menu Item
+ /** eventHandler is the function that will receive the "click" event from the
+ * menu item. <br>
+ * Event handler's signature must be "void foo( ObjectType, unsigned
+ * int )" and it must be contained as a member <br>
+ * of the class that is defined as the Widget, normally either the
+ * Window derived class or the class derived from Menu. <br>
+ * See e.g. Menu for an example. <br>
+ * The reason to why we have this "id" is because the same event handler can be
+ * defined for several menu items even in fact across menu objects, therefore
+ * this number should be unique across the application.
+ */
+ void appendItem(unsigned int id, const tstring & text, MenuItemDataPtr itemData = MenuItemDataPtr(new MenuItemData()));
+
+ template<typename DispatcherType>
+ void appendItem(unsigned int id, const tstring & text, const typename DispatcherType::F& f, MenuItemDataPtr itemData = MenuItemDataPtr(new MenuItemData())) {
+ appendItem(id, text, itemData);
+ callbacks.insert(std::make_pair(id, DispatcherType(f)));
+ }
+
+ void appendItem(unsigned int id, const tstring & text, const IdDispatcher::F& f, MenuItemDataPtr itemData = MenuItemDataPtr(new MenuItemData())) {
+ appendItem<IdDispatcher>(id, text, f, itemData);
+ }
+
+ void appendItem(unsigned int id, const tstring & text, BitmapPtr image);
+
+ template<typename DispatcherType>
+ void appendItem(unsigned int id, const tstring & text, const typename DispatcherType::F& f, BitmapPtr image) {
+ MenuItemDataPtr itemData(new MenuItemData());
+ if(ownerDrawn)
+ itemData->Image = image;
+ appendItem<DispatcherType>(id, text, f, itemData);
+ }
+
+ void appendItem(unsigned int id, const tstring & text, const IdDispatcher::F& f, BitmapPtr image) {
+ appendItem<IdDispatcher>(id, text, f, image);
+ }
+
+ /// Removes specified item from this menu
+ /** Call this function to actually DELETE a menu item from the menu hierarchy.
+ * Note that you have to specify the item position; and whenever you remove an item,
+ * all subsequent items change positions. To remove a range of items, remove from
+ * end to start.
+ */
+ void removeItem( unsigned itemIndex );
+
+ /// Remove all items from the menu
+ /** Will also delete any submenus.
+ */
+ void removeAllItems();
+
+ /// Return the number of items in the menu
+ int getCount() const;
+
+ /// Displays and handles a menu which can appear anywhere in the window.
+ /** Typically called by a Right Mouse click. If both the x and the y coordinate
+ * is - 1 ( default ) it'll show the context menu on the position the mouse was
+ * at when the system last recieved a message, basically the "right" place...
+ * <br>
+ * Depending on the flags it might return the id of the menu item selected, or 0
+ * if none was chosen. Flags with TPM_RETURNCMD will return the menu - item, but
+ * not do the menu command.
+ * < ul >
+ * < li >TPM_CENTERALIGN : Centers the shortcut menu horizontally relative to the coordinate specified by the x parameter< /li >
+ * < li >TPM_LEFTALIGN : Function positions the shortcut menu so that its left side is aligned with the coordinate specified by the x parameter< /li >
+ * < li >TPM_RIGHTALIGN : Opposite of LEFTALIGN< /li >
+ * < li >TPM_BOTTOMALIGN : Aligns menu bottoms to the coordinate specified by the y parameter< /li >
+ * < li >TPM_TOPALIGN : Opposite of BOTTOMALIGN< /li >
+ * < li >TPM_VCENTERALIGN : Centers vertically relative to the y parameter< /li >
+ * < li >TPM_NONOTIFY : Restricts the menu from sending notifications when user clicks item< /li >
+ * < li >TPM_RETURNCMD : returns the menu item identifier of the user's selection in the return value but DOES NOT carry out the event handler< /li >
+ * < li >TPM_LEFTBUTTON : Restricts users to selecting menu items with only left mouse button< /li >
+ * < li >TPM_RIGHTBUTTON : User can choose menu item with both mouse buttons< /li >
+ * < /ul >
+ * None of the following are used by default but can be manually chosen if you
+ * manually call SystemParametersInfo
+ * < ul >
+ * < li >TPM_HORNEGANIMATION : Animates the menu from right to left< /li >
+ * < li >TPM_HORPOSANIMATION : Animates the menu from left to right< /li >
+ * < li >TPM_NOANIMATION : Displays menu without animation< /li >
+ * < li >TPM_VERNEGANIMATION : Animates the menu from bottom to top< /li >
+ * < li >TPM_VERPOSANIMATION : Animates the menu from top to bottom< /li >
+ * < /ul >
+ */
+ unsigned trackPopupMenu( const ScreenCoordinate& sc, unsigned flags = 0 );
+
+ /// Sets menu title
+ /** A Menu can have a title, this function sets that title
+ */
+ void setTitle( const tstring & title, bool drawSidebar = false );
+
+ /// Sets title font
+ /** Create a font through e.g. createFont in WidgetFactory or similar and set the
+ * title font to the menu title through using this function
+ */
+ void setTitleFont( FontPtr font );
+
+ /// Removes menu title
+ /** If clearSidebar is true, sidebar is removed
+ */
+ void clearTitle( bool clearSidebar = false );
+
+ /// Checks (or uncheck) a specific menu item
+ /** Which menu item you wish to check ( or uncheck ) is passed in as the "id"
+ * parameter. <br>
+ * If the "value" parameter is true the item will be checked, otherwise it will
+ * be unchecked
+ */
+ void checkItem( unsigned id, bool value = true );
+
+ /// Enables (or disables) a specific menu item
+ /** Which menu item you wish to enable ( or disable ) is passed in as the "id"
+ * parameter. <br>
+ * If the "value" parameter is true the item becomes enabled, otherwise disabled
+ */
+ void setItemEnabled( unsigned id, bool byPosition = false, bool value = true );
+
+ UINT getMenuState(UINT id, bool byPosition = false);
+
+ /// Return true if the item is a separator (by position)
+ bool isSeparator(UINT id, bool byPosition = false);
+ /// Return true if the menu item is checked
+ bool isChecked(UINT id, bool byPosition = false);
+ /// Return true if the menu item is a popup menu
+ bool isPopup(UINT id, bool byPosition = false);
+ /// 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);
+
+ /// Returns true if menu is "system menu" (icon in top left of window)
+ bool isSystemMenu()
+ {
+ return isSysMenu;
+ }
+
+ /// Returns the text of a specific menu item
+ /** Which menu item you wish to retrieve the text for is defined by the "id"
+ * parameter of the function.
+ */
+ tstring getText( unsigned idOrPos, bool byPos );
+
+ /// Sets the text of a specific menu item
+ /** 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 );
+
+ /// Returns item data
+ MenuItemDataPtr getData( int itemIndex );
+
+ ObjectType getChild(UINT position);
+
+ virtual ~Menu();
+
+private:
+ /// Constructor Taking pointer to parent
+ explicit Menu( dwt::Widget * parent );
+
+ // ////////////////////////////////////////////////////////////////////////
+ // Menu item data wrapper, used internally
+ // MENUITEMINFO's dwItemData *should* point to it
+ // ////////////////////////////////////////////////////////////////////////
+ struct ItemDataWrapper
+ {
+ // The menu item belongs to
+ // For some messages (e.g. WM_MEASUREITEM),
+ // Windows doesn't specify it, so
+ // we need to keep this
+ const Menu* menu;
+
+ // Item index in the menu
+ // This is needed, because ID's for items
+ // are not unique (although Windows claims)
+ // e.g. we can have an item with ID 0,
+ // that is either separator or popup menu
+ int index;
+
+ // Specifies if item is menu title
+ bool isMenuTitleItem;
+
+ // Contains item data
+ MenuItemDataPtr data;
+
+ // Wrapper Constructor
+ ItemDataWrapper( const Menu* menu_, int itemIndex, MenuItemDataPtr itemData, bool isTitleItem = false )
+ : menu( menu_ )
+ , index( itemIndex )
+ , isMenuTitleItem( isTitleItem )
+ , data( itemData )
+ {}
+
+ ~ItemDataWrapper()
+ {}
+ };
+
+ // This is used during menu destruction
+ static void destroyItemDataWrapper( ItemDataWrapper * wrapper );
+
+ // True is menu is "system menu" (icon in top left of window)
+ bool isSysMenu;
+
+ // its sub menus
+ std::vector< ObjectType > itsChildren;
+
+ // its item data
+ std::vector < ItemDataWrapper * > itsItemData;
+
+ HMENU itsHandle;
+
+ Widget* itsParent;
+
+ bool ownerDrawn;
+
+ // Contains information about menu colors
+ MenuColorInfo itsColorInfo;
+
+ FontPtr font;
+
+ // Menu title
+ tstring itsTitle;
+
+ // Menu title font
+ FontPtr itsTitleFont;
+
+ // if true title is drawn as sidebar
+ bool drawSidebar;
+
+ typedef std::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 );
+};
+
+}
+
+#endif
+#endif
Deleted: dcplusplus/trunk/dwt/include/dwt/widgets/WidgetMenu.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/WidgetMenu.h 2008-04-14 20:35:32 UTC (rev 1159)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/WidgetMenu.h 2008-04-14 20:38:17 UTC (rev 1160)
@@ -1,517 +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 WINCE
-#ifndef DWT_WidgetMenu_h
-#define DWT_WidgetMenu_h
-
-#include "../resources/Bitmap.h"
-#include "../resources/Font.h"
-#include "../Dispatchers.h"
-#include "../CanvasClasses.h"
-
-#include <vector>
-#include <map>
-
-namespace dwt {
-
-/// Contains information about menu item
-struct MenuItemData
-{
- /// Menu item text color
- COLORREF TextColor;
-
- /// Menu item image
- BitmapPtr Image;
-
- /// Creates new menu item with specified data
- MenuItemData(
- BitmapPtr image = BitmapPtr( new Bitmap( ( HBITMAP ) NULL ) ), // defaults to empty bitmap
- COLORREF textColor = ::GetSysColor( COLOR_MENUTEXT ) )
- : TextColor( textColor ),
- Image( image )
- {}
-};
-
-/// \ingroup GlobalStuff
-// MenuItemDataPtr type, contains rendering data for e.g. WidgetMenu
-/** Helps easily create color values and so on for a WidgetMenu item! <br>
-* Each Menu Item can have different colors and so on, use this smart pointer to set
-* those values!
-*/
-typedef std::tr1::shared_ptr< MenuItemData > MenuItemDataPtr;
-
-/// Struct for coloring different areas of WidgetMenu
-/** Contains the different color settings of the WidgetMenu <br>
-* Default values to constructor makes menu look roughly like MSVC++7.1 menus
-*/
-struct MenuColorInfo
-{
- /// Menu color
- COLORREF colorMenu;
-
- /// Strip bar color
- COLORREF colorStrip;
-
- /// Highlighted menu item color
- COLORREF colorHighlight;
-
- /// Text of highlighted menu item color
- COLORREF colorHighlightText;
-
- /// Title text color
- COLORREF colorTitleText;
-
- /// Item image background color, used for transparency effects
- COLORREF colorImageBackground;
-
- /// Constructs MenuColorInfo objects
- /** If all the default arguments are used it will construct an object making
- * menus look roughly like they do in MSVC++ 7.1 <br>
- * Pass your own arguments to construct other color effects
- */
- MenuColorInfo( COLORREF menuColor = ColorUtilities::darkenColor( ::GetSysColor( COLOR_WINDOW ), 0.02 ),
- COLORREF stripColor = ColorUtilities::darkenColor( ::GetSysColor( COLOR_3DFACE ), 0.02 ),
- COLORREF highlightColor = ::GetSysColor( COLOR_HIGHLIGHT ),
- COLORREF highlightTextColor = ::GetSysColor( COLOR_HIGHLIGHTTEXT ),
- COLORREF titleTextColor = ::GetSysColor( COLOR_MENUTEXT ),
- COLORREF imageBackground = RGB( 0, 0, 0 ) ) // black
- : colorMenu( menuColor ),
- colorStrip( stripColor ),
- colorHighlight( highlightColor ),
- colorHighlightText( highlightTextColor ),
- colorTitleText( titleTextColor ),
- colorImageBackground( imageBackground )
- {}
-};
-
-/// Menu class
-/** \ingroup WidgetControls
-* \WidgetUsageInfo
-* \image html menu.png
-* Class for creating a Menu Control which then can be attached to e.g. a
-* Window. <br>
-* Note for Desktop version only! <br>
-*/
-class WidgetMenu : public boost::noncopyable
-{
- // friends
- friend class WidgetCreator< WidgetMenu >;
-
-public:
- /// Type of object
- typedef WidgetMenu ThisType;
-
- /// Object type
- typedef std::tr1::shared_ptr<WidgetMenu> ObjectType;
-
- struct Seed {
- Seed(bool ownerDrawn_ = true, const MenuColorInfo& colorInfo_ = MenuColorInfo(), FontPtr font_ = 0);
- bool popup;
- bool ownerDrawn;
- MenuColorInfo colorInfo;
- FontPtr font;
- };
-
- struct IdDispatcher
- {
- typedef std::tr1::function<void (unsigned)> F;
-
- IdDispatcher(const F& f_) : f(f_) { }
-
- bool operator()(const MSG& msg, LRESULT& ret) {
- f(LOWORD(msg.wParam));
- return true;
- }
-
- F f;
- };
-
- typedef Dispatchers::VoidVoid<> SimpleDispatcher;
-
- struct DrawItemDispatcher {
- typedef std::tr1::function<bool (int, LPDRAWITEMSTRUCT)> F;
-
- DrawItemDispatcher(const F& f_) : f(f_) { }
-
- bool operator()(const MSG& msg, LRESULT& ret) {
- return f(msg.wParam, reinterpret_cast<LPDRAWITEMSTRUCT>(msg.lParam));
- }
-
- F f;
- };
-
- struct MeasureItemDispatcher {
- typedef std::tr1::function<bool (LPMEASUREITEMSTRUCT)> F;
-
- MeasureItemDispatcher(const F& f_) : f(f_) { }
-
- bool operator()(const MSG& msg, LRESULT& ret) {
- return f(reinterpret_cast<LPMEASUREITEMSTRUCT>(msg.lParam));
- }
-
- F f;
- };
-
- /// Rendering settting settings
- static const int borderGap; /// Gap between the border and item
- static const int pointerGap; /// Gap between item text and sub - menu pointer
- static const int textIconGap; /// Gap between text and icon
- static const int textBorderGap; /// Gap between text and rectangel border
- static const int separatorHeight; /// Defines default height for rectangle containing separator
- static const int minSysMenuItemWidth; /// Minimum width for system menu items
- static Point defaultImageSize; /// Default image size, used when no image is available
-
- HMENU handle() const {
- return itsHandle;
- }
-
- Widget* getParent() const {
- return itsParent;
- }
-
- /// Actually creates the menu
- /** Creates the menu, the menu will be created initially empty!
- */
- void create(const Seed& cs);
-
- void attach(HMENU hMenu, const Seed& cs);
-
- void setMenu();
-
- /// Appends a popup to the menu
- /** Everything you "append" to a menu is added sequentially to the menu <br>
- * This specific "append" function appends a "popup" menu which is a menu
- * containing other menus. <br>
- * With other words a menu which is not an "option" but rather a new "subgroup".
- * <br>
- * The "File" menu of most application is for instance a "popup" menu while the
- * File/Print is often NOT a popup. <br>
- * To append items to the popup created call one of the appendItem overloaded
- * functions on the returned value of this function. <br>
- * Also, although references to all menu objects must be kept ( since they're
- * not collected automatically like other Widgets ) <br>
- * you don't have to keep a reference to the return value of this function since
- * it's being added as a reference to the children list of the "this" object.
- * <br>
- * A popup is basically another branch in the menu hierarchy <br>
- * See the WidgetMenu project for a demonstration.
- */
- ObjectType appendPopup( const tstring & text, MenuItemDataPtr itemData = MenuItemDataPtr(new MenuItemData()) );
-
- /// Returns the "System Menu"
- /** The system menu is a special menu that ( normally ) is accessed by pressing
- * the "window icon" at the top left of the window. <br>
- * In SmartWin++ this menu can ALSO be easily manipulated and added items to
- * etc... <br>
- * Also, although references to all menu objects must be kept ( since they're
- * not collected automatically like other Widgets ) <br>
- * you don't have to keep a reference to the return value of this function since
- * it's being added as a reference to the children list <br>
- * of the "this" object. <br>
- * See the WidgetMenu sample project for a demonstration.
- */
- ObjectType getSystemMenu();
-
- /// Setting event handler for Draw Item Event
- /** The Draw Item Event will be raised when the menu needs to draw itself, if you
- * wish to truly be creative and be 100% in control you must handle this Event
- * and do the actualy drawing of the Menu yourself, but for most people it will
- * be enough to just manipulate the background colors etc of the MenuItemData
- * given to the menu in the appendItem function <br>
- * Note! <br>
- * If this event is handled you also MUST handle the Measure Item Event!!
- */
- bool handleDrawItem(int id, LPDRAWITEMSTRUCT drawInfo);
-
- /// Setting event handler for Measure Item Event
- /** The Measure Item Event is nessecary to handle if you want to draw the menu
- * yourself since it is inside this Event Handler you're telling the system how
- * much space you need to actually do the drawing <br>
- * Note! <br>
- * If this event is handled you also MUST handle the Draw Item Event!!
- */
- bool handleMeasureItem(LPMEASUREITEMSTRUCT measureInfo);
-
- /// Appends a separator item to the menu
- /** A menu separator is basically just "air" between menu items.< br >
- * A separator cannot be "clicked" or "chosen".
- */
- void appendSeparatorItem();
-
- /// Appends a Menu Item
- /** eventHandler is the function that will receive the "click" event from the
- * menu item. <br>
- * Event handler's signature must be "void foo( ObjectType, unsigned
- * int )" and it must be contained as a member <br>
- * of the class that is defined as the Widget, normally either the
- * Window derived class or the class derived from WidgetMenu. <br>
- * See e.g. WidgetMenu for an example. <br>
- * The reason to why we have this "id" is because the same event handler can be
- * defined for several menu items even in fact across menu objects, therefore
- * this number should be unique across the application.
- */
- void appendItem(unsigned int id, const tstring & text, MenuItemDataPtr itemData = MenuItemDataPtr(new MenuItemData()));
-
- template<typename DispatcherType>
- void appendItem(unsigned int id, const tstring & text, const typename DispatcherType::F& f, MenuItemDataPtr itemData = MenuItemDataPtr(new MenuItemData())) {
- appendItem(id, text, itemData);
- callbacks.insert(std::make_pair(id, DispatcherType(f)));
- }
-
- void appendItem(unsigned int id, const tstring & text, const IdDispatcher::F& f, MenuItemDataPtr itemData = MenuItemDataPtr(new MenuItemData())) {
- appendItem<IdDispatcher>(id, text, f, itemData);
- }
-
- void appendItem(unsigned int id, const tstring & text, BitmapPtr image);
-
- template<typename DispatcherType>
- void appendItem(unsigned int id, const tstring & text, const typename DispatcherType::F& f, BitmapPtr image) {
- MenuItemDataPtr itemData(new MenuItemData());
- if(ownerDrawn)
- itemData->Image = image;
- appendItem<DispatcherType>(id, text, f, itemData);
- }
-
- void appendItem(unsigned int id, const tstring & text, const IdDispatcher::F& f, BitmapPtr image) {
- appendItem<IdDispatcher>(id, text, f, image);
- }
-
- /// Removes specified item from this menu
- /** Call this function to actually DELETE a menu item from the menu hierarchy.
- * Note that you have to specify the item position; and whenever you remove an item,
- * all subsequent items change positions. To remove a range of items, remove from
- * end to start.
- */
- void removeItem( unsigned itemIndex );
-
- /// Remove all items from the menu
- /** Will also delete any submenus.
- */
- void removeAllItems();
-
- /// Return the number of items in the menu
- int getCount() const;
-
- /// Displays and handles a menu which can appear anywhere in the window.
- /** Typically called by a Right Mouse click. If both the x and the y coordinate
- * is - 1 ( default ) it'll show the context menu on the position the mouse was
- * at when the system last recieved a message, basically the "right" place...
- * <br>
- * Depending on the flags it might return the id of the menu item selected, or 0
- * if none was chosen. Flags with TPM_RETURNCMD will return the menu - item, but
- * not do the menu command.
- * < ul >
- * < li >TPM_CENTERALIGN : Centers the shortcut menu horizontally relative to the coordinate specified by the x parameter< /li >
- * < li >TPM_LEFTALIGN : Function positions the shortcut menu so that its left side is aligned with the coordinate specified by the x parameter< /li >
- * < li >TPM_RIGHTALIGN : Opposite of LEFTALIGN< /li >
- * < li >TPM_BOTTOMALIGN : Aligns menu bottoms to the coordinate specified by the y parameter< /li >
- * < li >TPM_TOPALIGN : Opposite of BOTTOMALIGN< /li >
- * < li >TPM_VCENTERALIGN : Centers vertically relative to the y parameter< /li >
- * < li >TPM_NONOTIFY : Restricts the menu from sending notifications when user clicks item< /li >
- * < li >TPM_RETURNCMD : returns the menu item identifier of the user's selection in the return value but DOES NOT carry out the event handler< /li >
- * < li >TPM_LEFTBUTTON : Restricts users to selecting menu items with only left mouse button< /li >
- * < li >TPM_RIGHTBUTTON : User can choose menu item with both mouse buttons< /li >
- * < /ul >
- * None of the following are used by default but can be manually chosen if you
- * manually call SystemParametersInfo
- * < ul >
- * < li >TPM_HORNEGANIMATION : Animates the menu from right to left< /li >
- * < li >TPM_HORPOSANIMATION : Animates the menu from left to right< /li >
- * < li >TPM_NOANIMATION : Displays menu without animation< /li >
- * < li >TPM_VERNEGANIMATION : Animates the menu from bottom to top< /li >
- * < li >TPM_VERPOSANIMATION : Animates the menu from top to bottom< /li >
- * < /ul >
- */
- unsigned trackPopupMenu( const ScreenCoordinate& sc, unsigned flags = 0 );
-
- /// Sets menu title
- /** A WidgetMenu can have a title, this function sets that title
- */
- void setTitle( const tstring & title, bool drawSidebar = false );
-
- /// Sets title font
- /** Create a font through e.g. createFont in WidgetFactory or similar and set the
- * title font to the menu title through using this function
- */
- void setTitleFont( FontPtr font );
-
- /// Removes menu title
- /** If clearSidebar is true, sidebar is removed
- */
- void clearTitle( bool clearSidebar = false );
-
- /// Checks (or uncheck) a specific menu item
- /** Which menu item you wish to check ( or uncheck ) is passed in as the "id"
- * parameter. <br>
- * If the "value" parameter is true the item will be checked, otherwise it will
- * be unchecked
- */
- void checkItem( unsigned id, bool value = true );
-
- /// Enables (or disables) a specific menu item
- /** Which menu item you wish to enable ( or disable ) is passed in as the "id"
- * parameter. <br>
- * If the "value" parameter is true the item becomes enabled, otherwise disabled
- */
- void setItemEnabled( unsigned id, bool byPosition = false, bool value = true );
-
- UINT getMenuState(UINT id, bool byPosition = false);
-
- /// Return true if the item is a separator (by position)
- bool isSeparator(UINT id, bool byPosition = false);
- /// Return true if the menu item is checked
- bool isChecked(UINT id, bool byPosition = false);
- /// Return true if the menu item is a popup menu
- bool isPopup(UINT id, bool byPosition = false);
- /// 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);
-
- /// Returns true if menu is "system menu" (icon in top left of window)
- bool isSystemMenu()
- {
- return isSysMenu;
- }
-
- /// Returns the text of a specific menu item
- /** Which menu item you wish to retrieve the text for is defined by the "id"
- * parameter of the function.
- */
- tstring getText( unsigned idOrPos, bool byPos );
-
- /// Sets the text of a specific menu item
- /** 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 );
-
- /// Returns item data
- MenuItemDataPtr getData( int itemIndex );
-
- ObjectType getChild(UINT position);
-
- virtual ~WidgetMenu();
-
-private:
- /// Constructor Taking pointer to parent
- explicit WidgetMenu( dwt::Widget * parent );
-
- // ////////////////////////////////////////////////////////////////////////
- // Menu item data wrapper, used internally
- // MENUITEMINFO's dwItemData *should* point to it
- // ////////////////////////////////////////////////////////////////////////
- struct ItemDataWrapper
- {
- // The menu item belongs to
- // For some messages (e.g. WM_MEASUREITEM),
- // Windows doesn't specify it, so
- // we need to keep this
- const WidgetMenu* menu;
-
- // Item index in the menu
- // This is needed, because ID's for items
- // are not unique (although Windows claims)
- // e.g. we can have an item with ID 0,
- // that is either separator or popup menu
- int index;
-
- // Specifies if item is menu title
- bool isMenuTitleItem;
-
- // Contains item data
- MenuItemDataPtr data;
-
- // Wrapper Constructor
- ItemDataWrapper( const WidgetMenu* menu_, int itemIndex, MenuItemDataPtr itemData, bool isTitleItem = false )
- : menu( menu_ )
- , index( itemIndex )
- , isMenuTitleItem( isTitleItem )
- , data( itemData )
- {}
-
- ~ItemDataWrapper()
- {}
- };
-
- // This is used during menu destruction
- static void destroyItemDataWrapper( ItemDataWrapper * wrapper );
-
- // True is menu is "system menu" (icon in top left of window)
- bool isSysMenu;
-
- // its sub menus
- std::vector< ObjectType > itsChildren;
-
- // its item data
- std::vector < ItemDataWrapper * > itsItemData;
-
- HMENU itsHandle;
-
- Widget* itsParent;
-
- bool ownerDrawn;
-
- // Contains information about menu colors
- MenuColorInfo itsColorInfo;
-
- FontPtr font;
-
- // Menu title
- tstring itsTitle;
-
- // Menu title font
- FontPtr itsTitleFont;
-
- // if true title is drawn as sidebar
- bool drawSidebar;
-
- typedef std::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 );
-};
-
-}
-
-#endif
-#endif
Copied: dcplusplus/trunk/dwt/src/widgets/Menu.cpp (from rev 1159, dcplusplus/trunk/dwt/src/widgets/WidgetMenu.cpp)
===================================================================
--- dcplusplus/trunk/dwt/src/widgets/Menu.cpp (rev 0)
+++ dcplusplus/trunk/dwt/src/widgets/Menu.cpp 2008-04-14 20:38:17 UTC (rev 1160)
@@ -0,0 +1,1019 @@
+/*
+ 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 WINCE
+
+#include <dwt/widgets/Menu.h>
+
+#include <dwt/resources/Brush.h>
+#include <dwt/resources/Pen.h>
+
+namespace dwt {
+
+const int Menu::borderGap = 3;
+const int Menu::pointerGap = 5;
+const int Menu::textIconGap = 8;
+const int Menu::textBorderGap = 4;
+const int Menu::separatorHeight = 8;
+const int Menu::minSysMenuItemWidth = 130;
+Point Menu::defaultImageSize = Point( 16, 16 );
+
+Menu::Seed::Seed(bool ownerDrawn_, const MenuColorInfo& colorInfo_, FontPtr font_) :
+popup(true),
+ownerDrawn(ownerDrawn_),
+colorInfo(colorInfo_),
+font(font_)
+{
+}
+
+Menu::Menu( dwt::Widget* parent ) :
+isSysMenu(false),
+itsParent(parent),
+drawSidebar(false)
+{
+ xAssert(itsParent != NULL, _T("A Menu must have a parent"));
+}
+
+void Menu::createHelper(const Seed& cs) {
+ // save settings provided through the Seed
+ ownerDrawn = cs.ownerDrawn;
+ itsColorInfo = cs.colorInfo;
+
+ if(ownerDrawn) {
+ if(cs.font)
+ font = cs.font;
+ else
+ font = new Font(DefaultGuiFont);
+
+ {
+ LOGFONT lf;
+ ::GetObject(font->handle(), sizeof(lf), &lf);
+ lf.lfWeight = FW_BOLD;
+ itsTitleFont = FontPtr(new Font(::CreateFontIndirect(&lf), true));
+ }
+
+ // set default drawing
+ itsParent->setCallback(Message(WM_DRAWITEM), DrawItemDispatcher(std::tr1::bind(&Menu::handleDrawItem, this, _1, _2)));
+ itsParent->setCallback(Message(WM_MEASUREITEM), MeasureItemDispatcher(std::tr1::bind(&Menu::handleMeasureItem, this, _1)));
+ }
+}
+
+void Menu::create(const Seed& cs) {
+ createHelper(cs);
+
+ if(cs.popup)
+ itsHandle = ::CreatePopupMenu();
+ else
+ itsHandle = ::CreateMenu();
+ if ( !itsHandle )
+ {
+ xCeption x( _T( "CreateMenu in Menu::create fizzled..." ) );
+ throw x;
+ }
+}
+
+void Menu::attach(HMENU hMenu, const Seed& cs) {
+ createHelper(cs);
+
+ itsHandle = hMenu;
+
+ if(ownerDrawn) {
+ // update all current items to be owner-drawn
+ // @todo update sub-menus too...
+ const int count = getCount();
+ for(int i = 0; i < count; ++i) {
+ // init structure for items
+ MENUITEMINFO info;
+ memset( & info, 0, sizeof( info ) );
+ info.cbSize = sizeof( MENUITEMINFO );
+
+ // set flags
+ info.fMask = MIIM_FTYPE | MIIM_DATA;
+
+ if(::GetMenuItemInfo(itsHandle, i, TRUE, &info)) {
+ info.fMask |= MIIM_DATA;
+ info.fType |= MFT_OWNERDRAW;
+
+ // create item data wrapper
+ ItemDataWrapper * wrapper = new ItemDataWrapper( this, i, MenuItemDataPtr( new MenuItemData() ) );
+ info.dwItemData = reinterpret_cast< ULONG_PTR >( wrapper );
+
+ 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..." ) );
+ }
+ }
+}
+
+void Menu::setMenu() {
+ add...
[truncated message content] |
|
From: <arn...@us...> - 2008-04-14 20:48:55
|
Revision: 1161
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1161&view=rev
Author: arnetheduck
Date: 2008-04-14 13:48:35 -0700 (Mon, 14 Apr 2008)
Log Message:
-----------
dump menuitemdata, it might be revived later on as a MenuItem which contains a bit more info
Modified Paths:
--------------
dcplusplus/trunk/dwt/include/dwt/widgets/Menu.h
dcplusplus/trunk/dwt/src/widgets/Menu.cpp
dcplusplus/trunk/win32/QueueFrame.cpp
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-11 22:54:45.322000027 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
+ timestamp: 2008-04-11 23:47:46.262000084 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
Name: bzr:file-ids
- dwt/include/dwt/widgets/Menu.h 1003@f586c4b0-9d0d-0410-bc51-f1fe239209fc:dcplusplus%2Ftrunk:smartwin%2Finclude%2Fsmartwin%2Fwidgets%2FWidgetMenu.h
dwt/src/widgets/Menu.cpp 1003@f586c4b0-9d0d-0410-bc51-f1fe239209fc:dcplusplus%2Ftrunk:smartwin%2Fsource%2Fwidgets%2FWidgetMenu.cpp
+
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
+ 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
Modified: dcplusplus/trunk/dwt/include/dwt/widgets/Menu.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/Menu.h 2008-04-14 20:38:17 UTC (rev 1160)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/Menu.h 2008-04-14 20:48:35 UTC (rev 1161)
@@ -48,32 +48,6 @@
namespace dwt {
-/// Contains information about menu item
-struct MenuItemData
-{
- /// Menu item text color
- COLORREF TextColor;
-
- /// Menu item image
- BitmapPtr Image;
-
- /// Creates new menu item with specified data
- MenuItemData(
- BitmapPtr image = BitmapPtr( new Bitmap( ( HBITMAP ) NULL ) ), // defaults to empty bitmap
- COLORREF textColor = ::GetSysColor( COLOR_MENUTEXT ) )
- : TextColor( textColor ),
- Image( image )
- {}
-};
-
-/// \ingroup GlobalStuff
-// MenuItemDataPtr type, contains rendering data for e.g. Menu
-/** Helps easily create color values and so on for a Menu item! <br>
-* Each Menu Item can have different colors and so on, use this smart pointer to set
-* those values!
-*/
-typedef std::tr1::shared_ptr< MenuItemData > MenuItemDataPtr;
-
/// Struct for coloring different areas of Menu
/** Contains the different color settings of the Menu <br>
* Default values to constructor makes menu look roughly like MSVC++7.1 menus
@@ -230,7 +204,7 @@
* A popup is basically another branch in the menu hierarchy <br>
* See the Menu project for a demonstration.
*/
- ObjectType appendPopup( const tstring & text, MenuItemDataPtr itemData = MenuItemDataPtr(new MenuItemData()) );
+ ObjectType appendPopup( const tstring & text );
/// Returns the "System Menu"
/** The system menu is a special menu that ( normally ) is accessed by pressing
@@ -284,29 +258,16 @@
* defined for several menu items even in fact across menu objects, therefore
* this number should be unique across the application.
*/
- void appendItem(unsigned int id, const tstring & text, MenuItemDataPtr itemData = MenuItemDataPtr(new MenuItemData()));
+ void 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, MenuItemDataPtr itemData = MenuItemDataPtr(new MenuItemData())) {
- appendItem(id, text, itemData);
+ 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)));
}
- void appendItem(unsigned int id, const tstring & text, const IdDispatcher::F& f, MenuItemDataPtr itemData = MenuItemDataPtr(new MenuItemData())) {
- appendItem<IdDispatcher>(id, text, f, itemData);
- }
-
- void appendItem(unsigned int id, const tstring & text, BitmapPtr image);
-
- template<typename DispatcherType>
- void appendItem(unsigned int id, const tstring & text, const typename DispatcherType::F& f, BitmapPtr image) {
- MenuItemDataPtr itemData(new MenuItemData());
- if(ownerDrawn)
- itemData->Image = image;
- appendItem<DispatcherType>(id, text, f, itemData);
- }
-
- void appendItem(unsigned int id, const tstring & text, const IdDispatcher::F& f, BitmapPtr image) {
+ void appendItem(unsigned int id, const tstring & text, const IdDispatcher::F& f, BitmapPtr image = BitmapPtr()) {
appendItem<IdDispatcher>(id, text, f, image);
}
@@ -420,9 +381,6 @@
*/
void setText( unsigned id, const tstring& text );
- /// Returns item data
- MenuItemDataPtr getData( int itemIndex );
-
ObjectType getChild(UINT position);
virtual ~Menu();
@@ -453,15 +411,19 @@
// Specifies if item is menu title
bool isMenuTitleItem;
- // Contains item data
- MenuItemDataPtr data;
+ /// Menu item text color
+ COLORREF textColor;
+ /// Menu item image
+ BitmapPtr image;
+
// Wrapper Constructor
- ItemDataWrapper( const Menu* menu_, int itemIndex, MenuItemDataPtr itemData, bool isTitleItem = false )
- : menu( menu_ )
- , index( itemIndex )
- , isMenuTitleItem( isTitleItem )
- , data( itemData )
+ ItemDataWrapper( const Menu* menu_, int itemIndex, bool isTitleItem = false, BitmapPtr image_ = BitmapPtr()) :
+ menu( menu_ ),
+ index( itemIndex ),
+ isMenuTitleItem( isTitleItem ),
+ textColor(::GetSysColor(COLOR_MENUTEXT)),
+ image(image_)
{}
~ItemDataWrapper()
Modified: dcplusplus/trunk/dwt/src/widgets/Menu.cpp
===================================================================
--- dcplusplus/trunk/dwt/src/widgets/Menu.cpp 2008-04-14 20:38:17 UTC (rev 1160)
+++ dcplusplus/trunk/dwt/src/widgets/Menu.cpp 2008-04-14 20:48:35 UTC (rev 1161)
@@ -115,9 +115,7 @@
const int count = getCount();
for(int i = 0; i < count; ++i) {
// init structure for items
- MENUITEMINFO info;
- memset( & info, 0, sizeof( info ) );
- info.cbSize = sizeof( MENUITEMINFO );
+ MENUITEMINFO info = { sizeof( MENUITEMINFO ) };
// set flags
info.fMask = MIIM_FTYPE | MIIM_DATA;
@@ -127,7 +125,7 @@
info.fType |= MFT_OWNERDRAW;
// create item data wrapper
- ItemDataWrapper * wrapper = new ItemDataWrapper( this, i, MenuItemDataPtr( new MenuItemData() ) );
+ ItemDataWrapper * wrapper = new ItemDataWrapper( this, i );
info.dwItemData = reinterpret_cast< ULONG_PTR >( wrapper );
if(::SetMenuItemInfo(itsHandle, i, TRUE, &info))
@@ -146,16 +144,14 @@
throw xCeption( _T( "SetMenu in Menu::setMenu fizzled..." ) );
}
-Menu::ObjectType Menu::appendPopup( const tstring & text, MenuItemDataPtr itemData )
+Menu::ObjectType Menu::appendPopup( const tstring & text )
{
// create popup menu pointer
ObjectType retVal ( new Menu(itsParent) );
retVal->create( Seed(ownerDrawn, itsColorInfo, font) );
// init structure for new item
- MENUITEMINFO info;
- memset( & info, 0, sizeof( info ) );
- info.cbSize = sizeof( MENUITEMINFO );
+ MENUITEMINFO info = { sizeof( MENUITEMINFO ) };
// set flags
info.fMask = MIIM_SUBMENU | MIIM_CHECKMARKS | MIIM_STRING;
@@ -176,7 +172,7 @@
info.fType = MFT_OWNERDRAW;
// create item data
- wrapper = new ItemDataWrapper( this, position, itemData );
+ wrapper = new ItemDataWrapper( this, position );
info.dwItemData = reinterpret_cast< ULONG_PTR >( wrapper );
}
@@ -232,15 +228,6 @@
return - 1;
}
-MenuItemDataPtr Menu::getData( int itemIndex )
-{
- for(size_t i = 0; i < itsItemData.size(); ++i)
- if(itsItemData[i]->index == itemIndex)
- return itsItemData[i]->data;
-
- return MenuItemDataPtr();
-}
-
Menu::~Menu()
{
// Destroy this menu
@@ -361,9 +348,7 @@
if ( !drawSidebar )
{
// init struct for title info
- MENUITEMINFO info;
- memset( & info, 0, sizeof( MENUITEMINFO ) );
- info.cbSize = sizeof( MENUITEMINFO );
+ MENUITEMINFO info = { sizeof( MENUITEMINFO ) };
// set flags
info.fMask = MIIM_STATE | MIIM_STRING | MIIM_FTYPE | MIIM_DATA;
@@ -374,7 +359,7 @@
info.dwTypeData = const_cast< LPTSTR >( title.c_str() );
// created info for title item
- ItemDataWrapper * wrapper = new ItemDataWrapper( this, 0, MenuItemDataPtr( new MenuItemData() ), true );
+ ItemDataWrapper * wrapper = new ItemDataWrapper( this, 0, true );
// set item data
info.dwItemData = reinterpret_cast< ULONG_PTR >( wrapper );
@@ -405,9 +390,7 @@
const bool isMenuBar = ::GetMenu( wrapper->menu->getParent()->handle() ) == wrapper->menu->handle();
// init struct for menu item info
- MENUITEMINFO info;
- memset( & info, 0, sizeof( MENUITEMINFO ) );
- info.cbSize = sizeof( MENUITEMINFO );
+ MENUITEMINFO info = { sizeof( MENUITEMINFO ) };
// set flags
info.fMask = MIIM_CHECKMARKS | MIIM_FTYPE | MIIM_DATA | MIIM_STATE | MIIM_STRING;
@@ -418,10 +401,6 @@
// check if item is owner drawn
xAssert( ( info.fType & MFT_OWNERDRAW ) != 0, _T( "Not a owner - drawn item in drawItem()" ) );
- // get item data
- MenuItemDataPtr data ( wrapper->data );
- xAssert( data != 0, _T( "Couldn't find item data in drawItem()" ) );
-
// get state info
bool isGrayed = ( drawInfo->itemState & ODS_GRAYED ) == ODS_GRAYED;
bool isChecked = ( drawInfo->itemState & ODS_CHECKED ) == ODS_CHECKED;
@@ -433,13 +412,18 @@
HBITMAP image = NULL;
// if checked/unchecked image is avaiable
- if ( ( info.hbmpChecked != NULL ) && ( info.hbmpUnchecked != NULL ) )
+ if ( ( info.hbmpChecked != NULL ) && ( info.hbmpUnchecked != NULL ) ) {
image = isChecked ? info.hbmpChecked : info.hbmpUnchecked;
- else // get normal image
- image = data->Image->getBitmap();
+ } else if(wrapper->image) {// get normal image
+ image = wrapper->image->handle();
+ }
// this will contain image size
- Point imageSize = data->Image->getBitmapSize();
+ Point imageSize(0, 0);
+ if(wrapper->image) {
+ // TODO and if we use hbmpChecked etc?
+ imageSize = wrapper->image->getBitmapSize();
+ }
if ( ( imageSize.x == 0 ) && ( imageSize.y == 0 ) ) // no image
imageSize = defaultImageSize; // set default image size
@@ -597,7 +581,7 @@
isGrayed ? ::GetSysColor(COLOR_GRAYTEXT) :
wrapper->isMenuTitleItem ? colorInfo.colorTitleText :
highlight ? colorInfo.colorHighlightText :
- data->TextColor
+ wrapper->textColor
);
// Select item font
@@ -734,9 +718,7 @@
UINT & itemHeight = measureInfo->itemHeight;
// init struct for item info
- MENUITEMINFO info;
- memset( & info, 0, sizeof( MENUITEMINFO ) );
- info.cbSize = sizeof( MENUITEMINFO );
+ MENUITEMINFO info = { sizeof( MENUITEMINFO ) };
// set up flags
info.fMask = MIIM_FTYPE | MIIM_DATA | MIIM_CHECKMARKS | MIIM_STRING;
@@ -763,10 +745,6 @@
// get its DC
HDC hdc = ::GetDC( wrapper->menu->getParent()->handle() );
- // get the item data
- MenuItemDataPtr data = wrapper->data;
- xAssert( data != 0, _T( "Couldn't find item data in measureItem()" ) );
-
// get item text
const int length = info.cch + 1;
std::vector< TCHAR > buffer ( length );
@@ -789,7 +767,7 @@
itemHeight = textSize.cy + borderGap;
// check to see if item has an image
- Point imageSize = data->Image->getBitmapSize();
+ Point imageSize = wrapper->image ? wrapper->image->getBitmapSize() : Point(0, 0);
// this will contain checked/unchecked image size
Point checkImageSize;
@@ -852,10 +830,9 @@
void Menu::appendSeparatorItem()
{
// init structure for new item
- MENUITEMINFO itemInfo;
- memset( & itemInfo, 0, sizeof( itemInfo ) );
- itemInfo.cbSize = sizeof( MENUITEMINFO );
+ MENUITEMINFO itemInfo = { sizeof( MENUITEMINFO ) };
+
// set flags
itemInfo.fMask = MIIM_FTYPE;
itemInfo.fType = MFT_SEPARATOR;
@@ -869,7 +846,7 @@
itemInfo.fType |= MFT_OWNERDRAW;
// create item data wrapper
- wrapper = new ItemDataWrapper( this, position, MenuItemDataPtr( new MenuItemData() ) );
+ wrapper = new ItemDataWrapper( this, position );
itemInfo.dwItemData = reinterpret_cast< ULONG_PTR >( wrapper );
}
@@ -934,12 +911,10 @@
return count;
}
-void Menu::appendItem(unsigned int id, const tstring & text, MenuItemDataPtr itemData)
+void Menu::appendItem(unsigned int id, const tstring & text, BitmapPtr image)
{
// init structure for new item
- MENUITEMINFO info;
- memset( & info, 0, sizeof( info ) );
- info.cbSize = sizeof( MENUITEMINFO );
+ MENUITEMINFO info = { sizeof(MENUITEMINFO) };
// set flags
info.fMask = MIIM_DATA | MIIM_FTYPE | MIIM_CHECKMARKS | MIIM_ID | MIIM_STRING;
@@ -964,7 +939,7 @@
info.fType = MFT_OWNERDRAW;
// set item data
- wrapper = new ItemDataWrapper( this, index, itemData );
+ wrapper = new ItemDataWrapper( this, index, false, image);
info.dwItemData = reinterpret_cast< ULONG_PTR >( wrapper );
}
@@ -978,14 +953,6 @@
throw xCeption( _T( "Couldn't insert/update item in Menu::appendItem" ) );
}
-void Menu::appendItem(unsigned int id, const tstring & text, BitmapPtr image)
-{
- MenuItemDataPtr itemData(new MenuItemData());
- if(ownerDrawn)
- itemData->Image = image;
- appendItem(id, text, itemData);
-}
-
unsigned Menu::trackPopupMenu( const ScreenCoordinate& sc, unsigned flags )
{
addCommands();
Modified: dcplusplus/trunk/win32/QueueFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/QueueFrame.cpp 2008-04-14 20:38:17 UTC (rev 1160)
+++ dcplusplus/trunk/win32/QueueFrame.cpp 2008-04-14 20:48:35 UTC (rev 1161)
@@ -911,8 +911,7 @@
// Put it here to avoid a copy for each recursion...
static TCHAR tmpBuf[1024];
void QueueFrame::moveNode(HTREEITEM item, HTREEITEM parent) {
- TVINSERTSTRUCT tvis;
- memset(&tvis, 0, sizeof(tvis));
+ TVINSERTSTRUCT tvis = { 0 };
tvis.itemex.hItem = item;
tvis.itemex.mask = TVIF_CHILDREN | TVIF_HANDLE | TVIF_IMAGE | TVIF_INTEGRAL | TVIF_PARAM |
TVIF_SELECTEDIMAGE | TVIF_STATE | TVIF_TEXT;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2008-04-14 20:50:11
|
Revision: 1162
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1162&view=rev
Author: arnetheduck
Date: 2008-04-14 13:49:39 -0700 (Mon, 14 Apr 2008)
Log Message:
-----------
fix a buffer mayhem in load/save dialogs
Modified Paths:
--------------
dcplusplus/trunk/dwt/include/dwt/aspects/AspectFileFilter.h
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-11 23:47:46.262000084 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
+ timestamp: 2008-04-12 03:07:23.687000036 +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
+ 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
Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectFileFilter.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/aspects/AspectFileFilter.h 2008-04-14 20:48:35 UTC (rev 1161)
+++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectFileFilter.h 2008-04-14 20:49:39 UTC (rev 1162)
@@ -113,6 +113,7 @@
OPENFILENAME ofn = { 0 };
getOFN(ofn);
+ file.resize(PATH_BUFFER_SIZE);
ofn.lpstrFile = const_cast<LPTSTR>(file.c_str());
ofn.Flags = flags;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2008-04-14 20:52:48
|
Revision: 1163
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1163&view=rev
Author: arnetheduck
Date: 2008-04-14 13:52:34 -0700 (Mon, 14 Apr 2008)
Log Message:
-----------
fix share when requested by filename
Modified Paths:
--------------
dcplusplus/trunk/dcpp/ShareManager.cpp
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-12 03:07:23.687000036 +0200
committer: poy <po...@12...>
properties:
branch-nick: repo
+ timestamp: 2008-04-12 22:05:04.397000074 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
Name: bzr:revision-id:v3-trunk1
- 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn
1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn
1029 zouzou123gen-20080323221249-0su72zaj13e706mk
1030 arn...@gm...-20080324140623-muba1dl46m000o8c
1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6
1032 arn...@gm...-20080324153706-siidja05n84i00b1
1033 arn...@gm...-20080324153823-lhn3awurnu77riln
1034 arn...@gm...-20080324165650-zapppziji67yf5a2
1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2
1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3
1037 arn...@gm...-20080325100659-8fqy6q65itmghlep
1038 zouzou123gen-20080325175216-s297sdiucukfvijh
1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087
1040 arn...@gm...-20080325211747-nwwy1eb33r071sca
1041 arn...@gm...-20080326084110-qbselrjckku275xi
1042 zouzou123gen-20080326123631-35642mgbk2i4ty32
1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r
1044 arn...@gm...-20080326162031-il0nyms30w0mky43
1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv
1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g
1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv
1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q
1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz
1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf
1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd
1052 arn...@gm...-20080327120639-um3tukdt374rwvgm
1053 zouzou123gen-20080327130703-6vtek6uxy3vua543
1054 arn...@gm...-20080327215831-dmg5mkufskabwkro
1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf
1056 arn...@gm...-20080328085925-gceybsr53oml1p24
1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a
1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o
1059 arn...@gm...-20080329055630-braiir1dskv7a4qm
1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja
1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl
1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0
1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd
1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp
1065 arn...@gm...-20080329124926-2je1z18p0272zpua
1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp
1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r
1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5
1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql
1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q
1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux
1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd
1073 zouzou123gen-20080331124549-alyw7vugdn30piqy
1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm
1075 zouzou123gen-20080331140757-u94q52yccl5lsifk
1076 zouzou123gen-20080331152513-ue1x5qhigcw51348
1077 arn...@gm...-20080331184436-a8g6chibmg8nswls
1078 arn...@gm...-20080331220648-81485k28qmwruwz6
1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a
1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw
1081 zouzou123gen-20080401084117-24a454g8o0x656kg
1082 zouzou123gen-20080401133146-jabb5i8870fg6f66
1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6
1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f
1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk
1086 arn...@gm...-20080402084515-ofmnwihzv159jton
1087 arn...@gm...-20080402133105-y70soi38owzl76i9
1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae
1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0
1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8
1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh
1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5
1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h
1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46
1095 arn...@gm...-20080402193851-6mu64vgep6tijith
1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r
1097 arn...@gm...-20080402204331-so2e8n892o23pejr
1098 poy-20080402224153-225qylr2cfwhqrg7
1099 mrmikejj-20080403125112-o8polh8rkn62umyh
1100 arn...@gm...-20080403125139-8xub76j1xazhfxna
1101 po...@12...-20080403140544-13kockkjho883nb4
1102 po...@12...-20080403143012-bxghtoodiolugpbs
1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20
1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws
1105 arn...@gm...-20080403213124-54spdrwszgyimd90
1106 po...@12...-20080404002406-aj74x5tngi6mmmj1
1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra
1108 po...@12...-20080404145445-84lyk5tyy3b3br14
1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc
1110 po...@12...-20080405001107-14d1ojjof8xhvcj8
1111 arn...@gm...-20080405071929-jmnrul21sxx04kky
1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai
1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf
1114 po...@12...-20080405220250-8y09d0samsj8ja94
1115 po...@12...-20080406134101-4860ytb61sbu3yhg
1116 po...@12...-20080406155849-2wzxzuzs5m8zpk0g
1117 po...@12...-20080406164835-bv5dydhm3qqydsty
1118 arn...@gm...-20080406210237-c7tyfgiz2sjgv044
1119 po...@12...-20080407114423-4yajg1rffidq76bj
1120 arn...@gm...-20080407194826-c42t4bjzw4vflejn
1121 po...@12...-20080407214303-o7ul1bvcn6gvaoc9
1122 po...@12...-20080407220647-r7f3em92til5j67s
1123 po...@12...-20080408212439-54t3bqlhvw1nu4xc
1124 arn...@gm...-20080409193708-y6erfzwrcb1seet3
1125 arn...@gm...-20080409195827-ub6t2s3wdf28nfpz
1126 po...@12...-20080409215055-1zmqhhm2859878c1
1127 arn...@gm...-20080410102447-l4es4cbukkqwcnpc
1128 arn...@gm...-20080410214118-b70g50tl27cq9q29
1129 arn...@gm...-20080411074730-w1pu78qigtx87lx3
1130 arn...@gm...-20080411090724-kwdj9pg9hrv1xhwb
1131 po...@12...-20080411153057-tn7zhxqk0z7ceref
1132 arn...@gm...-20080411200946-ierqlg8v9vzj18n2
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
+ 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
Modified: dcplusplus/trunk/dcpp/ShareManager.cpp
===================================================================
--- dcplusplus/trunk/dcpp/ShareManager.cpp 2008-04-14 20:49:39 UTC (rev 1162)
+++ dcplusplus/trunk/dcpp/ShareManager.cpp 2008-04-14 20:52:34 UTC (rev 1163)
@@ -251,15 +251,15 @@
Directory* d = *dmi;
string::size_type j = i + 1;
- while( (i = virtualName.find('/', j)) != string::npos) {
- Directory::MapIter mi = d->directories.find(virtualName.substr(j, i-j));
+ while( (i = virtualFile.find('/', j)) != string::npos) {
+ Directory::MapIter mi = d->directories.find(virtualFile.substr(j, i-j));
j = i + 1;
if(mi == d->directories.end())
throw ShareException(UserConnection::FILE_NOT_AVAILABLE);
d = mi->second;
}
- Directory::File::Set::const_iterator it = find_if(d->files.begin(), d->files.end(), Directory::File::StringComp(virtualName.substr(j)));
+ Directory::File::Set::const_iterator it = find_if(d->files.begin(), d->files.end(), Directory::File::StringComp(virtualFile.substr(j)));
if(it == d->files.end())
throw ShareException(UserConnection::FILE_NOT_AVAILABLE);
return it;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2008-04-14 21:18:05
|
Revision: 1164
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1164&view=rev
Author: arnetheduck
Date: 2008-04-14 14:17:47 -0700 (Mon, 14 Apr 2008)
Log Message:
-----------
Fix vname again
Modified Paths:
--------------
dcplusplus/trunk/dcpp/ShareManager.cpp
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-12 22:05:04.397000074 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
+ timestamp: 2008-04-13 11:54:35.562000036 +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
+ 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
Modified: dcplusplus/trunk/dcpp/ShareManager.cpp
===================================================================
--- dcplusplus/trunk/dcpp/ShareManager.cpp 2008-04-14 20:52:34 UTC (rev 1163)
+++ dcplusplus/trunk/dcpp/ShareManager.cpp 2008-04-14 21:17:47 UTC (rev 1164)
@@ -293,7 +293,7 @@
const string& virtualName = aXml.getChildAttrib("Virtual");
string vName = validateVirtual(virtualName.empty() ? Util::getLastDir(realPath) : virtualName);
- shares.insert(std::make_pair(realPath, virtualName));
+ shares.insert(std::make_pair(realPath, vName));
}
aXml.stepOut();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2008-04-14 21:19:05
|
Revision: 1165
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1165&view=rev
Author: arnetheduck
Date: 2008-04-14 14:18:55 -0700 (Mon, 14 Apr 2008)
Log Message:
-----------
Remove tabsheet, only keep tabview...tabview will get the possibility to add non-container tabs later
Modified Paths:
--------------
dcplusplus/trunk/dwt/include/dwt/aspects/AspectSizable.h
dcplusplus/trunk/dwt/include/dwt/dwt.hpp
dcplusplus/trunk/dwt/include/dwt/forward.h
dcplusplus/trunk/dwt/include/dwt/widgets/Composite.h
dcplusplus/trunk/dwt/include/dwt/widgets/TabView.h
dcplusplus/trunk/dwt/src/widgets/TabView.cpp
dcplusplus/trunk/win32/MDIChildFrame.h
dcplusplus/trunk/win32/MainWindow.cpp
dcplusplus/trunk/win32/TransferView.cpp
dcplusplus/trunk/win32/TransferView.h
dcplusplus/trunk/win32/stdafx.h
Removed Paths:
-------------
dcplusplus/trunk/dwt/include/dwt/widgets/TabSheet.h
dcplusplus/trunk/dwt/src/widgets/TabSheet.cpp
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-13 11:54:35.562000036 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
+ timestamp: 2008-04-13 15:39:27.368000031 +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
+ 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
Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectSizable.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/aspects/AspectSizable.h 2008-04-14 21:17:47 UTC (rev 1164)
+++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectSizable.h 2008-04-14 21:18:55 UTC (rev 1165)
@@ -70,8 +70,8 @@
HWND H() const { return W().handle(); }
- typedef Dispatchers::ConvertBase<SizedEvent> SizeDispatcher;
- typedef Dispatchers::ConvertBase<Point, &Point::fromMSG> MoveDispatcher;
+ typedef Dispatchers::ConvertBase<SizedEvent, &Dispatchers::convert<SizedEvent>, false> SizeDispatcher;
+ typedef Dispatchers::ConvertBase<Point, &Point::fromMSG, false> MoveDispatcher;
public:
/// Sets the new size and position of the window
Modified: dcplusplus/trunk/dwt/include/dwt/dwt.hpp
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/dwt.hpp 2008-04-14 21:17:47 UTC (rev 1164)
+++ dcplusplus/trunk/dwt/include/dwt/dwt.hpp 2008-04-14 21:18:55 UTC (rev 1165)
@@ -78,7 +78,6 @@
#include "widgets/Spinner.h"
#include "widgets/StatusBar.h"
#include "widgets/Table.h"
-#include "widgets/TabSheet.h"
#include "widgets/TabView.h"
#include "widgets/TextBox.h"
#include "widgets/Tree.h"
Modified: dcplusplus/trunk/dwt/include/dwt/forward.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/forward.h 2008-04-14 21:17:47 UTC (rev 1164)
+++ dcplusplus/trunk/dwt/include/dwt/forward.h 2008-04-14 21:18:55 UTC (rev 1165)
@@ -98,9 +98,6 @@
class Table;
typedef Table* TablePtr;
-class TabSheet;
-typedef TabSheet* TabSheetPtr;
-
class TabView;
typedef TabView* TabViewPtr;
Modified: dcplusplus/trunk/dwt/include/dwt/widgets/Composite.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/Composite.h 2008-04-14 21:17:47 UTC (rev 1164)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/Composite.h 2008-04-14 21:18:55 UTC (rev 1165)
@@ -101,8 +101,8 @@
typedef dwt::StatusBarPtr StatusBarPtr;
typedef dwt::Table Table;
typedef dwt::TablePtr TablePtr;
- typedef dwt::TabSheet TabSheet;
- typedef dwt::TabSheetPtr TabSheetPtr;
+ typedef dwt::TabView TabView;
+ typedef dwt::TabViewPtr TabViewPtr;
typedef dwt::TextBox TextBox;
typedef dwt::TextBoxPtr TextBoxPtr;
typedef dwt::ToolBar ToolBar;
Deleted: dcplusplus/trunk/dwt/include/dwt/widgets/TabSheet.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/TabSheet.h 2008-04-14 21:17:47 UTC (rev 1164)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/TabSheet.h 2008-04-14 21:18:55 UTC (rev 1165)
@@ -1,388 +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_TabSheet_h
-#define DWT_TabSheet_h
-
-#include "../resources/ImageList.h"
-#include "../Rectangle.h"
-#include "../aspects/AspectCollection.h"
-#include "../aspects/AspectFocus.h"
-#include "../aspects/AspectFont.h"
-#include "../aspects/AspectPainting.h"
-#include "../aspects/AspectSelection.h"
-#include "../aspects/AspectText.h"
-#include "Control.h"
-
-namespace dwt {
-
-/// Tab Sheet Control class
-/** \ingroup WidgetControls
- * \WidgetUsageInfo
- * \image html tabsheet.png
- * Class for creating a Tab Control Widget. <br>
- * A Tab Control is a control consisting of "tab buttons" normally on the top of the
- * Widget where the user can select different pages to switch between to group
- * related information within. E.g. Visual Studio has got tab controls on the top of
- * the code area where the user can switch between the different opened files. Use
- * the onSelectionChanged event to make visible/invisible the different controls you
- * wish to use in the different tab pages! <br>
- * Normally you would add up one Container for each Tab Page the Tab Control
- * has.
- */
-class TabSheet :
- public CommonControl,
- // Aspects
- public AspectCollection<TabSheet, int>,
- public AspectFocus< TabSheet >,
- public AspectFont< TabSheet >,
- public AspectPainting< TabSheet >,
- public AspectSelection< TabSheet, int >,
- public AspectText< TabSheet >
-{
- typedef CommonControl BaseType;
- friend class AspectCollection<TabSheet, int>;
- friend class AspectSelection<TabSheet, int>;
- friend class WidgetCreator< TabSheet >;
-
- struct ChangingDispatcher
- {
- typedef std::tr1::function<bool (unsigned)> F;
-
- ChangingDispatcher(const F& f_, TabSheet* widget_) : f(f_), widget(widget_) { }
-
- bool operator()(const MSG& msg, LRESULT& ret) {
- unsigned param = TabCtrl_GetCurSel( widget->handle() );
- ret = f(param) ? FALSE : TRUE;
- return true;
- }
-
- F f;
- TabSheet* widget;
- };
-
-
-public:
- /// Class type
- typedef TabSheet ThisType;
-
- /// 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
- * should define one of these.
- */
- struct Seed : public BaseType::Seed {
- typedef ThisType WidgetType;
-
- FontPtr font;
-
- /// Fills with default parameters
- explicit Seed();
- };
-
- tstring getText(unsigned idx) const;
-
- void setText(unsigned idx, const tstring& text);
-
- /// Setting the event handler for the "selection changing" event
- /** The event handler must have the signature "bool foo( TabSheet * Widget,
- * unsigned indexNo )" whereby if you return true the user will be allowed to
- * actually CHANGE the page but if you return false the page will not be allowed
- * to change and the onSelectionChanged event will not fire ( good for
- * validation of fields etc...)
- */
- void onSelectionChanging(const ChangingDispatcher::F& f) {
- addCallback(
- Message( WM_NOTIFY, TCN_SELCHANGING ), ChangingDispatcher(f, this )
- );
- }
-
- /// Appends a "page" to the Tab Sheet
- /** The return value is the index of the new item appended. The input index is
- * where you wish to put the new page
- */
- // the negative values are already covered by throwing an exception
- unsigned int addPage( const tstring & header, unsigned index, LPARAM lParam = 0, int image = -1 );
-
- int getImage(unsigned idx) const;
-
- HWND getToolTips() const;
-
- LPARAM getData(unsigned idx);
-
- void setData(unsigned idx, LPARAM data);
-
- /// Actually creates the Tab Sheet Control
- /** You should call WidgetFactory::createTabSheet if you instantiate class
- * directly. <br>
- * Only if you DERIVE from class you should call this function directly.
- */
- void create( const Seed & cs = Seed() );
-
- /// Set tab buttons at bottom of control
- /** If passed true to this function tabs will appear at the bottom of the control
- */
- void setTabsAtBottom( bool value = true );
-
- /// Set tabs to "button" style
- /** If passed true to this function tabs will appear as buttons instead of
- * default as pages
- */
- void setButtonStyle( bool value = true );
-
- /// Set tabs to "flat button" style
- /** If passed true to this function tabs will appear as flat buttons instead of
- * default as pages
- */
- void setFlatButtonStyle( bool value = true );
-
- /// Turns hot tracking of tabs on or off
- /** If passed true hottracking of items will be turned on
- */
- void setHotTrack( bool value = true );
-
- /// Set tabs to "multiline" style
- /** If passed true to this function tabs will be able to span across multiple
- * lines
- */
- void setMultiline( bool value = true );
-
- /// Set tabs to "ragged right" style
- /** If passed true to this function tabs be ragged to the right to make pages
- * "span" across whole area if multiple lines are inserted
- */
- void setRaggedRight( bool value = true );
-
- /// Set tabs to appear vertically instead of horizontally which is the default style
- /** If passed true to this function tabs will appear vertically instead of
- * horizontally
- */
- void setVerticalTabs( bool value = true );
-
- /// Set tabs to appear vertically to the right
- /** This one also turns on vertical style
- */
- void setRightTabs( bool value = true );
-
- void setHighlight(int item, bool highlight = true);
-
- /// Set tabs to appear with a flat separator between different tabs
- /** If true passed flat separator style will be turned ON else OFF
- */
- void setFlatSeparators( bool value = true );
-
- void setImageList(const ImageListPtr& imageList);
-
- const ImageListPtr& getImageList() const;
-
- int hitTest(const ScreenCoordinate& pt);
-
- /// Get the area not used by the tabs
- /** This function should be used after adding the pages, so that the area not used by
- * the tabs can be calculated accurately. It returns coordinates respect to the
- * TabControl, this is, you have to adjust for the position of the control itself.
- */
- Rectangle getUsableArea(bool cutBorders = false) const;
-protected:
- // Constructor Taking pointer to parent
- explicit TabSheet( Widget * parent );
-
- // Protected to avoid direct instantiation, you can inherit and use
- // WidgetFactory class which is friend
- virtual ~TabSheet()
- {}
-
-private:
- // AspectSelection expectation implementation
- static Message getSelectionChangedMessage();
-
- // Keep a copy so it won't get deallocated...
- ImageListPtr imageList;
-
- // AspectCollection
- void eraseImpl( int row );
- void clearImpl();
- size_t sizeImpl() const;
-
- // AspectSelection
- int getSelectedImpl() const;
- void setSelectedImpl( int idx );
-
-};
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// Implementation of class
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-inline Message TabSheet::getSelectionChangedMessage() {
- return Message( WM_NOTIFY, TCN_SELCHANGE );
-}
-
-inline int TabSheet::getSelectedImpl() const {
- return TabCtrl_GetCurSel( this->handle() );
-}
-
-inline int TabSheet::getImage(unsigned idx) const
-{
- TCITEM item = { TCIF_IMAGE };
- if ( !TabCtrl_GetItem( this->handle(), idx, & item ) )
- {
- throw xCeption( _T( "Couldn't get image of item." ) );
- }
- return item.iImage;
-}
-
-inline HWND TabSheet::getToolTips() const
-{
- HWND wnd = TabCtrl_GetToolTips(this->handle());
- if(wnd == NULL)
- {
- throw xCeption( _T( "Couldn't get tooltips HWND." ) );
- }
- return wnd;
-}
-
-inline LPARAM TabSheet::getData(unsigned idx)
-{
- TCITEM item = { TCIF_PARAM };
- if ( !TabCtrl_GetItem( this->handle(), idx, & item ) )
- {
- throw xCeption( _T( "Couldn't get data of item." ) );
- }
- return item.lParam;
-}
-
-inline void TabSheet::setSelectedImpl( int idx ) {
- TabCtrl_SetCurSel( this->handle(), idx );
-}
-
-inline void TabSheet::setText( unsigned index, const tstring& text )
-{
- TCITEM item = { TCIF_TEXT };
- item.pszText = const_cast < TCHAR * >( text.c_str() );
- TabCtrl_SetItem(this->handle(), index, &item);
-}
-
-inline void TabSheet::setData( unsigned index, LPARAM lParam )
-{
- TCITEM item = { TCIF_PARAM };
- item.lParam = lParam;
- TabCtrl_SetItem(this->handle(), index, &item);
-}
-
-inline TabSheet::TabSheet( dwt::Widget * parent )
- : BaseType( parent )
-{
-}
-
-inline void TabSheet::setTabsAtBottom( bool value )
-{
- this->addRemoveStyle( TCS_BOTTOM, value );
-}
-
-inline void TabSheet::setButtonStyle( bool value )
-{
- this->addRemoveStyle( TCS_BUTTONS, value );
-}
-
-inline void TabSheet::setFlatButtonStyle( bool value )
-{
- this->addRemoveStyle( TCS_BUTTONS, value );
- this->addRemoveStyle( TCS_FLATBUTTONS, value );
-}
-
-inline void TabSheet::setHotTrack( bool value )
-{
- this->addRemoveStyle( TCS_HOTTRACK, value );
-}
-
-inline void TabSheet::setMultiline( bool value )
-{
- this->addRemoveStyle( TCS_MULTILINE, value );
-}
-
-inline void TabSheet::setRaggedRight( bool value )
-{
- this->addRemoveStyle( TCS_RAGGEDRIGHT, value );
-}
-
-inline void TabSheet::setVerticalTabs( bool value )
-{
- this->addRemoveStyle( TCS_VERTICAL, value );
-}
-
-inline void TabSheet::setRightTabs( bool value )
-{
- this->addRemoveStyle( TCS_VERTICAL | TCS_RIGHT, value );
-}
-
-inline void TabSheet::setFlatSeparators( bool value )
-{
- this->sendMessage( TCM_SETEXTENDEDSTYLE, TCS_EX_FLATSEPARATORS, value );
-}
-
-inline const ImageListPtr& TabSheet::getImageList() const
-{
- return imageList;
-}
-
-inline void TabSheet::setHighlight(int item, bool highlight) {
- TabCtrl_HighlightItem(handle(), item, highlight);
-}
-
-inline int TabSheet::hitTest(const ScreenCoordinate& pt) {
- TCHITTESTINFO tci = { ClientCoordinate(pt, this).getPoint() };
-
- return TabCtrl_HitTest(handle(), &tci);
-}
-
-inline void TabSheet::eraseImpl(int i) {
- TabCtrl_DeleteItem(this->handle(), i);
-}
-
-inline void TabSheet::clearImpl() {
- TabCtrl_DeleteAllItems(handle());
-}
-
-inline size_t TabSheet::sizeImpl() const {
- return static_cast<size_t>(TabCtrl_GetItemCount(this->handle()));
-}
-
-}
-
-#endif
Modified: dcplusplus/trunk/dwt/include/dwt/widgets/TabView.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/TabView.h 2008-04-14 21:17:47 UTC (rev 1164)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/TabView.h 2008-04-14 21:18:55 UTC (rev 1165)
@@ -32,11 +32,17 @@
#ifndef DWT_WIDGETTABVIEW_H_
#define DWT_WIDGETTABVIEW_H_
+#include "../resources/ImageList.h"
+#include "../Rectangle.h"
+#include "../aspects/AspectCollection.h"
+#include "../aspects/AspectFocus.h"
+#include "../aspects/AspectFont.h"
+#include "../aspects/AspectPainting.h"
+#include "../aspects/AspectSelection.h"
+#include "../aspects/AspectText.h"
#include "../WindowClass.h"
-#include "../Policies.h"
-#include "../aspects/AspectRaw.h"
-#include "../aspects/AspectSizable.h"
-#include "../aspects/AspectMouse.h"
+#include "Control.h"
+
#include <list>
#include <vector>
@@ -45,12 +51,19 @@
* A container that keeps widgets in tabs and handles switching etc
*/
class TabView :
- public MessageMap< Policies::Normal >,
-
- public AspectRaw<TabView>,
- public AspectSizable<TabView>
+ public CommonControl,
+ // Aspects
+ private AspectCollection<TabView, int>,
+ public AspectFocus< TabView >,
+ public AspectFont< TabView >,
+ public AspectPainting< TabView >,
+ public AspectSelection< TabView, int >,
+ public AspectText< TabView >
{
- typedef MessageMap<Policies::Normal> BaseType;
+ typedef CommonControl BaseType;
+ friend class AspectCollection<TabView, int>;
+ friend class AspectSelection<TabView, int>;
+ friend class WidgetCreator< TabView >;
typedef std::tr1::function<void (const tstring&)> TitleChangedFunction;
typedef std::tr1::function<void (HWND, unsigned)> HelpFunction;
typedef std::tr1::function<bool (const ScreenCoordinate&)> ContextMenuFunction;
@@ -65,6 +78,8 @@
struct Seed : public BaseType::Seed {
typedef ThisType WidgetType;
+ FontPtr font;
+
bool toggleActive;
/// Fills with default parameters
@@ -96,15 +111,11 @@
bool filter(const MSG& msg);
- TabSheetPtr getTab();
-
const Rectangle& getClientSize() const { return clientSize; }
void create( const Seed & cs = Seed() );
protected:
- friend class WidgetCreator<TabView>;
-
explicit TabView(Widget* parent);
virtual ~TabView() { }
@@ -120,7 +131,6 @@
static WindowClass windowClass;
- TabSheetPtr tab;
ToolTipPtr tip;
TitleChangedFunction titleChangedFunction;
@@ -134,6 +144,7 @@
typedef WindowList::iterator WindowIter;
WindowList viewOrder;
Rectangle clientSize;
+ ImageListPtr imageList;
std::vector<IconPtr> icons;
int active;
ContainerPtr dragging;
@@ -162,11 +173,58 @@
int addIcon(const IconPtr& icon);
void swapWidgets(ContainerPtr oldW, ContainerPtr newW);
+
+ tstring getText(unsigned idx) const;
+
+ void setText(unsigned idx, const tstring& text);
+
+ // AspectCollection
+ void eraseImpl( int row );
+ void clearImpl();
+ size_t sizeImpl() const;
+
+ // AspectSelection
+ int getSelectedImpl() const;
+ void setSelectedImpl( int idx );
+ // AspectSelection expectation implementation
+ static Message getSelectionChangedMessage();
+
+ const ImageListPtr& getImageList() const;
+
+ int hitTest(const ScreenCoordinate& pt);
+
+ /// Get the area not used by the tabs
+ /** This function should be used after adding the pages, so that the area not used by
+ * the tabs can be calculated accurately. It returns coordinates respect to the
+ * TabControl, this is, you have to adjust for the position of the control itself.
+ */
+ Rectangle getUsableArea(bool cutBorders = false) const;
+
};
-inline TabSheetPtr TabView::getTab() {
- return tab;
+inline Message TabView::getSelectionChangedMessage() {
+ return Message( WM_NOTIFY, TCN_SELCHANGE );
}
+inline void TabView::eraseImpl(int i) {
+ TabCtrl_DeleteItem(this->handle(), i);
}
+
+inline void TabView::clearImpl() {
+ TabCtrl_DeleteAllItems(handle());
+}
+
+inline size_t TabView::sizeImpl() const {
+ return static_cast<size_t>(TabCtrl_GetItemCount(this->handle()));
+}
+
+inline void TabView::setSelectedImpl( int idx ) {
+ TabCtrl_SetCurSel( this->handle(), idx );
+}
+
+inline int TabView::getSelectedImpl() const {
+ return TabCtrl_GetCurSel( this->handle() );
+}
+
+}
#endif /*WIDGETTABVIEW_H_*/
Deleted: dcplusplus/trunk/dwt/src/widgets/TabSheet.cpp
===================================================================
--- dcplusplus/trunk/dwt/src/widgets/TabSheet.cpp 2008-04-14 21:17:47 UTC (rev 1164)
+++ dcplusplus/trunk/dwt/src/widgets/TabSheet.cpp 2008-04-14 21:18:55 UTC (rev 1165)
@@ -1,106 +0,0 @@
-/*
- DC++ Widget Toolkit
-
- Copyright (c) 2007-2008, Jacek Sieka
-
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- * Neither the name of the DWT nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#include <dwt/widgets/TabSheet.h>
-
-namespace dwt {
-
-TabSheet::Seed::Seed() :
- BaseType::Seed(WC_TABCONTROL, WS_CHILD | WS_TABSTOP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN),
- font(new Font(DefaultGuiFont))
-{
-}
-
-void TabSheet::create( const Seed & cs )
-{
- BaseType::create(cs);
- if(cs.font)
- setFont( cs.font );
-}
-
-unsigned int TabSheet::addPage( const tstring & header, unsigned index, LPARAM data, int image )
-{
- TCITEM item;
- item.mask = TCIF_TEXT | TCIF_PARAM;
- item.pszText = const_cast < TCHAR * >( header.c_str() );
- item.lParam = data;
- if(image != -1) {
- item.mask |= TCIF_IMAGE;
- item.iImage = image;
- }
-
- int newIdx = TabCtrl_InsertItem( this->handle(), index, & item );
- if ( newIdx == - 1 )
- {
- xCeption x( _T( "Error while trying to add page into Tab Sheet" ) );
- throw x;
- }
- return ( unsigned int ) newIdx;
-}
-
-dwt::Rectangle TabSheet::getUsableArea(bool cutBorders) const
-{
- RECT rc;
- ::GetWindowRect(handle(), &rc);
- ::MapWindowPoints(NULL, getParent()->handle(), (LPPOINT)&rc, 2);
- TabCtrl_AdjustRect( this->handle(), false, &rc );
- Rectangle rect( rc );
- if(cutBorders) {
- Rectangle rctabs(getClientAreaSize());
- // Get rid of ugly border...assume y border is the same as x border
- long border = (rctabs.width() - rect.width()) / 2;
- rect.pos.x = rctabs.x();
- rect.size.x = rctabs.width();
- rect.size.y += border;
- }
- return rect;
-}
-
-void TabSheet::setImageList(const ImageListPtr& imageList_)
-{
- imageList = imageList_;
- TabCtrl_SetImageList(handle(), imageList->handle());
-}
-
-tstring TabSheet::getText(unsigned idx) const
-{
- TCITEM item = { TCIF_TEXT };
- TCHAR buffer[200];
- item.cchTextMax = 198;
- item.pszText = buffer;
- if ( !TabCtrl_GetItem( this->handle(), idx, & item ) )
- {
- throw xCeption( _T( "Couldn't retrieve text in TabSheet::getText." ) );
- }
- return buffer;
-}
-
-}
Modified: dcplusplus/trunk/dwt/src/widgets/TabView.cpp
===================================================================
--- dcplusplus/trunk/dwt/src/widgets/TabView.cpp 2008-04-14 21:17:47 UTC (rev 1164)
+++ dcplusplus/trunk/dwt/src/widgets/TabView.cpp 2008-04-14 21:18:55 UTC (rev 1165)
@@ -33,7 +33,6 @@
#include <dwt/widgets/Container.h>
#include <dwt/widgets/ToolTip.h>
-#include <dwt/widgets/TabSheet.h>
#include <dwt/WidgetCreator.h>
#include <dwt/util/StringUtils.h>
@@ -42,14 +41,68 @@
WindowClass TabView::windowClass(_T("TabView"), &TabView::wndProc, NULL, ( HBRUSH )( COLOR_WINDOW + 1 ));
TabView::Seed::Seed(bool toggleActive_) :
- BaseType::Seed(windowClass.getClassName(), WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_VISIBLE),
+ BaseType::Seed(WC_TABCONTROL, WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_VISIBLE |
+ TCS_HOTTRACK | TCS_MULTILINE | TCS_RAGGEDRIGHT | TCS_TOOLTIPS | TCS_FOCUSNEVER),
+ font(new Font(DefaultGuiFont)),
toggleActive(toggleActive_)
{
+ // Flicker bugfix, as described in SWT:
+ /*
+ * Feature in Windows. The tab control window class
+ * uses the CS_HREDRAW and CS_VREDRAW style bits to
+ * force a full redraw of the control and all children
+ * when resized. This causes flashing. The fix is to
+ * register a new window class without these bits and
+ * implement special code that damages only the exposed
+ * area.
+ *
+ * NOTE: Screen readers look for the exact class name
+ * of the control in order to provide the correct kind
+ * of assistance. Therefore, it is critical that the
+ * new window class have the same name. It is possible
+ * to register a local window class with the same name
+ * as a global class. Since bits that affect the class
+ * are being changed, it is possible that other native
+ * code, other than SWT, could create a control with
+ * this class name, and fail unexpectedly.
+ */
+
+ static bool first = true;
+ if(first) {
+ // From SWT:
+ /*
+ * Feature in Windows. The tab control window class
+ * uses the CS_HREDRAW and CS_VREDRAW style bits to
+ * force a full redraw of the control and all children
+ * when resized. This causes flashing. The fix is to
+ * register a new window class without these bits and
+ * implement special code that damages only the exposed
+ * area.
+ *
+ * NOTE: Screen readers look for the exact class name
+ * of the control in order to provide the correct kind
+ * of assistance. Therefore, it is critical that the
+ * new window class have the same name. It is possible
+ * to register a local window class with the same name
+ * as a global class. Since bits that affect the class
+ * are being changed, it is possible that other native
+ * code, other than SWT, could create a control with
+ * this class name, and fail unexpectedly.
+ */
+ WNDCLASSEX cls = { sizeof(WNDCLASSEX) };
+ ::GetClassInfoEx(NULL, WC_TABCONTROL, &cls);
+
+ cls.lpszClassName = WC_TABCONTROL;
+ cls.hInstance = ::GetModuleHandle(NULL);
+ cls.style &= ~(CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS);
+
+ ::RegisterClassEx(&cls);
+ first = false;
+ }
}
TabView::TabView(Widget* w) :
BaseType(w),
- tab(0),
tip(0),
toggleActive(false),
inTab(false),
@@ -61,32 +114,50 @@
PolicyType::create(cs);
toggleActive = cs.toggleActive;
- TabSheet::Seed tcs;
- tcs.style = WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_VISIBLE |
- TCS_HOTTRACK | TCS_MULTILINE | TCS_RAGGEDRIGHT | TCS_TOOLTIPS | TCS_FOCUSNEVER;
- tab = WidgetCreator<TabSheet>::create(this, tcs);
- tab->setImageList(ImageListPtr(new ImageList(16, 16, ILC_COLOR32 | ILC_MASK)));
- tab->onSelectionChanged(std::tr1::bind(&TabView::handleTabSelected, this));
+ if(cs.font)
+ setFont( cs.font );
+
+ imageList = new ImageList(16, 16, ILC_COLOR32 | ILC_MASK);
+
+ TabCtrl_SetImageList(handle(), imageList->handle());
+
+ onSelectionChanged(std::tr1::bind(&TabView::handleTabSelected, this));
+ onLeftMouseDown(std::tr1::bind(&TabView::handleLeftMouseDown, this, _1));
+ onLeftMouseUp(std::tr1::bind(&TabView::handleLeftMouseUp, this, _1));
+ onContextMenu(std::tr1::bind(&TabView::handleContextMenu, this, _1));
+ onMiddleMouseDown(std::tr1::bind(&TabView::handleMiddleMouseDown, this, _1));
+ onHelp(std::tr1::bind(&TabView::handleHelp, this, _1, _2));
+
onSized(std::tr1::bind(&TabView::handleSized, this, _1));
- tab->onLeftMouseDown(std::tr1::bind(&TabView::handleLeftMouseDown, this, _1));
- tab->onLeftMouseUp(std::tr1::bind(&TabView::handleLeftMouseUp, this, _1));
- tab->onContextMenu(std::tr1::bind(&TabView::handleContextMenu, this, _1));
- tab->onMiddleMouseDown(std::tr1::bind(&TabView::handleMiddleMouseDown, this, _1));
- tab->onHelp(std::tr1::bind(&TabView::handleHelp, this, _1, _2));
- tip = WidgetCreator<ToolTip>::attach(this, tab->getToolTips()); // created and managed by the tab control thanks to the TCS_TOOLTIPS style
- if(tip) {
- tip->addRemoveStyle(TTS_NOPREFIX, true);
- tip->onRaw(std::tr1::bind(&TabView::handleToolTip, this, _2), Message(WM_NOTIFY, TTN_GETDISPINFO));
- }
+ tip = WidgetCreator<ToolTip>::attach(this, TabCtrl_GetToolTips(handle())); // created and managed by the tab control thanks to the TCS_TOOLTIPS style
+ tip->addRemoveStyle(TTS_NOPREFIX, true);
+ tip->onRaw(std::tr1::bind(&TabView::handleToolTip, this, _2), Message(WM_NOTIFY, TTN_GETDISPINFO));
}
void TabView::add(Container* w, const IconPtr& icon) {
int image = addIcon(icon);
- size_t tabs = tab->size();
+ size_t tabs = size();
TabInfo* ti = new TabInfo(w);
- tab->addPage(formatTitle(w->getText()), tabs, reinterpret_cast<LPARAM>(ti), image);
+ tstring title = formatTitle(w->getText());
+
+ TCITEM item = { 0 };
+ item.mask = TCIF_TEXT | TCIF_PARAM;
+ item.pszText = const_cast < TCHAR * >( title.c_str() );
+ item.lParam = reinterpret_cast<LPARAM>(ti);
+ if(image != -1) {
+ item.mask |= TCIF_IMAGE;
+ item.iImage = image;
+ }
+
+ int newIdx = TabCtrl_InsertItem( handle(), tabs, &item );
+ if ( newIdx == - 1 )
+ {
+ xCeption x( _T( "Error while trying to add page into Tab Sheet" ) );
+ throw x;
+ }
+
viewOrder.push_front(w);
if(viewOrder.size() == 1 || w->hasStyle(WS_VISIBLE)) {
@@ -104,7 +175,7 @@
}
Container* TabView::getActive() {
- TabInfo* ti = getTabInfo(tab->getSelected());
+ TabInfo* ti = getTabInfo(getSelected());
return ti ? ti->w : 0;
}
@@ -113,7 +184,7 @@
setActive(*(--(--viewOrder.end())));
}
- Container* cur = getTabInfo(tab->getSelected())->w;
+ Container* cur = getTabInfo(getSelected())->w;
viewOrder.remove(w);
@@ -123,7 +194,7 @@
int i = findTab(w);
if(i != -1) {
delete getTabInfo(i);
- tab->erase(i);
+ erase(i);
layout();
}
active = findTab(cur);
@@ -136,7 +207,7 @@
tstring TabView::getTabText(Container* w) {
int i = findTab(w);
if(i != -1)
- return tab->getText(i);
+ return getText(i);
return tstring();
}
@@ -151,7 +222,7 @@
if(i == -1)
return;
- tab->setSelected(i);
+ setSelected(i);
handleTabSelected();
}
@@ -172,7 +243,7 @@
}
void TabView::handleTabSelected() {
- int i = tab->getSelected();
+ int i = getSelected();
if(i == active) {
return;
}
@@ -189,7 +260,8 @@
if(!inTab)
setTop(ti->w);
active = i;
- tab->setHighlight(i, false);
+
+ TabCtrl_HighlightItem(handle(), i, FALSE);
if(titleChangedFunction)
titleChangedFunction(ti->w->getText());
@@ -197,13 +269,13 @@
void TabView::mark(Container* w) {
int i = findTab(w);
- if(i != -1 && i != tab->getSelected()) {
- tab->setHighlight(i, true);
+ if(i != -1 && i != getSelected()) {
+ TabCtrl_HighlightItem(handle(), i, TRUE);
}
}
int TabView::findTab(Container* w) {
- for(size_t i = 0; i < tab->size(); ++i) {
+ for(size_t i = 0; i < size(); ++i) {
if(getTabInfo(i)->w == w) {
return static_cast<int>(i);
}
@@ -216,13 +288,18 @@
}
TabView::TabInfo* TabView::getTabInfo(int i) {
- return i == -1 ? 0 : reinterpret_cast<TabInfo*>(tab->getData(i));
+ if(i != -1) {
+ TCITEM item = { TCIF_PARAM };
+ TabCtrl_GetItem(handle(), i, &item);
+ return reinterpret_cast<TabInfo*>(item.lParam);
+ }
+ return 0;
}
bool TabView::handleTextChanging(Container* w, const tstring& newText) {
int i = findTab(w);
if(i != -1) {
- tab->setText(i, formatTitle(newText));
+ setText(i, formatTitle(newText));
layout();
if((i == active) && titleChangedFunction)
@@ -238,14 +315,15 @@
}
void TabView::handleSized(const SizedEvent& sz) {
- tab->setBounds(Rectangle(sz.size));
+ // TODO the tab control itself has not seen the message yet so getUsableArea will return an invalid size if
+ // the number of rows changes for a multirow tab
layout();
}
void TabView::layout() {
- Rectangle tmp = tab->getUsableArea(true);
+ Rectangle tmp = getUsableArea(true);
if(!(tmp == clientSize)) {
- int i = tab->getSelected();
+ int i = getSelected();
if(i != -1) {
getTabInfo(i)->w->setBounds(tmp);
}
@@ -312,7 +390,7 @@
if(image == -1) {
image = icons.size();
icons.push_back(icon);
- tab->getImageList()->add(*icon);
+ getImageList()->add(*icon);
}
}
return image;
@@ -329,13 +407,13 @@
}
void TabView::handleLeftMouseDown(const MouseEvent& mouseEventResult) {
- TabInfo* ti = getTabInfo(tab->hitTest(mouseEventResult.pos));
+ TabInfo* ti = getTabInfo(hitTest(mouseEventResult.pos));
if(ti) {
if(mouseEventResult.isShiftPressed)
ti->w->close();
else {
dragging = ti->w;
- ::SetCapture(tab->handle());
+ ::SetCapture(handle());
}
}
}
@@ -350,11 +428,11 @@
if(dragPos == -1)
return;
- int dropPos = tab->hitTest(mouseEventResult.pos);
+ int dropPos = hitTest(mouseEventResult.pos);
if(dropPos == -1) {
// not in the tab control; move the tab to the end
- dropPos = tab->size() - 1;
+ dropPos = size() - 1;
}
if(dropPos == dragPos) {
@@ -368,14 +446,18 @@
}
// save some information about the tab before we erase it
- TabInfo* ti = getTabInfo(dragPos);
- int image = tab->getImage(dragPos);
+ TCITEM item = { TCIF_TEXT | TCIF_PARAM | TCIF_IMAGE };
+ TCHAR buf[1024] = { 0 };
+ item.pszText = buf;
+ item.cchTextMax = (sizeof(buf) / sizeof(TCHAR)) - 1;
+
+ TabCtrl_GetItem( this->handle(), dragPos, & item );
- tab->erase(dragPos);
+ erase(dragPos);
- tab->addPage(formatTitle(ti->w->getText()), dropPos, reinterpret_cast<LPARAM>(ti), image);
+ TabCtrl_InsertItem(handle(), dropPos, &item);
- active = tab->getSelected();
+ active = getSelected();
layout();
}
@@ -384,16 +466,16 @@
bool TabView::handleContextMenu(ScreenCoordinate pt) {
TabInfo* ti = 0;
if(pt.x() == -1 && pt.y() == -1) {
- int i = tab->getSelected();
+ int i = getSelected();
RECT rc;
- if(i == -1 || !TabCtrl_GetItemRect(tab->handle(), i, &rc)) {
+ if(i == -1 || !TabCtrl_GetItemRect(handle(), i, &rc)) {
return false;
}
pt = ScreenCoordinate(Point(rc.left, rc.top));
ti = getTabInfo(i);
} else {
- int i = tab->hitTest(pt);
+ int i = hitTest(pt);
if(i == -1) {
return false;
}
@@ -408,7 +490,7 @@
}
void TabView::handleMiddleMouseDown(const MouseEvent& mouseEventResult) {
- TabInfo* ti = getTabInfo(tab->hitTest(mouseEventResult.pos));
+ TabInfo* ti = getTabInfo(hitTest(mouseEventResult.pos));
if(ti)
ti->w->close();
}
@@ -416,7 +498,7 @@
void TabView::handleHelp(HWND hWnd, unsigned id) {
if(helpFunction) {
// hWnd and id are those of the whole tab control; not those of the specific tab on which the user wants help for
- TabInfo* ti = getTabInfo(tab->hitTest(ScreenCoordinate(Point::fromLParam(::GetMessagePos()))));
+ TabInfo* ti = getTabInfo(hitTest(ScreenCoordinate(Point::fromLParam(::GetMessagePos()))));
if(ti)
id = ti->w->getHelpId();
@@ -432,7 +514,7 @@
if(msg.message == WM_KEYUP && msg.wParam == VK_CONTROL) {
inTab = false;
- TabInfo* ti = getTabInfo(tab->getSelected());
+ TabInfo* ti = getTabInfo(getSelected());
if(ti) {
setTop(ti->w);
}
@@ -444,4 +526,51 @@
return false;
}
+void TabView::setText( unsigned index, const tstring& text )
+{
+ TCITEM item = { TCIF_TEXT };
+ item.pszText = const_cast < TCHAR * >( text.c_str() );
+ TabCtrl_SetItem(this->handle(), index, &item);
}
+
+tstring TabView::getText(unsigned idx) const
+{
+ TCITEM item = { TCIF_TEXT };
+ TCHAR buffer[1024];
+ item.cchTextMax = (sizeof(buffer) / sizeof(TCHAR)) - 1 ;
+ item.pszText = buffer;
+ if ( !TabCtrl_GetItem( this->handle(), idx, & item ) )
+ {
+ throw xCeption( _T( "Couldn't retrieve text in TabView::getText." ) );
+ }
+ return buffer;
+}
+
+dwt::Rectangle TabView::getUsableArea(bool cutBorders) const
+{
+ RECT rc;
+ ::GetClientRect(handle(), &rc);
+ TabCtrl_AdjustRect( this->handle(), false, &rc );
+ Rectangle rect( rc );
+ if(cutBorders) {
+ Rectangle rctabs(getClientAreaSize());
+ // Get rid of ugly border...assume y border is the same as x border
+ long border = (rctabs.width() - rect.width()) / 2;
+ rect.pos.x = rctabs.x();
+ rect.size.x = rctabs.width();
+ rect.size.y += border;
+ }
+ return rect;
+}
+
+const ImageListPtr& TabView::getImageList() const {
+ return imageList;
+}
+
+int TabView::hitTest(const ScreenCoordinate& pt) {
+ TCHITTESTINFO tci = { ClientCoordinate(pt, this).getPoint() };
+
+ return TabCtrl_HitTest(handle(), &tci);
+}
+
+}
Modified: dcplusplus/trunk/win32/MDIChildFrame.h
===================================================================
--- dcplusplus/trunk/win32/MDIChildFrame.h 2008-04-14 21:17:47 UTC (rev 1164)
+++ dcplusplus/trunk/win32/MDIChildFrame.h 2008-04-14 21:18:55 UTC (rev 1165)
@@ -39,7 +39,7 @@
protected:
MDIChildFrame(dwt::TabView* tabView, const tstring& title, unsigned helpId = 0, dwt::IconPtr icon = dwt::IconPtr(), bool activate = true) :
- BaseType(tabView->getTab()),
+ BaseType(tabView),
lastFocus(NULL),
alwaysSameFocus(false),
reallyClose(false)
@@ -119,7 +119,7 @@
}
dwt::TabView* getParent() {
- return static_cast<dwt::TabView*>(BaseType::getParent()->getParent());
+ return static_cast<dwt::TabView*>(BaseType::getParent());
}
private:
Modified: dcplusplus/trunk/win32/MainWindow.cpp
===================================================================
--- dcplusplus/trunk/win32/MainWindow.cpp 2008-04-14 21:17:47 UTC (rev 1164)
+++ dcplusplus/trunk/win32/MainWindow.cpp 2008-04-14 21:18:55 UTC (rev 1165)
@@ -756,7 +756,7 @@
MainWindow* mf = reinterpret_cast<MainWindow*>(p);
HWND wnd, wnd2 = NULL;
- while( (wnd=::GetWindow(mf->getTabView()->getTab()->handle(), GW_CHILD)) != NULL) {
+ while( (wnd=::GetWindow(mf->getTabView()->handle(), GW_CHILD)) != NULL) {
if(wnd == wnd2) {
::Sleep(100);
} else {
Modified: dcplusplus/trunk/win32/TransferView.cpp
===================================================================
--- dcplusplus/trunk/win32/TransferView.cpp 2008-04-14 21:17:47 UTC (rev 1164)
+++ dcplusplus/trunk/win32/TransferView.cpp 2008-04-14 21:18:55 UTC (rev 1165)
@@ -71,26 +71,25 @@
create();
{
- TabSheet::Seed tcs;
- tcs.style |= TCS_HOTTRACK | TCS_RAGGEDRIGHT | TCS_FOCUSNEVER;
- tabs = addChild(tcs);
- tabs->onSelectionChanged(std::tr1::bind(&TransferView::handleTabSelected, this));
- }
-
+ TabView::Seed cs;
+ cs.location = getBounds();
+ tabs = addChild(cs);
+ }
+
{
Container::Seed cs;
cs.caption = T_("Connections");
cs.background = (HBRUSH)(COLOR_3DFACE + 1);
- cs.location = tabs->getUsableArea(true);
+ cs.location = tabs->getClientSize();
connectionsWindow = dwt::WidgetCreator<Container>::create(tabs, cs);
connectionsWindow->setHelpId(IDH_CONNECTIONS);
- tabs->addPage(T_("Connections"), 0);
+ tabs->add(connectionsWindow, dwt::IconPtr());
cs.style &= ~WS_VISIBLE;
cs.caption = T_("Downloads");
downloadsWindow = dwt::WidgetCreator<Container>::create(tabs, cs);
downloadsWindow->setHelpId(IDH_DOWNLOADS);
- tabs->addPage(T_("Downloads"), 1);
+ tabs->add(downloadsWindow, dwt::IconPtr());
}
{
@@ -142,29 +141,13 @@
}
-void TransferView::handleTabSelected() {
- int i = tabs->getSelected();
-
- if(i == 0) {
- ::ShowWindow(downloadsWindow->handle(), SW_HIDE);
- ::ShowWindow(connectionsWindow->handle(), SW_SHOW);
- } else {
- ::ShowWindow(connectionsWindow->handle(), SW_HIDE);
- ::ShowWindow(downloadsWindow->handle(), SW_SHOW);
- }
-}
-
void TransferView::handleSized(const dwt::SizedEvent& sz) {
layout();
}
void TransferView::layout() {
tabs->setBounds(dwt::Point(0,0), getClientAreaSize());
- dwt::Rectangle rect = tabs->getUsableArea(true);
-
- connectionsWindow->setBounds(rect);
connections->setBounds(dwt::Rectangle(connectionsWindow->getClientAreaSize()));
- downloadsWindow->setBounds(rect);
downloads->setBounds(dwt::Rectangle(downloadsWindow->getClientAreaSize()));
}
Modified: dcplusplus/trunk/win32/TransferView.h
===================================================================
--- dcplusplus/trunk/win32/TransferView.h 2008-04-14 21:17:47 UTC (rev 1164)
+++ dcplusplus/trunk/win32/TransferView.h 2008-04-14 21:18:55 UTC (rev 1165)
@@ -241,9 +241,9 @@
WidgetDownloadsPtr downloads;
ContainerPtr downloadsWindow;
- TabSheetPtr tabs;
+ TabViewPtr tabs;
- dwt::TabView* mdi;
+ TabViewPtr mdi;
dwt::ImageListPtr arrows;
bool startup;
@@ -262,7 +262,6 @@
void runUserCommand(const UserCommand& uc);
bool handleKeyDown(int c);
void handleDblClicked();
- void handleTabSelected();
MenuPtr makeContextMenu(ConnectionInfo* ii);
Modified: dcplusplus/trunk/win32/stdafx.h
===================================================================
--- dcplusplus/trunk/win32/stdafx.h 2008-04-14 21:17:47 UTC (rev 1164)
+++ dcplusplus/trunk/win32/stdafx.h 2008-04-14 21:18:55 UTC (rev 1165)
@@ -39,7 +39,6 @@
#include <dwt/widgets/ModelessDialog.h>
#include <dwt/widgets/RadioButton.h>
#include <dwt/widgets/Table.h>
-#include <dwt/widgets/TabSheet.h>
#include <dwt/widgets/TabView.h>
#include <dwt/widgets/TextBox.h>
#include <dwt/widgets/Tree.h>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2008-04-14 21:19:35
|
Revision: 1166
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1166&view=rev
Author: arnetheduck
Date: 2008-04-14 14:19:27 -0700 (Mon, 14 Apr 2008)
Log Message:
-----------
interim fix for tabview wm_size issue
Modified Paths:
--------------
dcplusplus/trunk/dwt/include/dwt/widgets/TabView.h
dcplusplus/trunk/dwt/src/widgets/TabView.cpp
dcplusplus/trunk/win32/TransferView.cpp
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-13 15:39:27.368000031 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
+ timestamp: 2008-04-13 18:50:25.740999937 +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
+ 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
Modified: dcplusplus/trunk/dwt/include/dwt/widgets/TabView.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/TabView.h 2008-04-14 21:18:55 UTC (rev 1165)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/TabView.h 2008-04-14 21:19:27 UTC (rev 1166)
@@ -169,7 +169,7 @@
void handleHelp(HWND hWnd, unsigned id);
tstring formatTitle(tstring title);
- void layout();
+ LRESULT layout();
int addIcon(const IconPtr& icon);
void swapWidgets(ContainerPtr oldW, ContainerPtr newW);
Modified: dcplusplus/trunk/dwt/src/widgets/TabView.cpp
===================================================================
--- dcplusplus/trunk/dwt/src/widgets/TabView.cpp 2008-04-14 21:18:55 UTC (rev 1165)
+++ dcplusplus/trunk/dwt/src/widgets/TabView.cpp 2008-04-14 21:19:27 UTC (rev 1166)
@@ -40,6 +40,8 @@
WindowClass TabView::windowClass(_T("TabView"), &TabView::wndProc, NULL, ( HBRUSH )( COLOR_WINDOW + 1 ));
+static UINT RESIZE_MESSAGE = 0;
+
TabView::Seed::Seed(bool toggleActive_) :
BaseType::Seed(WC_TABCONTROL, WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_VISIBLE |
TCS_HOTTRACK | TCS_MULTILINE | TCS_RAGGEDRIGHT | TCS_TOOLTIPS | TCS_FOCUSNEVER),
@@ -98,6 +100,8 @@
::RegisterClassEx(&cls);
first = false;
+
+ RESIZE_MESSAGE = ::RegisterWindowMessage(_T("TabView_Refresh"));
}
}
@@ -130,6 +134,8 @@
onSized(std::tr1::bind(&TabView::handleSized, this, _1));
+ onRaw(std::tr1::bind(&TabView::layout, this), Message(RESIZE_MESSAGE));
+
tip = WidgetCreator<ToolTip>::attach(this, TabCtrl_GetToolTips(handle())); // created and managed by the tab control thanks to the TCS_TOOLTIPS style
tip->addRemoveStyle(TTS_NOPREFIX, true);
tip->onRaw(std::tr1::bind(&TabView::handleToolTip, this, _2), Message(WM_NOTIFY, TTN_GETDISPINFO));
@@ -315,12 +321,14 @@
}
void TabView::handleSized(const SizedEvent& sz) {
- // TODO the tab control itself has not seen the message yet so getUsableArea will return an invalid size if
- // the number of rows changes for a multirow tab
- layout();
+ // We defer the layout because the tab control itself must process WM_SIZE first in order to calculate the
+ // number of rows (otherwise getUsableArea returns the usable area before the resize...)
+ // This is less than ideal since it means the children will not be synchronously resized which apps may expect
+ // TODO Fix this...
+ postMessage(RESIZE_MESSAGE);
}
-void TabView::layout() {
+LRESULT TabView::layout() {
Rectangle tmp = getUsableArea(true);
if(!(tmp == clientSize)) {
int i = getSelected();
@@ -329,6 +337,8 @@
}
clientSize = tmp;
}
+ // Dummy return value to satisfy onRaw - this should be fixed sometime...
+ return 0;
}
void TabView::next(bool reverse) {
Modified: dcplusplus/trunk/win32/TransferView.cpp
===================================================================
--- dcplusplus/trunk/win32/TransferView.cpp 2008-04-14 21:18:55 UTC (rev 1165)
+++ dcplusplus/trunk/win32/TransferView.cpp 2008-04-14 21:19:27 UTC (rev 1166)
@@ -60,6 +60,10 @@
N_("Size")
};
+static void fills(dwt::ContainerPtr parent, dwt::TablePtr control) {
+ control->setBounds(dwt::Rectangle(parent->getClientAreaSize()));
+}
+
TransferView::TransferView(dwt::Widget* parent, dwt::TabView* mdi_) :
WidgetFactory<dwt::Container>(parent),
connections(0),
@@ -123,6 +127,9 @@
downloads->onContextMenu(std::tr1::bind(&TransferView::handleDownloadsMenu, this, _1));
}
+
+ connectionsWindow->onSized(std::tr1::bind(&fills, connectionsWindow, connections));
+ downloadsWindow->onSized(std::tr1::bind(&fills, downloadsWindow, downloads));
onSized(std::tr1::bind(&TransferView::handleSized, this, _1));
onRaw(std::tr1::bind(&TransferView::handleDestroy, this, _1, _2), dwt::Message(WM_DESTROY));
@@ -147,8 +154,6 @@
void TransferView::layout() {
tabs->setBounds(dwt::Point(0,0), getClientAreaSize());
- connections->setBounds(dwt::Rectangle(connectionsWindow->getClientAreaSize()));
- downloads->setBounds(dwt::Rectangle(downloadsWindow->getClientAreaSize()));
}
void TransferView::prepareClose() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2008-04-14 21:19:58
|
Revision: 1167
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1167&view=rev
Author: arnetheduck
Date: 2008-04-14 14:19:48 -0700 (Mon, 14 Apr 2008)
Log Message:
-----------
update changelog too
Modified Paths:
--------------
dcplusplus/trunk/changelog.txt
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-13 18:50:25.740999937 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
+ timestamp: 2008-04-13 20:26:18.454999924 +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
+ 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
Modified: dcplusplus/trunk/changelog.txt
===================================================================
--- dcplusplus/trunk/changelog.txt 2008-04-14 21:19:27 UTC (rev 1166)
+++ dcplusplus/trunk/changelog.txt 2008-04-14 21:19:48 UTC (rev 1167)
@@ -31,7 +31,9 @@
* [L#212411] Fixed downloading multiple file lists (poy)
* Added filter already shared from search results (thanks smir)
* [L#206521] Fixed directory not being removable (thanks poy)
+* Reduced resize flicker some
+
-- 0.705 2008-03-14 --
* Several patches for better *nix compatibility of the core (thanks steven sheehy et al)
* Improve segmented download implementation
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2008-04-14 21:20:50
|
Revision: 1168
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1168&view=rev
Author: arnetheduck
Date: 2008-04-14 14:20:37 -0700 (Mon, 14 Apr 2008)
Log Message:
-----------
sound patch
Modified Paths:
--------------
dcplusplus/trunk/changelog.txt
dcplusplus/trunk/dcpp/SettingsManager.cpp
dcplusplus/trunk/dcpp/SettingsManager.h
dcplusplus/trunk/win32/Appearance2Page.cpp
dcplusplus/trunk/win32/Appearance2Page.h
dcplusplus/trunk/win32/DCPlusPlus.rc
dcplusplus/trunk/win32/HubFrame.cpp
dcplusplus/trunk/win32/LogPage.cpp
dcplusplus/trunk/win32/LogPage.h
dcplusplus/trunk/win32/PrivateFrame.cpp
dcplusplus/trunk/win32/PropPage.cpp
dcplusplus/trunk/win32/PropPage.h
dcplusplus/trunk/win32/WinUtil.cpp
dcplusplus/trunk/win32/WinUtil.h
dcplusplus/trunk/win32/resource.h
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-13 20:26:18.454999924 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
+ timestamp: 2008-04-13 20:45:17.299000025 +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
+ arn...@gm...-20080329054606-ubefm4h98xjgvif9
arn...@gm...-20080329220538-g3f1nvcfh1ycetw7
robert@smir-20080331181318-buvm17zqqym5ryct
po...@12...-20080411151741-4v1p7g8chsber07o
po...@12...-20080412010859-rirxtkww5ilq2pj5
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
+ 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
Modified: dcplusplus/trunk/changelog.txt
===================================================================
--- dcplusplus/trunk/changelog.txt 2008-04-14 21:19:48 UTC (rev 1167)
+++ dcplusplus/trunk/changelog.txt 2008-04-14 21:20:37 UTC (rev 1168)
@@ -32,8 +32,8 @@
* Added filter already shared from search results (thanks smir)
* [L#206521] Fixed directory not being removable (thanks poy)
* Reduced resize flicker some
+* Added various sound options (thanks poy)
-
-- 0.705 2008-03-14 --
* Several patches for better *nix compatibility of the core (thanks steven sheehy et al)
* Improve segmented download implementation
Modified: dcplusplus/trunk/dcpp/SettingsManager.cpp
===================================================================
--- dcplusplus/trunk/dcpp/SettingsManager.cpp 2008-04-14 21:19:48 UTC (rev 1167)
+++ dcplusplus/trunk/dcpp/SettingsManager.cpp 2008-04-14 21:20:37 UTC (rev 1168)
@@ -45,15 +45,16 @@
"FinishedULWidths", "FinishedULOrder", "CID", "SpyFrameWidths", "SpyFrameOrder", "LogFileMainChat",
"LogFilePrivateChat", "LogFileStatus", "LogFileUpload", "LogFileDownload", "LogFileSystem",
"LogFormatSystem", "LogFormatStatus", "DirectoryListingFrameOrder", "DirectoryListingFrameWidths",
- "TLSPrivateKeyFile", "TLSCertificateFile", "TLSTrustedCertificatesPath", "BeepFile",
+ "TLSPrivateKeyFile", "TLSCertificateFile", "TLSTrustedCertificatesPath",
"Language", "DownloadsOrder", "DownloadsWidth",
+ "SoundMainChat", "SoundPM", "SoundPMWindow",
"SENTRY",
// Ints
"IncomingConnections", "InPort", "Slots", "AutoFollow", "ClearSearch",
"BackgroundColor", "TextColor", "UseOemMonoFont", "ShareHidden", "FilterMessages", "MinimizeToTray",
"AutoSearch", "TimeStamps", "ConfirmExit", "PopupHubPms", "PopupBotPms", "IgnoreHubPms", "IgnoreBotPms",
"ListDuplicates", "BufferSize", "DownloadSlots", "MaxDownloadSpeed", "LogMainChat", "LogPrivateChat",
- "LogDownloads", "LogUploads", "StatusInChat", "ShowJoins", "PrivateMessageBeep", "PrivateMessageBeepOpen",
+ "LogDownloads", "LogUploads", "StatusInChat", "ShowJoins",
"UseSystemIcons", "PopupPMs", "MinUploadSpeed", "GetUserInfo", "UrlHandler", "MainWindowState",
"MainWindowSizeX", "MainWindowSizeY", "MainWindowPosX", "MainWindowPosY", "AutoAway",
"SocksPort", "SocksResolve", "KeepLists", "AutoKick", "QueueFrameShowTree",
@@ -147,8 +148,6 @@
setDefault(STATUS_IN_CHAT, true);
setDefault(SHOW_JOINS, false);
setDefault(UPLOAD_SPEED, connectionSpeeds[0]);
- setDefault(PRIVATE_MESSAGE_BEEP, false);
- setDefault(PRIVATE_MESSAGE_BEEP_OPEN, false);
setDefault(USE_SYSTEM_ICONS, true);
setDefault(USE_OEM_MONOFONT, false);
setDefault(POPUP_PMS, true);
Modified: dcplusplus/trunk/dcpp/SettingsManager.h
===================================================================
--- dcplusplus/trunk/dcpp/SettingsManager.h 2008-04-14 21:19:48 UTC (rev 1167)
+++ dcplusplus/trunk/dcpp/SettingsManager.h 2008-04-14 21:20:37 UTC (rev 1168)
@@ -57,8 +57,9 @@
FINISHED_UL_WIDTHS, FINISHED_UL_ORDER, PRIVATE_ID, SPYFRAME_WIDTHS, SPYFRAME_ORDER, LOG_FILE_MAIN_CHAT,
LOG_FILE_PRIVATE_CHAT, LOG_FILE_STATUS, LOG_FILE_UPLOAD, LOG_FILE_DOWNLOAD, LOG_FILE_SYSTEM,
LOG_FORMAT_SYSTEM, LOG_FORMAT_STATUS, DIRECTORLISTINGFRAME_ORDER, DIRECTORLISTINGFRAME_WIDTHS,
- TLS_PRIVATE_KEY_FILE, TLS_CERTIFICATE_FILE, TLS_TRUSTED_CERTIFICATES_PATH, BEEPFILE,
+ TLS_PRIVATE_KEY_FILE, TLS_CERTIFICATE_FILE, TLS_TRUSTED_CERTIFICATES_PATH,
LANGUAGE, DOWNLOADS_ORDER, DOWNLOADS_WIDTHS,
+ SOUND_MAIN_CHAT, SOUND_PM, SOUND_PM_WINDOW,
STR_LAST };
enum IntSetting { INT_FIRST = STR_LAST + 1,
@@ -66,7 +67,7 @@
BACKGROUND_COLOR, TEXT_COLOR, USE_OEM_MONOFONT, SHARE_HIDDEN, FILTER_MESSAGES, MINIMIZE_TRAY,
AUTO_SEARCH, TIME_STAMPS, CONFIRM_EXIT, POPUP_HUB_PMS, POPUP_BOT_PMS, IGNORE_HUB_PMS, IGNORE_BOT_PMS,
LIST_DUPES, BUFFER_SIZE, DOWNLOAD_SLOTS, MAX_DOWNLOAD_SPEED, LOG_MAIN_CHAT, LOG_PRIVATE_CHAT,
- LOG_DOWNLOADS, LOG_UPLOADS, STATUS_IN_CHAT, SHOW_JOINS, PRIVATE_MESSAGE_BEEP, PRIVATE_MESSAGE_BEEP_OPEN,
+ LOG_DOWNLOADS, LOG_UPLOADS, STATUS_IN_CHAT, SHOW_JOINS,
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,
Modified: dcplusplus/trunk/win32/Appearance2Page.cpp
===================================================================
--- dcplusplus/trunk/win32/Appearance2Page.cpp 2008-04-14 21:19:48 UTC (rev 1167)
+++ dcplusplus/trunk/win32/Appearance2Page.cpp 2008-04-14 21:20:37 UTC (rev 1168)
@@ -32,16 +32,14 @@
{ IDC_COLOREXAMPLE, IDH_SETTINGS_APPEARANCE2_COLORS },
{ IDC_SETTINGS_UPLOAD_BAR_COLOR, IDH_SETTINGS_APPEARANCE2_UPLOAD_BAR_COLOR },
{ IDC_SETTINGS_DOWNLOAD_BAR_COLOR, IDH_SETTINGS_APPEARANCE2_DOWNLOAD_BAR_COLOR },
- { IDC_SETTINGS_REQUIRES_RESTART, IDH_SETTINGS_APPEARANCE_REQUIRES_RESTART },
{ IDC_BEEP_NOTIFICATION, IDH_SETTINGS_APPEARANCE2_BEEPFILE },
{ IDC_BEEPFILE, IDH_SETTINGS_APPEARANCE2_BEEPFILE },
{ IDC_BROWSE, IDH_SETTINGS_APPEARANCE2_BEEPFILE },
+ { IDC_SETTINGS_REQUIRES_RESTART, IDH_SETTINGS_APPEARANCE_REQUIRES_RESTART },
{ 0, 0 }
};
PropPage::TextItem Appearance2Page::texts[] = {
- { IDC_BEEP_NOTIFICATION, N_("Notification sound") },
- { IDC_BROWSE, N_("&Browse...") },
{ IDC_SETTINGS_COLORS, N_("Colors") },
{ IDC_SELWINCOLOR, N_("Select &window color") },
{ IDC_SELTEXT, N_("Select &text style") },
@@ -49,26 +47,25 @@
{ IDC_SETTINGS_REQUIRES_RESTART, N_("Note; most of these options require that you restart DC++") },
{ IDC_SETTINGS_UPLOAD_BAR_COLOR, N_("Uploads") },
{ IDC_SETTINGS_SOUNDS, N_("Sounds") },
- { IDC_PRIVATE_MESSAGE_BEEP, N_("Make an annoying sound every time a private message is received") },
- { IDC_PRIVATE_MESSAGE_BEEP_OPEN, N_("Make an annoying sound when a private message window is opened") },
{ IDC_SETTINGS_DOWNLOAD_BAR_COLOR, N_("Downloads") },
+ { IDC_BEEP_NOTIFICATION, N_("Notification sound") },
+ { IDC_BROWSE, N_("&Browse...") },
{ 0, 0 }
};
-PropPage::Item Appearance2Page::items[] = {
- { IDC_PRIVATE_MESSAGE_BEEP, SettingsManager::PRIVATE_MESSAGE_BEEP, PropPage::T_BOOL },
- { IDC_PRIVATE_MESSAGE_BEEP_OPEN, SettingsManager::PRIVATE_MESSAGE_BEEP_OPEN, PropPage::T_BOOL },
- { IDC_BEEPFILE, SettingsManager::BEEPFILE, PropPage::T_STR },
- { 0, 0, PropPage::T_END }
+Appearance2Page::SoundOption Appearance2Page::soundOptions[] = {
+ { N_("Every time a main chat message is received"), SettingsManager::SOUND_MAIN_CHAT, Util::emptyStringT },
+ { N_("Every time a private message is received"), SettingsManager::SOUND_PM, Util::emptyStringT },
+ { N_("When a private message window is opened"), SettingsManager::SOUND_PM_WINDOW, Util::emptyStringT },
+ { 0, 0, Util::emptyStringT }
};
-Appearance2Page::Appearance2Page(dwt::Widget* parent) : PropPage(parent) {
+Appearance2Page::Appearance2Page(dwt::Widget* parent) : PropPage(parent), oldSelection(-1) {
createDialog(IDD_APPEARANCE2PAGE);
setHelpId(IDH_APPEARANCE2PAGE);
WinUtil::setHelpIds(this, helpItems);
PropPage::translate(handle(), texts);
- PropPage::read(handle(), items, 0, 0);
fg = SETTING(TEXT_COLOR);
bg = SETTING(BACKGROUND_COLOR);
@@ -82,30 +79,48 @@
example->setColor(fg, bg);
example->setFont(font);
- ButtonPtr button = attachChild<Button>(IDC_SELWINCOLOR);
- button->onClicked(std::tr1::bind(&Appearance2Page::handleBackgroundClicked, this));
+ attachChild(sounds, IDC_SOUNDS);
+ PropPage::initList(sounds->handle());
- button = attachChild<Button>(IDC_SELTEXT);
- button->onClicked(std::tr1::bind(&Appearance2Page::handleTextClicked, this));
+ {
+ ButtonPtr button = attachChild<Button>(IDC_SELWINCOLOR);
+ button->onClicked(std::tr1::bind(&Appearance2Page::handleBackgroundClicked, this));
- button = attachChild<Button>(IDC_SETTINGS_UPLOAD_BAR_COLOR);
- button->onClicked(std::tr1::bind(&Appearance2Page::handleULClicked, this));
+ button = attachChild<Button>(IDC_SELTEXT);
+ button->onClicked(std::tr1::bind(&Appearance2Page::handleTextClicked, this));
- button = attachChild<Button>(IDC_SETTINGS_DOWNLOAD_BAR_COLOR);
- button->onClicked(std::tr1::bind(&Appearance2Page::handleDLClicked, this));
+ button = attachChild<Button>(IDC_SETTINGS_UPLOAD_BAR_COLOR);
+ button->onClicked(std::tr1::bind(&Appearance2Page::handleULClicked, this));
- button = attachChild<Button>(IDC_BROWSE);
- button->onClicked(std::tr1::bind(&Appearance2Page::handleBrowseClicked, this));
+ button = attachChild<Button>(IDC_SETTINGS_DOWNLOAD_BAR_COLOR);
+ button->onClicked(std::tr1::bind(&Appearance2Page::handleDLClicked, this));
+ }
- attachChild<TextBox>(IDC_BEEPFILE);
+ attachChild(beepFileLabel, IDC_BEEP_NOTIFICATION);
+
+ attachChild(beepFile, IDC_BEEPFILE);
+
+ attachChild(browse, IDC_BROWSE);
+ browse->onClicked(std::tr1::bind(&Appearance2Page::handleBrowseClicked, this));
+
+ setBeepEnabled(false);
+
+ for(size_t i = 0; soundOptions[i].setting != 0; ++i) {
+ soundOptions[i].file = Text::toT(SettingsManager::getInstance()->get((SettingsManager::StrSetting)soundOptions[i].setting));
+
+ TStringList row;
+ row.push_back(T_(soundOptions[i].text));
+ sounds->setChecked(sounds->insert(row), !soundOptions[i].file.empty());
+ }
+ sounds->setColumnWidth(0, LVSCW_AUTOSIZE);
+ saveSoundOptions();
+ sounds->onSelectionChanged(std::tr1::bind(&Appearance2Page::handleSelectionChanged, this));
}
Appearance2Page::~Appearance2Page() {
}
void Appearance2Page::write() {
- PropPage::write(handle(), items, 0,0);
-
SettingsManager* settings = SettingsManager::getInstance();
settings->set(SettingsManager::TEXT_COLOR, (int)fg);
@@ -113,6 +128,10 @@
settings->set(SettingsManager::UPLOAD_BAR_COLOR, (int)upBar);
settings->set(SettingsManager::DOWNLOAD_BAR_COLOR, (int)downBar);
settings->set(SettingsManager::TEXT_FONT, Text::fromT(WinUtil::encodeFont(logFont)));
+
+ saveSoundOptions();
+ for(size_t i = 0; soundOptions[i].setting != 0; ++i)
+ settings->set((SettingsManager::StrSetting)soundOptions[i].setting, Text::fromT(soundOptions[i].file));
}
void Appearance2Page::handleBackgroundClicked() {
@@ -151,13 +170,52 @@
}
}
-void Appearance2Page::handleBrowseClicked() {
- TCHAR buf[MAX_PATH];
+void Appearance2Page::handleSelectionChanged() {
+ saveSoundOptions();
- ::GetDlgItemText(handle(), IDC_BEEPFILE, buf, MAX_PATH);
- tstring x = buf;
+ int sel = sounds->getSelected();
+ if(sel >= 0) {
+ bool checked = sounds->isChecked(sel);
+ setBeepEnabled(checked);
+ beepFile->setText(
+ (checked && soundOptions[sel].file != _T("beep"))
+ ? soundOptions[sel].file
+ : Util::emptyStringT
+ );
+ } else {
+ setBeepEnabled(false);
+ beepFile->setText(Util::emptyStringT);
+ }
+ oldSelection = sel;
+}
+void Appearance2Page::handleBrowseClicked() {
+ tstring x = beepFile->getText();
if(createLoadDialog().open(x)) {
- setItemText(IDC_BEEPFILE, x);
+ beepFile->setText(x);
}
}
+
+void Appearance2Page::setBeepEnabled(bool enabled) {
+ beepFileLabel->setEnabled(enabled);
+ beepFile->setEnabled(enabled);
+ browse->setEnabled(enabled);
+}
+
+void Appearance2Page::saveSoundOptions() {
+ for(size_t i = 0; i < sounds->size(); ++i) {
+ if(sounds->isChecked(i)) {
+ if(soundOptions[i].file.empty())
+ soundOptions[i].file = _T("beep");
+ } else
+ soundOptions[i].file = Util::emptyStringT;
+ }
+
+ if(oldSelection >= 0) {
+ if(sounds->isChecked(oldSelection)) {
+ tstring text = beepFile->getText();
+ soundOptions[oldSelection].file = text.empty() ? _T("beep") : text;
+ } else
+ soundOptions[oldSelection].file = Util::emptyStringT;
+ }
+}
Modified: dcplusplus/trunk/win32/Appearance2Page.h
===================================================================
--- dcplusplus/trunk/win32/Appearance2Page.h 2008-04-14 21:19:48 UTC (rev 1167)
+++ dcplusplus/trunk/win32/Appearance2Page.h 2008-04-14 21:20:37 UTC (rev 1168)
@@ -30,20 +30,35 @@
virtual void write();
private:
- static Item items[];
static TextItem texts[];
+ struct SoundOption {
+ const char* text;
+ int setting;
+ tstring file;
+ };
+ static SoundOption soundOptions[];
+
LabelPtr example;
+ TablePtr sounds;
+ LabelPtr beepFileLabel;
+ TextBoxPtr beepFile;
+ ButtonPtr browse;
COLORREF fg, bg, upBar, downBar;
dwt::FontPtr font;
LOGFONT logFont;
+ int oldSelection;
void handleBackgroundClicked();
void handleTextClicked();
void handleULClicked();
void handleDLClicked();
+ void handleSelectionChanged();
void handleBrowseClicked();
+
+ void setBeepEnabled(bool enabled);
+ void saveSoundOptions();
};
#endif // !defined(DCPLUSPLUS_WIN32_APPEARANCE_2_PAGE_H)
Modified: dcplusplus/trunk/win32/DCPlusPlus.rc
===================================================================
--- dcplusplus/trunk/win32/DCPlusPlus.rc 2008-04-14 21:19:48 UTC (rev 1167)
+++ dcplusplus/trunk/win32/DCPlusPlus.rc 2008-04-14 21:20:37 UTC (rev 1168)
@@ -224,15 +224,12 @@
LTEXT "Donate ???:s! (ok, $$$ is fine too =) (see help menu)",IDC_COLOREXAMPLE,107,17,91,32,SS_NOPREFIX | SS_SUNKEN | WS_BORDER | NOT WS_GROUP
PUSHBUTTON "Uploads",IDC_SETTINGS_UPLOAD_BAR_COLOR,209,17,51,14
PUSHBUTTON "Downloads",IDC_SETTINGS_DOWNLOAD_BAR_COLOR,209,35,51,14
- GROUPBOX "Sounds",IDC_SETTINGS_SOUNDS,6,62,264,42
- CONTROL "Make an annoying sound every time a private message is received",IDC_PRIVATE_MESSAGE_BEEP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,74,246,10
- CONTROL "Make an annoying sound when a private message window is opened",IDC_PRIVATE_MESSAGE_BEEP_OPEN,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,87,246,10
+ GROUPBOX "Sounds",IDC_SETTINGS_SOUNDS,6,62,264,77
+ CONTROL "",IDC_SOUNDS,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,16,73,244,40
+ LTEXT "Notification sound",IDC_BEEP_NOTIFICATION,16,120,66,8
+ EDITTEXT IDC_BEEPFILE,85,118,119,12,ES_AUTOHSCROLL
+ PUSHBUTTON "&Browse...",IDC_BROWSE,210,119,50,12
LTEXT "Note; most of these options require that you restart DC++",IDC_SETTINGS_REQUIRES_RESTART,7,209,253,8
- LTEXT "Notification sound",IDC_BEEP_NOTIFICATION,10,110,66,8
- EDITTEXT IDC_BEEPFILE,85,108,119,12,ES_AUTOHSCROLL
- PUSHBUTTON "&Browse...",IDC_BROWSE,210,109,50,12
END
IDD_LOGPAGE DIALOGEX 100, 0, 275, 225
Modified: dcplusplus/trunk/win32/HubFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/HubFrame.cpp 2008-04-14 21:19:48 UTC (rev 1167)
+++ dcplusplus/trunk/win32/HubFrame.cpp 2008-04-14 21:20:37 UTC (rev 1168)
@@ -447,6 +447,7 @@
if(scroll)
chat->sendMessage(WM_VSCROLL, SB_BOTTOM);
+ WinUtil::playSound(SettingsManager::SOUND_MAIN_CHAT);
setDirty(SettingsManager::BOLD_HUB);
}
Modified: dcplusplus/trunk/win32/LogPage.cpp
===================================================================
--- dcplusplus/trunk/win32/LogPage.cpp 2008-04-14 21:19:48 UTC (rev 1167)
+++ dcplusplus/trunk/win32/LogPage.cpp 2008-04-14 21:20:37 UTC (rev 1168)
@@ -59,7 +59,7 @@
{ 0, 0 }
};
-LogPage::LogPage(dwt::Widget* parent) : PropPage(parent) {
+LogPage::LogPage(dwt::Widget* parent) : PropPage(parent), oldSelection(-1) {
createDialog(IDD_LOGPAGE);
setHelpId(IDH_LOGPAGE);
@@ -78,16 +78,14 @@
attachChild<Button>(IDC_BROWSE_LOG)->onClicked(std::tr1::bind(&LogPage::handleBrowseClicked, this));
- attachChild(dataGrid, IDC_LOG_OPTIONS);
- dataGrid->onRaw(std::tr1::bind(&LogPage::handleItemChanged, this), dwt::Message(WM_NOTIFY, LVN_ITEMCHANGED));
+ 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);
-
- oldSelection = -1;
}
LogPage::~LogPage() {
@@ -123,13 +121,13 @@
}
}
-LRESULT LogPage::handleItemChanged() {
+void LogPage::handleSelectionChanged() {
getValues();
- int sel = dataGrid->getSelected();
+ int sel = logOptions->getSelected();
if(sel >= 0 && sel < LogManager::LAST) {
- bool checkState = dataGrid->isChecked(sel);
+ bool checkState = logOptions->isChecked(sel);
logFormat->setEnabled(checkState);
logFile->setEnabled(checkState);
@@ -145,8 +143,6 @@
logFile->setText(Util::emptyStringT);
logFormat->setText(Util::emptyStringT);
}
-
- return 0;
}
void LogPage::getValues() {
Modified: dcplusplus/trunk/win32/LogPage.h
===================================================================
--- dcplusplus/trunk/win32/LogPage.h 2008-04-14 21:19:48 UTC (rev 1167)
+++ dcplusplus/trunk/win32/LogPage.h 2008-04-14 21:20:37 UTC (rev 1168)
@@ -35,7 +35,7 @@
static TextItem texts[];
static ListItem listItems[];
- TablePtr dataGrid;
+ TablePtr logOptions;
TextBoxPtr logFormat;
TextBoxPtr logFile;
@@ -47,7 +47,7 @@
TStringPairList options;
void handleBrowseClicked();
- LRESULT handleItemChanged();
+ void handleSelectionChanged();
void getValues();
};
Modified: dcplusplus/trunk/win32/PrivateFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/PrivateFrame.cpp 2008-04-14 21:19:48 UTC (rev 1167)
+++ dcplusplus/trunk/win32/PrivateFrame.cpp 2008-04-14 21:20:37 UTC (rev 1168)
@@ -61,21 +61,10 @@
if(!(BOOLSETTING(NO_AWAYMSG_TO_BOTS) && user->isSet(User::BOT)))
p->sendMessage(Text::toT(Util::getAwayMessage()));
}
-
- if(BOOLSETTING(PRIVATE_MESSAGE_BEEP) || BOOLSETTING(PRIVATE_MESSAGE_BEEP_OPEN)) {
- if (SETTING(BEEPFILE).empty())
- MessageBeep(MB_OK);
- else
- ::PlaySound(Text::toT(SETTING(BEEPFILE)).c_str(), NULL, SND_FILENAME | SND_ASYNC);
- }
+ WinUtil::playSound(SettingsManager::SOUND_PM_WINDOW);
} else {
- if(BOOLSETTING(PRIVATE_MESSAGE_BEEP)) {
- if (SETTING(BEEPFILE).empty())
- MessageBeep(MB_OK);
- else
- ::PlaySound(Text::toT(SETTING(BEEPFILE)).c_str(), NULL, SND_FILENAME | SND_ASYNC);
- }
i->second->addChat(aMessage);
+ WinUtil::playSound(SettingsManager::SOUND_PM);
}
}
Modified: dcplusplus/trunk/win32/PropPage.cpp
===================================================================
--- dcplusplus/trunk/win32/PropPage.cpp 2008-04-14 21:19:48 UTC (rev 1167)
+++ dcplusplus/trunk/win32/PropPage.cpp 2008-04-14 21:20:37 UTC (rev 1168)
@@ -63,15 +63,8 @@
}
if(listItems != NULL) {
- ListView_SetExtendedListViewStyle(list, LVS_EX_LABELTIP | LVS_EX_CHECKBOXES | LVS_EX_FULLROWSELECT);
+ initList(list);
- 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);
-
LVITEM lvi = { LVIF_TEXT };
for(int i = 0; listItems[i].setting != 0; i++) {
tstring str = T_(listItems[i].desc);
@@ -85,6 +78,17 @@
}
}
+void PropPage::initList(HWND list) {
+ ListView_SetExtendedListViewStyle(list, 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);
+}
+
void PropPage::write(HWND page, Item const* items, ListItem* listItems /* = NULL */, HWND list /* = NULL */)
{
dcassert(page != NULL);
Modified: dcplusplus/trunk/win32/PropPage.h
===================================================================
--- dcplusplus/trunk/win32/PropPage.h 2008-04-14 21:19:48 UTC (rev 1167)
+++ dcplusplus/trunk/win32/PropPage.h 2008-04-14 21:20:37 UTC (rev 1168)
@@ -51,6 +51,7 @@
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 translate(HWND page, TextItem* items);
};
Modified: dcplusplus/trunk/win32/WinUtil.cpp
===================================================================
--- dcplusplus/trunk/win32/WinUtil.cpp 2008-04-14 21:19:48 UTC (rev 1167)
+++ dcplusplus/trunk/win32/WinUtil.cpp 2008-04-14 21:20:37 UTC (rev 1168)
@@ -314,6 +314,16 @@
return true;
}
+void WinUtil::playSound(int setting) {
+ string sound = SettingsManager::getInstance()->get((SettingsManager::StrSetting)setting);
+ if(!sound.empty()) {
+ if(sound == "beep")
+ ::MessageBeep(MB_OK);
+ else
+ ::PlaySound(Text::toT(sound).c_str(), NULL, SND_FILENAME | SND_ASYNC);
+ }
+}
+
void WinUtil::openFile(const tstring& file) {
::ShellExecute(NULL, NULL, file.c_str(), NULL, NULL, SW_SHOWNORMAL);
}
Modified: dcplusplus/trunk/win32/WinUtil.h
===================================================================
--- dcplusplus/trunk/win32/WinUtil.h 2008-04-14 21:19:48 UTC (rev 1167)
+++ dcplusplus/trunk/win32/WinUtil.h 2008-04-14 21:20:37 UTC (rev 1168)
@@ -105,6 +105,8 @@
*/
static bool checkCommand(tstring& cmd, tstring& param, tstring& message, tstring& status, bool& thirdPerson);
+ static void playSound(int setting);
+
static void openFile(const tstring& file);
static void openFolder(const tstring& file);
Modified: dcplusplus/trunk/win32/resource.h
===================================================================
--- dcplusplus/trunk/win32/resource.h 2008-04-14 21:19:48 UTC (rev 1167)
+++ dcplusplus/trunk/win32/resource.h 2008-04-14 21:20:37 UTC (rev 1168)
@@ -269,8 +269,6 @@
#define IDC_PRIO_LOW_SIZE 2126
#define IDC_PRIO_NORMAL_SIZE 2127
#define IDC_PRIVATE_ID 2128
-#define IDC_PRIVATE_MESSAGE_BEEP 2129
-#define IDC_PRIVATE_MESSAGE_BEEP_OPEN 2130
#define IDC_PROXY 2131
#define IDC_PUB_LIST_CONFIG 2132
#define IDC_QUEUE 2133
@@ -443,6 +441,7 @@
#define IDC_SETTINGS_CERTIFICATE_FILE 2300
#define IDC_SETTINGS_TRUSTED_CERTIFICATES_PATH 2301
#define IDC_UPDOWN 2302
+#define IDC_SOUNDS 2303
// Stuff that uses multiple id's
#define IDC_BROWSELIST 3000
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2008-04-14 21:21:28
|
Revision: 1169
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1169&view=rev
Author: arnetheduck
Date: 2008-04-14 14:21:14 -0700 (Mon, 14 Apr 2008)
Log Message:
-----------
Disable seg dl option
Modified Paths:
--------------
dcplusplus/trunk/changelog.txt
dcplusplus/trunk/dcpp/QueueItem.cpp
dcplusplus/trunk/dcpp/SettingsManager.cpp
dcplusplus/trunk/dcpp/SettingsManager.h
dcplusplus/trunk/win32/Advanced3Page.cpp
dcplusplus/trunk/win32/AdvancedPage.cpp
dcplusplus/trunk/win32/DCPlusPlus.rc
dcplusplus/trunk/win32/resource.h
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-13 20:45:17.299000025 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
+ timestamp: 2008-04-13 21:36:55.736999989 +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
+ 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
Modified: dcplusplus/trunk/changelog.txt
===================================================================
--- dcplusplus/trunk/changelog.txt 2008-04-14 21:20:37 UTC (rev 1168)
+++ dcplusplus/trunk/changelog.txt 2008-04-14 21:21:14 UTC (rev 1169)
@@ -27,12 +27,14 @@
* [L#211313] Fixed bad virtual name being loaded (thanks kulmegil)
* [L#202801] Allow virtual folders to have the same name
* Allow more characters in virtual names
-* Improved transfer speed averaging
+* [L#190015] Improved transfer speed averaging
* [L#212411] Fixed downloading multiple file lists (poy)
* Added filter already shared from search results (thanks smir)
* [L#206521] Fixed directory not being removable (thanks poy)
* Reduced resize flicker some
* Added various sound options (thanks poy)
+* [L#211497] Segment size is automatically chosen depending on speed
+* [L#209876] Added option to completely disable segmented downloads
-- 0.705 2008-03-14 --
* Several patches for better *nix compatibility of the core (thanks steven sheehy et al)
Modified: dcplusplus/trunk/dcpp/QueueItem.cpp
===================================================================
--- dcplusplus/trunk/dcpp/QueueItem.cpp 2008-04-14 21:20:37 UTC (rev 1168)
+++ dcplusplus/trunk/dcpp/QueueItem.cpp 2008-04-14 21:21:14 UTC (rev 1169)
@@ -92,25 +92,34 @@
return Segment(0, -1);
}
+ if(!BOOLSETTING(SEGMENTED_DL) && !downloads.empty()) {
+ return Segment(0, 0);
+ }
+
int64_t remaining = getSize() - getDownloadedBytes();
- int64_t 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);
+ 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);
+ }
}
+
+ // Round off to nearest block size
+ targetSize = ((targetSize + blockSize / 2) / blockSize) * blockSize;
+ } else {
+ targetSize = remaining;
}
- // Round off to nearest block size
- targetSize = ((targetSize + blockSize / 2) / blockSize) * blockSize;
-
int64_t start = 0;
int64_t curSize = targetSize;
Modified: dcplusplus/trunk/dcpp/SettingsManager.cpp
===================================================================
--- dcplusplus/trunk/dcpp/SettingsManager.cpp 2008-04-14 21:20:37 UTC (rev 1168)
+++ dcplusplus/trunk/dcpp/SettingsManager.cpp 2008-04-14 21:21:14 UTC (rev 1169)
@@ -77,7 +77,7 @@
"OpenWaitingUsers", "BoldWaitingUsers", "OpenSystemLog", "BoldSystemLog", "AutoRefreshTime",
"UseTLS", "AutoSearchLimit", "AltSortOrder", "AutoKickNoFavs", "PromptPassword", "SpyFrameIgnoreTthSearches",
"DontDlAlreadyQueued", "MaxCommandLength", "AllowUntrustedHubs", "AllowUntrustedClients",
- "TLSPort", "FastHash", "SortFavUsersFirst", "ShowShellMenu", "MinSegmentSize", "FollowLinks",
+ "TLSPort", "FastHash", "SortFavUsersFirst", "ShowShellMenu", "SegmentedDL", "FollowLinks",
"SendBloom", "OwnerDrawnMenus", "Coral", "SearchFilterShared",
"SENTRY",
// Int64
@@ -270,7 +270,7 @@
setDefault(FAST_HASH, true);
setDefault(SORT_FAVUSERS_FIRST, false);
setDefault(SHOW_SHELL_MENU, false);
- setDefault(MIN_SEGMENT_SIZE, 1024);
+ setDefault(SEGMENTED_DL, true);
setDefault(FOLLOW_LINKS, false);
setDefault(SEND_BLOOM, true);
setDefault(OWNER_DRAWN_MENUS, true);
Modified: dcplusplus/trunk/dcpp/SettingsManager.h
===================================================================
--- dcplusplus/trunk/dcpp/SettingsManager.h 2008-04-14 21:20:37 UTC (rev 1168)
+++ dcplusplus/trunk/dcpp/SettingsManager.h 2008-04-14 21:21:14 UTC (rev 1169)
@@ -90,7 +90,7 @@
OPEN_WAITING_USERS, BOLD_WAITING_USERS, OPEN_SYSTEM_LOG, BOLD_SYSTEM_LOG, AUTO_REFRESH_TIME,
USE_TLS, AUTO_SEARCH_LIMIT, ALT_SORT_ORDER, AUTO_KICK_NO_FAVS, PROMPT_PASSWORD, SPY_FRAME_IGNORE_TTH_SEARCHES,
DONT_DL_ALREADY_QUEUED, MAX_COMMAND_LENGTH, ALLOW_UNTRUSTED_HUBS, ALLOW_UNTRUSTED_CLIENTS,
- TLS_PORT, FAST_HASH, SORT_FAVUSERS_FIRST, SHOW_SHELL_MENU, MIN_SEGMENT_SIZE, FOLLOW_LINKS,
+ TLS_PORT, FAST_HASH, SORT_FAVUSERS_FIRST, SHOW_SHELL_MENU, SEGMENTED_DL, FOLLOW_LINKS,
SEND_BLOOM, OWNER_DRAWN_MENUS, CORAL, SEARCH_FILTER_SHARED,
INT_LAST };
Modified: dcplusplus/trunk/win32/Advanced3Page.cpp
===================================================================
--- dcplusplus/trunk/win32/Advanced3Page.cpp 2008-04-14 21:20:37 UTC (rev 1168)
+++ dcplusplus/trunk/win32/Advanced3Page.cpp 2008-04-14 21:21:14 UTC (rev 1169)
@@ -62,9 +62,6 @@
{ IDC_SETTINGS_SOCKET_OUT_BUFFER, IDH_SETTINGS_ADVANCED3_SOCKET_OUT_BUFFER },
{ IDC_SOCKET_OUT_BUFFER, IDH_SETTINGS_ADVANCED3_SOCKET_OUT_BUFFER },
{ IDC_SETTINGS_B3, IDH_SETTINGS_ADVANCED3_SOCKET_OUT_BUFFER },
- { IDC_SETTINGS_MIN_SEGMENT_SIZE, IDH_SETTINGS_ADVANCED3_MIN_SEGMENT_SIZE },
- { IDC_MIN_SEGMENT_SIZE, IDH_SETTINGS_ADVANCED3_MIN_SEGMENT_SIZE },
- { IDC_SETTINGS_KB3, IDH_SETTINGS_ADVANCED3_MIN_SEGMENT_SIZE },
{ 0, 0 }
};
@@ -89,8 +86,6 @@
{ IDC_SETTINGS_B2, N_("B") },
{ IDC_SETTINGS_SOCKET_OUT_BUFFER, N_("Socket write buffer") },
{ IDC_SETTINGS_B3, N_("B") },
- { IDC_SETTINGS_MIN_SEGMENT_SIZE, N_("Min segment size") },
- { IDC_SETTINGS_KB3, N_("KiB") },
{ 0, 0 }
};
@@ -107,7 +102,6 @@
{ IDC_PRIVATE_ID, SettingsManager::PRIVATE_ID, PropPage::T_STR },
{ IDC_AUTO_REFRESH_TIME, SettingsManager::AUTO_REFRESH_TIME, PropPage::T_INT },
{ IDC_AUTO_SEARCH_LIMIT, SettingsManager::AUTO_SEARCH_LIMIT, PropPage::T_INT },
- { IDC_MIN_SEGMENT_SIZE, SettingsManager::MIN_SEGMENT_SIZE, PropPage::T_INT },
{ 0, 0, PropPage::T_END }
};
@@ -135,7 +129,6 @@
attachChild<TextBox>(IDC_BIND_ADDRESS);
attachChild<TextBox>(IDC_SOCKET_IN_BUFFER);
attachChild<TextBox>(IDC_SOCKET_OUT_BUFFER);
- attachChild<TextBox>(IDC_MIN_SEGMENT_SIZE);
}
Advanced3Page::~Advanced3Page() {
Modified: dcplusplus/trunk/win32/AdvancedPage.cpp
===================================================================
--- dcplusplus/trunk/win32/AdvancedPage.cpp 2008-04-14 21:20:37 UTC (rev 1168)
+++ dcplusplus/trunk/win32/AdvancedPage.cpp 2008-04-14 21:21:14 UTC (rev 1169)
@@ -35,7 +35,7 @@
{ SettingsManager::MAGNET_REGISTER, N_("Register with Windows to handle magnet: URI links") },
{ SettingsManager::KEEP_LISTS, N_("Don't delete file lists when exiting") },
{ SettingsManager::AUTO_KICK, N_("Automatically disconnect users who leave the hub") },
- { SettingsManager::SHOW_PROGRESS_BARS, N_("Show progress bars for transfers") },
+// TODO { SettingsManager::SHOW_PROGRESS_BARS, N_("Show progress bars for transfers") },
{ SettingsManager::SFV_CHECK, N_("Enable automatic SFV checking") },
{ SettingsManager::NO_AWAYMSG_TO_BOTS, N_("Don't send the away message to bots") },
{ SettingsManager::ADLS_BREAK_ON_FIRST, N_("Break on first ADLSearch match") },
@@ -48,6 +48,7 @@
{ SettingsManager::SHOW_SHELL_MENU, N_("Show shell menu where possible") },
{ SettingsManager::OWNER_DRAWN_MENUS, N_("Use extended menus with icons and titles") },
{ SettingsManager::CORAL, N_("Use Coral network when downloading hub lists (improves reliability)") },
+ { SettingsManager::SEGMENTED_DL, N_("Enable segmented downloads") },
{ 0, 0 }
};
Modified: dcplusplus/trunk/win32/DCPlusPlus.rc
===================================================================
--- dcplusplus/trunk/win32/DCPlusPlus.rc 2008-04-14 21:20:37 UTC (rev 1168)
+++ dcplusplus/trunk/win32/DCPlusPlus.rc 2008-04-14 21:21:14 UTC (rev 1169)
@@ -446,9 +446,6 @@
RTEXT "Socket write buffer",IDC_SETTINGS_SOCKET_OUT_BUFFER,134,95,70,8
EDITTEXT IDC_SOCKET_OUT_BUFFER,208,93,41,14,ES_AUTOHSCROLL
LTEXT "B",IDC_SETTINGS_B3,252,95,16,8
- RTEXT "Min segment size",IDC_SETTINGS_MIN_SEGMENT_SIZE,134,112,70,8
- EDITTEXT IDC_MIN_SEGMENT_SIZE,208,110,41,14,ES_AUTOHSCROLL
- LTEXT "KiB",IDC_SETTINGS_KB3,252,112,16,8
END
IDD_NETWORKPAGE DIALOGEX 100, 0, 275, 225
Modified: dcplusplus/trunk/win32/resource.h
===================================================================
--- dcplusplus/trunk/win32/resource.h 2008-04-14 21:20:37 UTC (rev 1168)
+++ dcplusplus/trunk/win32/resource.h 2008-04-14 21:21:14 UTC (rev 1169)
@@ -430,8 +430,7 @@
#define IDC_WINDOWS_OPTIONS 2289
#define IDC_WINDOWS_STARTUP 2290
#define IDC_SETTINGS_PAGES 2291
-#define IDC_SETTINGS_MIN_SEGMENT_SIZE 2292
-#define IDC_MIN_SEGMENT_SIZE 2293
+#define IDC_SEGMENTED_DL 2293
#define IDC_GREETZ 2294
#define IDC_LATEST_VERSION 2295
#define IDC_SETTINGS_PID 2296
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2008-04-14 21:22:08
|
Revision: 1170
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1170&view=rev
Author: arnetheduck
Date: 2008-04-14 14:21:50 -0700 (Mon, 14 Apr 2008)
Log Message:
-----------
Fix antifrag, remove antifrag option, remove unused resume flag
Modified Paths:
--------------
dcplusplus/trunk/changelog.txt
dcplusplus/trunk/dcpp/DirectoryListing.cpp
dcplusplus/trunk/dcpp/Download.cpp
dcplusplus/trunk/dcpp/Download.h
dcplusplus/trunk/dcpp/QueueItem.h
dcplusplus/trunk/dcpp/QueueManager.cpp
dcplusplus/trunk/dcpp/QueueManager.h
dcplusplus/trunk/dcpp/SettingsManager.cpp
dcplusplus/trunk/dcpp/SettingsManager.h
dcplusplus/trunk/win32/QueuePage.cpp
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-13 21:36:55.736999989 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
+ timestamp: 2008-04-14 15:29:47.677000046 +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
+ 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
Modified: dcplusplus/trunk/changelog.txt
===================================================================
--- dcplusplus/trunk/changelog.txt 2008-04-14 21:21:14 UTC (rev 1169)
+++ dcplusplus/trunk/changelog.txt 2008-04-14 21:21:50 UTC (rev 1170)
@@ -35,6 +35,8 @@
* Added various sound options (thanks poy)
* [L#211497] Segment size is automatically chosen depending on speed
* [L#209876] Added option to completely disable segmented downloads
+* [L#209885] Fix antifrag not working as it should
+* Anti-frag no longer optional - not using it was broken by segmented downloading
-- 0.705 2008-03-14 --
* Several patches for better *nix compatibility of the core (thanks steven sheehy et al)
Modified: dcplusplus/trunk/dcpp/DirectoryListing.cpp
===================================================================
--- dcplusplus/trunk/dcpp/DirectoryListing.cpp 2008-04-14 21:21:14 UTC (rev 1169)
+++ dcplusplus/trunk/dcpp/DirectoryListing.cpp 2008-04-14 21:21:50 UTC (rev 1170)
@@ -278,7 +278,7 @@
}
void DirectoryListing::download(File* aFile, const string& aTarget, bool view, bool highPrio) {
- int flags = (view ? (QueueItem::FLAG_TEXT | QueueItem::FLAG_CLIENT_VIEW) : QueueItem::FLAG_RESUME);
+ int flags = (view ? (QueueItem::FLAG_TEXT | QueueItem::FLAG_CLIENT_VIEW) : 0);
QueueManager::getInstance()->add(aTarget, aFile->getSize(), aFile->getTTH(), getUser(), flags);
Modified: dcplusplus/trunk/dcpp/Download.cpp
===================================================================
--- dcplusplus/trunk/dcpp/Download.cpp 2008-04-14 21:21:14 UTC (rev 1169)
+++ dcplusplus/trunk/dcpp/Download.cpp 2008-04-14 21:21:50 UTC (rev 1170)
@@ -59,25 +59,8 @@
setSegment(qi.getNextSegment(getTigerTree().getBlockSize(), 0, 0));
}
- if(qi.isSet(QueueItem::FLAG_RESUME)) {
-#ifdef PORT_ME
- const string& target = (getTempTarget().empty() ? getPath() : getTempTarget());
- int64_t start = File::getSize(target);
-
- // Only use antifrag if we don't have a previous non-antifrag part
- if( BOOLSETTING(ANTI_FRAG) && (start == -1) ) {
- int64_t aSize = File::getSize(target + Download::ANTI_FRAG_EXT);
-
- if(aSize == d->getTotal()) {
- start = d->getStartPos();
- } else {
- start = 0;
- }
- d->setFlag(Download::FLAG_ANTI_FRAG);
- }
-#else
+ if(getType() == TYPE_FILE) {
setFlag(Download::FLAG_ANTI_FRAG);
-#endif
}
}
}
Modified: dcplusplus/trunk/dcpp/Download.h
===================================================================
--- dcplusplus/trunk/dcpp/Download.h 2008-04-14 21:21:14 UTC (rev 1169)
+++ dcplusplus/trunk/dcpp/Download.h 2008-04-14 21:21:50 UTC (rev 1170)
@@ -18,7 +18,6 @@
static const string ANTI_FRAG_EXT;
enum {
- FLAG_RESUME = 1 << 0,
FLAG_ZDOWNLOAD = 1 << 1,
FLAG_CALC_CRC32 = 1 << 2,
FLAG_CRC32_OK = 1 << 3,
Modified: dcplusplus/trunk/dcpp/QueueItem.h
===================================================================
--- dcplusplus/trunk/dcpp/QueueItem.h 2008-04-14 21:21:14 UTC (rev 1169)
+++ dcplusplus/trunk/dcpp/QueueItem.h 2008-04-14 21:21:50 UTC (rev 1170)
@@ -56,8 +56,6 @@
enum FileFlags {
/** Normal download, no flags set */
FLAG_NORMAL = 0x00,
- /** This download should be resumed if possible */
- FLAG_RESUME = 0x01,
/** This is a user file listing download */
FLAG_USER_LIST = 0x02,
/** The file list is downloaded to use for directory download (used with USER_LIST) */
Modified: dcplusplus/trunk/dcpp/QueueManager.cpp
===================================================================
--- dcplusplus/trunk/dcpp/QueueManager.cpp 2008-04-14 21:21:14 UTC (rev 1169)
+++ dcplusplus/trunk/dcpp/QueueManager.cpp 2008-04-14 21:21:50 UTC (rev 1170)
@@ -434,7 +434,7 @@
}
void QueueManager::add(const string& aTarget, int64_t aSize, const TTHValue& root, const UserPtr& aUser,
- int aFlags /* = QueueItem::FLAG_RESUME */, bool addBad /* = true */) throw(QueueException, FileException)
+ int aFlags /* = 0 */, bool addBad /* = true */) throw(QueueException, FileException)
{
bool wantConnection = true;
@@ -803,6 +803,11 @@
string target = d->getDownloadTarget();
File::ensureDirectory(target);
File* f = new File(target, File::WRITE, File::OPEN | File::CREATE | File::SHARED);
+
+ if(d->isSet(Download::FLAG_ANTI_FRAG) && f->getSize() < qi->getSize()) {
+ f->setSize(qi->getSize());
+ }
+
f->setPos(d->getSegment().getStart());
d->setFile(f);
} else if(d->getType() == Transfer::TYPE_FULL_LIST) {
@@ -1311,7 +1316,7 @@
inDownloads = true;
} else if(inDownloads) {
if(cur == NULL && name == sDownload) {
- int flags = QueueItem::FLAG_RESUME;
+ int flags = 0;
int64_t size = Util::toInt64(getAttrib(attribs, sSize, 1));
if(size == 0)
return;
Modified: dcplusplus/trunk/dcpp/QueueManager.h
===================================================================
--- dcplusplus/trunk/dcpp/QueueManager.h 2008-04-14 21:21:14 UTC (rev 1169)
+++ dcplusplus/trunk/dcpp/QueueManager.h 2008-04-14 21:21:50 UTC (rev 1170)
@@ -74,7 +74,7 @@
public:
/** Add a file to the queue. */
void add(const string& aTarget, int64_t aSize, const TTHValue& root, const UserPtr& aUser,
- int aFlags = QueueItem::FLAG_RESUME, bool addBad = true) throw(QueueException, FileException);
+ int aFlags = 0, bool addBad = true) throw(QueueException, FileException);
/** Add a user's filelist to the queue. */
void addList(const UserPtr& aUser, int aFlags, const string& aInitialDir = Util::emptyString) throw(QueueException, FileException);
/** Queue a partial file list download */
Modified: dcplusplus/trunk/dcpp/SettingsManager.cpp
===================================================================
--- dcplusplus/trunk/dcpp/SettingsManager.cpp 2008-04-14 21:21:14 UTC (rev 1169)
+++ dcplusplus/trunk/dcpp/SettingsManager.cpp 2008-04-14 21:21:50 UTC (rev 1170)
@@ -59,7 +59,7 @@
"MainWindowSizeX", "MainWindowSizeY", "MainWindowPosX", "MainWindowPosY", "AutoAway",
"SocksPort", "SocksResolve", "KeepLists", "AutoKick", "QueueFrameShowTree",
"CompressTransfers", "ShowProgressBars", "SFVCheck",
- "MaxCompression", "AntiFrag", "NoAwayMsgToBots", "SkipZeroByte", "AdlsBreakOnFirst",
+ "MaxCompression", "NoAwayMsgToBots", "SkipZeroByte", "AdlsBreakOnFirst",
"HubUserCommands", "AutoSearchAutoMatch", "DownloadBarColor", "UploadBarColor", "LogSystem",
"LogFilelistTransfers", "SendUnknownCommands", "MaxHashSpeed", "OpenUserCmdHelp",
"GetUserCountry", "FavShowJoins", "LogStatusMessages", "ShowStatusbar",
@@ -180,7 +180,6 @@
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");
setDefault(MAX_COMPRESSION, 6);
- setDefault(ANTI_FRAG, true);
setDefault(NO_AWAYMSG_TO_BOTS, true);
setDefault(SKIP_ZERO_BYTE, false);
setDefault(ADLS_BREAK_ON_FIRST, false);
Modified: dcplusplus/trunk/dcpp/SettingsManager.h
===================================================================
--- dcplusplus/trunk/dcpp/SettingsManager.h 2008-04-14 21:21:14 UTC (rev 1169)
+++ dcplusplus/trunk/dcpp/SettingsManager.h 2008-04-14 21:21:50 UTC (rev 1170)
@@ -72,7 +72,7 @@
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,
- MAX_COMPRESSION, ANTI_FRAG, NO_AWAYMSG_TO_BOTS, SKIP_ZERO_BYTE, ADLS_BREAK_ON_FIRST,
+ 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,
GET_USER_COUNTRY, FAV_SHOW_JOINS, LOG_STATUS_MESSAGES, SHOW_STATUSBAR,
Modified: dcplusplus/trunk/win32/QueuePage.cpp
===================================================================
--- dcplusplus/trunk/win32/QueuePage.cpp 2008-04-14 21:21:14 UTC (rev 1169)
+++ dcplusplus/trunk/win32/QueuePage.cpp 2008-04-14 21:21:50 UTC (rev 1170)
@@ -110,7 +110,6 @@
{ SettingsManager::SKIP_ZERO_BYTE, N_("Skip zero-byte files") },
{ SettingsManager::DONT_DL_ALREADY_SHARED, N_("Don't download files already in share") },
{ SettingsManager::DONT_DL_ALREADY_QUEUED, N_("Don't download files already in the queue") },
- { SettingsManager::ANTI_FRAG, N_("Use antifragmentation method for downloads") },
{ 0, 0 }
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2008-04-14 21:22:38
|
Revision: 1171
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1171&view=rev
Author: arnetheduck
Date: 2008-04-14 14:22:24 -0700 (Mon, 14 Apr 2008)
Log Message:
-----------
Fix pubhublist download issues
Modified Paths:
--------------
dcplusplus/trunk/changelog.txt
dcplusplus/trunk/dcpp/FavoriteManager.cpp
dcplusplus/trunk/win32/AboutDlg.cpp
dcplusplus/trunk/win32/PublicHubsFrame.cpp
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-14 15:29:47.677000046 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
+ timestamp: 2008-04-14 15:35:44.157999992 +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
+ 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
Modified: dcplusplus/trunk/changelog.txt
===================================================================
--- dcplusplus/trunk/changelog.txt 2008-04-14 21:21:50 UTC (rev 1170)
+++ dcplusplus/trunk/changelog.txt 2008-04-14 21:22:24 UTC (rev 1171)
@@ -37,6 +37,7 @@
* [L#209876] Added option to completely disable segmented downloads
* [L#209885] Fix antifrag not working as it should
* Anti-frag no longer optional - not using it was broken by segmented downloading
+* [L#215779] Fix a few hub list download issues (thanks emtee)
-- 0.705 2008-03-14 --
* Several patches for better *nix compatibility of the core (thanks steven sheehy et al)
Modified: dcplusplus/trunk/dcpp/FavoriteManager.cpp
===================================================================
--- dcplusplus/trunk/dcpp/FavoriteManager.cpp 2008-04-14 21:21:50 UTC (rev 1170)
+++ dcplusplus/trunk/dcpp/FavoriteManager.cpp 2008-04-14 21:22:24 UTC (rev 1171)
@@ -702,8 +702,10 @@
c->removeListener(this);
lastServer++;
running = false;
- if(useHttp)
+ if(useHttp){
+ downloadBuf = Util::emptyString;
fire(FavoriteManagerListener::DownloadFailed(), aLine);
+ }
}
void FavoriteManager::on(Complete, HttpConnection*, const string& aLine) throw() {
c->removeListener(this);
Modified: dcplusplus/trunk/win32/AboutDlg.cpp
===================================================================
--- dcplusplus/trunk/win32/AboutDlg.cpp 2008-04-14 21:21:50 UTC (rev 1170)
+++ dcplusplus/trunk/win32/AboutDlg.cpp 2008-04-14 21:22:24 UTC (rev 1171)
@@ -41,7 +41,7 @@
"bsod, sulan, jonathan stone, tim burton, izzzo, guitarm, paka, nils maier, jens oknelid, yoji, "
"krzysztof tyszecki, poison, mikejj, pur, bigmuscle, martin, jove, bart vullings, "
"steven sheehy, tobias nygren, poy, dorian, stephan hohe, mafa_45, mikael eman, james ross,"
-"stanislav maslovski, david grundberg, pavel andreev, yakov suraev, kulmegil, smir. "
+"stanislav maslovski, david grundberg, pavel andreev, yakov suraev, kulmegil, smir, emtee. "
"Keep it coming!";
AboutDlg::AboutDlg(dwt::Widget* parent) : WidgetFactory<dwt::ModalDialog>(parent) {
Modified: dcplusplus/trunk/win32/PublicHubsFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/PublicHubsFrame.cpp 2008-04-14 21:21:50 UTC (rev 1170)
+++ dcplusplus/trunk/win32/PublicHubsFrame.cpp 2008-04-14 21:22:24 UTC (rev 1171)
@@ -281,7 +281,7 @@
for(StringList::iterator idx = lists.begin(); idx != lists.end(); ++idx) {
pubLists->addValue(Text::toT(*idx).c_str());
}
- pubLists->setSelected(FavoriteManager::getInstance()->getSelectedHubList());
+ pubLists->setSelected((FavoriteManager::getInstance()->getSelectedHubList()) % lists.size());
}
void PublicHubsFrame::updateList() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2008-04-14 21:23:12
|
Revision: 1172
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1172&view=rev
Author: arnetheduck
Date: 2008-04-14 14:22:52 -0700 (Mon, 14 Apr 2008)
Log Message:
-----------
Changed tab order in hub windows
Modified Paths:
--------------
dcplusplus/trunk/changelog.txt
dcplusplus/trunk/win32/HubFrame.cpp
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-14 15:35:44.157999992 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
+ timestamp: 2008-04-14 19:43:41.015000105 +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
+ 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
Modified: dcplusplus/trunk/changelog.txt
===================================================================
--- dcplusplus/trunk/changelog.txt 2008-04-14 21:22:24 UTC (rev 1171)
+++ dcplusplus/trunk/changelog.txt 2008-04-14 21:22:52 UTC (rev 1172)
@@ -32,12 +32,13 @@
* Added filter already shared from search results (thanks smir)
* [L#206521] Fixed directory not being removable (thanks poy)
* Reduced resize flicker some
-* Added various sound options (thanks poy)
+* [L#195209] Added various sound options (thanks poy)
* [L#211497] Segment size is automatically chosen depending on speed
* [L#209876] Added option to completely disable segmented downloads
* [L#209885] Fix antifrag not working as it should
* Anti-frag no longer optional - not using it was broken by segmented downloading
* [L#215779] Fix a few hub list download issues (thanks emtee)
+* [L#195209] Changed tab order in hub windows (poy)
-- 0.705 2008-03-14 --
* Several patches for better *nix compatibility of the core (thanks steven sheehy et al)
Modified: dcplusplus/trunk/win32/HubFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/HubFrame.cpp 2008-04-14 21:22:24 UTC (rev 1171)
+++ dcplusplus/trunk/win32/HubFrame.cpp 2008-04-14 21:22:52 UTC (rev 1172)
@@ -125,17 +125,6 @@
}
{
- TextBox::Seed cs = WinUtil::Seeds::textBox;
- cs.style |= WS_VSCROLL | ES_MULTILINE | ES_NOHIDESEL | ES_READONLY;
- chat = addChild(cs);
- chat->setHelpId(IDH_HUB_CHAT);
- chat->setTextLimit(0);
- addWidget(chat);
- paned->setFirst(chat);
- chat->onContextMenu(std::tr1::bind(&HubFrame::handleChatContextMenu, this, _1));
- }
-
- {
users = addChild(WidgetUsers::Seed());
addWidget(users);
paned->setSecond(users);
@@ -151,6 +140,17 @@
users->onKeyDown(std::tr1::bind(&HubFrame::handleUsersKeyDown, this, _1));
users->onContextMenu(std::tr1::bind(&HubFrame::handleUsersContextMenu, this, _1));
}
+
+ {
+ TextBox::Seed cs = WinUtil::Seeds::textBox;
+ cs.style |= WS_VSCROLL | ES_MULTILINE | ES_NOHIDESEL | ES_READONLY;
+ chat = addChild(cs);
+ chat->setHelpId(IDH_HUB_CHAT);
+ chat->setTextLimit(0);
+ addWidget(chat);
+ paned->setFirst(chat);
+ chat->onContextMenu(std::tr1::bind(&HubFrame::handleChatContextMenu, this, _1));
+ }
{
CheckBox::Seed cs(_T("+/-"));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2008-04-14 21:23:32
|
Revision: 1173
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1173&view=rev
Author: arnetheduck
Date: 2008-04-14 14:23:26 -0700 (Mon, 14 Apr 2008)
Log Message:
-----------
fix ugly size hack
Modified Paths:
--------------
dcplusplus/trunk/dwt/include/dwt/widgets/TabView.h
dcplusplus/trunk/dwt/src/widgets/TabView.cpp
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-14 19:43:41.015000105 +0200
committer: poy <po...@12...>
properties:
branch-nick: repo
+ timestamp: 2008-04-14 20:14:59.684999943 +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
+ 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
Modified: dcplusplus/trunk/dwt/include/dwt/widgets/TabView.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/TabView.h 2008-04-14 21:22:52 UTC (rev 1172)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/TabView.h 2008-04-14 21:23:26 UTC (rev 1173)
@@ -115,6 +115,8 @@
void create( const Seed & cs = Seed() );
+ virtual bool tryFire( const MSG & msg, LRESULT & retVal );
+
protected:
explicit TabView(Widget* parent);
@@ -169,7 +171,7 @@
void handleHelp(HWND hWnd, unsigned id);
tstring formatTitle(tstring title);
- LRESULT layout();
+ void layout();
int addIcon(const IconPtr& icon);
void swapWidgets(ContainerPtr oldW, ContainerPtr newW);
Modified: dcplusplus/trunk/dwt/src/widgets/TabView.cpp
===================================================================
--- dcplusplus/trunk/dwt/src/widgets/TabView.cpp 2008-04-14 21:22:52 UTC (rev 1172)
+++ dcplusplus/trunk/dwt/src/widgets/TabView.cpp 2008-04-14 21:23:26 UTC (rev 1173)
@@ -40,8 +40,6 @@
WindowClass TabView::windowClass(_T("TabView"), &TabView::wndProc, NULL, ( HBRUSH )( COLOR_WINDOW + 1 ));
-static UINT RESIZE_MESSAGE = 0;
-
TabView::Seed::Seed(bool toggleActive_) :
BaseType::Seed(WC_TABCONTROL, WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_VISIBLE |
TCS_HOTTRACK | TCS_MULTILINE | TCS_RAGGEDRIGHT | TCS_TOOLTIPS | TCS_FOCUSNEVER),
@@ -100,8 +98,6 @@
::RegisterClassEx(&cls);
first = false;
-
- RESIZE_MESSAGE = ::RegisterWindowMessage(_T("TabView_Refresh"));
}
}
@@ -132,13 +128,8 @@
onMiddleMouseDown(std::tr1::bind(&TabView::handleMiddleMouseDown, this, _1));
onHelp(std::tr1::bind(&TabView::handleHelp, this, _1, _2));
- onSized(std::tr1::bind(&TabView::handleSized, this, _1));
-
- onRaw(std::tr1::bind(&TabView::layout, this), Message(RESIZE_MESSAGE));
-
tip = WidgetCreator<ToolTip>::attach(this, TabCtrl_GetToolTips(handle())); // created and managed by the tab control thanks to the TCS_TOOLTIPS style
tip->addRemoveStyle(TTS_NOPREFIX, true);
- tip->onRaw(std::tr1::bind(&TabView::handleToolTip, this, _2), Message(WM_NOTIFY, TTN_GETDISPINFO));
}
void TabView::add(Container* w, const IconPtr& icon) {
@@ -321,14 +312,10 @@
}
void TabView::handleSized(const SizedEvent& sz) {
- // We defer the layout because the tab control itself must process WM_SIZE first in order to calculate the
- // number of rows (otherwise getUsableArea returns the usable area before the resize...)
- // This is less than ideal since it means the children will not be synchronously resized which apps may expect
- // TODO Fix this...
- postMessage(RESIZE_MESSAGE);
+ layout();
}
-LRESULT TabView::layout() {
+void TabView::layout() {
Rectangle tmp = getUsableArea(true);
if(!(tmp == clientSize)) {
int i = getSelected();
@@ -337,8 +324,6 @@
}
clientSize = tmp;
}
- // Dummy return value to satisfy onRaw - this should be fixed sometime...
- return 0;
}
void TabView::next(bool reverse) {
@@ -583,4 +568,19 @@
return TabCtrl_HitTest(handle(), &tci);
}
+bool TabView::tryFire( const MSG & msg, LRESULT & retVal ) {
+ bool handled = BaseType::tryFire(msg, retVal);
+
+ if(msg.message == WM_SIZE) {
+ // We need to let the tab control window proc handle this first, otherwise getUsableArea will not return
+ // correct values on mulitrow tabs (since the number of rows might change with the size)
+ retVal = returnUnhandled(msg.hwnd, msg.message, msg.wParam, msg.lParam);
+
+ handleSized(SizedEvent(msg));
+
+ return true;
+ }
+ 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-14 21:24:14
|
Revision: 1174
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1174&view=rev
Author: arnetheduck
Date: 2008-04-14 14:24:06 -0700 (Mon, 14 Apr 2008)
Log Message:
-----------
fix&simplify help in tabs, tooltips are optional
Modified Paths:
--------------
dcplusplus/trunk/dwt/include/dwt/aspects/AspectHelp.h
dcplusplus/trunk/dwt/include/dwt/widgets/TabView.h
dcplusplus/trunk/dwt/src/widgets/TabView.cpp
dcplusplus/trunk/win32/TransferView.cpp
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-14 20:14:59.684999943 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
+ timestamp: 2008-04-14 22:57:19.171000004 +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
+ 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
Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectHelp.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/aspects/AspectHelp.h 2008-04-14 21:23:26 UTC (rev 1173)
+++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectHelp.h 2008-04-14 21:24:06 UTC (rev 1174)
@@ -39,37 +39,49 @@
template<typename WidgetType>
class AspectHelp {
+ WidgetType& W() { return *static_cast<WidgetType*>(this); }
+ HWND H() { return W().handle(); }
+
struct Dispatcher {
typedef std::tr1::function<void (HWND, unsigned)> F;
- Dispatcher(const F& f_) : f(f_) { }
+ Dispatcher(const F& f_, WidgetType* widget_) : f(f_), widget(widget_) { }
bool operator()(const MSG& msg, LRESULT& ret) {
LPHELPINFO lphi = reinterpret_cast<LPHELPINFO>(msg.lParam);
if(lphi->iContextType != HELPINFO_WINDOW)
return false;
- f(reinterpret_cast<HWND>(lphi->hItemHandle), lphi->dwContextId);
+
+ unsigned id = lphi->dwContextId;
+ widget->helpImpl(id);
+ f(reinterpret_cast<HWND>(lphi->hItemHandle), id);
+
ret = TRUE;
return true;
}
F f;
+ WidgetType* widget;
};
public:
unsigned getHelpId() {
- return ::GetWindowContextHelpId(static_cast<WidgetType*>(this)->handle());
+ return ::GetWindowContextHelpId(H());
}
void setHelpId(unsigned id) {
- ::SetWindowContextHelpId(static_cast<WidgetType*>(this)->handle(), id);
+ ::SetWindowContextHelpId(H(), id);
}
void onHelp(const typename Dispatcher::F& f) {
- static_cast<WidgetType*>(this)->addCallback(
- Message( WM_HELP ), Dispatcher(f)
- );
+ W().addCallback(Message(WM_HELP), Dispatcher(f, &W()));
}
+
+private:
+ virtual void helpImpl(unsigned& id) {
+ // empty on purpose.
+ // implement this in your widget if you wish to change the help id before it is dispatched
+ }
};
}
Modified: dcplusplus/trunk/dwt/include/dwt/widgets/TabView.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/TabView.h 2008-04-14 21:23:26 UTC (rev 1173)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/TabView.h 2008-04-14 21:24:06 UTC (rev 1174)
@@ -65,7 +65,6 @@
friend class AspectSelection<TabView, int>;
friend class WidgetCreator< TabView >;
typedef std::tr1::function<void (const tstring&)> TitleChangedFunction;
- typedef std::tr1::function<void (HWND, unsigned)> HelpFunction;
typedef std::tr1::function<bool (const ScreenCoordinate&)> ContextMenuFunction;
public:
@@ -105,10 +104,6 @@
void onTabContextMenu(ContainerPtr w, const ContextMenuFunction& f);
- void onHelp(const HelpFunction& f) {
- helpFunction = f;
- }
-
bool filter(const MSG& msg);
const Rectangle& getClientSize() const { return clientSize; }
@@ -136,7 +131,6 @@
ToolTipPtr tip;
TitleChangedFunction titleChangedFunction;
- HelpFunction helpFunction;
bool toggleActive;
@@ -168,7 +162,6 @@
void handleLeftMouseUp(const MouseEvent& mouseEventResult);
bool handleContextMenu(dwt::ScreenCoordinate pt);
void handleMiddleMouseDown(const MouseEvent& mouseEventResult);
- void handleHelp(HWND hWnd, unsigned id);
tstring formatTitle(tstring title);
void layout();
@@ -184,7 +177,10 @@
void eraseImpl( int row );
void clearImpl();
size_t sizeImpl() const;
-
+
+ // AspectHelp
+ void helpImpl(unsigned& id);
+
// AspectSelection
int getSelectedImpl() const;
void setSelectedImpl( int idx );
Modified: dcplusplus/trunk/dwt/src/widgets/TabView.cpp
===================================================================
--- dcplusplus/trunk/dwt/src/widgets/TabView.cpp 2008-04-14 21:23:26 UTC (rev 1173)
+++ dcplusplus/trunk/dwt/src/widgets/TabView.cpp 2008-04-14 21:24:06 UTC (rev 1174)
@@ -126,10 +126,14 @@
onLeftMouseUp(std::tr1::bind(&TabView::handleLeftMouseUp, this, _1));
onContextMenu(std::tr1::bind(&TabView::handleContextMenu, this, _1));
onMiddleMouseDown(std::tr1::bind(&TabView::handleMiddleMouseDown, this, _1));
- onHelp(std::tr1::bind(&TabView::handleHelp, this, _1, _2));
- tip = WidgetCreator<ToolTip>::attach(this, TabCtrl_GetToolTips(handle())); // created and managed by the tab control thanks to the TCS_TOOLTIPS style
- tip->addRemoveStyle(TTS_NOPREFIX, true);
+ if(cs.style & TCS_TOOLTIPS) {
+ tip = WidgetCreator<ToolTip>::attach(this, TabCtrl_GetToolTips(handle())); // created and managed by the tab control thanks to the TCS_TOOLTIPS style
+ if(tip) {
+ tip->addRemoveStyle(TTS_NOPREFIX, true);
+ tip->onRaw(std::tr1::bind(&TabView::handleToolTip, this, _2), Message(WM_NOTIFY, TTN_GETDISPINFO));
+ }
+ }
}
void TabView::add(Container* w, const IconPtr& icon) {
@@ -490,16 +494,11 @@
ti->w->close();
}
-void TabView::handleHelp(HWND hWnd, unsigned id) {
- if(helpFunction) {
- // hWnd and id are those of the whole tab control; not those of the specific tab on which the user wants help for
- TabInfo* ti = getTabInfo(hitTest(ScreenCoordinate(Point::fromLParam(::GetMessagePos()))));
- if(ti)
- id = ti->w->getHelpId();
-
- // even if no tab was found below the cursor, forward the message to the application so that it can display its default help
- helpFunction(hWnd, id);
- }
+void TabView::helpImpl(unsigned& id) {
+ // we have the help id of the whole tab control; convert to the one of the specific tab the user just clicked on
+ TabInfo* ti = getTabInfo(hitTest(ScreenCoordinate(Point::fromLParam(::GetMessagePos()))));
+ if(ti)
+ id = ti->w->getHelpId();
}
bool TabView::filter(const MSG& msg) {
Modified: dcplusplus/trunk/win32/TransferView.cpp
===================================================================
--- dcplusplus/trunk/win32/TransferView.cpp 2008-04-14 21:23:26 UTC (rev 1173)
+++ dcplusplus/trunk/win32/TransferView.cpp 2008-04-14 21:24:06 UTC (rev 1174)
@@ -78,6 +78,7 @@
TabView::Seed cs;
cs.location = getBounds();
tabs = addChild(cs);
+ tabs->onHelp(std::tr1::bind(&WinUtil::help, _1, _2));
}
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2008-04-14 21:24:37
|
Revision: 1175
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1175&view=rev
Author: arnetheduck
Date: 2008-04-14 14:24:29 -0700 (Mon, 14 Apr 2008)
Log Message:
-----------
Remove double comment
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-14 22:57:19.171000004 +0200
committer: poy <po...@12...>
properties:
branch-nick: repo
+ timestamp: 2008-04-14 23:16:16.674999952 +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
+ 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
Modified: dcplusplus/trunk/dwt/src/widgets/TabView.cpp
===================================================================
--- dcplusplus/trunk/dwt/src/widgets/TabView.cpp 2008-04-14 21:24:06 UTC (rev 1174)
+++ dcplusplus/trunk/dwt/src/widgets/TabView.cpp 2008-04-14 21:24:29 UTC (rev 1175)
@@ -46,30 +46,9 @@
font(new Font(DefaultGuiFont)),
toggleActive(toggleActive_)
{
- // Flicker bugfix, as described in SWT:
- /*
- * Feature in Windows. The tab control window class
- * uses the CS_HREDRAW and CS_VREDRAW style bits to
- * force a full redraw of the control and all children
- * when resized. This causes flashing. The fix is to
- * register a new window class without these bits and
- * implement special code that damages only the exposed
- * area.
- *
- * NOTE: Screen readers look for the exact class name
- * of the control in order to provide the correct kind
- * of assistance. Therefore, it is critical that the
- * new window class have the same name. It is possible
- * to register a local window class with the same name
- * as a global class. Since bits that affect the class
- * are being changed, it is possible that other native
- * code, other than SWT, could create a control with
- * this class name, and fail unexpectedly.
- */
-
static bool first = true;
if(first) {
- // From SWT:
+ // Flicker bugfix, as described in SWT:
/*
* Feature in Windows. The tab control window class
* uses the CS_HREDRAW and CS_VREDRAW style bits to
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:00:28
|
Revision: 1176
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1176&view=rev
Author: arnetheduck
Date: 2008-04-24 06:00:18 -0700 (Thu, 24 Apr 2008)
Log Message:
-----------
Reduce tab switch flicker, remove unused windowclass
Modified Paths:
--------------
dcplusplus/trunk/dwt/include/dwt/widgets/TabView.h
dcplusplus/trunk/dwt/src/widgets/TabView.cpp
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-14 23:16:16.674999952 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
+ timestamp: 2008-04-15 10:04:09.540999889 +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
+ 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
Modified: dcplusplus/trunk/dwt/include/dwt/widgets/TabView.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/TabView.h 2008-04-14 21:24:29 UTC (rev 1175)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/TabView.h 2008-04-24 13:00:18 UTC (rev 1176)
@@ -40,7 +40,6 @@
#include "../aspects/AspectPainting.h"
#include "../aspects/AspectSelection.h"
#include "../aspects/AspectText.h"
-#include "../WindowClass.h"
#include "Control.h"
#include <list>
@@ -126,8 +125,6 @@
ContextMenuFunction handleContextMenu;
};
- static WindowClass windowClass;
-
ToolTipPtr tip;
TitleChangedFunction titleChangedFunction;
Modified: dcplusplus/trunk/dwt/src/widgets/TabView.cpp
===================================================================
--- dcplusplus/trunk/dwt/src/widgets/TabView.cpp 2008-04-14 21:24:29 UTC (rev 1175)
+++ dcplusplus/trunk/dwt/src/widgets/TabView.cpp 2008-04-24 13:00:18 UTC (rev 1176)
@@ -38,8 +38,6 @@
namespace dwt {
-WindowClass TabView::windowClass(_T("TabView"), &TabView::wndProc, NULL, ( HBRUSH )( COLOR_WINDOW + 1 ));
-
TabView::Seed::Seed(bool toggleActive_) :
BaseType::Seed(WC_TABCONTROL, WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_VISIBLE |
TCS_HOTTRACK | TCS_MULTILINE | TCS_RAGGEDRIGHT | TCS_TOOLTIPS | TCS_FOCUSNEVER),
@@ -108,10 +106,8 @@
if(cs.style & TCS_TOOLTIPS) {
tip = WidgetCreator<ToolTip>::attach(this, TabCtrl_GetToolTips(handle())); // created and managed by the tab control thanks to the TCS_TOOLTIPS style
- if(tip) {
- tip->addRemoveStyle(TTS_NOPREFIX, true);
- tip->onRaw(std::tr1::bind(&TabView::handleToolTip, this, _2), Message(WM_NOTIFY, TTN_GETDISPINFO));
- }
+ tip->addRemoveStyle(TTS_NOPREFIX, true);
+ tip->onRaw(std::tr1::bind(&TabView::handleToolTip, this, _2), Message(WM_NOTIFY, TTN_GETDISPINFO));
}
}
@@ -207,19 +203,13 @@
}
void TabView::swapWidgets(Container* oldW, Container* newW) {
- sendMessage(WM_SETREDRAW, FALSE);
-
+ newW->setBounds(clientSize, false);
+ newW->setVisible(true);
if(oldW) {
oldW->sendMessage(WM_ACTIVATE, WA_INACTIVE, reinterpret_cast<LPARAM>(newW->handle()));
oldW->setVisible(false);
}
-
- newW->setVisible(true);
- newW->setBounds(clientSize, false);
newW->sendMessage(WM_ACTIVATE, WA_ACTIVE, oldW ? reinterpret_cast<LPARAM>(oldW->handle()) : 0);
-
- sendMessage(WM_SETREDRAW, TRUE);
- ::RedrawWindow(handle(), NULL, NULL, RDW_FRAME | RDW_INVALIDATE | RDW_UPDATENOW | RDW_ALLCHILDREN);
}
void TabView::handleTabSelected() {
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:03:26
|
Revision: 1177
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1177&view=rev
Author: arnetheduck
Date: 2008-04-24 06:02:58 -0700 (Thu, 24 Apr 2008)
Log Message:
-----------
simplify tooltip interface
Modified Paths:
--------------
dcplusplus/trunk/dwt/include/dwt/Policies.h
dcplusplus/trunk/dwt/include/dwt/aspects/AspectActivate.h
dcplusplus/trunk/dwt/include/dwt/aspects/AspectDragDrop.h
dcplusplus/trunk/dwt/include/dwt/widgets/CheckBox.h
dcplusplus/trunk/dwt/include/dwt/widgets/ToolTip.h
dcplusplus/trunk/dwt/src/widgets/ToolTip.cpp
dcplusplus/trunk/win32/AspectStatus.h
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-15 10:04:09.540999889 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
+ timestamp: 2008-04-15 14:45:40.223999977 +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
+ 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
Modified: dcplusplus/trunk/dwt/include/dwt/Policies.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/Policies.h 2008-04-24 13:00:18 UTC (rev 1176)
+++ dcplusplus/trunk/dwt/include/dwt/Policies.h 2008-04-24 13:02:58 UTC (rev 1177)
@@ -255,9 +255,6 @@
#ifndef WINCE // MDI Widgets doesn't exist on CE
/// Aspect classes for a MDI Child Container Widget
-/** Used as the third template argument to WidgetFactory if you're creating an MDI
- * Child Container Widget
- */
class MDIChild
: public Widget
{
Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectActivate.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/aspects/AspectActivate.h 2008-04-24 13:00:18 UTC (rev 1176)
+++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectActivate.h 2008-04-24 13:02:58 UTC (rev 1177)
@@ -51,6 +51,9 @@
class AspectActivate
{
WidgetType& W() { return *static_cast<WidgetType*>(this); }
+ const WidgetType& W() const { return *static_cast<const WidgetType*>(this); }
+
+ HWND H() const { return W().handle(); }
static bool isActive(const MSG& msg) {
return LOWORD( msg.wParam ) == WA_ACTIVE || LOWORD( msg.wParam ) == WA_CLICKACTIVE;
@@ -94,13 +97,13 @@
template< class WidgetType >
void AspectActivate< WidgetType >::setActive()
{
- ::SetActiveWindow( static_cast< WidgetType * >( this )->handle() );
+ ::SetActiveWindow( H() );
}
template< class WidgetType >
bool AspectActivate< WidgetType >::getActive() const
{
- return ::GetActiveWindow() == static_cast< const WidgetType * >( this )->handle();
+ return ::GetActiveWindow() == H();
}
}
Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectDragDrop.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/aspects/AspectDragDrop.h 2008-04-24 13:00:18 UTC (rev 1176)
+++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectDragDrop.h 2008-04-24 13:02:58 UTC (rev 1177)
@@ -52,6 +52,11 @@
template< class WidgetType >
class AspectDragDrop
{
+ WidgetType& W() { return *static_cast<WidgetType*>(this); }
+ const WidgetType& W() const { return *static_cast<const WidgetType*>(this); }
+
+ HWND H() const { return W().handle(); }
+
struct Dispatcher {
typedef std::tr1::function<void (std::vector< tstring>, Point )> F;
@@ -99,9 +104,7 @@
* }
*/
void onDragDrop(const typename Dispatcher::F& f) {
- static_cast<WidgetType*>(this)->addCallback(
- Message( WM_DROPFILES ), Dispatcher(f)
- );
+ W().addCallback(Message( WM_DROPFILES ), Dispatcher(f));
}
/// Setup Drag & Drop for this dialog
/** This setup the ability to receive an WM_DROPFILES msg if you drop a file on dialog
@@ -117,7 +120,7 @@
template< class WidgetType >
void AspectDragDrop< WidgetType >::setDragAcceptFiles(bool accept)
{
- DragAcceptFiles(static_cast< WidgetType * >( this )->handle(),accept);
+ DragAcceptFiles(H(), accept);
}
}
Modified: dcplusplus/trunk/dwt/include/dwt/widgets/CheckBox.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/CheckBox.h 2008-04-24 13:00:18 UTC (rev 1176)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/CheckBox.h 2008-04-24 13:02:58 UTC (rev 1177)
@@ -101,7 +101,7 @@
inline void CheckBox::setChecked( bool value )
{
- this->sendMessage(BM_SETCHECK, static_cast< WPARAM >( value ? BST_CHECKED : BST_UNCHECKED ) );
+ this->sendMessage(BM_SETCHECK, value ? BST_CHECKED : BST_UNCHECKED);
}
inline bool CheckBox::getChecked()
Modified: dcplusplus/trunk/dwt/include/dwt/widgets/ToolTip.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/ToolTip.h 2008-04-24 13:00:18 UTC (rev 1176)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/ToolTip.h 2008-04-24 13:02:58 UTC (rev 1177)
@@ -52,16 +52,19 @@
typedef MessageMap< Policies::Subclassed > BaseType;
friend class WidgetCreator< ToolTip >;
- struct Dispatcher
- {
- typedef std::tr1::function<const tstring& ()> F;
+ struct Dispatcher {
+ typedef std::tr1::function<void (tstring&)> F;
Dispatcher(const F& f_) : f(f_) { }
bool operator()(const MSG& msg, LRESULT& ret) {
LPNMTTDISPINFO ttdi = reinterpret_cast< LPNMTTDISPINFO >( msg.lParam );
- ttdi->lpszText = const_cast<LPTSTR>(f().c_str());
- return 0;
+ ToolTip* tip = hwnd_cast<ToolTip*>(ttdi->hdr.hwndFrom);
+ if(tip) {
+ f(tip->text);
+ ttdi->lpszText = const_cast<LPTSTR>(tip->text.c_str());
+ }
+ return true;
}
F f;
@@ -72,7 +75,7 @@
typedef ToolTip ThisType;
/// Object type
- typedef ThisType * ObjectType;
+ typedef ThisType* ObjectType;
struct Seed : public BaseType::Seed {
typedef ThisType WidgetType;
@@ -86,6 +89,8 @@
void setTool(Widget* widget, const Dispatcher::F& callback);
void setMaxTipWidth(int width);
+
+ void onGetTip(const Dispatcher::F& f);
/// Actually creates the Toolbar
/** You should call WidgetFactory::createToolbar if you instantiate class
@@ -102,6 +107,8 @@
// is supposed to do so when parent is killed...
virtual ~ToolTip()
{}
+
+ tstring text;
};
inline ToolTip::ToolTip( Widget * parent )
@@ -115,6 +122,10 @@
sendMessage(TTM_SETMAXTIPWIDTH, 0, static_cast<LPARAM>(width));
}
+inline void ToolTip::onGetTip(const Dispatcher::F& f) {
+ setCallback(Message(WM_NOTIFY, TTN_GETDISPINFO), Dispatcher(f));
}
+}
+
#endif /*ToolTip_H_*/
Modified: dcplusplus/trunk/dwt/src/widgets/ToolTip.cpp
===================================================================
--- dcplusplus/trunk/dwt/src/widgets/ToolTip.cpp 2008-04-24 13:00:18 UTC (rev 1176)
+++ dcplusplus/trunk/dwt/src/widgets/ToolTip.cpp 2008-04-24 13:02:58 UTC (rev 1177)
@@ -51,9 +51,7 @@
}
void ToolTip::setTool(Widget* widget, const Dispatcher::F& f) {
- addCallback(
- Message(WM_NOTIFY, TTN_GETDISPINFO), Dispatcher(f)
- );
+ onGetTip(f);
TOOLINFO ti = { sizeof(TOOLINFO) };
ti.uFlags = TTF_IDISHWND | TTF_SUBCLASS;
Modified: dcplusplus/trunk/win32/AspectStatus.h
===================================================================
--- dcplusplus/trunk/win32/AspectStatus.h 2008-04-24 13:00:18 UTC (rev 1176)
+++ dcplusplus/trunk/win32/AspectStatus.h 2008-04-24 13:02:58 UTC (rev 1177)
@@ -42,7 +42,7 @@
status = static_cast<WidgetType*>(this)->addChild(cs);
statusTip = static_cast<WidgetType*>(this)->addChild(dwt::ToolTip::Seed());
- statusTip->setTool(status, std::tr1::bind(&ThisType::handleToolTip, this));
+ statusTip->setTool(status, std::tr1::bind(&ThisType::handleToolTip, this, _1));
}
void setStatus(int s, const tstring& text) {
@@ -75,7 +75,6 @@
statusSizes[WidgetType::STATUS_STATUS] = sz.x - std::accumulate(statusSizes.begin(), statusSizes.end(), 0);
status->setSections(statusSizes);
- statusTip->setMaxTipWidth(statusSizes[WidgetType::STATUS_STATUS]);
}
void mapWidget(int s, dwt::Widget* widget) {
@@ -93,7 +92,6 @@
dwt::Application::FilterIter filterIter;
dwt::ToolTipPtr statusTip;
TStringList lastLines;
- tstring tip;
enum { MAX_LINES = 10 };
@@ -102,7 +100,8 @@
return false;
}
- const tstring& handleToolTip() {
+ void handleToolTip(tstring& tip) {
+ statusTip->setMaxTipWidth(statusSizes[WidgetType::STATUS_STATUS]);
tip.clear();
for(size_t i = 0; i < lastLines.size(); ++i) {
if(i > 0) {
@@ -110,7 +109,6 @@
}
tip += lastLines[i];
}
- return tip;
}
};
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:06:07
|
Revision: 1178
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1178&view=rev
Author: arnetheduck
Date: 2008-04-24 06:05:59 -0700 (Thu, 24 Apr 2008)
Log Message:
-----------
Removed rollback option
Modified Paths:
--------------
dcplusplus/trunk/changelog.txt
dcplusplus/trunk/help/settings_expert.html
dcplusplus/trunk/win32/Advanced3Page.cpp
dcplusplus/trunk/win32/DCPlusPlus.rc
dcplusplus/trunk/win32/resource.h
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-15 14:45:40.223999977 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
+ timestamp: 2008-04-15 16:14:50.305999994 +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
+ 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
Modified: dcplusplus/trunk/changelog.txt
===================================================================
--- dcplusplus/trunk/changelog.txt 2008-04-24 13:02:58 UTC (rev 1177)
+++ dcplusplus/trunk/changelog.txt 2008-04-24 13:05:59 UTC (rev 1178)
@@ -39,6 +39,7 @@
* Anti-frag no longer optional - not using it was broken by segmented downloading
* [L#215779] Fix a few hub list download issues (thanks emtee)
* [L#195209] Changed tab order in hub windows (poy)
+* Removed unused rollback option (thanks mikejj)
-- 0.705 2008-03-14 --
* Several patches for better *nix compatibility of the core (thanks steven sheehy et al)
Modified: dcplusplus/trunk/help/settings_expert.html
===================================================================
--- dcplusplus/trunk/help/settings_expert.html 2008-04-24 13:02:58 UTC (rev 1177)
+++ dcplusplus/trunk/help/settings_expert.html 2008-04-24 13:05:59 UTC (rev 1178)
@@ -8,8 +8,6 @@
<body>
<h1>Experts only</h1>
<dl style="margin-left: 40px;">
- <dt>Rollback</dt>
- <dd cshelp=IDH_SETTINGS_ADVANCED3_ROLLBACK>This option is not used currently.</dd>
<dt>Max Hash Speed</dt>
<dd cshelp=IDH_SETTINGS_ADVANCED3_MAX_HASH_SPEED>This is the speed at which DC++ will hash your files, in
MiB/s.
Modified: dcplusplus/trunk/win32/Advanced3Page.cpp
===================================================================
--- dcplusplus/trunk/win32/Advanced3Page.cpp 2008-04-24 13:02:58 UTC (rev 1177)
+++ dcplusplus/trunk/win32/Advanced3Page.cpp 2008-04-24 13:05:59 UTC (rev 1178)
@@ -28,8 +28,6 @@
#include <dwt/widgets/Spinner.h>
static const WinUtil::HelpItem helpItems[] = {
- { IDC_SETTINGS_ROLLBACK, IDH_SETTINGS_ADVANCED3_ROLLBACK },
- { IDC_ROLLBACK, IDH_SETTINGS_ADVANCED3_ROLLBACK },
{ IDC_SETTINGS_B, IDH_SETTINGS_ADVANCED3_ROLLBACK },
{ IDC_SETTINGS_MAX_HASH_SPEED, IDH_SETTINGS_ADVANCED3_MAX_HASH_SPEED },
{ IDC_MAX_HASH_SPEED, IDH_SETTINGS_ADVANCED3_MAX_HASH_SPEED },
@@ -66,7 +64,6 @@
};
PropPage::TextItem Advanced3Page::texts[] = {
- { IDC_SETTINGS_ROLLBACK, N_("Rollback") },
{ IDC_SETTINGS_B, N_("B") },
{ IDC_SETTINGS_MAX_HASH_SPEED, N_("Max hash speed") },
{ IDC_SETTINGS_MBS, N_("MiB/s") },
@@ -116,7 +113,6 @@
SpinnerPtr spinner = attachChild<Spinner>(IDC_SEARCH_HISTORY_SPIN);
spinner->setRange(0, 100);
- attachChild<TextBox>(IDC_ROLLBACK);
attachChild<TextBox>(IDC_MAX_HASH_SPEED);
attachChild<TextBox>(IDC_SHOW_LAST_LINES_LOG);
attachChild<TextBox>(IDC_SET_MINISLOT_SIZE);
Modified: dcplusplus/trunk/win32/DCPlusPlus.rc
===================================================================
--- dcplusplus/trunk/win32/DCPlusPlus.rc 2008-04-24 13:02:58 UTC (rev 1177)
+++ dcplusplus/trunk/win32/DCPlusPlus.rc 2008-04-24 13:05:59 UTC (rev 1178)
@@ -412,24 +412,21 @@
CAPTION "Experts only"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- RTEXT "Rollback",IDC_SETTINGS_ROLLBACK,7,10,57,8
- EDITTEXT IDC_ROLLBACK,69,7,45,14,ES_AUTOHSCROLL | ES_NUMBER
- LTEXT "B",IDC_SETTINGS_B,117,10,16,8
- RTEXT "Max Hash Speed",IDC_SETTINGS_MAX_HASH_SPEED,7,27,57,8
- EDITTEXT IDC_MAX_HASH_SPEED,69,24,45,14,ES_AUTOHSCROLL
- LTEXT "MiB/s",IDC_SETTINGS_MBS,117,27,16,8
- RTEXT "PM history",IDC_SETTINGS_PM_HISTORY,7,44,57,8
- EDITTEXT IDC_SHOW_LAST_LINES_LOG,69,41,45,14,ES_AUTOHSCROLL
- RTEXT "Mini slot size",IDC_SETTINGS_TEXT_MINISLOT,7,61,57,8
- EDITTEXT IDC_SET_MINISLOT_SIZE,69,58,45,14,ES_AUTOHSCROLL
- LTEXT "KiB",IDC_SETTINGS_KB2,117,61,16,8
- RTEXT "Max filelist size",IDC_SETTINGS_MAX_FILELIST_SIZE,7,78,57,8
- EDITTEXT IDC_MAX_FILELIST_SIZE,69,75,45,14,ES_AUTOHSCROLL
- LTEXT "MiB",IDC_SETTINGS_MB,117,78,16,8
- RTEXT "PID",IDC_SETTINGS_PID,7,95,57,8
- EDITTEXT IDC_PRIVATE_ID,69,92,45,14,ES_AUTOHSCROLL
- RTEXT "Auto refresh time",IDC_SETTINGS_AUTO_REFRESH_TIME,7,112,57,8
- EDITTEXT IDC_AUTO_REFRESH_TIME,69,110,45,14,ES_AUTOHSCROLL
+ RTEXT "Max Hash Speed",IDC_SETTINGS_MAX_HASH_SPEED,7,10,57,8
+ EDITTEXT IDC_MAX_HASH_SPEED,69,7,45,14,ES_AUTOHSCROLL
+ LTEXT "MiB/s",IDC_SETTINGS_MBS,117,10,16,8
+ RTEXT "PM history",IDC_SETTINGS_PM_HISTORY,7,27,57,8
+ EDITTEXT IDC_SHOW_LAST_LINES_LOG,69,24,45,14,ES_AUTOHSCROLL
+ RTEXT "Mini slot size",IDC_SETTINGS_TEXT_MINISLOT,7,44,57,8
+ EDITTEXT IDC_SET_MINISLOT_SIZE,69,41,45,14,ES_AUTOHSCROLL
+ LTEXT "KiB",IDC_SETTINGS_KB2,117,44,16,8
+ RTEXT "Max filelist size",IDC_SETTINGS_MAX_FILELIST_SIZE,7,61,57,8
+ EDITTEXT IDC_MAX_FILELIST_SIZE,69,58,45,14,ES_AUTOHSCROLL
+ LTEXT "MiB",IDC_SETTINGS_MB,117,61,16,8
+ RTEXT "PID",IDC_SETTINGS_PID,7,78,57,8
+ EDITTEXT IDC_PRIVATE_ID,69,75,45,14,ES_AUTOHSCROLL
+ RTEXT "Auto refresh time",IDC_SETTINGS_AUTO_REFRESH_TIME,7,95,57,8
+ EDITTEXT IDC_AUTO_REFRESH_TIME,69,93,45,14,ES_AUTOHSCROLL
RTEXT "Write buffer size",IDC_SETTINGS_WRITE_BUFFER,134,10,70,8
EDITTEXT IDC_BUFFERSIZE,208,7,41,14,ES_AUTOHSCROLL
LTEXT "KiB",IDC_SETTINGS_KB,252,10,16,8
Modified: dcplusplus/trunk/win32/resource.h
===================================================================
--- dcplusplus/trunk/win32/resource.h 2008-04-24 13:02:58 UTC (rev 1177)
+++ dcplusplus/trunk/win32/resource.h 2008-04-24 13:05:59 UTC (rev 1178)
@@ -279,7 +279,6 @@
#define IDC_REMOVE_MENU 2138
#define IDC_RENAME 2139
#define IDC_RESULT 2140
-#define IDC_ROLLBACK 2141
#define IDC_SEARCH_HISTORY 2142
#define IDC_SEARCH_HISTORY_SPIN 2143
#define IDC_SEARCH_STRING 2144
@@ -366,7 +365,6 @@
#define IDC_SETTINGS_PUBLIC_HUB_LIST_URL 2225
#define IDC_SETTINGS_RAW 2226
#define IDC_SETTINGS_REQUIRES_RESTART 2227
-#define IDC_SETTINGS_ROLLBACK 2228
#define IDC_SETTINGS_S1 2229
#define IDC_SETTINGS_S2 2230
#define IDC_SETTINGS_S3 2231
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:07:10
|
Revision: 1179
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1179&view=rev
Author: arnetheduck
Date: 2008-04-24 06:06:52 -0700 (Thu, 24 Apr 2008)
Log Message:
-----------
simplify the help dispatcher
Modified Paths:
--------------
dcplusplus/trunk/dwt/include/dwt/aspects/AspectHelp.h
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-15 16:14:50.305999994 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
+ timestamp: 2008-04-15 16:30:18.937000036 +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
+ 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
Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectHelp.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/aspects/AspectHelp.h 2008-04-24 13:05:59 UTC (rev 1178)
+++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectHelp.h 2008-04-24 13:06:52 UTC (rev 1179)
@@ -40,28 +40,32 @@
template<typename WidgetType>
class AspectHelp {
WidgetType& W() { return *static_cast<WidgetType*>(this); }
- HWND H() { return W().handle(); }
+ const WidgetType& W() const { return *static_cast<const WidgetType*>(this); }
+ HWND H() const { return W().handle(); }
+
struct Dispatcher {
typedef std::tr1::function<void (HWND, unsigned)> F;
- Dispatcher(const F& f_, WidgetType* widget_) : f(f_), widget(widget_) { }
+ Dispatcher(const F& f_) : f(f_) { }
bool operator()(const MSG& msg, LRESULT& ret) {
LPHELPINFO lphi = reinterpret_cast<LPHELPINFO>(msg.lParam);
if(lphi->iContextType != HELPINFO_WINDOW)
return false;
+ HWND hWnd = reinterpret_cast<HWND>(lphi->hItemHandle);
unsigned id = lphi->dwContextId;
- widget->helpImpl(id);
- f(reinterpret_cast<HWND>(lphi->hItemHandle), id);
+ WidgetType* w = hwnd_cast<WidgetType*>(hWnd);
+ if(w)
+ w->helpImpl(id);
+ f(hWnd, id);
ret = TRUE;
return true;
}
F f;
- WidgetType* widget;
};
public:
@@ -74,7 +78,7 @@
}
void onHelp(const typename Dispatcher::F& f) {
- W().addCallback(Message(WM_HELP), Dispatcher(f, &W()));
+ W().addCallback(Message(WM_HELP), Dispatcher(f));
}
private:
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:09:00
|
Revision: 1180
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1180&view=rev
Author: arnetheduck
Date: 2008-04-24 06:08:55 -0700 (Thu, 24 Apr 2008)
Log Message:
-----------
Some header cleanup, prefer unordered_map, fix libraryloader
Modified Paths:
--------------
dcplusplus/trunk/dwt/include/dwt/Application.h
dcplusplus/trunk/dwt/include/dwt/LibraryLoader.h
dcplusplus/trunk/dwt/include/dwt/resources/Accelerator.h
dcplusplus/trunk/dwt/include/dwt/widgets/Menu.h
dcplusplus/trunk/dwt/src/Application.cpp
dcplusplus/trunk/dwt/src/Bitmap.cpp
dcplusplus/trunk/dwt/src/Icon.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/MDIChild.cpp
dcplusplus/trunk/dwt/src/widgets/MDIParent.cpp
dcplusplus/trunk/dwt/src/widgets/ModalDialog.cpp
dcplusplus/trunk/dwt/src/widgets/ModelessDialog.cpp
dcplusplus/trunk/win32/WidgetPaned.h
dcplusplus/trunk/win32/stdafx.h
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-15 16:30:18.937000036 +0200
committer: poy <po...@12...>
properties:
branch-nick: repo
+ timestamp: 2008-04-15 19:49:58.423000097 +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
+ 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
Modified: dcplusplus/trunk/dwt/include/dwt/Application.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/Application.h 2008-04-24 13:06:52 UTC (rev 1179)
+++ dcplusplus/trunk/dwt/include/dwt/Application.h 2008-04-24 13:08:55 UTC (rev 1180)
@@ -43,9 +43,8 @@
#include "xCeption.h"
#include <vector>
#include <list>
-#include <map>
+#include <functional>
#include <boost/noncopyable.hpp>
-#include "Message.h"
#ifdef _MSC_VER
#ifndef WINCE
@@ -106,11 +105,6 @@
*/
static Application & instance();
- /// Returns the HINSTANCE to the process
- /** Returns the handle to the process.
- */
- HINSTANCE getAppHandle();
-
/// Returns the path to the process
/** NOTE! <br>
* This function returns the PATH to the application WITHOUT the process image
@@ -147,7 +141,7 @@
/// The initialization that must be done first.
/** Used internally by the WinMain function, and externally for DLL initialization.
*/
- static void init( HINSTANCE hInstance, int nCmdShow );
+ static void init( int nCmdShow );
/// Shut down operations
static void uninit();
@@ -201,9 +195,6 @@
// The "one and only" object of type Application...
static Application * itsInstance;
- // The global HINSTANCE given in the WinMain function
- const HINSTANCE itsHInstance;
-
int itsCmdShow;
// Command line parameters
@@ -219,7 +210,7 @@
FilterList filters;
// Private Constructor to ensure Singleton Implementation
- Application( HINSTANCE hInst, int nCmdShow );
+ Application( int nCmdShow );
};
}
Modified: dcplusplus/trunk/dwt/include/dwt/LibraryLoader.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/LibraryLoader.h 2008-04-24 13:06:52 UTC (rev 1179)
+++ dcplusplus/trunk/dwt/include/dwt/LibraryLoader.h 2008-04-24 13:08:55 UTC (rev 1180)
@@ -38,11 +38,10 @@
#include "WindowsHeaders.h"
#include "tstring.h"
-#include "Threads.h"
#include "xCeption.h"
-#include <map>
-#include <utility>
+#include <boost/noncopyable.hpp>
+
namespace dwt {
/// Class for helping loading of libraries or dlls
@@ -67,8 +66,7 @@
* EXACT SAME arguments! <br>
* See example usage in RichTextBox.h
*/
-class LibraryLoader
-{
+class LibraryLoader : private boost::noncopyable {
public:
/// Constructor loading the given library
/** Constructor loading the given library unless library is loaded from before.
@@ -94,8 +92,6 @@
*/
void load( const tstring & libraryName );
-
-
/// Get procedure address from loaded library by name
/** Allows you get a procedure address from the dll.
* Example: <br>
@@ -122,13 +118,7 @@
static DWORD getCommonControlsVersion();
private:
- LibraryLoader( const LibraryLoader & ); // DENY COPY
- LibraryLoader & operator =( const LibraryLoader & ); // DENY ASSIGNMENT
- tstring itsLibraryName;
HMODULE itsHMod;
- static Utilities::CriticalSection itsCs;
- static std::map< tstring, std::pair< int, HMODULE > > itsLibrariesLoaded;
- bool hasCalledLoad;
};
}
Modified: dcplusplus/trunk/dwt/include/dwt/resources/Accelerator.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/resources/Accelerator.h 2008-04-24 13:06:52 UTC (rev 1179)
+++ dcplusplus/trunk/dwt/include/dwt/resources/Accelerator.h 2008-04-24 13:08:55 UTC (rev 1180)
@@ -32,7 +32,6 @@
#ifndef DWT_ACCELERATOR_H_
#define DWT_ACCELERATOR_H_
-#include "../Application.h"
#include "Handle.h"
#include <boost/intrusive_ptr.hpp>
@@ -54,7 +53,7 @@
typedef boost::intrusive_ptr< Accelerator > AcceleratorPtr;
inline Accelerator::Accelerator(Widget* widget_, unsigned id) :
- ResourceType(::LoadAccelerators(Application::instance().getAppHandle(), MAKEINTRESOURCE(id))),
+ ResourceType(::LoadAccelerators(::GetModuleHandle(NULL), MAKEINTRESOURCE(id))),
widget(widget_)
{
Modified: dcplusplus/trunk/dwt/include/dwt/widgets/Menu.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/Menu.h 2008-04-24 13:06:52 UTC (rev 1179)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/Menu.h 2008-04-24 13:08:55 UTC (rev 1180)
@@ -44,7 +44,7 @@
#include <memory>
#include <vector>
-#include <map>
+#include <tr1/unordered_map>
namespace dwt {
@@ -462,7 +462,7 @@
// if true title is drawn as sidebar
bool drawSidebar;
- typedef std::map<unsigned, Widget::CallbackType> CallbackMap;
+ typedef std::tr1::unordered_map<unsigned, Widget::CallbackType> CallbackMap;
CallbackMap callbacks;
void createHelper(const Seed& cs);
Modified: dcplusplus/trunk/dwt/src/Application.cpp
===================================================================
--- dcplusplus/trunk/dwt/src/Application.cpp 2008-04-24 13:06:52 UTC (rev 1179)
+++ dcplusplus/trunk/dwt/src/Application.cpp 2008-04-24 13:08:55 UTC (rev 1180)
@@ -59,9 +59,9 @@
/** Initializes the runtime for SmartWin++
Typically only called by WinMain or DllMain.
*/
-void Application::init( HINSTANCE hInstance, int nCmdShow )
+void Application::init( int nCmdShow )
{
- itsInstance = new Application( hInstance, nCmdShow );
+ itsInstance = new Application(nCmdShow );
#ifndef WINCE
BOOL enable;
@@ -128,16 +128,11 @@
return retVal;
}
-HINSTANCE Application::getAppHandle()
+Application::Application( int nCmdShow )
+ : itsCmdShow(nCmdShow)
{
- return itsHInstance;
}
-Application::Application( HINSTANCE hInst, int nCmdShow )
- : itsHInstance( hInst ), itsCmdShow(nCmdShow)
-{
-}
-
const CommandLine & Application::getCommandLine() const
{
return itsCmdLine;
@@ -208,7 +203,7 @@
{
if ( 0 == itsInstance )
{
- init( ::GetModuleHandle( NULL ), 0 );
+ init(0);
}
return * itsInstance;
}
@@ -355,7 +350,7 @@
unsigned int retVal = 0;
bool corruptMemMemLeak = false;
- dwt::Application::init( hInstance, nCmdShow );
+ dwt::Application::init( nCmdShow );
try {
retVal = SmartWinMain( dwt::Application::instance() ); // Call library user's startup function.
dwt::Application::uninit();
Modified: dcplusplus/trunk/dwt/src/Bitmap.cpp
===================================================================
--- dcplusplus/trunk/dwt/src/Bitmap.cpp 2008-04-24 13:06:52 UTC (rev 1179)
+++ dcplusplus/trunk/dwt/src/Bitmap.cpp 2008-04-24 13:08:55 UTC (rev 1180)
@@ -35,7 +35,6 @@
#include <dwt/resources/Bitmap.h>
#include <dwt/Point.h>
-#include <dwt/Application.h>
namespace dwt {
@@ -44,14 +43,14 @@
{}
Bitmap::Bitmap( unsigned resourceId, unsigned flags )
- : ResourceType( ( HBITMAP )::LoadImage( Application::instance().getAppHandle(), MAKEINTRESOURCE( resourceId ), IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION ) )
+ : ResourceType( ( HBITMAP )::LoadImage( ::GetModuleHandle(NULL), MAKEINTRESOURCE( resourceId ), IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION ) )
{}
Bitmap::Bitmap( const tstring & filePath, unsigned flags )
#ifdef WINCE
: itsBitmap( ::SHLoadImageFile( filePath.c_str() ) )
#else
- : ResourceType( ( HBITMAP )::LoadImage( Application::instance().getAppHandle(), filePath.c_str(), IMAGE_BITMAP, 0, 0, flags | LR_LOADFROMFILE ) )
+ : ResourceType( ( HBITMAP )::LoadImage( ::GetModuleHandle(NULL), filePath.c_str(), IMAGE_BITMAP, 0, 0, flags | LR_LOADFROMFILE ) )
#endif
{}
Modified: dcplusplus/trunk/dwt/src/Icon.cpp
===================================================================
--- dcplusplus/trunk/dwt/src/Icon.cpp 2008-04-24 13:06:52 UTC (rev 1179)
+++ dcplusplus/trunk/dwt/src/Icon.cpp 2008-04-24 13:08:55 UTC (rev 1180)
@@ -34,7 +34,6 @@
*/
#include <dwt/resources/Icon.h>
-#include <dwt/Application.h>
namespace dwt {
@@ -43,14 +42,14 @@
{}
Icon::Icon( unsigned resourceId )
- : ResourceType(::LoadIcon( Application::instance().getAppHandle(), MAKEINTRESOURCE( resourceId ) ) )
+ : ResourceType(::LoadIcon(::GetModuleHandle(NULL), MAKEINTRESOURCE( resourceId ) ) )
{}
Icon::Icon( const tstring & filePath )
#ifdef WINCE
- : itsIcon( ::LoadIcon( Application::instance().getAppHandle(), filePath.c_str() ) )
+ : itsIcon( ::LoadIcon(::GetModuleHandle(NULL), filePath.c_str() ) )
#else
- : ResourceType( (HICON)::LoadImage( Application::instance().getAppHandle(), filePath.c_str(), IMAGE_ICON, 0, 0, LR_LOADFROMFILE ) )
+ : ResourceType( (HICON)::LoadImage(::GetModuleHandle(NULL), filePath.c_str(), IMAGE_ICON, 0, 0, LR_LOADFROMFILE ) )
#endif
{}
Modified: dcplusplus/trunk/dwt/src/ImageList.cpp
===================================================================
--- dcplusplus/trunk/dwt/src/ImageList.cpp 2008-04-24 13:06:52 UTC (rev 1179)
+++ dcplusplus/trunk/dwt/src/ImageList.cpp 2008-04-24 13:08:55 UTC (rev 1180)
@@ -34,7 +34,6 @@
*/
#include <dwt/resources/ImageList.h>
-#include <dwt/Application.h>
#include <dwt/xCeption.h>
namespace dwt {
Modified: dcplusplus/trunk/dwt/src/LibraryLoader.cpp
===================================================================
--- dcplusplus/trunk/dwt/src/LibraryLoader.cpp 2008-04-24 13:06:52 UTC (rev 1179)
+++ dcplusplus/trunk/dwt/src/LibraryLoader.cpp 2008-04-24 13:08:55 UTC (rev 1180)
@@ -33,103 +33,69 @@
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <dwt/WindowsHeaders.h>
#include <dwt/LibraryLoader.h>
-#include <utility>
namespace dwt {
-// Static members definitions!
-Utilities::CriticalSection LibraryLoader::itsCs;
-std::map< tstring, std::pair< int, HMODULE > > LibraryLoader::itsLibrariesLoaded;
+LibraryLoader::LibraryLoader( const tstring & libraryName ) :
+ itsHMod(NULL)
+{
+ load(libraryName);
+}
-LibraryLoader::~LibraryLoader()
+LibraryLoader::LibraryLoader() :
+ itsHMod(NULL)
{
- // Need a lock here since we're accessing the shared static version of its map!
- Utilities::ThreadLock lock( LibraryLoader::itsCs );
+}
- if ( !hasCalledLoad )
- return;
-
- // Decreasing reference count
- LibraryLoader::itsLibrariesLoaded[itsLibraryName].first -= 1;
-
- // Checking to see if last instance and if so freeing library and removing map entry
- if ( 0 == LibraryLoader::itsLibrariesLoaded[itsLibraryName].first )
- {
- ::FreeLibrary( LibraryLoader::itsLibrariesLoaded[itsLibraryName].second );
- LibraryLoader::itsLibrariesLoaded.erase( itsLibraryName );
+LibraryLoader::~LibraryLoader() {
+ if(itsHMod != NULL) {
+ ::FreeLibrary(itsHMod);
}
}
void LibraryLoader::load( const tstring & libraryName )
{
- // Need a lock here since we're accessing the shared static version of its map!
- Utilities::ThreadLock lock( LibraryLoader::itsCs );
-
// VERY important we DON'T increase refcount or anything like that
- if ( hasCalledLoad )
- {
+ if ( itsHMod != NULL ) {
xCeption x( _T( "Already called load on LibraryLoader object" ) );
throw x;
}
- itsLibraryName = libraryName;
+ // Loading library
+ itsHMod = ::LoadLibrary( libraryName.c_str() );
- hasCalledLoad = true;
-
- std::map< tstring, std::pair< int, HMODULE > >::const_iterator exists = LibraryLoader::itsLibrariesLoaded.find( libraryName );
- if ( LibraryLoader::itsLibrariesLoaded.end() == exists )
- {
- // Loading library
- itsHMod = ::LoadLibrary( libraryName.c_str() );
-
- // TODO: Rewrite xAssert to get support for submitting tstrings (could show library name)
- xAssert( itsHMod != 0, _T( "Error while trying to load library or dll!" ) );
-
- // SUCCESS!
- itsLibrariesLoaded[libraryName].second = itsHMod;
- itsLibrariesLoaded[libraryName].first = 1;
- }
- else
- {
- itsLibrariesLoaded[libraryName].first += 1;
- }
+ // TODO: Rewrite xAssert to get support for submitting tstrings (could show library name)
+ xAssert( itsHMod != 0, _T( "Error while trying to load library or dll!" ) );
}
-LibraryLoader::LibraryLoader( const tstring & libraryName )
- : itsLibraryName( libraryName ),
- hasCalledLoad( false )
-{
- load( libraryName );
-}
-
-LibraryLoader::LibraryLoader()
- : hasCalledLoad( false )
-{
-}
-
// Get procedure address from loaded library by name
-FARPROC LibraryLoader::getProcAddress( const tstring & procedureName )
-{
+FARPROC LibraryLoader::getProcAddress( const tstring & procedureName ) {
return ::GetProcAddress( itsHMod, util::AsciiGuaranteed::doConvert( procedureName, util::ConversionCodepage::ANSI ).c_str() );
}
// Get procedure address from loaded library by ordinal value
-FARPROC LibraryLoader::getProcAddress( long procedureOrdinal )
-{
+FARPROC LibraryLoader::getProcAddress( long procedureOrdinal ) {
return ::GetProcAddress( itsHMod, (LPCSTR)0 + procedureOrdinal );
}
DWORD LibraryLoader::getCommonControlsVersion() {
- LibraryLoader lib(_T("comctl32.dll"));
- DLLGETVERSIONPROC pDllGetVersion = (DLLGETVERSIONPROC)lib.getProcAddress(_T("DllGetVersion"));
- if(pDllGetVersion) {
- DLLVERSIONINFO dvi = { sizeof(dvi) };
- if(SUCCEEDED((*pDllGetVersion)(&dvi)))
- return PACK_COMCTL_VERSION(dvi.dwMajorVersion, dvi.dwMinorVersion);
+ static DWORD version = 0;
+ if(version == 0) {
+ try {
+ LibraryLoader lib(_T("comctl32.dll"));
+ DLLGETVERSIONPROC pDllGetVersion = (DLLGETVERSIONPROC)lib.getProcAddress(_T("DllGetVersion"));
+ if(pDllGetVersion) {
+ DLLVERSIONINFO dvi = { sizeof(dvi) };
+ if(SUCCEEDED((*pDllGetVersion)(&dvi))) {
+ version = PACK_COMCTL_VERSION(dvi.dwMajorVersion, dvi.dwMinorVersion);
+ }
+ }
+ } catch(...) {
+ // Ignore loading exceptions...
+ }
}
- return 0;
+ return version;
}
}
Modified: dcplusplus/trunk/dwt/src/Widget.cpp
===================================================================
--- dcplusplus/trunk/dwt/src/Widget.cpp 2008-04-24 13:06:52 UTC (rev 1179)
+++ dcplusplus/trunk/dwt/src/Widget.cpp 2008-04-24 13:08:55 UTC (rev 1180)
@@ -47,8 +47,6 @@
#include <dwt/Widget.h>
-#include <dwt/Threads.h>
-#include <dwt/Application.h>
#include <dwt/xCeption.h>
namespace dwt {
@@ -79,7 +77,7 @@
cs.location.x(), cs.location.y(), cs.location.width(), cs.location.height(),
itsParent ? itsParent->handle() : 0,
cs.menuHandle,
- Application::instance().getAppHandle(),
+ ::GetModuleHandle(NULL),
reinterpret_cast< LPVOID >( this )
);
if (!hWnd) {
Modified: dcplusplus/trunk/dwt/src/WindowClass.cpp
===================================================================
--- dcplusplus/trunk/dwt/src/WindowClass.cpp 2008-04-24 13:06:52 UTC (rev 1179)
+++ dcplusplus/trunk/dwt/src/WindowClass.cpp 2008-04-24 13:08:55 UTC (rev 1180)
@@ -30,7 +30,6 @@
*/
#include <dwt/WindowClass.h>
-#include <dwt/Application.h>
#include <dwt/xCeption.h>
#include <dwt/Widget.h>
@@ -49,7 +48,7 @@
wc.hIcon = icon ? icon->handle() : NULL;
wc.hIconSm = smallIcon ? icon->handle() : NULL;
wc.hCursor = cursor;
- wc.hInstance = Application::instance().getAppHandle();
+ wc.hInstance = ::GetModuleHandle(NULL);
wc.lpszClassName = className.c_str();
atom = ::RegisterClassEx(&wc);
@@ -62,7 +61,7 @@
WindowClass::~WindowClass() {
if(atom != 0) {
- ::UnregisterClass(getClassName(), Application::instance().getAppHandle());
+ ::UnregisterClass(getClassName(), ::GetModuleHandle(NULL));
}
}
Modified: dcplusplus/trunk/dwt/src/widgets/MDIChild.cpp
===================================================================
--- dcplusplus/trunk/dwt/src/widgets/MDIChild.cpp 2008-04-24 13:06:52 UTC (rev 1179)
+++ dcplusplus/trunk/dwt/src/widgets/MDIChild.cpp 2008-04-24 13:08:55 UTC (rev 1180)
@@ -31,8 +31,6 @@
#include <dwt/widgets/MDIChild.h>
-#include <dwt/Application.h>
-
namespace dwt {
MDIChild::Seed::Seed(const tstring& caption) :
@@ -51,7 +49,7 @@
cs.style,
cs.location.x(), cs.location.y(), cs.location.width(), cs.location.height(),
getParent()->handle(),
- Application::instance().getAppHandle(),
+ ::GetModuleHandle(NULL),
reinterpret_cast< LPARAM >( static_cast< Widget * >( this ) ) );
if(active) {
Modified: dcplusplus/trunk/dwt/src/widgets/MDIParent.cpp
===================================================================
--- dcplusplus/trunk/dwt/src/widgets/MDIParent.cpp 2008-04-24 13:06:52 UTC (rev 1179)
+++ dcplusplus/trunk/dwt/src/widgets/MDIParent.cpp 2008-04-24 13:08:55 UTC (rev 1180)
@@ -30,7 +30,6 @@
*/
#include <dwt/widgets/MDIParent.h>
-#include <dwt/Application.h>
namespace dwt {
@@ -54,7 +53,7 @@
cs.location.x(), cs.location.y(), cs.location.width(), cs.location.height(),
this->getParent() ? this->getParent()->handle() : 0,
NULL,
- Application::instance().getAppHandle(),
+ ::GetModuleHandle(NULL),
reinterpret_cast< LPVOID >( &ccs ) );
if ( !wnd )
{
Modified: dcplusplus/trunk/dwt/src/widgets/ModalDialog.cpp
===================================================================
--- dcplusplus/trunk/dwt/src/widgets/ModalDialog.cpp 2008-04-24 13:06:52 UTC (rev 1179)
+++ dcplusplus/trunk/dwt/src/widgets/ModalDialog.cpp 2008-04-24 13:08:55 UTC (rev 1180)
@@ -30,7 +30,6 @@
*/
#include <dwt/widgets/ModalDialog.h>
-#include <dwt/Application.h>
namespace dwt {
@@ -38,16 +37,10 @@
{
// this will not return until the dialog is closed by calling endDialog() with
// a retv
- //
- INT_PTR retv = ::DialogBoxParam
- ( ( Application::instance().getAppHandle() )
- , ( MAKEINTRESOURCE( resourceId ) )
- , ( this->getParent() ? this->getParent()->handle() : 0 )
- , ( (DLGPROC)&ThisType::wndProc )
- , ( reinterpret_cast< LPARAM >( dynamic_cast< Widget * >( this ) ) )
- );
- if ( retv == - 1 )
- {
+ INT_PTR retv = ::DialogBoxParam(::GetModuleHandle(NULL), MAKEINTRESOURCE( resourceId ),
+ this->getParent() ? this->getParent()->handle() : 0, (DLGPROC)&ThisType::wndProc,
+ reinterpret_cast< LPARAM >(static_cast< Widget * >( this )) );
+ if ( retv == - 1 ) {
throw xCeption( _T( "Couldn't create modal dialog" ) );
}
return static_cast< int >( retv );
@@ -64,8 +57,7 @@
// a retv
//
INT_PTR retv = ::DialogBoxIndirectParam
- ( Application::instance().getAppHandle() // HINSTANCE hInstance
- , ( DLGTEMPLATE * ) dlg_menu_winclass_title // LPCDLGTEMPLATE hDialogTemplate
+ ( ::GetModuleHandle(NULL), ( DLGTEMPLATE * ) dlg_menu_winclass_title
, this->getParent() ? this->getParent()->handle() : 0 // HWND hWndParent
, (DLGPROC)&ThisType::wndProc // DLGPROC lpDialogFunc
, reinterpret_cast< LPARAM >( dynamic_cast< Widget * >( this ) )
Modified: dcplusplus/trunk/dwt/src/widgets/ModelessDialog.cpp
===================================================================
--- dcplusplus/trunk/dwt/src/widgets/ModelessDialog.cpp 2008-04-24 13:06:52 UTC (rev 1179)
+++ dcplusplus/trunk/dwt/src/widgets/ModelessDialog.cpp 2008-04-24 13:08:55 UTC (rev 1180)
@@ -31,13 +31,11 @@
#include <dwt/widgets/ModelessDialog.h>
-#include <dwt/Application.h>
-
namespace dwt {
void ModelessDialog::createDialog( unsigned resourceId )
{
- HWND wnd = ::CreateDialogParam( Application::instance().getAppHandle(),
+ HWND wnd = ::CreateDialogParam( ::GetModuleHandle(NULL),
MAKEINTRESOURCE( resourceId ),
( this->getParent() ? this->getParent()->handle() : 0 ),
( (DLGPROC)&ThisType::wndProc ),
Modified: dcplusplus/trunk/win32/WidgetPaned.h
===================================================================
--- dcplusplus/trunk/win32/WidgetPaned.h 2008-04-24 13:06:52 UTC (rev 1179)
+++ dcplusplus/trunk/win32/WidgetPaned.h 2008-04-24 13:08:55 UTC (rev 1180)
@@ -215,6 +215,7 @@
::MoveWindow(children.second->handle(), right.x(), right.y(), right.width(), right.height(), TRUE);
this->setBounds(rcSplit);
+ this->redraw(rcSplit);
}
#endif
Modified: dcplusplus/trunk/win32/stdafx.h
===================================================================
--- dcplusplus/trunk/win32/stdafx.h 2008-04-24 13:06:52 UTC (rev 1179)
+++ dcplusplus/trunk/win32/stdafx.h 2008-04-24 13:08:55 UTC (rev 1180)
@@ -28,6 +28,7 @@
#include <libintl.h>
#include <dwt/WidgetFactory.h>
+#include <dwt/Application.h>
#include <dwt/resources/Accelerator.h>
#include <dwt/resources/Pen.h>
#include <dwt/widgets/Button.h>
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: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.
|
|
From: <arn...@us...> - 2008-04-24 13:11:56
|
Revision: 1182
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1182&view=rev
Author: arnetheduck
Date: 2008-04-24 06:11:46 -0700 (Thu, 24 Apr 2008)
Log Message:
-----------
help updates by eMTee
Modified Paths:
--------------
dcplusplus/trunk/help/cshelp.h
dcplusplus/trunk/help/settings_advanced.html
dcplusplus/trunk/help/settings_colors_and_sounds.html
dcplusplus/trunk/help/settings_downloads.html
dcplusplus/trunk/help/settings_expert.html
dcplusplus/trunk/help/settings_queue.html
dcplusplus/trunk/help/window_search.html
dcplusplus/trunk/win32/Advanced3Page.cpp
dcplusplus/trunk/win32/SearchFrame.cpp
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-15 20:29:42.640000105 +0200
committer: poy <po...@12...>
properties:
branch-nick: repo
+ timestamp: 2008-04-15 20:57:00.592999935 +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
+ 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
Modified: dcplusplus/trunk/help/cshelp.h
===================================================================
--- dcplusplus/trunk/help/cshelp.h 2008-04-24 13:10:28 UTC (rev 1181)
+++ dcplusplus/trunk/help/cshelp.h 2008-04-24 13:11:46 UTC (rev 1182)
@@ -151,169 +151,167 @@
#define IDH_SETTINGS_DOWNLOAD_PROXY 11073
-#define IDH_SETTINGS_ADVANCED3_ROLLBACK 11074
+#define IDH_SETTINGS_ADVANCED3_MAX_HASH_SPEED 11074
-#define IDH_SETTINGS_ADVANCED3_MAX_HASH_SPEED 11075
+#define IDH_SETTINGS_ADVANCED3_PM_HISTORY 11075
-#define IDH_SETTINGS_ADVANCED3_PM_HISTORY 11076
+#define IDH_SETTINGS_ADVANCED3_MINISLOT_SIZE 11076
-#define IDH_SETTINGS_ADVANCED3_MINISLOT_SIZE 11077
+#define IDH_SETTINGS_ADVANCED3_MAX_FILELIST_SIZE 11077
-#define IDH_SETTINGS_ADVANCED3_MAX_FILELIST_SIZE 11078
+#define IDH_SETTINGS_ADVANCED3_PRIVATE_ID 11078
-#define IDH_SETTINGS_ADVANCED3_PRIVATE_ID 11079
+#define IDH_SETTINGS_ADVANCED3_AUTO_REFRESH_TIME 11079
-#define IDH_SETTINGS_ADVANCED3_AUTO_REFRESH_TIME 11080
+#define IDH_SETTINGS_ADVANCED3_BUFFERSIZE 11080
-#define IDH_SETTINGS_ADVANCED3_BUFFERSIZE 11081
+#define IDH_SETTINGS_ADVANCED3_AUTO_SEARCH_LIMIT 11081
-#define IDH_SETTINGS_ADVANCED3_AUTO_SEARCH_LIMIT 11082
+#define IDH_SETTINGS_ADVANCED3_SEARCH_HISTORY 11082
-#define IDH_SETTINGS_ADVANCED3_SEARCH_HISTORY 11083
+#define IDH_SETTINGS_ADVANCED3_BIND_ADDRESS 11083
-#define IDH_SETTINGS_ADVANCED3_BIND_ADDRESS 11084
+#define IDH_SETTINGS_ADVANCED3_SOCKET_IN_BUFFER 11084
-#define IDH_SETTINGS_ADVANCED3_SOCKET_IN_BUFFER 11085
+#define IDH_SETTINGS_ADVANCED3_SOCKET_OUT_BUFFER 11085
-#define IDH_SETTINGS_ADVANCED3_SOCKET_OUT_BUFFER 11086
+#define IDH_SETTINGS_FAVORITE_DIRS_FAVORITE_DIRECTORIES 11086
-#define IDH_SETTINGS_ADVANCED3_MIN_SEGMENT_SIZE 11087
+#define IDH_SETTINGS_FAVORITE_DIRS_RENAME 11087
-#define IDH_SETTINGS_FAVORITE_DIRS_FAVORITE_DIRECTORIES 11088
+#define IDH_SETTINGS_FAVORITE_DIRS_REMOVE 11088
-#define IDH_SETTINGS_FAVORITE_DIRS_RENAME 11089
+#define IDH_SETTINGS_FAVORITE_DIRS_ADD 11089
-#define IDH_SETTINGS_FAVORITE_DIRS_REMOVE 11090
+#define IDH_SETTINGS_GENERAL_PERSONAL_INFORMATION 11090
-#define IDH_SETTINGS_FAVORITE_DIRS_ADD 11091
+#define IDH_SETTINGS_GENERAL_NICK 11091
-#define IDH_SETTINGS_GENERAL_PERSONAL_INFORMATION 11092
+#define IDH_SETTINGS_GENERAL_EMAIL 11092
-#define IDH_SETTINGS_GENERAL_NICK 11093
+#define IDH_SETTINGS_GENERAL_DESCRIPTION 11093
-#define IDH_SETTINGS_GENERAL_EMAIL 11094
+#define IDH_SETTINGS_GENERAL_CONNECTION 11094
-#define IDH_SETTINGS_GENERAL_DESCRIPTION 11095
+#define IDH_SETTINGS_LOG_DIRECTORY 11095
-#define IDH_SETTINGS_GENERAL_CONNECTION 11096
+#define IDH_SETTINGS_QUEUE_AUTOPRIO 11096
-#define IDH_SETTINGS_LOG_DIRECTORY 11097
+#define IDH_SETTINGS_QUEUE_PRIO_HIGHEST 11097
-#define IDH_SETTINGS_QUEUE_AUTOPRIO 11098
+#define IDH_SETTINGS_QUEUE_PRIO_NORMAL 11098
-#define IDH_SETTINGS_QUEUE_PRIO_HIGHEST 11099
+#define IDH_SETTINGS_QUEUE_PRIO_HIGH 11099
-#define IDH_SETTINGS_QUEUE_PRIO_NORMAL 11100
+#define IDH_SETTINGS_QUEUE_PRIO_LOW 11100
-#define IDH_SETTINGS_QUEUE_PRIO_HIGH 11101
+#define IDH_SETTINGS_QUEUE_AUTODROP 11101
-#define IDH_SETTINGS_QUEUE_PRIO_LOW 11102
+#define IDH_SETTINGS_QUEUE_AUTODROP_SPEED 11102
-#define IDH_SETTINGS_QUEUE_AUTODROP 11103
+#define IDH_SETTINGS_QUEUE_AUTODROP_ELAPSED 11103
-#define IDH_SETTINGS_QUEUE_AUTODROP_SPEED 11104
+#define IDH_SETTINGS_QUEUE_AUTODROP_MINSOURCES 11104
-#define IDH_SETTINGS_QUEUE_AUTODROP_ELAPSED 11105
+#define IDH_SETTINGS_QUEUE_AUTODROP_INTERVAL 11105
-#define IDH_SETTINGS_QUEUE_AUTODROP_MINSOURCES 11106
+#define IDH_SETTINGS_QUEUE_AUTODROP_INACTIVITY 11106
-#define IDH_SETTINGS_QUEUE_AUTODROP_INTERVAL 11107
+#define IDH_SETTINGS_QUEUE_AUTODROP_FILESIZE 11107
-#define IDH_SETTINGS_QUEUE_AUTODROP_INACTIVITY 11108
+#define IDH_SETTINGS_UPLOAD_DIRECTORIES 11108
-#define IDH_SETTINGS_QUEUE_AUTODROP_FILESIZE 11109
+#define IDH_SETTINGS_UPLOAD_SHAREHIDDEN 11109
-#define IDH_SETTINGS_UPLOAD_DIRECTORIES 11110
+#define IDH_SETTINGS_UPLOAD_RENAME 11110
-#define IDH_SETTINGS_UPLOAD_SHAREHIDDEN 11111
+#define IDH_SETTINGS_UPLOAD_REMOVE 11111
-#define IDH_SETTINGS_UPLOAD_RENAME 11112
+#define IDH_SETTINGS_UPLOAD_ADD 11112
-#define IDH_SETTINGS_UPLOAD_REMOVE 11113
+#define IDH_SETTINGS_UPLOAD_MIN_UPLOAD_SPEED 11113
-#define IDH_SETTINGS_UPLOAD_ADD 11114
+#define IDH_SETTINGS_UPLOAD_SLOTS 11114
-#define IDH_SETTINGS_UPLOAD_MIN_UPLOAD_SPEED 11115
+#define IDH_SETTINGS_UC_LIST 11115
-#define IDH_SETTINGS_UPLOAD_SLOTS 11116
+#define IDH_SETTINGS_UC_ADD 11116
-#define IDH_SETTINGS_UC_LIST 11117
+#define IDH_SETTINGS_UC_CHANGE 11117
-#define IDH_SETTINGS_UC_ADD 11118
+#define IDH_SETTINGS_UC_MOVE_UP 11118
-#define IDH_SETTINGS_UC_CHANGE 11119
+#define IDH_SETTINGS_UC_MOVE_DOWN 11119
-#define IDH_SETTINGS_UC_MOVE_UP 11120
+#define IDH_SETTINGS_UC_REMOVE 11120
-#define IDH_SETTINGS_UC_MOVE_DOWN 11121
+#define IDH_ADLS_NEW 11121
-#define IDH_SETTINGS_UC_REMOVE 11122
+#define IDH_ADLS_PROPERTIES 11122
-#define IDH_ADLS_NEW 11123
+#define IDH_ADLS_MOVE_UP 11123
-#define IDH_ADLS_PROPERTIES 11124
+#define IDH_ADLS_MOVE_DOWN 11124
-#define IDH_ADLS_MOVE_UP 11125
+#define IDH_ADLS_REMOVE 11125
-#define IDH_ADLS_MOVE_DOWN 11126
+#define IDH_FAVORITE_HUBS_CONNECT 11126
-#define IDH_ADLS_REMOVE 11127
+#define IDH_FAVORITE_HUBS_NEW 11127
-#define IDH_FAVORITE_HUBS_CONNECT 11128
+#define IDH_FAVORITE_HUBS_PROPERTIES 11128
-#define IDH_FAVORITE_HUBS_NEW 11129
+#define IDH_FAVORITE_HUBS_MOVE_UP 11129
-#define IDH_FAVORITE_HUBS_PROPERTIES 11130
+#define IDH_FAVORITE_HUBS_MOVE_DOWN 11130
-#define IDH_FAVORITE_HUBS_MOVE_UP 11131
+#define IDH_FAVORITE_HUBS_REMOVE 11131
-#define IDH_FAVORITE_HUBS_MOVE_DOWN 11132
+#define IDH_FILE_LIST_DIRS 11132
-#define IDH_FAVORITE_HUBS_REMOVE 11133
+#define IDH_FILE_LIST_FILES 11133
-#define IDH_FILE_LIST_DIRS 11134
+#define IDH_FILE_LIST_SUBSTRACT 11134
-#define IDH_FILE_LIST_FILES 11135
+#define IDH_FILE_LIST_MATCH_QUEUE 11135
-#define IDH_FILE_LIST_SUBSTRACT 11136
+#define IDH_FILE_LIST_FIND 11136
-#define IDH_FILE_LIST_MATCH_QUEUE 11137
+#define IDH_FILE_LIST_NEXT 11137
-#define IDH_FILE_LIST_FIND 11138
+#define IDH_HUB_CHAT 11138
-#define IDH_FILE_LIST_NEXT 11139
+#define IDH_HUB_MESSAGE 11139
-#define IDH_HUB_CHAT 11140
+#define IDH_HUB_FILTER 11140
-#define IDH_HUB_MESSAGE 11141
+#define IDH_PM_CHAT 11141
-#define IDH_HUB_FILTER 11142
+#define IDH_PM_MESSAGE 11142
-#define IDH_PM_CHAT 11143
+#define IDH_PUBLIC_HUBS_FILTER 11143
-#define IDH_PM_MESSAGE 11144
+#define IDH_PUBLIC_HUBS_LISTS 11144
-#define IDH_PUBLIC_HUBS_FILTER 11145
+#define IDH_PUBLIC_HUBS_REFRESH 11145
-#define IDH_PUBLIC_HUBS_LISTS 11146
+#define IDH_SEARCH_SEARCH_FOR 11146
-#define IDH_PUBLIC_HUBS_REFRESH 11147
+#define IDH_SEARCH_PURGE 11147
-#define IDH_SEARCH_SEARCH_FOR 11148
+#define IDH_SEARCH_SEARCH 11148
-#define IDH_SEARCH_PURGE 11149
+#define IDH_SEARCH_SIZE 11149
-#define IDH_SEARCH_SEARCH 11150
+#define IDH_SEARCH_TYPE 11150
-#define IDH_SEARCH_SIZE 11151
+#define IDH_SEARCH_SLOTS 11151
-#define IDH_SEARCH_TYPE 11152
+#define IDH_SEARCH_SHARE 11152
-#define IDH_SEARCH_SLOTS 11153
+#define IDH_SEARCH_HUBS 11153
-#define IDH_SEARCH_HUBS 11154
+#define IDH_SPY_IGNORE_TTH 11154
-#define IDH_SPY_IGNORE_TTH 11155
-
#endif
Modified: dcplusplus/trunk/help/settings_advanced.html
===================================================================
--- dcplusplus/trunk/help/settings_advanced.html 2008-04-24 13:10:28 UTC (rev 1181)
+++ dcplusplus/trunk/help/settings_advanced.html 2008-04-24 13:11:46 UTC (rev 1182)
@@ -121,6 +121,8 @@
<dd>Have DC++ draw its own menus, which allows icons and titles to be added. Disable to revert to classic Windows menus.</dd>
<dt>Use Coral network when downloading hub lists (improves reliability)</dt>
<dd>With this option enabled, DC++ uses <a href="http://www.coralcdn.org">The Coral Content Distribution Network</a> when establishing HTTP connections.</dd>
+ <dt>Enable segmented downloads</dt>
+ <dd>With this option enabled, DC++ uses uses segmented downloading. i.e. it downloads each file in many parts simultaneously from all available sources.</dd>
</dl>
</body>
</html>
Modified: dcplusplus/trunk/help/settings_colors_and_sounds.html
===================================================================
--- dcplusplus/trunk/help/settings_colors_and_sounds.html 2008-04-24 13:10:28 UTC (rev 1181)
+++ dcplusplus/trunk/help/settings_colors_and_sounds.html 2008-04-24 13:11:46 UTC (rev 1182)
@@ -32,14 +32,17 @@
</dl>
<h2>Sounds</h2>
<dl style="margin-left: 40px;">
- <dt>Make an annoying sound every time a private message is received</dt>
+ <dt>Every time a main chat message is received</dt>
+ <dd>When set, the system's "Default Beep" sound will play when a
+main chat message is received.</dd>
+ <dt>Every time a private message is received</dt>
<dd>When set, the system's "Default Beep" sound will play when a
private message is received.</dd>
- <dt>Make an annoying sound when a private message window is opened</dt>
+ <dt>When a private message window is opened</dt>
<dd>When set, the system's "Default Beep" sound will play when a
private message window is opened.</dd>
<dt>Notification sound</dt>
- <dd cshelp=IDH_SETTINGS_APPEARANCE2_BEEPFILE>Instead of the system's computer beep, you can select a different beep or tune for above options.</dd>
+ <dd cshelp=IDH_SETTINGS_APPEARANCE2_BEEPFILE>Instead of the system's beep sound, you can select a different beep or tune for all above options. To assign a custom sound to one of them select the option in the list and click Browse. You can add only Wave (embedded) sound files (typically with .wav extension).</dd>
</dl>
</body>
</html>
Modified: dcplusplus/trunk/help/settings_downloads.html
===================================================================
--- dcplusplus/trunk/help/settings_downloads.html 2008-04-24 13:10:28 UTC (rev 1181)
+++ dcplusplus/trunk/help/settings_downloads.html 2008-04-24 13:11:46 UTC (rev 1182)
@@ -28,25 +28,21 @@
<dd cshelp=IDH_SETTINGS_DOWNLOAD_TEMP_DOWNLOAD_DIRECTORY>All incomplete downloads will be stored in this directory.
If you leave it empty, temporary downloads will be stored in the "Incomplete\"
subdirectory under where the DC++ executable is located. The directory will be automatically created if needed.
-<br>Make sure you have enough disk space, appropriate write access and filesystem for unfinished downloads.
-In case of an error (eg. when the drive that holds your Unfinished Downloads ran out of space) you will
+<br>Make sure you have enough disk space, appropriate write access and filesystem for unfinished downloads. From version 0.706 DC++ always use antifragmentation method for downloads so it will try to reserve the full space needed for a file
+when starting the download. In case of an error (eg. when the drive that holds your Unfinished Downloads ran out of space) you will
get 'Not enough space on the disk' message even if your target drive has enough free space for your download!
<br>You can
use <span style="font-weight: bold;">%[targetdrive]</span> for optional unfinished directory for target
-drive. This way you can share the incomplete files among your drives which will result smaller chance of runnig out of disk space.
+drive. This way you can share the incomplete files among your drives which will result a smaller chance of runnig out of disk space.
This option is also useful if you often download large files to a drive other than where your usual unfinished directory
-resides. At the end of a successful download moving a large file to its target could be very time & resource consuming,
+resides. At the end of a successful download moving a large file to its target could be very time and resource consuming,
especially when moving files to another partition of a same physical drive.
<br>
For example : with %[targetdrive]DCUnfinished\ set, DC++ will use E:\DCUnfinished\ for incomplete files when you download to any target
located on drive E: and so on...
<br>
If the file has been downloaded the incomplete file will
-bear the name <filename>.<ext>.<TTH>.dctmp. If <a
- href="settings_queue.html#antifrag">Use AntiFragmentation Method
-for Downloads</a> is enabled the files will have ".antifrag" added to
-the end of it's name. As in
-<filename>.<ext>.<TTH>.dctmp.antifrag. </dd>
+bear the name <filename>.<ext>.<TTH>.dctmp.antifrag. </dd>
</dl>
</div>
<h2>Limits</h2>
Modified: dcplusplus/trunk/help/settings_expert.html
===================================================================
--- dcplusplus/trunk/help/settings_expert.html 2008-04-24 13:10:28 UTC (rev 1181)
+++ dcplusplus/trunk/help/settings_expert.html 2008-04-24 13:11:46 UTC (rev 1182)
@@ -61,8 +61,6 @@
<dt>Socket write buffer</dt>
<dd cshelp=IDH_SETTINGS_ADVANCED3_SOCKET_OUT_BUFFER>The size of the buffer DC++ use to write to sockets.
Measured in bytes. (default: 8192 bytes)</dd>
- <dt>Min segment size</dt>
- <dd cshelp=IDH_SETTINGS_ADVANCED3_MIN_SEGMENT_SIZE>DC++ now uses segment downloading. i.e. it downloads each file in many little parts. This setting lets you specifiy the mimium size of these parts. (default: 1MiB)</dd>
</dl>
</body>
</html>
Modified: dcplusplus/trunk/help/settings_queue.html
===================================================================
--- dcplusplus/trunk/help/settings_queue.html 2008-04-24 13:10:28 UTC (rev 1181)
+++ dcplusplus/trunk/help/settings_queue.html 2008-04-24 13:11:46 UTC (rev 1182)
@@ -111,18 +111,6 @@
<dt>Don't download files already in queue</dt>
<dd>This option will stop you from downloading files which already
exist in your queue.</dd>
- <dt><a name="antifrag"></a>Use AntiFragmentation Method for
-Downloads</dt>
- <dd>This option will try to reserve the full space needed for a file
-when starting the download. This should reduce the fragmentation of
-files on your hard drive. (Fragmentation is bad because reading files
-from your drive will take longer because the drive head has to hop from
-place to place instead of reading in a continuous fashion.) <span style="font-style: italic;">Disable if unsure. The drawbacks are a
-short pause at the start of every download during which the drive space
-is reserved, less drive space being available while you are
-downloading, and possibly losing <span style="font-weight: bold;">all</span>
-progress on your download if Windows crashes and DC++ cannot exit
-cleanly.</span></dd>
</dl>
</div>
</body>
Modified: dcplusplus/trunk/help/window_search.html
===================================================================
--- dcplusplus/trunk/help/window_search.html 2008-04-24 13:10:28 UTC (rev 1181)
+++ dcplusplus/trunk/help/window_search.html 2008-04-24 13:11:46 UTC (rev 1182)
@@ -1,64 +1,66 @@
-<!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>Search</title>
-</head>
-<body>
-<h1>Search</h1>
-<h2>Search Options</h2>
-<dl style="margin-left: 40px;">
- <dt>Search for</dt>
- <dd cshelp=IDH_SEARCH_SEARCH_FOR>This is the set of search strings to search for. Words beginning with "-" will be filtered away.</dd>
- <dt>Purge</dt>
- <dd cshelp=IDH_SEARCH_PURGE>Clear the contents of the <a href="settings_expert.html#searchhistory">search history</a>.</dd>
- <dt>Search</dt>
- <dd cshelp=IDH_SEARCH_SEARCH>Start searching for the set of search strings defined above. Note; you may not start too many searches in a small amount of time.</dd>
- <dt>Size</dt>
- <dd cshelp=IDH_SEARCH_SIZE>Filter away files depending on their file size.</dd>
- <dt>File type</dt>
- <dd cshelp=IDH_SEARCH_TYPE>Filter away files depending on their file type (extension).</dd>
- <dt>Only users with free slots</dt>
- <dd cshelp=IDH_SEARCH_SLOTS>Filter away files depending on the user's free slots.</dd>
- <dt>Hubs</dt>
- <dd cshelp=IDH_SEARCH_HUBS>Search only selected hubs.</dd>
-</dl>
-<h2>Columns</h2>
-<dl style="margin-left: 80px;">
- <dt>File</dt>
- <dd>The file name.</dd>
- <dt>User</dt>
- <dd>The user's nick name.</dd>
- <dt>Type</dt>
- <dd>The file's extension (file type).</dd>
- <dt>Size</dt>
- <dd>The file's size.</dd>
- <dt>Slots</dt>
- <dd>x/y: x slots available of a total y.</dd>
- <dt>Path</dt>
- <dd>The path in the user's file list where the file is stored.</dd>
- <dt>Connection</dt>
- <dd>The user's possible <a href="settings_general#linespeed">line speed in upload</a>.</dd>
- <dt>Hub</dt>
- <dd>In which hub the user is in.</dd>
- <dt>Exact size</dt>
- <dd>The exact size of the file.</dd>
- <dt>IP</dt>
- <dd>The user's IP.</dd>
- <dt>TTH root</dt>
- <dd>The TTH root for the file.</dd>
- <dt>CID</dt>
- <dd>The unique ID that DC++ use to identify other users.</dd>
-</dl>
-<h2>Status bar</h2>
-<dl style="margin-left: 40px;">
- <dt>Unnamed checkbox</dt>
- <dd>Toggle the displayment of the search options.</dd>
- <dt># items</dt>
- <dd>The amount of items that are displayed in the window.</dd>
- <dt># filtered</dt>
- <dd>The amount of files that have been filtered away from the view.</dd>
-</dl>
-</body>
-</html>
+<!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>Search</title>
+</head>
+<body>
+<h1>Search</h1>
+<h2>Search Options</h2>
+<dl style="margin-left: 40px;">
+ <dt>Search for</dt>
+ <dd cshelp=IDH_SEARCH_SEARCH_FOR>This is the set of search strings to search for. Words beginning with "-" will be filtered away.</dd>
+ <dt>Purge</dt>
+ <dd cshelp=IDH_SEARCH_PURGE>Clear the contents of the <a href="settings_expert.html#searchhistory">search history</a>.</dd>
+ <dt>Search</dt>
+ <dd cshelp=IDH_SEARCH_SEARCH>Start searching for the set of search strings defined above. Note; you may not start too many searches in a small amount of time.</dd>
+ <dt>Size</dt>
+ <dd cshelp=IDH_SEARCH_SIZE>Filter away files depending on their file size.</dd>
+ <dt>File type</dt>
+ <dd cshelp=IDH_SEARCH_TYPE>Filter away files depending on their file type (extension).</dd>
+ <dt>Only users with free slots</dt>
+ <dd cshelp=IDH_SEARCH_SLOTS>Filter away files depending on the user's free slots.</dd>
+ <dt>Hide files already in share</dt>
+ <dd cshelp=IDH_SEARCH_SHARE>Filter away files that are already in share.</dd>
+ <dt>Hubs</dt>
+ <dd cshelp=IDH_SEARCH_HUBS>Search only selected hubs.</dd>
+</dl>
+<h2>Columns</h2>
+<dl style="margin-left: 80px;">
+ <dt>File</dt>
+ <dd>The file name.</dd>
+ <dt>User</dt>
+ <dd>The user's nick name.</dd>
+ <dt>Type</dt>
+ <dd>The file's extension (file type).</dd>
+ <dt>Size</dt>
+ <dd>The file's size.</dd>
+ <dt>Slots</dt>
+ <dd>x/y: x slots available of a total y.</dd>
+ <dt>Path</dt>
+ <dd>The path in the user's file list where the file is stored.</dd>
+ <dt>Connection</dt>
+ <dd>The user's possible <a href="settings_general#linespeed">line speed in upload</a>.</dd>
+ <dt>Hub</dt>
+ <dd>In which hub the user is in.</dd>
+ <dt>Exact size</dt>
+ <dd>The exact size of the file.</dd>
+ <dt>IP</dt>
+ <dd>The user's IP.</dd>
+ <dt>TTH root</dt>
+ <dd>The TTH root for the file.</dd>
+ <dt>CID</dt>
+ <dd>The unique ID that DC++ use to identify other users.</dd>
+</dl>
+<h2>Status bar</h2>
+<dl style="margin-left: 40px;">
+ <dt>Unnamed checkbox</dt>
+ <dd>Toggle the displayment of the search options.</dd>
+ <dt># items</dt>
+ <dd>The amount of items that are displayed in the window.</dd>
+ <dt># filtered</dt>
+ <dd>The amount of files that have been filtered away from the view.</dd>
+</dl>
+</body>
+</html>
Modified: dcplusplus/trunk/win32/Advanced3Page.cpp
===================================================================
--- dcplusplus/trunk/win32/Advanced3Page.cpp 2008-04-24 13:10:28 UTC (rev 1181)
+++ dcplusplus/trunk/win32/Advanced3Page.cpp 2008-04-24 13:11:46 UTC (rev 1182)
@@ -28,7 +28,6 @@
#include <dwt/widgets/Spinner.h>
static const WinUtil::HelpItem helpItems[] = {
- { IDC_SETTINGS_B, IDH_SETTINGS_ADVANCED3_ROLLBACK },
{ IDC_SETTINGS_MAX_HASH_SPEED, IDH_SETTINGS_ADVANCED3_MAX_HASH_SPEED },
{ IDC_MAX_HASH_SPEED, IDH_SETTINGS_ADVANCED3_MAX_HASH_SPEED },
{ IDC_SETTINGS_MBS, IDH_SETTINGS_ADVANCED3_MAX_HASH_SPEED },
@@ -64,7 +63,6 @@
};
PropPage::TextItem Advanced3Page::texts[] = {
- { IDC_SETTINGS_B, N_("B") },
{ IDC_SETTINGS_MAX_HASH_SPEED, N_("Max hash speed") },
{ IDC_SETTINGS_MBS, N_("MiB/s") },
{ IDC_SETTINGS_PM_HISTORY, N_("PM history") },
Modified: dcplusplus/trunk/win32/SearchFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/SearchFrame.cpp 2008-04-24 13:10:28 UTC (rev 1181)
+++ dcplusplus/trunk/win32/SearchFrame.cpp 2008-04-24 13:11:46 UTC (rev 1182)
@@ -218,6 +218,7 @@
{
CheckBox::Seed cs(T_("Hide files already in share"));
filter = addChild(cs);
+ filter->setHelpId(IDH_SEARCH_SHARE);
filter->setChecked(filterShared);
filter->onClicked(std::tr1::bind(&SearchFrame::handleFilterClicked, this)) ;
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:12:45
|
Revision: 1183
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1183&view=rev
Author: arnetheduck
Date: 2008-04-24 06:12:41 -0700 (Thu, 24 Apr 2008)
Log Message:
-----------
basis for help on specific list-view items in settings
Modified Paths:
--------------
dcplusplus/trunk/dwt/include/dwt/widgets/Table.h
dcplusplus/trunk/dwt/src/widgets/TabView.cpp
dcplusplus/trunk/dwt/src/widgets/Table.cpp
dcplusplus/trunk/win32/PropPage.cpp
dcplusplus/trunk/win32/PropPage.h
dcplusplus/trunk/win32/SearchFrame.cpp
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-15 20:57:00.592999935 +0200
committer: poy <po...@12...>
properties:
branch-nick: repo
+ timestamp: 2008-04-15 22:25:35.000000000 +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
+ 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
Modified: dcplusplus/trunk/dwt/include/dwt/widgets/Table.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/Table.h 2008-04-24 13:11:46 UTC (rev 1182)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/Table.h 2008-04-24 13:12:41 UTC (rev 1183)
@@ -448,7 +448,9 @@
ScreenCoordinate getContextMenuPos();
void ensureVisible(int i, bool partial = false);
-
+
+ int hitTest(const ScreenCoordinate& pt);
+
/// Actually creates the Data Grid Control
/** You should call WidgetFactory::createTable if you instantiate class
* directly. <br>
Modified: dcplusplus/trunk/dwt/src/widgets/TabView.cpp
===================================================================
--- dcplusplus/trunk/dwt/src/widgets/TabView.cpp 2008-04-24 13:11:46 UTC (rev 1182)
+++ dcplusplus/trunk/dwt/src/widgets/TabView.cpp 2008-04-24 13:12:41 UTC (rev 1183)
@@ -532,7 +532,6 @@
int TabView::hitTest(const ScreenCoordinate& pt) {
TCHITTESTINFO tci = { ClientCoordinate(pt, this).getPoint() };
-
return TabCtrl_HitTest(handle(), &tci);
}
Modified: dcplusplus/trunk/dwt/src/widgets/Table.cpp
===================================================================
--- dcplusplus/trunk/dwt/src/widgets/Table.cpp 2008-04-24 13:11:46 UTC (rev 1182)
+++ dcplusplus/trunk/dwt/src/widgets/Table.cpp 2008-04-24 13:12:41 UTC (rev 1183)
@@ -475,5 +475,9 @@
}
}
+int Table::hitTest(const ScreenCoordinate& pt) {
+ LVHITTESTINFO lvi = { ClientCoordinate(pt, this).getPoint() };
+ return ListView_HitTest(handle(), &lvi);
+}
}
Modified: dcplusplus/trunk/win32/PropPage.cpp
===================================================================
--- dcplusplus/trunk/win32/PropPage.cpp 2008-04-24 13:11:46 UTC (rev 1182)
+++ dcplusplus/trunk/win32/PropPage.cpp 2008-04-24 13:12:41 UTC (rev 1183)
@@ -61,17 +61,24 @@
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);
+
+ list->onHelp(std::tr1::bind(&PropPage::handleListHelp, this, _1, _2, listItems, list));
}
void PropPage::initList(TablePtr list) {
+ dcassert(list);
+
list->setTableStyle(LVS_EX_LABELTIP | LVS_EX_CHECKBOXES | LVS_EX_FULLROWSELECT);
TStringList dummy;
@@ -121,7 +128,16 @@
}
void PropPage::translate(HWND page, TextItem* items) {
+ dcassert(page && items);
if(items)
for(size_t i = 0; items[i].itemID != 0; ++i)
::SetDlgItemText(page, items[i].itemID, CT_(items[i].stringToTranslate));
}
+
+void PropPage::handleListHelp(HWND hWnd, unsigned id, const ListItem* listItems, TablePtr list) {
+ // we have the help id of the whole list-view; convert to the one of the specific option the user just clicked on
+ int item = list->hitTest(dwt::ScreenCoordinate(dwt::Point::fromLParam(::GetMessagePos())));
+ if(item >= 0 && item < sizeof(*listItems) / sizeof(ListItem) && listItems[item].helpId)
+ id = listItems[item].helpId;
+ WinUtil::help(hWnd, id);
+}
Modified: dcplusplus/trunk/win32/PropPage.h
===================================================================
--- dcplusplus/trunk/win32/PropPage.h 2008-04-24 13:11:46 UTC (rev 1182)
+++ dcplusplus/trunk/win32/PropPage.h 2008-04-24 13:12:41 UTC (rev 1183)
@@ -57,6 +57,9 @@
void write(HWND page, const Item* items);
void write(const ListItem* listItems, TablePtr list);
void translate(HWND page, TextItem* items);
+
+private:
+ void handleListHelp(HWND hWnd, unsigned id, const ListItem* listItems, TablePtr list);
};
#endif // !defined(PROP_PAGE_H)
Modified: dcplusplus/trunk/win32/SearchFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/SearchFrame.cpp 2008-04-24 13:11:46 UTC (rev 1182)
+++ dcplusplus/trunk/win32/SearchFrame.cpp 2008-04-24 13:12:41 UTC (rev 1183)
@@ -211,16 +211,12 @@
slots = addChild(cs);
slots->setHelpId(IDH_SEARCH_SLOTS);
slots->setChecked(onlyFree);
-
slots->onClicked(std::tr1::bind(&SearchFrame::handleSlotsClicked, this)) ;
- }
- {
- CheckBox::Seed cs(T_("Hide files already in share"));
+ cs.caption = T_("Hide files already in share");
filter = addChild(cs);
filter->setHelpId(IDH_SEARCH_SHARE);
filter->setChecked(filterShared);
-
filter->onClicked(std::tr1::bind(&SearchFrame::handleFilterClicked, this)) ;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X