Menu
▾
▴
[Dcplusplus-commit] SF.net SVN: dcplusplus: [1121] dcplusplus/trunk
|
From: <arn...@us...> - 2008-04-07 19:41:14
|
Revision: 1121
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1121&view=rev
Author: arnetheduck
Date: 2008-04-07 12:40:48 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
remaining simple factory items gone
Modified Paths:
--------------
dcplusplus/trunk/.bzrignore
dcplusplus/trunk/Doxyfile
dcplusplus/trunk/smartwin/include/smartwin/SmartWin.h
dcplusplus/trunk/smartwin/include/smartwin/WidgetFactory.h
dcplusplus/trunk/smartwin/include/smartwin/forward.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/Composite.h
dcplusplus/trunk/win32/ADLSProperties.cpp
dcplusplus/trunk/win32/AboutDlg.cpp
dcplusplus/trunk/win32/Advanced3Page.cpp
dcplusplus/trunk/win32/Appearance2Page.cpp
dcplusplus/trunk/win32/CertificatesPage.cpp
dcplusplus/trunk/win32/CommandDlg.cpp
dcplusplus/trunk/win32/DownloadPage.cpp
dcplusplus/trunk/win32/FavHubProperties.cpp
dcplusplus/trunk/win32/FavoriteDirsPage.cpp
dcplusplus/trunk/win32/HashProgressDlg.cpp
dcplusplus/trunk/win32/HubListsDlg.cpp
dcplusplus/trunk/win32/LineDlg.cpp
dcplusplus/trunk/win32/LogPage.cpp
dcplusplus/trunk/win32/MagnetDlg.cpp
dcplusplus/trunk/win32/SettingsDialog.cpp
dcplusplus/trunk/win32/UCPage.cpp
dcplusplus/trunk/win32/UploadPage.cpp
dcplusplus/trunk/win32/stdafx.h
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-02 21:38:51.338000059 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
+ timestamp: 2008-04-02 22:38:10.176000118 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
Name: bzr:file-ids
- smartwin/include/smartwin/widgets/TabView.h 849@f586c4b0-9d0d-0410-bc51-f1fe239209fc:dcplusplus%2Ftrunk:smartwin%2Finclude%2Fsmartwin%2Fwidgets%2FWidgetTabView.h
smartwin/source/widgets/TabView.cpp 849@f586c4b0-9d0d-0410-bc51-f1fe239209fc:dcplusplus%2Ftrunk:smartwin%2Fsource%2Fwidgets%2FWidgetTabView.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
+ 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
Modified: dcplusplus/trunk/.bzrignore
===================================================================
--- dcplusplus/trunk/.bzrignore 2008-04-07 19:38:47 UTC (rev 1120)
+++ dcplusplus/trunk/.bzrignore 2008-04-07 19:40:48 UTC (rev 1121)
@@ -12,3 +12,4 @@
./help/compile.log
./help/cshelp.txt
./.pydevproject
+./doc
Modified: dcplusplus/trunk/Doxyfile
===================================================================
--- dcplusplus/trunk/Doxyfile 2008-04-07 19:38:47 UTC (rev 1120)
+++ dcplusplus/trunk/Doxyfile 2008-04-07 19:40:48 UTC (rev 1121)
@@ -463,7 +463,8 @@
# with spaces.
INPUT = dcpp \
- win32
+ win32 \
+ smartwin
# This tag can be used to specify the character encoding of the source files that
# doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default
Modified: dcplusplus/trunk/smartwin/include/smartwin/SmartWin.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/SmartWin.h 2008-04-07 19:38:47 UTC (rev 1120)
+++ dcplusplus/trunk/smartwin/include/smartwin/SmartWin.h 2008-04-07 19:40:48 UTC (rev 1121)
@@ -63,6 +63,8 @@
#include "resources/Icon.h"
#include "resources/ImageList.h"
#include "resources/Pen.h"
+#include "widgets/Button.h"
+#include "widgets/CheckBox.h"
#include "widgets/ComboBox.h"
#include "widgets/Container.h"
#include "widgets/CoolBar.h"
@@ -81,6 +83,7 @@
#include "widgets/Table.h"
#include "widgets/TabSheet.h"
#include "widgets/TabView.h"
+#include "widgets/TextBox.h"
#include "widgets/Tree.h"
#include "widgets/ToolBar.h"
#include "widgets/ToolTip.h"
Modified: dcplusplus/trunk/smartwin/include/smartwin/WidgetFactory.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/WidgetFactory.h 2008-04-07 19:38:47 UTC (rev 1120)
+++ dcplusplus/trunk/smartwin/include/smartwin/WidgetFactory.h 2008-04-07 19:40:48 UTC (rev 1121)
@@ -28,16 +28,12 @@
#ifndef WidgetFactory_h
#define WidgetFactory_h
-#include "../SmartUtil.h"
-#include "widgets/Button.h"
#include "widgets/ColorDialog.h"
#include "widgets/FolderDialog.h"
#include "widgets/MessageBox.h"
-#include "widgets/CheckBox.h"
#include "widgets/LoadDialog.h"
#include "widgets/SaveDialog.h"
#include "widgets/StatusBar.h"
-#include "widgets/TextBox.h"
#include "WidgetFactoryPlatformImplementation.h"
#include "WidgetCreator.h"
@@ -78,21 +74,11 @@
public:
// Bring widgets into the namespace of the class that inherits from us
- typedef SmartWin::Button Button;
-
- typedef typename Button::ObjectType ButtonPtr;
-
typedef SmartWin::FolderDialog FolderDialog;
/// MessageBox class and object type.
typedef SmartWin::MessageBox MessageBox;
- /// TextBox class type.
- typedef SmartWin::TextBox TextBox;
-
- /// TextBox object type.
- typedef typename TextBox::ObjectType TextBoxPtr;
-
/// StatusBar class type.
typedef SmartWin::StatusBar< > StatusBar;
@@ -114,12 +100,6 @@
/// ColorDialog class and object type.
typedef SmartWin::ColorDialog ColorDialog;
- /// CheckBox class type.
- typedef SmartWin::CheckBox CheckBox;
-
- /// CheckBox object type.
- typedef typename CheckBox::ObjectType CheckBoxPtr;
-
/// Default Constructor creating a factory Widget
/** Default Constructor creating a factory Widget without a parent, if you need
* to explicitly state a parent like for instance you often would want in a
@@ -147,38 +127,11 @@
*/
ColorDialog createColorDialog();
- // TODO: Update, this isn't an automated collected Widget anymore...
- /// Creates a Message Box and returns a pointer to it.
+ /// Creates a Message Box returns it.
/** Use this one to construct a ( stack object ) to show a message box
*/
MessageBox createMessageBox();
- /// Creates a Check Box and returns a pointer to it.
- /** DON'T delete the returned pointer!!!
- */
- CheckBoxPtr createCheckBox( const typename CheckBox::Seed & cs = CheckBox::Seed() );
-
- /// \ingroup SubclassDialog
- /// Subclasses a Check Box from the given resource id.
- /** DON'T delete the returned pointer!!! <br>
- * Use e.g. the Dialog Designer to design a dialog and attach the controls
- * with this function.
- */
- CheckBoxPtr attachCheckBox( unsigned id );
-
- /// Creates a Edit Control and returns a pointer to it.
- /** DON'T delete the returned pointer!!!
- */
- TextBoxPtr createTextBox( const typename TextBox::Seed & cs = TextBox::Seed() );
-
- /// \ingroup SubclassDialog
- /// Subclasses a Text Box Control from the given resource id.
- /** DON'T delete the returned pointer!!! <br>
- * Use e.g. the Dialog Designer to design a dialog and attach the controls
- * with this function.
- */
- TextBoxPtr attachTextBox( unsigned id );
-
// TODO: Is there any point in attaching a status bar ? ! ?
/// Creates a Status Bar and returns a pointer to it.
/** DON'T delete the returned pointer!!!
@@ -190,17 +143,6 @@
*/
StatusBarSectionsPtr createStatusBarSections( const typename StatusBarSections::Seed & cs = StatusBarSections::Seed() );
- /// Creates a Button Control and returns a pointer to it.
- /** DON'T delete the returned pointer!!!
- */
- ButtonPtr createButton( const typename Button::Seed & cs = Button::Seed() );
-
- /// \ingroup SubclassDialog
- /// Subclasses a Button Control from the given resource id.
- /** DON'T delete the returned pointer!!!< br >
- * Use e.g. the Dialog Designer to design a dialog and attach the controls with this function.
- */
- ButtonPtr attachButton( unsigned id );
protected:
// Protected to try to avoid stack creation...
virtual ~WidgetFactory()
@@ -252,34 +194,6 @@
}
template<typename ContainerWidgetType>
-typename WidgetFactory< ContainerWidgetType >::CheckBoxPtr
- WidgetFactory< ContainerWidgetType >::createCheckBox( const typename CheckBox::Seed & cs )
-{
- return WidgetCreator< CheckBox >::create( this, cs );
-}
-
-template<typename ContainerWidgetType>
-typename WidgetFactory< ContainerWidgetType >::CheckBoxPtr
-WidgetFactory< ContainerWidgetType >::attachCheckBox( unsigned id )
-{
- return WidgetCreator< CheckBox >::attach( this, id );
-}
-
-template<typename ContainerWidgetType>
-typename WidgetFactory< ContainerWidgetType >::TextBoxPtr
-WidgetFactory< ContainerWidgetType >::createTextBox( const typename TextBox::Seed & cs )
-{
- return WidgetCreator< TextBox >::create( this, cs );
-}
-
-template<typename ContainerWidgetType>
-typename WidgetFactory< ContainerWidgetType >::TextBoxPtr
-WidgetFactory< ContainerWidgetType >::attachTextBox( unsigned id )
-{
- return WidgetCreator< TextBox >::attach( this, id );
-}
-
-template<typename ContainerWidgetType>
typename WidgetFactory< ContainerWidgetType >::StatusBarPtr
WidgetFactory< ContainerWidgetType >::createStatusBar( const typename StatusBar::Seed & cs )
{
@@ -293,20 +207,6 @@
return WidgetCreator< StatusBarSections >::create( this, cs );
}
-template<typename ContainerWidgetType>
-typename WidgetFactory< ContainerWidgetType >::ButtonPtr
- WidgetFactory< ContainerWidgetType >::createButton( const Button::Seed & cs )
-{
- return WidgetCreator< Button >::create( this, cs );
-}
-
-template<typename ContainerWidgetType>
-typename WidgetFactory< ContainerWidgetType >::ButtonPtr
-WidgetFactory< ContainerWidgetType >::attachButton( unsigned id )
-{
- return WidgetCreator< Button >::attach( this, id );
-}
-
// end namespace SmartWin
}
Modified: dcplusplus/trunk/smartwin/include/smartwin/forward.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/forward.h 2008-04-07 19:38:47 UTC (rev 1120)
+++ dcplusplus/trunk/smartwin/include/smartwin/forward.h 2008-04-07 19:40:48 UTC (rev 1121)
@@ -60,6 +60,9 @@
class TabView;
typedef TabView* TabViewPtr;
+class TextBox;
+typedef TextBox* TextBoxPtr;
+
class ToolBar;
typedef ToolBar* ToolBarPtr;
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Composite.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Composite.h 2008-04-07 19:38:47 UTC (rev 1120)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Composite.h 2008-04-07 19:40:48 UTC (rev 1121)
@@ -70,6 +70,8 @@
typedef SmartWin::TablePtr TablePtr;
typedef SmartWin::TabSheet TabSheet;
typedef SmartWin::TabSheetPtr TabSheetPtr;
+ typedef SmartWin::TextBox TextBox;
+ typedef SmartWin::TextBoxPtr TextBoxPtr;
typedef SmartWin::ToolBar ToolBar;
typedef SmartWin::ToolBarPtr ToolBarPtr;
typedef SmartWin::ToolTip ToolTip;
Modified: dcplusplus/trunk/win32/ADLSProperties.cpp
===================================================================
--- dcplusplus/trunk/win32/ADLSProperties.cpp 2008-04-07 19:38:47 UTC (rev 1120)
+++ dcplusplus/trunk/win32/ADLSProperties.cpp 2008-04-07 19:40:48 UTC (rev 1121)
@@ -105,18 +105,18 @@
destDir = attachTextBox(IDC_DEST_DIR);
destDir->setText(Text::toT(search->destDir));
- active = attachCheckBox(IDC_IS_ACTIVE);
+ active = attachChild<CheckBox>(IDC_IS_ACTIVE);
active->setText(T_("Enabled"));
active->setChecked(search->isActive);
- autoQueue = attachCheckBox(IDC_AUTOQUEUE);
+ autoQueue = attachChild<CheckBox>(IDC_AUTOQUEUE);
autoQueue->setText(T_("Download Matches"));
autoQueue->setChecked(search->isAutoQueue);
- ButtonPtr button = attachButton(IDOK);
+ ButtonPtr button = attachChild<Button>(IDOK);
button->onClicked(std::tr1::bind(&ADLSProperties::handleOKClicked, this));
- button = attachButton(IDCANCEL);
+ button = attachChild<Button>(IDCANCEL);
button->onClicked(std::tr1::bind(&ADLSProperties::endDialog, this, IDCANCEL));
centerWindow();
Modified: dcplusplus/trunk/win32/AboutDlg.cpp
===================================================================
--- dcplusplus/trunk/win32/AboutDlg.cpp 2008-04-07 19:38:47 UTC (rev 1120)
+++ dcplusplus/trunk/win32/AboutDlg.cpp 2008-04-07 19:40:48 UTC (rev 1121)
@@ -70,7 +70,7 @@
}
setItemText(IDC_LATEST, T_("Downloading..."));
- attachButton(IDOK)->onClicked(std::tr1::bind(&AboutDlg::endDialog, this, IDOK));
+ attachChild<Button>(IDOK)->onClicked(std::tr1::bind(&AboutDlg::endDialog, this, IDOK));
centerWindow();
Modified: dcplusplus/trunk/win32/Advanced3Page.cpp
===================================================================
--- dcplusplus/trunk/win32/Advanced3Page.cpp 2008-04-07 19:38:47 UTC (rev 1120)
+++ dcplusplus/trunk/win32/Advanced3Page.cpp 2008-04-07 19:40:48 UTC (rev 1121)
@@ -25,6 +25,8 @@
#include <dcpp/SettingsManager.h>
#include "WinUtil.h"
+#include <smartwin/widgets/Spinner.h>
+
static const WinUtil::HelpItem helpItems[] = {
{ IDC_SETTINGS_ROLLBACK, IDH_SETTINGS_ADVANCED3_ROLLBACK },
{ IDC_ROLLBACK, IDH_SETTINGS_ADVANCED3_ROLLBACK },
Modified: dcplusplus/trunk/win32/Appearance2Page.cpp
===================================================================
--- dcplusplus/trunk/win32/Appearance2Page.cpp 2008-04-07 19:38:47 UTC (rev 1120)
+++ dcplusplus/trunk/win32/Appearance2Page.cpp 2008-04-07 19:40:48 UTC (rev 1121)
@@ -82,19 +82,19 @@
example->setColor(fg, bg);
example->setFont(font);
- ButtonPtr button = attachButton(IDC_SELWINCOLOR);
+ ButtonPtr button = attachChild<Button>(IDC_SELWINCOLOR);
button->onClicked(std::tr1::bind(&Appearance2Page::handleBackgroundClicked, this));
- button = attachButton(IDC_SELTEXT);
+ button = attachChild<Button>(IDC_SELTEXT);
button->onClicked(std::tr1::bind(&Appearance2Page::handleTextClicked, this));
- button = attachButton(IDC_SETTINGS_UPLOAD_BAR_COLOR);
+ button = attachChild<Button>(IDC_SETTINGS_UPLOAD_BAR_COLOR);
button->onClicked(std::tr1::bind(&Appearance2Page::handleULClicked, this));
- button = attachButton(IDC_SETTINGS_DOWNLOAD_BAR_COLOR);
+ button = attachChild<Button>(IDC_SETTINGS_DOWNLOAD_BAR_COLOR);
button->onClicked(std::tr1::bind(&Appearance2Page::handleDLClicked, this));
- button = attachButton(IDC_BROWSE);
+ button = attachChild<Button>(IDC_BROWSE);
button->onClicked(std::tr1::bind(&Appearance2Page::handleBrowseClicked, this));
attachTextBox(IDC_BEEPFILE);
Modified: dcplusplus/trunk/win32/CertificatesPage.cpp
===================================================================
--- dcplusplus/trunk/win32/CertificatesPage.cpp 2008-04-07 19:38:47 UTC (rev 1120)
+++ dcplusplus/trunk/win32/CertificatesPage.cpp 2008-04-07 19:40:48 UTC (rev 1121)
@@ -70,15 +70,15 @@
PropPage::read(handle(), items, listItems, ::GetDlgItem(handle(), IDC_TLS_OPTIONS));
privateKeyFile = attachTextBox(IDC_TLS_PRIVATE_KEY_FILE);
- attachButton(IDC_BROWSE_PRIVATE_KEY)->onClicked(std::tr1::bind(&CertificatesPage::handleBrowsePrivateKeyClicked, this));
+ attachChild<Button>(IDC_BROWSE_PRIVATE_KEY)->onClicked(std::tr1::bind(&CertificatesPage::handleBrowsePrivateKeyClicked, this));
certificateFile = attachTextBox(IDC_TLS_CERTIFICATE_FILE);
- attachButton(IDC_BROWSE_CERTIFICATE)->onClicked(std::tr1::bind(&CertificatesPage::handleBrowseCertificateClicked, this));
+ attachChild<Button>(IDC_BROWSE_CERTIFICATE)->onClicked(std::tr1::bind(&CertificatesPage::handleBrowseCertificateClicked, this));
trustedCertificatesPath = attachTextBox(IDC_TLS_TRUSTED_CERTIFICATES_PATH);
- attachButton(IDC_BROWSE_TRUSTED_PATH)->onClicked(std::tr1::bind(&CertificatesPage::handleBrowseTrustedPathClicked, this));
+ attachChild<Button>(IDC_BROWSE_TRUSTED_PATH)->onClicked(std::tr1::bind(&CertificatesPage::handleBrowseTrustedPathClicked, this));
- attachButton(IDC_GENERATE_CERTS)->onClicked(std::tr1::bind(&CertificatesPage::handleGenerateCertsClicked, this));
+ attachChild<Button>(IDC_GENERATE_CERTS)->onClicked(std::tr1::bind(&CertificatesPage::handleGenerateCertsClicked, this));
}
CertificatesPage::~CertificatesPage() {
Modified: dcplusplus/trunk/win32/CommandDlg.cpp
===================================================================
--- dcplusplus/trunk/win32/CommandDlg.cpp 2008-04-07 19:38:47 UTC (rev 1120)
+++ dcplusplus/trunk/win32/CommandDlg.cpp 2008-04-07 19:40:48 UTC (rev 1121)
@@ -115,16 +115,16 @@
PM->setText(T_("PM"));
PM->onClicked(std::tr1::bind(&CommandDlg::handleTypeChanged, this));
- hubMenu = attachCheckBox(IDC_SETTINGS_HUB_MENU);
+ hubMenu = attachChild<CheckBox>(IDC_SETTINGS_HUB_MENU);
hubMenu->setText(T_("Hub Menu"));
- userMenu = attachCheckBox(IDC_SETTINGS_USER_MENU);
+ userMenu = attachChild<CheckBox>(IDC_SETTINGS_USER_MENU);
userMenu->setText(T_("User Menu"));
- searchMenu = attachCheckBox(IDC_SETTINGS_SEARCH_MENU);
+ searchMenu = attachChild<CheckBox>(IDC_SETTINGS_SEARCH_MENU);
searchMenu->setText(T_("Search Menu"));
- fileListMenu = attachCheckBox(IDC_SETTINGS_FILELIST_MENU);
+ fileListMenu = attachChild<CheckBox>(IDC_SETTINGS_FILELIST_MENU);
fileListMenu->setText(T_( "Filelist Menu"));
nameBox = attachTextBox(IDC_NAME);
@@ -137,26 +137,26 @@
nick = attachTextBox(IDC_NICK);
nick->onTextChanged(std::tr1::bind(&CommandDlg::updateCommand, this));
- once = attachCheckBox(IDC_SETTINGS_ONCE);
+ once = attachChild<CheckBox>(IDC_SETTINGS_ONCE);
once->setText(T_("Send once per nick"));
result = attachTextBox(IDC_RESULT);
- openHelp = attachCheckBox(IDC_USER_CMD_OPEN_HELP);
+ openHelp = attachChild<CheckBox>(IDC_USER_CMD_OPEN_HELP);
openHelp->setText(T_("Always open help file with this dialog"));
bool bOpenHelp = BOOLSETTING(OPEN_USER_CMD_HELP);
openHelp->setChecked(bOpenHelp);
{
- ButtonPtr button = attachButton(IDOK);
+ ButtonPtr button = attachChild<Button>(IDOK);
button->setText(T_("OK"));
button->onClicked(std::tr1::bind(&CommandDlg::handleOKClicked, this));
- button = attachButton(IDCANCEL);
+ button = attachChild<Button>(IDCANCEL);
button->setText(T_("Cancel"));
button->onClicked(std::tr1::bind(&CommandDlg::endDialog, this, IDCANCEL));
- button = attachButton(IDHELP);
+ button = attachChild<Button>(IDHELP);
button->setText(T_("Help"));
button->onClicked(std::tr1::bind(&WinUtil::help, handle(), IDH_USER_COMMAND));
}
Modified: dcplusplus/trunk/win32/DownloadPage.cpp
===================================================================
--- dcplusplus/trunk/win32/DownloadPage.cpp 2008-04-07 19:38:47 UTC (rev 1120)
+++ dcplusplus/trunk/win32/DownloadPage.cpp 2008-04-07 19:40:48 UTC (rev 1121)
@@ -26,6 +26,8 @@
#include "WinUtil.h"
#include "HubListsDlg.h"
+#include <smartwin/widgets/Spinner.h>
+
static const WinUtil::HelpItem helpItems[] = {
{ IDC_SETTINGS_DOWNLOAD_DIRECTORY, IDH_SETTINGS_DOWNLOAD_DOWNLOADDIR },
{ IDC_DOWNLOADDIR, IDH_SETTINGS_DOWNLOAD_DOWNLOADDIR },
@@ -80,11 +82,11 @@
PropPage::translate(handle(), texts);
PropPage::read(handle(), items);
- attachButton(IDC_BROWSEDIR)->onClicked(std::tr1::bind(&DownloadPage::handleBrowseDir, this));
+ attachChild<Button>(IDC_BROWSEDIR)->onClicked(std::tr1::bind(&DownloadPage::handleBrowseDir, this));
- attachButton(IDC_BROWSETEMPDIR)->onClicked(std::tr1::bind(&DownloadPage::handleBrowseTempDir, this));
+ attachChild<Button>(IDC_BROWSETEMPDIR)->onClicked(std::tr1::bind(&DownloadPage::handleBrowseTempDir, this));
- attachButton(IDC_SETTINGS_LIST_CONFIG)->onClicked(std::tr1::bind(&DownloadPage::handleConfigHubLists, this));
+ attachChild<Button>(IDC_SETTINGS_LIST_CONFIG)->onClicked(std::tr1::bind(&DownloadPage::handleConfigHubLists, this));
SpinnerPtr spinner = attachChild<Spinner>(IDC_SLOTSSPIN);
spinner->setRange(0, 100);
Modified: dcplusplus/trunk/win32/FavHubProperties.cpp
===================================================================
--- dcplusplus/trunk/win32/FavHubProperties.cpp 2008-04-07 19:38:47 UTC (rev 1120)
+++ dcplusplus/trunk/win32/FavHubProperties.cpp 2008-04-07 19:40:48 UTC (rev 1121)
@@ -102,10 +102,10 @@
userDescription->setTextLimit(35);
userDescription->setText(Text::toT(entry->getUserDescription()));
- ButtonPtr button = attachButton(IDOK);
+ ButtonPtr button = attachChild<Button>(IDOK);
button->onClicked(std::tr1::bind(&FavHubProperties::handleOKClicked, this));
- button = attachButton(IDCANCEL);
+ button = attachChild<Button>(IDCANCEL);
button->onClicked(std::tr1::bind(&FavHubProperties::endDialog, this, IDCANCEL));
centerWindow();
Modified: dcplusplus/trunk/win32/FavoriteDirsPage.cpp
===================================================================
--- dcplusplus/trunk/win32/FavoriteDirsPage.cpp 2008-04-07 19:38:47 UTC (rev 1120)
+++ dcplusplus/trunk/win32/FavoriteDirsPage.cpp 2008-04-07 19:40:48 UTC (rev 1121)
@@ -76,11 +76,11 @@
onDragDrop(std::tr1::bind(&FavoriteDirsPage::handleDragDrop, this, _1));
- attachButton(IDC_RENAME)->onClicked(std::tr1::bind(&FavoriteDirsPage::handleRenameClicked, this));
+ attachChild<Button>(IDC_RENAME)->onClicked(std::tr1::bind(&FavoriteDirsPage::handleRenameClicked, this));
- attachButton(IDC_REMOVE)->onClicked(std::tr1::bind(&FavoriteDirsPage::handleRemoveClicked, this));
+ attachChild<Button>(IDC_REMOVE)->onClicked(std::tr1::bind(&FavoriteDirsPage::handleRemoveClicked, this));
- attachButton(IDC_ADD)->onClicked(std::tr1::bind(&FavoriteDirsPage::handleAddClicked, this));
+ attachChild<Button>(IDC_ADD)->onClicked(std::tr1::bind(&FavoriteDirsPage::handleAddClicked, this));
}
FavoriteDirsPage::~FavoriteDirsPage() {
Modified: dcplusplus/trunk/win32/HashProgressDlg.cpp
===================================================================
--- dcplusplus/trunk/win32/HashProgressDlg.cpp 2008-04-07 19:38:47 UTC (rev 1120)
+++ dcplusplus/trunk/win32/HashProgressDlg.cpp 2008-04-07 19:40:48 UTC (rev 1121)
@@ -47,7 +47,7 @@
attachChild(progress, IDC_HASH_PROGRESS);
progress->setRange(0, 10000);
- ButtonPtr ok = attachButton(IDOK);
+ ButtonPtr ok = attachChild<Button>(IDOK);
ok->setText(T_("Run in background"));
ok->onClicked(std::tr1::bind(&HashProgressDlg::endDialog, this, IDOK));
Modified: dcplusplus/trunk/win32/HubListsDlg.cpp
===================================================================
--- dcplusplus/trunk/win32/HubListsDlg.cpp 2008-04-07 19:38:47 UTC (rev 1120)
+++ dcplusplus/trunk/win32/HubListsDlg.cpp 2008-04-07 19:40:48 UTC (rev 1121)
@@ -77,29 +77,29 @@
hubLists->onDblClicked(std::tr1::bind(&HubListsDlg::handleDoubleClick, this));
hubLists->onKeyDown(std::tr1::bind(&HubListsDlg::handleKeyDown, this, _1));
- ButtonPtr button = attachButton(IDC_LIST_ADD);
+ ButtonPtr button = attachChild<Button>(IDC_LIST_ADD);
button->setText(T_("&Add"));
button->onClicked(std::tr1::bind(&HubListsDlg::handleAddClicked, this));
- button = attachButton(IDC_LIST_UP);
+ button = attachChild<Button>(IDC_LIST_UP);
button->setText(T_("Move &Up"));
button->onClicked(std::tr1::bind(&HubListsDlg::handleMoveUpClicked, this));
- button = attachButton(IDC_LIST_DOWN);
+ button = attachChild<Button>(IDC_LIST_DOWN);
button->setText(T_("Move &Down"));
button->onClicked(std::tr1::bind(&HubListsDlg::handleMoveDownClicked, this));
- button = attachButton(IDC_LIST_EDIT);
+ button = attachChild<Button>(IDC_LIST_EDIT);
button->setText(T_("&Edit"));
button->onClicked(std::tr1::bind(&HubListsDlg::handleEditClicked, this));
- button = attachButton(IDC_LIST_REMOVE);
+ button = attachChild<Button>(IDC_LIST_REMOVE);
button->setText(T_("&Remove"));
button->onClicked(std::tr1::bind(&HubListsDlg::handleRemoveClicked, this));
- attachButton(IDOK)->onClicked(std::tr1::bind(&HubListsDlg::handleOKClicked, this));
+ attachChild<Button>(IDOK)->onClicked(std::tr1::bind(&HubListsDlg::handleOKClicked, this));
- attachButton(IDCANCEL)->onClicked(std::tr1::bind(&HubListsDlg::endDialog, this, IDCANCEL));
+ attachChild<Button>(IDCANCEL)->onClicked(std::tr1::bind(&HubListsDlg::endDialog, this, IDCANCEL));
centerWindow();
Modified: dcplusplus/trunk/win32/LineDlg.cpp
===================================================================
--- dcplusplus/trunk/win32/LineDlg.cpp 2008-04-07 19:38:47 UTC (rev 1120)
+++ dcplusplus/trunk/win32/LineDlg.cpp 2008-04-07 19:40:48 UTC (rev 1121)
@@ -32,8 +32,8 @@
}
bool LineDlg::initDialog() {
- attachButton(IDOK)->onClicked(std::tr1::bind(&LineDlg::okClicked, this));
- attachButton(IDCANCEL)->onClicked(std::tr1::bind(&LineDlg::cancelClicked, this));
+ attachChild<Button>(IDOK)->onClicked(std::tr1::bind(&LineDlg::okClicked, this));
+ attachChild<Button>(IDCANCEL)->onClicked(std::tr1::bind(&LineDlg::cancelClicked, this));
attachChild<Label>(IDC_DESCRIPTION)->setText(desc);
line = attachTextBox(IDC_LINE);
Modified: dcplusplus/trunk/win32/LogPage.cpp
===================================================================
--- dcplusplus/trunk/win32/LogPage.cpp 2008-04-07 19:38:47 UTC (rev 1120)
+++ dcplusplus/trunk/win32/LogPage.cpp 2008-04-07 19:40:48 UTC (rev 1121)
@@ -76,7 +76,7 @@
attachTextBox(IDC_LOG_DIRECTORY);
- attachButton(IDC_BROWSE_LOG)->onClicked(std::tr1::bind(&LogPage::handleBrowseClicked, this));
+ 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), SmartWin::Message(WM_NOTIFY, LVN_ITEMCHANGED));
Modified: dcplusplus/trunk/win32/MagnetDlg.cpp
===================================================================
--- dcplusplus/trunk/win32/MagnetDlg.cpp 2008-04-07 19:38:47 UTC (rev 1120)
+++ dcplusplus/trunk/win32/MagnetDlg.cpp 2008-04-07 19:40:48 UTC (rev 1121)
@@ -62,16 +62,16 @@
doNothing->setText(T_("Do nothing"));
//doNothing->onClicked(std::tr1::bind(&MagnetDlg::handleRadioButtonClicked, this, doNothing));
- //remember = attachCheckBox(IDC_MAGNET_REMEMBER);
+ //remember = attachChild<CheckBox>(IDC_MAGNET_REMEMBER);
//remember->setText(T_("Do the same action next time without asking"));
::ShowWindow(getItem(IDC_MAGNET_REMEMBER), false);
::CheckRadioButton(handle(), IDC_MAGNET_1_QUEUE, IDC_MAGNET_3_NOTHING, IDC_MAGNET_2_SEARCH);
- ButtonPtr button = attachButton(IDOK);
+ ButtonPtr button = attachChild<Button>(IDOK);
button->onClicked(std::tr1::bind(&MagnetDlg::handleOKClicked, this));
- button = attachButton(IDCANCEL);
+ button = attachChild<Button>(IDCANCEL);
button->onClicked(std::tr1::bind(&MagnetDlg::endDialog, this, IDCANCEL));
centerWindow();
Modified: dcplusplus/trunk/win32/SettingsDialog.cpp
===================================================================
--- dcplusplus/trunk/win32/SettingsDialog.cpp 2008-04-07 19:38:47 UTC (rev 1120)
+++ dcplusplus/trunk/win32/SettingsDialog.cpp 2008-04-07 19:40:48 UTC (rev 1121)
@@ -74,15 +74,15 @@
pageTree->onSelectionChanged(std::tr1::bind(&SettingsDialog::selectionChanged, this));
{
- ButtonPtr button = attachButton(IDOK);
+ ButtonPtr button = attachChild<Button>(IDOK);
button->setText(T_("OK"));
button->onClicked(std::tr1::bind(&SettingsDialog::handleOKClicked, this));
- button = attachButton(IDCANCEL);
+ button = attachChild<Button>(IDCANCEL);
button->setText(T_("Cancel"));
button->onClicked(std::tr1::bind(&SettingsDialog::endDialog, this, IDCANCEL));
- button = attachButton(IDHELP);
+ button = attachChild<Button>(IDHELP);
button->setText(T_("Help"));
button->onClicked(std::tr1::bind(&SettingsDialog::handleHelp, this, handle(), IDH_STARTPAGE));
}
Modified: dcplusplus/trunk/win32/UCPage.cpp
===================================================================
--- dcplusplus/trunk/win32/UCPage.cpp 2008-04-07 19:38:47 UTC (rev 1120)
+++ dcplusplus/trunk/win32/UCPage.cpp 2008-04-07 19:40:48 UTC (rev 1121)
@@ -81,15 +81,15 @@
commands->onDblClicked(std::tr1::bind(&UCPage::handleDoubleClick, this));
commands->onKeyDown(std::tr1::bind(&UCPage::handleKeyDown, this, _1));
- attachButton(IDC_ADD_MENU)->onClicked(std::tr1::bind(&UCPage::handleAddClicked, this));
+ attachChild<Button>(IDC_ADD_MENU)->onClicked(std::tr1::bind(&UCPage::handleAddClicked, this));
- attachButton(IDC_CHANGE_MENU)->onClicked(std::tr1::bind(&UCPage::handleChangeClicked, this));
+ attachChild<Button>(IDC_CHANGE_MENU)->onClicked(std::tr1::bind(&UCPage::handleChangeClicked, this));
- attachButton(IDC_MOVE_UP)->onClicked(std::tr1::bind(&UCPage::handleMoveUpClicked, this));
+ attachChild<Button>(IDC_MOVE_UP)->onClicked(std::tr1::bind(&UCPage::handleMoveUpClicked, this));
- attachButton(IDC_MOVE_DOWN)->onClicked(std::tr1::bind(&UCPage::handleMoveDownClicked, this));
+ attachChild<Button>(IDC_MOVE_DOWN)->onClicked(std::tr1::bind(&UCPage::handleMoveDownClicked, this));
- attachButton(IDC_REMOVE_MENU)->onClicked(std::tr1::bind(&UCPage::handleRemoveClicked, this));
+ attachChild<Button>(IDC_REMOVE_MENU)->onClicked(std::tr1::bind(&UCPage::handleRemoveClicked, this));
}
UCPage::~UCPage() {
Modified: dcplusplus/trunk/win32/UploadPage.cpp
===================================================================
--- dcplusplus/trunk/win32/UploadPage.cpp 2008-04-07 19:38:47 UTC (rev 1120)
+++ dcplusplus/trunk/win32/UploadPage.cpp 2008-04-07 19:40:48 UTC (rev 1121)
@@ -29,6 +29,8 @@
#include "LineDlg.h"
#include "HashProgressDlg.h"
+#include <smartwin/widgets/Spinner.h>
+
static const WinUtil::HelpItem helpItems[] = {
{ IDC_SETTINGS_SHARED_DIRECTORIES, IDH_SETTINGS_UPLOAD_DIRECTORIES },
{ IDC_DIRECTORIES, IDH_SETTINGS_UPLOAD_DIRECTORIES },
@@ -105,7 +107,7 @@
onDragDrop(std::tr1::bind(&UploadPage::handleDragDrop, this, _1));
- CheckBoxPtr shareHidden = attachCheckBox(IDC_SHAREHIDDEN);
+ CheckBoxPtr shareHidden = attachChild<CheckBox>(IDC_SHAREHIDDEN);
shareHidden->onClicked(std::tr1::bind(&UploadPage::handleShareHiddenClicked, this, shareHidden));
attachChild(total, IDC_TOTAL);
Modified: dcplusplus/trunk/win32/stdafx.h
===================================================================
--- dcplusplus/trunk/win32/stdafx.h 2008-04-07 19:38:47 UTC (rev 1120)
+++ dcplusplus/trunk/win32/stdafx.h 2008-04-07 19:40:48 UTC (rev 1121)
@@ -31,13 +31,13 @@
#include <smartwin/resources/Accelerator.h>
#include <smartwin/resources/Pen.h>
#include <smartwin/widgets/Button.h>
+#include <smartwin/widgets/CheckBox.h>
#include <smartwin/widgets/ComboBox.h>
#include <smartwin/widgets/Container.h>
#include <smartwin/widgets/Label.h>
#include <smartwin/widgets/ModalDialog.h>
#include <smartwin/widgets/ModelessDialog.h>
#include <smartwin/widgets/RadioButton.h>
-#include <smartwin/widgets/Spinner.h>
#include <smartwin/widgets/Table.h>
#include <smartwin/widgets/TabSheet.h>
#include <smartwin/widgets/TabView.h>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
