Menu
▾
▴
[Dcplusplus-commit] SF.net SVN: dcplusplus: [1115] dcplusplus/trunk
|
From: <arn...@us...> - 2008-04-07 19:30:51
|
Revision: 1115
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1115&view=rev
Author: arnetheduck
Date: 2008-04-07 12:29:43 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
fix tabbing, visibility, fonts, coloring; more addChild&Seed updates
Modified Paths:
--------------
dcplusplus/trunk/changelog.txt
dcplusplus/trunk/smartwin/include/smartwin/Widget.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/RadioButton.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/TextBox.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/Tree.h
dcplusplus/trunk/smartwin/source/widgets/Button.cpp
dcplusplus/trunk/smartwin/source/widgets/ComboBox.cpp
dcplusplus/trunk/smartwin/source/widgets/Table.cpp
dcplusplus/trunk/smartwin/source/widgets/TextBox.cpp
dcplusplus/trunk/smartwin/source/widgets/Tree.cpp
dcplusplus/trunk/win32/AspectStatus.h
dcplusplus/trunk/win32/DirectoryListingFrame.cpp
dcplusplus/trunk/win32/HubFrame.cpp
dcplusplus/trunk/win32/MDIChildFrame.h
dcplusplus/trunk/win32/MainWindow.cpp
dcplusplus/trunk/win32/NotepadFrame.cpp
dcplusplus/trunk/win32/PublicHubsFrame.cpp
dcplusplus/trunk/win32/QueueFrame.cpp
dcplusplus/trunk/win32/SearchFrame.cpp
dcplusplus/trunk/win32/SystemFrame.cpp
dcplusplus/trunk/win32/TextFrame.cpp
dcplusplus/trunk/win32/WidgetPaned.h
dcplusplus/trunk/win32/WinUtil.cpp
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-02 16:44:59.851999998 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
+ timestamp: 2008-04-02 16:50:51.052000046 +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
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
+ 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
Modified: dcplusplus/trunk/changelog.txt
===================================================================
--- dcplusplus/trunk/changelog.txt 2008-04-07 19:26:50 UTC (rev 1114)
+++ dcplusplus/trunk/changelog.txt 2008-04-07 19:29:43 UTC (rev 1115)
@@ -20,6 +20,7 @@
* [L#205660] Readded hub column to transfers (thanks mikejj)
* Fixed file list refresh happening 1 minute later than expected (poy)
* [L#209277] Fixed crash on bad translation
+* More controls now use the font defined in settings (poy)
-- 0.705 2008-03-14 --
* Several patches for better *nix compatibility of the core (thanks steven sheehy et al)
Modified: dcplusplus/trunk/smartwin/include/smartwin/Widget.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/Widget.h 2008-04-07 19:26:50 UTC (rev 1114)
+++ dcplusplus/trunk/smartwin/include/smartwin/Widget.h 2008-04-07 19:29:43 UTC (rev 1115)
@@ -177,7 +177,6 @@
const Rectangle& location_ = letTheSystemDecide, HMENU menuHandle_ = NULL)
: className(className_), caption(caption_), style( style_ ), exStyle( exStyle_ ), location( location_ ), menuHandle( menuHandle_ )
{}
-
};
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/RadioButton.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/RadioButton.h 2008-04-07 19:26:50 UTC (rev 1114)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/RadioButton.h 2008-04-07 19:29:43 UTC (rev 1115)
@@ -73,8 +73,6 @@
*/
struct Seed : public BaseType::Seed {
typedef ThisType WidgetType;
-
- FontPtr font;
/// Fills with default parameters
Seed(const SmartUtil::tstring& caption_ = SmartUtil::tstring());
@@ -114,7 +112,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
inline RadioButton::RadioButton( Widget * parent )
- : ButtonType( parent )
+ : BaseType( parent )
{
}
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/TextBox.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/TextBox.h 2008-04-07 19:26:50 UTC (rev 1114)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/TextBox.h 2008-04-07 19:29:43 UTC (rev 1115)
@@ -76,9 +76,12 @@
{
friend class WidgetCreator< TextBoxBase >;
friend class AspectUpdate<TextBoxBase>;
-
+
typedef Dispatchers::VoidVoid<> Dispatcher;
+protected:
+ typedef CommonControl BaseType;
+
public:
/// Sets the current selection of the Edit Control
/** Start means the offset of where the current selection shall start, if it is
@@ -367,7 +370,7 @@
}
inline TextBoxBase::TextBoxBase( Widget * parent )
- : ControlType( parent )
+ : BaseType( parent )
{
// Can't have a text box without a parent...
xAssert( parent, _T( "Cant have a TextBox without a parent..." ) );
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Tree.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Tree.h 2008-04-07 19:26:50 UTC (rev 1114)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Tree.h 2008-04-07 19:29:43 UTC (rev 1115)
@@ -106,15 +106,16 @@
/// Object type
typedef ThisType* ObjectType;
+ typedef CommonControl BaseType;
+
/// 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.
*/
- class Seed
- : public Widget::Seed
- {
- public:
+ struct Seed : public BaseType::Seed {
+ typedef ThisType WidgetType;
+
FontPtr font;
/// Fills with default parameters
@@ -413,7 +414,7 @@
}
inline Tree::Tree( Widget * parent )
- : ControlType( parent )
+ : BaseType( parent )
{
}
Modified: dcplusplus/trunk/smartwin/source/widgets/Button.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/Button.cpp 2008-04-07 19:26:50 UTC (rev 1114)
+++ dcplusplus/trunk/smartwin/source/widgets/Button.cpp 2008-04-07 19:29:43 UTC (rev 1115)
@@ -3,7 +3,7 @@
namespace SmartWin {
Button::Seed::Seed(const SmartUtil::tstring& caption, DWORD style) :
- BaseType::Seed(WC_BUTTON, style | WS_CHILD, 0, caption),
+ BaseType::Seed(WC_BUTTON, style | WS_CHILD | WS_TABSTOP, 0, caption),
font(new Font(DefaultGuiFont))
{
}
Modified: dcplusplus/trunk/smartwin/source/widgets/ComboBox.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/ComboBox.cpp 2008-04-07 19:26:50 UTC (rev 1114)
+++ dcplusplus/trunk/smartwin/source/widgets/ComboBox.cpp 2008-04-07 19:29:43 UTC (rev 1115)
@@ -3,7 +3,7 @@
namespace SmartWin {
ComboBox::Seed::Seed() :
- BaseType::Seed(WC_COMBOBOX, WS_CHILD | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_AUTOHSCROLL),
+ BaseType::Seed(WC_COMBOBOX, WS_CHILD | WS_TABSTOP | WS_VSCROLL),
font(new Font(DefaultGuiFont)),
extended(true)
{
Modified: dcplusplus/trunk/smartwin/source/widgets/Table.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/Table.cpp 2008-04-07 19:26:50 UTC (rev 1114)
+++ dcplusplus/trunk/smartwin/source/widgets/Table.cpp 2008-04-07 19:29:43 UTC (rev 1115)
@@ -11,7 +11,7 @@
bool Table::ComCtl6 = false;
Table::Seed::Seed() :
- BaseType::Seed(WC_LISTVIEW, WS_CHILD | WS_TABSTOP | LVS_REPORT | LVS_EDITLABELS),
+ BaseType::Seed(WC_LISTVIEW, WS_CHILD | WS_TABSTOP | LVS_REPORT),
font(new Font(DefaultGuiFont)),
lvStyle(0)
{
Modified: dcplusplus/trunk/smartwin/source/widgets/TextBox.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/TextBox.cpp 2008-04-07 19:26:50 UTC (rev 1114)
+++ dcplusplus/trunk/smartwin/source/widgets/TextBox.cpp 2008-04-07 19:29:43 UTC (rev 1115)
@@ -9,7 +9,7 @@
}
void TextBox::create( const Seed & cs ) {
- ControlType::create(cs);
+ BaseType::create(cs);
if(cs.font)
setFont( cs.font );
}
Modified: dcplusplus/trunk/smartwin/source/widgets/Tree.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/Tree.cpp 2008-04-07 19:26:50 UTC (rev 1114)
+++ dcplusplus/trunk/smartwin/source/widgets/Tree.cpp 2008-04-07 19:29:43 UTC (rev 1115)
@@ -3,15 +3,14 @@
namespace SmartWin {
Tree::Seed::Seed() :
- Widget::Seed(WC_TREEVIEW, WS_CHILD | WS_VISIBLE | WS_TABSTOP),
+ BaseType::Seed(WC_TREEVIEW, WS_CHILD | WS_TABSTOP),
font(new Font(DefaultGuiFont))
{
}
void Tree::create( const Seed & cs )
{
- ControlType::create(cs);
-
+ BaseType::create(cs);
if(cs.font)
setFont( cs.font );
}
Modified: dcplusplus/trunk/win32/AspectStatus.h
===================================================================
--- dcplusplus/trunk/win32/AspectStatus.h 2008-04-07 19:26:50 UTC (rev 1114)
+++ dcplusplus/trunk/win32/AspectStatus.h 2008-04-07 19:29:43 UTC (rev 1115)
@@ -19,6 +19,8 @@
#ifndef DCPLUSPLUS_WIN32_ASPECTSTATUS_H_
#define DCPLUSPLUS_WIN32_ASPECTSTATUS_H_
+#include "WinUtil.h"
+
template<class WidgetType>
class AspectStatus {
typedef AspectStatus<WidgetType> ThisType;
@@ -36,7 +38,9 @@
}
void initStatus(bool sizeGrip = false) {
- status = static_cast<WidgetType*>(this)->addChild(StatusBarSections::Seed(sizeGrip));
+ StatusBarSections::Seed cs(sizeGrip);
+ cs.font = WinUtil::font;
+ status = static_cast<WidgetType*>(this)->addChild(cs);
statusTip = static_cast<WidgetType*>(this)->addChild(SmartWin::ToolTip::Seed());
statusTip->setTool(status, std::tr1::bind(&ThisType::handleToolTip, this));
Modified: dcplusplus/trunk/win32/DirectoryListingFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/DirectoryListingFrame.cpp 2008-04-07 19:26:50 UTC (rev 1114)
+++ dcplusplus/trunk/win32/DirectoryListingFrame.cpp 2008-04-07 19:29:43 UTC (rev 1115)
@@ -123,8 +123,7 @@
updating(false),
searching(false)
{
- paned = createVPaned();
- paned->setRelativePos(0.3);
+ paned = addChild(WidgetVPaned::Seed(0.3));
{
dirs = addChild(WidgetDirs::Seed());
Modified: dcplusplus/trunk/win32/HubFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/HubFrame.cpp 2008-04-07 19:26:50 UTC (rev 1114)
+++ dcplusplus/trunk/win32/HubFrame.cpp 2008-04-07 19:29:43 UTC (rev 1115)
@@ -88,12 +88,11 @@
inTabMenu(false),
inTabComplete(false)
{
- paned = createVPaned();
- paned->setRelativePos(0.7);
+ paned = addChild(WidgetVPaned::Seed(0.7));
{
TextBox::Seed cs = WinUtil::Seeds::textBox;
- cs.style = WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_MULTILINE;
+ cs.style |= WS_VSCROLL | ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_MULTILINE;
message = addChild(cs);
message->setHelpId(IDH_HUB_MESSAGE);
addWidget(message, true, false);
@@ -105,7 +104,7 @@
{
TextBox::Seed cs = WinUtil::Seeds::textBox;
- cs.style = WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL;
+ cs.style |= ES_AUTOHSCROLL;
filter = addChild(cs);
filter->setHelpId(IDH_HUB_FILTER);
addWidget(filter);
@@ -127,7 +126,7 @@
{
TextBox::Seed cs = WinUtil::Seeds::textBox;
- cs.style = WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | ES_MULTILINE | ES_NOHIDESEL | ES_READONLY;
+ cs.style |= WS_VSCROLL | ES_MULTILINE | ES_NOHIDESEL | ES_READONLY;
chat = addChild(cs);
chat->setHelpId(IDH_HUB_CHAT);
chat->setTextLimit(0);
Modified: dcplusplus/trunk/win32/MDIChildFrame.h
===================================================================
--- dcplusplus/trunk/win32/MDIChildFrame.h 2008-04-07 19:26:50 UTC (rev 1114)
+++ dcplusplus/trunk/win32/MDIChildFrame.h 2008-04-07 19:29:43 UTC (rev 1115)
@@ -151,6 +151,11 @@
text->setColor(WinUtil::textColor, WinUtil::bgColor);
}
+ // don't handle WM_CTLCOLOR* for Buttons or Button-derived controls
+ void addColor(SmartWin::Button* widget) {
+ // empty on purpose
+ }
+
template<typename A>
void addColor(SmartWin::AspectColor<A>* widget) {
widget->setColor(WinUtil::textColor, WinUtil::bgColor);
Modified: dcplusplus/trunk/win32/MainWindow.cpp
===================================================================
--- dcplusplus/trunk/win32/MainWindow.cpp 2008-04-07 19:26:50 UTC (rev 1114)
+++ dcplusplus/trunk/win32/MainWindow.cpp 2008-04-07 19:29:43 UTC (rev 1115)
@@ -170,8 +170,7 @@
setHelpId(IDH_STARTPAGE);
- paned = addChild(WidgetHPaned::Seed());
- paned->setRelativePos(0.7);
+ paned = addChild(WidgetHPaned::Seed(0.7));
}
void MainWindow::initMenu() {
Modified: dcplusplus/trunk/win32/NotepadFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/NotepadFrame.cpp 2008-04-07 19:26:50 UTC (rev 1114)
+++ dcplusplus/trunk/win32/NotepadFrame.cpp 2008-04-07 19:29:43 UTC (rev 1115)
@@ -29,7 +29,7 @@
{
{
TextBox::Seed cs = WinUtil::Seeds::textBox;
- cs.style = WS_CHILD | WS_VISIBLE | WS_VSCROLL | ES_MULTILINE | ES_AUTOVSCROLL | ES_NOHIDESEL | ES_WANTRETURN;
+ cs.style |= WS_VSCROLL | ES_MULTILINE | ES_AUTOVSCROLL | ES_NOHIDESEL | ES_WANTRETURN;
pad = addChild(cs);
addWidget(pad);
}
Modified: dcplusplus/trunk/win32/PublicHubsFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/PublicHubsFrame.cpp 2008-04-07 19:26:50 UTC (rev 1114)
+++ dcplusplus/trunk/win32/PublicHubsFrame.cpp 2008-04-07 19:29:43 UTC (rev 1115)
@@ -120,7 +120,7 @@
{
TextBox::Seed cs = WinUtil::Seeds::textBox;
- cs.style = WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL;
+ cs.style |= ES_AUTOHSCROLL;
filter = addChild(cs);
filter->setHelpId(IDH_PUBLIC_HUBS_FILTER);
addWidget(filter);
@@ -152,14 +152,12 @@
cs.caption = T_("&Configure");
configure = addChild(cs);
configure->setHelpId(IDH_PUBLIC_HUBS_LISTS);
- configure->setFont(WinUtil::font);
addWidget(configure);
configure->onClicked(std::tr1::bind(&PublicHubsFrame::handleConfigure, this));
cs.caption = T_("&Refresh");
refresh = addChild(cs);
refresh->setHelpId(IDH_PUBLIC_HUBS_REFRESH);
- refresh->setFont(WinUtil::font);
addWidget(refresh);
refresh->onClicked(std::tr1::bind(&PublicHubsFrame::handleRefresh, this));
@@ -169,12 +167,10 @@
cs.caption = T_("F&ilter");
filterDesc = addChild(cs);
filterDesc->setHelpId(IDH_PUBLIC_HUBS_FILTER);
- filterDesc->setFont(WinUtil::font);
cs.caption = T_("Configured Public Hub Lists");
lists = addChild(cs);
lists->setHelpId(IDH_PUBLIC_HUBS_LISTS);
- lists->setFont(WinUtil::font);
}
initStatus();
Modified: dcplusplus/trunk/win32/QueueFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/QueueFrame.cpp 2008-04-07 19:26:50 UTC (rev 1114)
+++ dcplusplus/trunk/win32/QueueFrame.cpp 2008-04-07 19:29:43 UTC (rev 1115)
@@ -65,8 +65,7 @@
queueItems(0),
fileLists(0)
{
- paned = addChild(WidgetVPaned::Seed());
- paned->setRelativePos(0.3);
+ paned = addChild(WidgetVPaned::Seed(0.3));
{
dirs = addChild(WidgetDirs::Seed());
@@ -97,8 +96,8 @@
}
{
- CheckBox::Seed cs;
- cs.caption = _T("+/-");
+ CheckBox::Seed cs(_T("+/-"));
+ cs.style &= ~WS_TABSTOP;
showTree = addChild(cs);
showTree->setChecked(BOOLSETTING(QUEUEFRAME_SHOW_TREE));
showTree->onClicked(std::tr1::bind(&QueueFrame::handleShowTreeClicked, this));
Modified: dcplusplus/trunk/win32/SearchFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/SearchFrame.cpp 2008-04-07 19:26:50 UTC (rev 1114)
+++ dcplusplus/trunk/win32/SearchFrame.cpp 2008-04-07 19:29:43 UTC (rev 1115)
@@ -247,6 +247,7 @@
{
CheckBox::Seed cs(_T("+/-"));
+ cs.style &= ~WS_TABSTOP;
showUI = addChild(cs);
showUI->setChecked(bShowUI);
Modified: dcplusplus/trunk/win32/SystemFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/SystemFrame.cpp 2008-04-07 19:26:50 UTC (rev 1114)
+++ dcplusplus/trunk/win32/SystemFrame.cpp 2008-04-07 19:29:43 UTC (rev 1115)
@@ -28,7 +28,7 @@
{
{
TextBox::Seed cs = WinUtil::Seeds::textBox;
- cs.style = WS_CHILD | WS_VISIBLE | WS_VSCROLL | ES_AUTOVSCROLL | ES_MULTILINE | ES_NOHIDESEL | ES_READONLY;
+ cs.style |= WS_VSCROLL | ES_AUTOVSCROLL | ES_MULTILINE | ES_NOHIDESEL | ES_READONLY;
log = addChild(cs);
addWidget(log);
}
Modified: dcplusplus/trunk/win32/TextFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/TextFrame.cpp 2008-04-07 19:26:50 UTC (rev 1114)
+++ dcplusplus/trunk/win32/TextFrame.cpp 2008-04-07 19:29:43 UTC (rev 1115)
@@ -30,7 +30,7 @@
pad(0)
{
TextBox::Seed cs = WinUtil::Seeds::textBox;
- cs.style = WS_CHILD | WS_VISIBLE | WS_VSCROLL | ES_AUTOVSCROLL | ES_MULTILINE | ES_NOHIDESEL | ES_READONLY;
+ cs.style |= WS_VSCROLL | ES_AUTOVSCROLL | ES_MULTILINE | ES_NOHIDESEL | ES_READONLY;
cs.font = WinUtil::monoFont;
pad = addChild(cs);
addWidget(pad);
Modified: dcplusplus/trunk/win32/WidgetPaned.h
===================================================================
--- dcplusplus/trunk/win32/WidgetPaned.h 2008-04-07 19:26:50 UTC (rev 1114)
+++ dcplusplus/trunk/win32/WidgetPaned.h 2008-04-07 19:29:43 UTC (rev 1115)
@@ -40,7 +40,9 @@
struct Seed : public BaseType::Seed {
typedef ThisType WidgetType;
- explicit Seed();
+ double pos;
+
+ explicit Seed(double pos_ = 0.5);
};
void setRelativePos(double pos_) {
@@ -120,7 +122,9 @@
SmartWin::IconPtr(), SmartWin::IconPtr(), LoadCursor( 0, horizontal ? IDC_SIZENS : IDC_SIZEWE ));
template< bool horizontal >
-WidgetPaned< horizontal >::Seed::Seed() : BaseType::Seed(windowClass.getClassName(), WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS)
+WidgetPaned< horizontal >::Seed::Seed(double pos_) :
+ BaseType::Seed(windowClass.getClassName(), WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS),
+ pos(pos_)
{
}
@@ -136,6 +140,7 @@
template< bool horizontal >
void WidgetPaned< horizontal >::create( const Seed & cs )
{
+ pos = cs.pos;
BaseType::create(cs);
onLeftMouseDown(std::tr1::bind(&ThisType::handleLButtonDown, this, _1));
Modified: dcplusplus/trunk/win32/WinUtil.cpp
===================================================================
--- dcplusplus/trunk/win32/WinUtil.cpp 2008-04-07 19:26:50 UTC (rev 1114)
+++ dcplusplus/trunk/win32/WinUtil.cpp 2008-04-07 19:29:43 UTC (rev 1115)
@@ -120,7 +120,7 @@
}
// Const so that noone else will change them after they've been initialized
- //SmartWin::Button::Seed& xbutton = const_cast<SmartWin::Button::Seed&>(Seeds::button);
+ SmartWin::Button::Seed& xbutton = const_cast<SmartWin::Button::Seed&>(Seeds::button);
ComboBox::Seed& xcomboBoxEdit = const_cast<ComboBox::Seed&>(Seeds::comboBoxEdit);
ComboBox::Seed& xcomboBoxStatic = const_cast<ComboBox::Seed&>(Seeds::comboBoxStatic);
SmartWin::Table::Seed& xTable = const_cast<SmartWin::Table::Seed&>(Seeds::Table);
@@ -128,10 +128,15 @@
TextBox::Seed& xtextBox = const_cast<TextBox::Seed&>(Seeds::textBox);
SmartWin::Tree::Seed& xtreeView = const_cast<SmartWin::Tree::Seed&>(Seeds::treeView);
- xcomboBoxStatic.style = WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_HSCROLL | WS_VSCROLL | CBS_DROPDOWNLIST;
- xcomboBoxEdit.style = WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWN | CBS_AUTOHSCROLL;
+ xbutton.font = font;
+
+ xcomboBoxStatic.style |= CBS_DROPDOWNLIST;
+ xcomboBoxStatic.font = font;
+
+ xcomboBoxEdit.style |= CBS_DROPDOWN | CBS_AUTOHSCROLL;
+ xcomboBoxEdit.font = font;
- xTable.style = WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_HSCROLL | WS_VSCROLL | LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS;
+ xTable.style |= WS_HSCROLL | WS_VSCROLL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS;
xTable.exStyle = WS_EX_CLIENTEDGE;
xTable.lvStyle = LVS_EX_HEADERDRAGDROP | LVS_EX_FULLROWSELECT | LVS_EX_LABELTIP | LVS_EX_DOUBLEBUFFER;
xTable.font = font;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
