Menu
▾
▴
[Dcplusplus-commit] SF.net SVN: dcplusplus: [1116] dcplusplus/trunk
|
From: <arn...@us...> - 2008-04-07 19:32:33
|
Revision: 1116
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1116&view=rev
Author: arnetheduck
Date: 2008-04-07 12:31:56 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
labels, toolbars & coolbars removed from factory
Modified Paths:
--------------
dcplusplus/trunk/smartwin/include/smartwin/SmartWin.h
dcplusplus/trunk/smartwin/include/smartwin/WidgetFactory.h
dcplusplus/trunk/smartwin/include/smartwin/WidgetFactoryPlatformSmartWinDesktop.h
dcplusplus/trunk/smartwin/include/smartwin/forward.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/Composite.h
dcplusplus/trunk/win32/Appearance2Page.cpp
dcplusplus/trunk/win32/LineDlg.cpp
dcplusplus/trunk/win32/MainWindow.cpp
dcplusplus/trunk/win32/UploadPage.cpp
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-02 16:50:51.052000046 +0200
committer: zouzou123gen
properties:
branch-nick: bzr
+ timestamp: 2008-04-02 17:21:37.403000116 +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
+ 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
Modified: dcplusplus/trunk/smartwin/include/smartwin/SmartWin.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/SmartWin.h 2008-04-07 19:29:43 UTC (rev 1115)
+++ dcplusplus/trunk/smartwin/include/smartwin/SmartWin.h 2008-04-07 19:31:56 UTC (rev 1116)
@@ -64,7 +64,9 @@
#include "resources/ImageList.h"
#include "resources/Pen.h"
#include "widgets/Container.h"
+#include "widgets/CoolBar.h"
#include "widgets/DateTime.h"
+#include "widgets/Label.h"
#include "widgets/MDIChild.h"
#include "widgets/MDIFrame.h"
#include "widgets/MDIParent.h"
@@ -73,6 +75,7 @@
#include "widgets/RadioButton.h"
#include "widgets/Slider.h"
#include "widgets/Spinner.h"
+#include "widgets/ToolBar.h"
#include "widgets/Window.h"
namespace sw = SmartWin;
Modified: dcplusplus/trunk/smartwin/include/smartwin/WidgetFactory.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/WidgetFactory.h 2008-04-07 19:29:43 UTC (rev 1115)
+++ dcplusplus/trunk/smartwin/include/smartwin/WidgetFactory.h 2008-04-07 19:31:56 UTC (rev 1116)
@@ -40,7 +40,6 @@
#include "widgets/LoadDialog.h"
#include "widgets/ProgressBar.h"
#include "widgets/SaveDialog.h"
-#include "widgets/Label.h"
#include "widgets/StatusBar.h"
#include "widgets/WidgetTabView.h"
#include "widgets/TabSheet.h"
@@ -159,12 +158,6 @@
/// ComboBox object type.
typedef typename ComboBox::ObjectType ComboBoxPtr;
- /// Label class type.
- typedef SmartWin::Label Label;
-
- /// Label object type.
- typedef typename Label::ObjectType LabelPtr;
-
/// CheckBox class type.
typedef SmartWin::CheckBox CheckBox;
@@ -334,19 +327,6 @@
*/
ComboBoxPtr attachComboBox( unsigned id );
- /// Creates a Label Control and returns a pointer to it.
- /** DON'T delete the returned pointer!!!
- */
- LabelPtr createLabel( const typename Label::Seed & cs = Label::Seed() );
-
- /// \ingroup SubclassDialog
- /// Subclasses a Label 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.
- */
- LabelPtr attachLabel( unsigned id );
-
ToolTipPtr createToolTip( const typename ToolTip::Seed & cs = ToolTip::Seed() );
protected:
// Protected to try to avoid stack creation...
@@ -539,20 +519,6 @@
}
template<typename ContainerWidgetType>
-typename WidgetFactory< ContainerWidgetType >::LabelPtr
-WidgetFactory< ContainerWidgetType >::createLabel( const typename Label::Seed & cs )
-{
- return WidgetCreator< Label >::create( this, cs );
-}
-
-template<typename ContainerWidgetType>
-typename WidgetFactory< ContainerWidgetType >::LabelPtr
-WidgetFactory< ContainerWidgetType >::attachLabel( unsigned id )
-{
- return WidgetCreator< Label >::attach( this, id );
-}
-
-template<typename ContainerWidgetType>
typename WidgetFactory< ContainerWidgetType >::ToolTipPtr
WidgetFactory< ContainerWidgetType >::createToolTip( const typename ToolTip::Seed & cs )
{
Modified: dcplusplus/trunk/smartwin/include/smartwin/WidgetFactoryPlatformSmartWinDesktop.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/WidgetFactoryPlatformSmartWinDesktop.h 2008-04-07 19:29:43 UTC (rev 1115)
+++ dcplusplus/trunk/smartwin/include/smartwin/WidgetFactoryPlatformSmartWinDesktop.h 2008-04-07 19:31:56 UTC (rev 1116)
@@ -33,8 +33,6 @@
#include "widgets/RichTextBox.h"
#include "widgets/FontDialog.h"
#include "widgets/WidgetMenu.h"
-#include "widgets/ToolBar.h"
-#include "widgets/CoolBar.h"
#include "WidgetCreator.h"
namespace SmartWin
@@ -65,18 +63,6 @@
/// ChooseFont class and object type.
typedef SmartWin::FontDialog FontDialog;
- /// Toolbar class type.
- typedef SmartWin::ToolBar ToolBar;
-
- /// Toolbar object type.
- typedef typename ToolBar::ObjectType ToolBarPtr;
-
- /// Coolbar class type.
- typedef SmartWin::CoolBar CoolBar;
-
- /// Coolbar object type.
- typedef typename CoolBar::ObjectType CoolBarPtr;
-
/// Constructor taking a pointer to it's parent.
/** If you for instance create a WidgetChildWindow then use this Constructor
* since it explicitly sets the parent of the Widget.
@@ -125,22 +111,6 @@
{
return WidgetCreator< WidgetMenu >::attach( this, cs, hMenu );
}
-
- /// Creates a Tool Bar and returns a pointer to it.
- /** DON'T delete the returned pointer!!!
- */
- ToolBarPtr createToolbar( const typename ToolBar::Seed & cs = ToolBar::Seed() )
- {
- return WidgetCreator< ToolBar >::create( this, cs );
- }
-
- /// Creates a Cool Bar and returns a pointer to it.
- /** DON'T delete the returned pointer!!!
- */
- CoolBarPtr createCoolbar( const typename CoolBar::Seed & cs = CoolBar::Seed() )
- {
- return WidgetCreator< CoolBar >::create( this, cs );
- }
};
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
Modified: dcplusplus/trunk/smartwin/include/smartwin/forward.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/forward.h 2008-04-07 19:29:43 UTC (rev 1115)
+++ dcplusplus/trunk/smartwin/include/smartwin/forward.h 2008-04-07 19:31:56 UTC (rev 1116)
@@ -15,6 +15,9 @@
class Container;
typedef Container* ContainerPtr;
+class CoolBar;
+typedef CoolBar* CoolBarPtr;
+
class DateTime;
typedef DateTime* DateTimePtr;
@@ -42,6 +45,9 @@
class Table;
typedef Table* TablePtr;
+class ToolBar;
+typedef ToolBar* ToolBarPtr;
+
class Tree;
typedef Tree* TreePtr;
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Composite.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Composite.h 2008-04-07 19:29:43 UTC (rev 1115)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Composite.h 2008-04-07 19:31:56 UTC (rev 1116)
@@ -50,18 +50,22 @@
typedef SmartWin::CheckBoxPtr CheckBoxPtr;
typedef SmartWin::Container Container;
typedef SmartWin::ContainerPtr ContainerPtr;
+ typedef SmartWin::CoolBar CoolBar;
+ typedef SmartWin::CoolBarPtr CoolBarPtr;
typedef SmartWin::DateTime DateTime;
typedef SmartWin::DateTimePtr DateTimePtr;
typedef SmartWin::Label Label;
typedef SmartWin::LabelPtr LabelPtr;
+ typedef SmartWin::RadioButton RadioButton;
+ typedef SmartWin::RadioButtonPtr RadioButtonPtr;
+ typedef SmartWin::Spinner Spinner;
+ typedef SmartWin::SpinnerPtr SpinnerPtr;
typedef SmartWin::Table Table;
typedef SmartWin::TablePtr TablePtr;
+ typedef SmartWin::ToolBar ToolBar;
+ typedef SmartWin::ToolBarPtr ToolBarPtr;
typedef SmartWin::Tree Tree;
typedef SmartWin::TreePtr TreePtr;
- typedef SmartWin::Spinner Spinner;
- typedef SmartWin::SpinnerPtr SpinnerPtr;
- typedef SmartWin::RadioButton RadioButton;
- typedef SmartWin::RadioButtonPtr RadioButtonPtr;
/// Seed class
/** This class contains all of the values needed to create the widget. It also
Modified: dcplusplus/trunk/win32/Appearance2Page.cpp
===================================================================
--- dcplusplus/trunk/win32/Appearance2Page.cpp 2008-04-07 19:29:43 UTC (rev 1115)
+++ dcplusplus/trunk/win32/Appearance2Page.cpp 2008-04-07 19:31:56 UTC (rev 1116)
@@ -78,7 +78,7 @@
WinUtil::decodeFont(Text::toT(SETTING(TEXT_FONT)), logFont);
font = SmartWin::FontPtr(new SmartWin::Font(::CreateFontIndirect(&logFont), true));
- example = attachLabel(IDC_COLOREXAMPLE);
+ attachChild(example, IDC_COLOREXAMPLE);
example->setColor(fg, bg);
example->setFont(font);
Modified: dcplusplus/trunk/win32/LineDlg.cpp
===================================================================
--- dcplusplus/trunk/win32/LineDlg.cpp 2008-04-07 19:29:43 UTC (rev 1115)
+++ dcplusplus/trunk/win32/LineDlg.cpp 2008-04-07 19:31:56 UTC (rev 1116)
@@ -34,7 +34,7 @@
bool LineDlg::initDialog() {
attachButton(IDOK)->onClicked(std::tr1::bind(&LineDlg::okClicked, this));
attachButton(IDCANCEL)->onClicked(std::tr1::bind(&LineDlg::cancelClicked, this));
- attachLabel(IDC_DESCRIPTION)->setText(desc);
+ attachChild<Label>(IDC_DESCRIPTION)->setText(desc);
line = attachTextBox(IDC_LINE);
line->setFocus();
Modified: dcplusplus/trunk/win32/MainWindow.cpp
===================================================================
--- dcplusplus/trunk/win32/MainWindow.cpp 2008-04-07 19:29:43 UTC (rev 1115)
+++ dcplusplus/trunk/win32/MainWindow.cpp 2008-04-07 19:31:56 UTC (rev 1116)
@@ -49,6 +49,8 @@
#include <dcpp/ClientManager.h>
#include <dcpp/Download.h>
+#include <smartwin/widgets/ToolBar.h>
+
MainWindow::MainWindow() :
WidgetFactory<SmartWin::Window>(0),
paned(0),
Modified: dcplusplus/trunk/win32/UploadPage.cpp
===================================================================
--- dcplusplus/trunk/win32/UploadPage.cpp 2008-04-07 19:29:43 UTC (rev 1115)
+++ dcplusplus/trunk/win32/UploadPage.cpp 2008-04-07 19:31:56 UTC (rev 1116)
@@ -108,7 +108,7 @@
CheckBoxPtr shareHidden = attachCheckBox(IDC_SHAREHIDDEN);
shareHidden->onClicked(std::tr1::bind(&UploadPage::handleShareHiddenClicked, this, shareHidden));
- total = attachLabel(IDC_TOTAL);
+ attachChild(total, IDC_TOTAL);
total->setText(Text::toT(Util::formatBytes(ShareManager::getInstance()->getShareSize())));
ButtonPtr button = attachChild<SmartWin::Button>(IDC_RENAME);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
