Menu
▾
▴
[Dcplusplus-commit] SF.net SVN: dcplusplus: [1099] dcplusplus/trunk
|
From: <arn...@us...> - 2008-04-07 18:52:25
|
Revision: 1099
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1099&view=rev
Author: arnetheduck
Date: 2008-04-07 11:51:57 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
rename create&attach functions for Table and Label
Modified Paths:
--------------
dcplusplus/trunk/smartwin/include/smartwin/WidgetFactory.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/ModalDialog.h
dcplusplus/trunk/win32/Appearance2Page.cpp
dcplusplus/trunk/win32/FavoriteDirsPage.cpp
dcplusplus/trunk/win32/HubListsDlg.cpp
dcplusplus/trunk/win32/LineDlg.cpp
dcplusplus/trunk/win32/LogPage.cpp
dcplusplus/trunk/win32/SearchFrame.cpp
dcplusplus/trunk/win32/UCPage.cpp
dcplusplus/trunk/win32/UploadPage.cpp
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-03-31 14:45:49.411999941 +0200
committer: zouzou123gen
properties:
branch-nick: bzr
+ timestamp: 2008-03-31 15:51:08.490000010 +0200
committer: zouzou123gen
properties:
branch-nick: bzr
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
+ 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
Modified: dcplusplus/trunk/smartwin/include/smartwin/WidgetFactory.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/WidgetFactory.h 2008-04-07 18:50:33 UTC (rev 1098)
+++ dcplusplus/trunk/smartwin/include/smartwin/WidgetFactory.h 2008-04-07 18:51:57 UTC (rev 1099)
@@ -105,10 +105,10 @@
/// MessageBox class and object type.
typedef SmartWin::MessageBox MessageBox;
- /// DataGrid class type.
+ /// Table class type.
typedef SmartWin::Table Table;
- /// DataGrid object type.
+ /// Table object type.
typedef typename Table::ObjectType TablePtr;
/// TreeView class type.
@@ -192,10 +192,10 @@
/// ComboBox object type.
typedef typename ComboBox::ObjectType ComboBoxPtr;
- /// Static class type.
+ /// Label class type.
typedef SmartWin::Label Label;
- /// Static object type.
+ /// Label object type.
typedef typename Label::ObjectType LabelPtr;
/// CheckBox class type.
@@ -282,7 +282,7 @@
* Use e.g. the Dialog Designer to design a dialog and attach the controls
* with this function.
*/
- TablePtr attachList( unsigned id );
+ TablePtr attachTable( unsigned id );
/// Creates a Check Box and returns a pointer to it.
/** DON'T delete the returned pointer!!!
@@ -447,18 +447,18 @@
*/
ComboBoxPtr attachComboBox( unsigned id );
- /// Creates a Static Control and returns a pointer to it.
+ /// Creates a Label Control and returns a pointer to it.
/** DON'T delete the returned pointer!!!
*/
- LabelPtr createStatic( const typename Label::Seed & cs = Label::Seed() );
+ LabelPtr createLabel( const typename Label::Seed & cs = Label::Seed() );
/// \ingroup SubclassDialog
- /// Subclasses a Static Control from the given resource id.
+ /// 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 attachStatic( unsigned id );
+ LabelPtr attachLabel( unsigned id );
ToolTipPtr createToolTip( const typename ToolTip::Seed & cs = ToolTip::Seed() );
protected:
@@ -520,7 +520,7 @@
template<typename ContainerWidgetType>
typename WidgetFactory< ContainerWidgetType >::TablePtr
-WidgetFactory< ContainerWidgetType >::attachList( unsigned id )
+WidgetFactory< ContainerWidgetType >::attachTable( unsigned id )
{
return WidgetCreator< Table >::attach( this, id );
}
@@ -728,14 +728,14 @@
template<typename ContainerWidgetType>
typename WidgetFactory< ContainerWidgetType >::LabelPtr
-WidgetFactory< ContainerWidgetType >::createStatic( const typename Label::Seed & cs )
+WidgetFactory< ContainerWidgetType >::createLabel( const typename Label::Seed & cs )
{
return WidgetCreator< Label >::create( this, cs );
}
template<typename ContainerWidgetType>
typename WidgetFactory< ContainerWidgetType >::LabelPtr
-WidgetFactory< ContainerWidgetType >::attachStatic( unsigned id )
+WidgetFactory< ContainerWidgetType >::attachLabel( unsigned id )
{
return WidgetCreator< Label >::attach( this, id );
}
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/ModalDialog.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/ModalDialog.h 2008-04-07 18:50:33 UTC (rev 1098)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/ModalDialog.h 2008-04-07 18:51:57 UTC (rev 1099)
@@ -93,7 +93,7 @@
* you wish to use, and set the event handlers for all controls and events you
* wish to handle. <br>
* Example : <br>
- * LabelPtr prompt = attachStatic( IDC_PROMPT ); <br>
+ * LabelPtr prompt = attachLabel( IDC_PROMPT ); <br>
* prompt->onClicked( &X::myClickMethod ); <br>
* ...etc...
*/
@@ -107,7 +107,7 @@
* constructor of your dialog, <br>
* and in your initDialog you create the dialog's Widgets yourself. <br>
* Example : <br>
- * LabelPtr prompt = createStatic(); <br>
+ * LabelPtr prompt = createLabel(); <br>
* prompt->setBounds( 10, 100, 100, 50 ); <br>
* prompt->setText( _T("testing") );
*/
Modified: dcplusplus/trunk/win32/Appearance2Page.cpp
===================================================================
--- dcplusplus/trunk/win32/Appearance2Page.cpp 2008-04-07 18:50:33 UTC (rev 1098)
+++ dcplusplus/trunk/win32/Appearance2Page.cpp 2008-04-07 18:51:57 UTC (rev 1099)
@@ -78,7 +78,7 @@
WinUtil::decodeFont(Text::toT(SETTING(TEXT_FONT)), logFont);
font = SmartWin::FontPtr(new SmartWin::Font(::CreateFontIndirect(&logFont), true));
- example = attachStatic(IDC_COLOREXAMPLE);
+ example = attachLabel(IDC_COLOREXAMPLE);
example->setColor(fg, bg);
example->setFont(font);
Modified: dcplusplus/trunk/win32/FavoriteDirsPage.cpp
===================================================================
--- dcplusplus/trunk/win32/FavoriteDirsPage.cpp 2008-04-07 18:50:33 UTC (rev 1098)
+++ dcplusplus/trunk/win32/FavoriteDirsPage.cpp 2008-04-07 18:51:57 UTC (rev 1099)
@@ -52,7 +52,7 @@
WinUtil::setHelpIds(this, helpItems);
PropPage::translate(handle(), texts);
- directories = attachList(IDC_FAVORITE_DIRECTORIES);
+ directories = attachTable(IDC_FAVORITE_DIRECTORIES);
directories->setTableStyle(LVS_EX_LABELTIP | LVS_EX_FULLROWSELECT);
TStringList columns;
Modified: dcplusplus/trunk/win32/HubListsDlg.cpp
===================================================================
--- dcplusplus/trunk/win32/HubListsDlg.cpp 2008-04-07 18:50:33 UTC (rev 1098)
+++ dcplusplus/trunk/win32/HubListsDlg.cpp 2008-04-07 18:51:57 UTC (rev 1099)
@@ -62,7 +62,7 @@
editBox = attachTextBox(IDC_LIST_EDIT_BOX);
- hubLists = attachList(IDC_LIST_LIST);
+ hubLists = attachTable(IDC_LIST_LIST);
hubLists->setTableStyle(LVS_EX_LABELTIP | LVS_EX_FULLROWSELECT);
TStringList columns;
Modified: dcplusplus/trunk/win32/LineDlg.cpp
===================================================================
--- dcplusplus/trunk/win32/LineDlg.cpp 2008-04-07 18:50:33 UTC (rev 1098)
+++ dcplusplus/trunk/win32/LineDlg.cpp 2008-04-07 18:51:57 UTC (rev 1099)
@@ -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));
- attachStatic(IDC_DESCRIPTION)->setText(desc);
+ attachLabel(IDC_DESCRIPTION)->setText(desc);
line = attachTextBox(IDC_LINE);
line->setFocus();
Modified: dcplusplus/trunk/win32/LogPage.cpp
===================================================================
--- dcplusplus/trunk/win32/LogPage.cpp 2008-04-07 18:50:33 UTC (rev 1098)
+++ dcplusplus/trunk/win32/LogPage.cpp 2008-04-07 18:51:57 UTC (rev 1099)
@@ -78,7 +78,7 @@
attachButton(IDC_BROWSE_LOG)->onClicked(std::tr1::bind(&LogPage::handleBrowseClicked, this));
- dataGrid = attachList(IDC_LOG_OPTIONS);
+ dataGrid = attachTable(IDC_LOG_OPTIONS);
dataGrid->onRaw(std::tr1::bind(&LogPage::handleItemChanged, this), SmartWin::Message(WM_NOTIFY, LVN_ITEMCHANGED));
logFormat = attachTextBox(IDC_LOG_FORMAT);
Modified: dcplusplus/trunk/win32/SearchFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/SearchFrame.cpp 2008-04-07 18:50:33 UTC (rev 1098)
+++ dcplusplus/trunk/win32/SearchFrame.cpp 2008-04-07 18:51:57 UTC (rev 1099)
@@ -113,22 +113,22 @@
cs.exStyle = WS_EX_TRANSPARENT;
cs.caption = T_("Search for");
- searchLabel = createStatic(cs);
+ searchLabel = createLabel(cs);
searchLabel->setHelpId(IDH_SEARCH_SEARCH_FOR);
cs.caption = T_("Size");
- sizeLabel = createStatic(cs);
+ sizeLabel = createLabel(cs);
sizeLabel->setHelpId(IDH_SEARCH_SIZE);
cs.caption = T_("File type");
- typeLabel = createStatic(cs);
+ typeLabel = createLabel(cs);
typeLabel->setHelpId(IDH_SEARCH_TYPE);
cs.caption = T_("Search options");
- optionLabel = createStatic(cs);
+ optionLabel = createLabel(cs);
cs.caption = T_("Hubs");
- hubsLabel = createStatic(cs);
+ hubsLabel = createLabel(cs);
hubsLabel->setHelpId(IDH_SEARCH_HUBS);
}
Modified: dcplusplus/trunk/win32/UCPage.cpp
===================================================================
--- dcplusplus/trunk/win32/UCPage.cpp 2008-04-07 18:50:33 UTC (rev 1098)
+++ dcplusplus/trunk/win32/UCPage.cpp 2008-04-07 18:51:57 UTC (rev 1099)
@@ -59,7 +59,7 @@
PropPage::translate(handle(), texts);
PropPage::read(handle(), items);
- commands = attachList(IDC_MENU_ITEMS);
+ commands = attachTable(IDC_MENU_ITEMS);
commands->setTableStyle(LVS_EX_LABELTIP | LVS_EX_FULLROWSELECT);
TStringList columns;
Modified: dcplusplus/trunk/win32/UploadPage.cpp
===================================================================
--- dcplusplus/trunk/win32/UploadPage.cpp 2008-04-07 18:50:33 UTC (rev 1098)
+++ dcplusplus/trunk/win32/UploadPage.cpp 2008-04-07 18:51:57 UTC (rev 1099)
@@ -78,7 +78,7 @@
PropPage::translate(handle(), texts);
PropPage::read(handle(), items);
- directories = attachList(IDC_DIRECTORIES);
+ directories = attachTable(IDC_DIRECTORIES);
directories->setTableStyle(LVS_EX_LABELTIP | LVS_EX_FULLROWSELECT);
TStringList columns;
@@ -108,7 +108,7 @@
CheckBoxPtr shareHidden = attachCheckBox(IDC_SHAREHIDDEN);
shareHidden->onClicked(std::tr1::bind(&UploadPage::handleShareHiddenClicked, this, shareHidden));
- total = attachStatic(IDC_TOTAL);
+ total = attachLabel(IDC_TOTAL);
total->setText(Text::toT(Util::formatBytes(ShareManager::getInstance()->getShareSize())));
ButtonPtr button = attachButton(IDC_RENAME);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
