Menu
▾
▴
dcplusplus-commit — SVN commit log
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
(24) |
Mar
(9) |
Apr
(4) |
May
(7) |
Jun
(13) |
Jul
(19) |
Aug
(1) |
Sep
(12) |
Oct
(20) |
Nov
(1) |
Dec
(15) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
|
Feb
(6) |
Mar
(24) |
Apr
(1) |
May
(10) |
Jun
(30) |
Jul
(46) |
Aug
(20) |
Sep
(12) |
Oct
(27) |
Nov
(51) |
Dec
(58) |
| 2008 |
Jan
(40) |
Feb
(40) |
Mar
(78) |
Apr
(138) |
May
(4) |
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(5) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
(3) |
May
|
Jun
(2) |
Jul
(10) |
Aug
(1) |
Sep
(11) |
Oct
(31) |
Nov
(7) |
Dec
(1) |
| 2011 |
Jan
(1) |
Feb
|
Mar
(3) |
Apr
|
May
(1) |
Jun
|
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
(2) |
Sep
|
Oct
|
Nov
(2) |
Dec
(2) |
| 2013 |
Jan
(3) |
Feb
(5) |
Mar
(1) |
Apr
|
May
|
Jun
(11) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(4) |
| 2014 |
Jan
(2) |
Feb
(3) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2015 |
Jan
|
Feb
(2) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2025 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(4) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <arn...@us...> - 2008-04-07 19:25:44
|
Revision: 1113
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1113&view=rev
Author: arnetheduck
Date: 2008-04-07 12:24:43 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
remove radiobutton from factory
Modified Paths:
--------------
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/Advanced3Page.cpp
dcplusplus/trunk/win32/CommandDlg.cpp
dcplusplus/trunk/win32/DownloadPage.cpp
dcplusplus/trunk/win32/MagnetDlg.cpp
dcplusplus/trunk/win32/NetworkPage.cpp
dcplusplus/trunk/win32/stdafx.h
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-02 15:31:05.088000059 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
+ timestamp: 2008-04-02 16:24:17.150000095 +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
+ 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
Modified: dcplusplus/trunk/smartwin/include/smartwin/SmartWin.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/SmartWin.h 2008-04-07 19:23:14 UTC (rev 1112)
+++ dcplusplus/trunk/smartwin/include/smartwin/SmartWin.h 2008-04-07 19:24:43 UTC (rev 1113)
@@ -46,12 +46,12 @@
#include "../SmartUtil.h"
#include "Anchors.h"
#include "Application.h"
-#include "Point.h"
-#include "Rectangle.h"
#include "ClipBoard.h"
#include "Cursor.h"
#include "LibraryLoader.h"
#include "Place.h"
+#include "Point.h"
+#include "Rectangle.h"
#include "Resource.h"
#include "Threads.h"
#include "WidgetFactory.h"
@@ -63,14 +63,15 @@
#include "resources/Icon.h"
#include "resources/ImageList.h"
#include "resources/Pen.h"
+#include "widgets/DateTime.h"
+#include "widgets/MDIChild.h"
+#include "widgets/MDIFrame.h"
+#include "widgets/MDIParent.h"
#include "widgets/ModalDialog.h"
#include "widgets/ModelessDialog.h"
-#include "widgets/DateTime.h"
+#include "widgets/RadioButton.h"
#include "widgets/Slider.h"
#include "widgets/Spinner.h"
-#include "widgets/MDIChild.h"
-#include "widgets/MDIFrame.h"
-#include "widgets/MDIParent.h"
namespace sw = SmartWin;
Modified: dcplusplus/trunk/smartwin/include/smartwin/WidgetFactory.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/WidgetFactory.h 2008-04-07 19:23:14 UTC (rev 1112)
+++ dcplusplus/trunk/smartwin/include/smartwin/WidgetFactory.h 2008-04-07 19:24:43 UTC (rev 1113)
@@ -40,7 +40,6 @@
#include "widgets/GroupBox.h"
#include "widgets/LoadDialog.h"
#include "widgets/ProgressBar.h"
-#include "widgets/RadioButton.h"
#include "widgets/SaveDialog.h"
#include "widgets/Label.h"
#include "widgets/StatusBar.h"
@@ -147,12 +146,6 @@
/// GroupBox object type.
typedef typename GroupBox::ObjectType GroupBoxPtr;
- /// RadioButton class type.
- typedef SmartWin::RadioButton RadioButton;
-
- /// RadioButton object type.
- typedef typename RadioButton::ObjectType RadioButtonPtr;
-
/// LoadFileDialog class type.
typedef SmartWin::LoadDialog LoadDialog;
@@ -347,16 +340,6 @@
*/
GroupBoxPtr attachGroupBox( unsigned id );
- /// Creates a Radio Button Control and returns a pointer to it.
- /** DON'T delete the returned pointer!!!
- */
- RadioButtonPtr createRadioButton( GroupBoxPtr parent, const typename RadioButton::Seed & cs = RadioButton::Seed() );
-
- /// Subclasses a Radio Button Control and returns a pointer to it.
- /** DON'T delete the returned pointer!!!
- */
- RadioButtonPtr attachRadioButton( unsigned id );
-
/// Creates a Comb Box and returns a pointer to it.
/** DON'T delete the returned pointer!!!
*/
@@ -568,25 +551,6 @@
}
template<typename ContainerWidgetType>
-typename WidgetFactory< ContainerWidgetType >::RadioButtonPtr
-WidgetFactory< ContainerWidgetType >::createRadioButton( GroupBoxPtr parent, const typename RadioButton::Seed & cs )
-{
-#ifdef PORT_ME
- RadioButtonPtr retVal = WidgetCreator< RadioButton >::create( parent, internal_::getTypedParentOrThrow < EventHandlerClass * >( this ), cs );
- parent->addChild( retVal );
- return retVal;
-#endif
-}
-
-template<typename ContainerWidgetType>
-typename WidgetFactory< ContainerWidgetType >::RadioButtonPtr
-WidgetFactory< ContainerWidgetType >::attachRadioButton( unsigned id )
-{
- RadioButtonPtr retVal = WidgetCreator< RadioButton >::attach( this, id );
- return retVal;
-}
-
-template<typename ContainerWidgetType>
typename WidgetFactory< ContainerWidgetType >::ComboBoxPtr
WidgetFactory< ContainerWidgetType >::createComboBox( const typename ComboBox::Seed & cs )
{
Modified: dcplusplus/trunk/smartwin/include/smartwin/forward.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/forward.h 2008-04-07 19:23:14 UTC (rev 1112)
+++ dcplusplus/trunk/smartwin/include/smartwin/forward.h 2008-04-07 19:24:43 UTC (rev 1113)
@@ -27,6 +27,9 @@
class MDIParent;
typedef MDIParent* MDIParentPtr;
+class RadioButton;
+typedef RadioButton* RadioButtonPtr;
+
class Spinner;
typedef Spinner* SpinnerPtr;
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Composite.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Composite.h 2008-04-07 19:23:14 UTC (rev 1112)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Composite.h 2008-04-07 19:24:43 UTC (rev 1113)
@@ -42,14 +42,23 @@
typedef Control<Policy> BaseType;
// TODO Maybe move this to a separate class?
-
+ // This brings these classes into the namespace of classes that inherit from Composite
+ typedef SmartWin::Button Button;
typedef SmartWin::ButtonPtr ButtonPtr;
+ typedef SmartWin::CheckBox CheckBox;
typedef SmartWin::CheckBoxPtr CheckBoxPtr;
+ typedef SmartWin::DateTime DateTime;
typedef SmartWin::DateTimePtr DateTimePtr;
+ typedef SmartWin::Label Label;
typedef SmartWin::LabelPtr LabelPtr;
+ typedef SmartWin::Table Table;
typedef SmartWin::TablePtr TablePtr;
+ 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/Advanced3Page.cpp
===================================================================
--- dcplusplus/trunk/win32/Advanced3Page.cpp 2008-04-07 19:23:14 UTC (rev 1112)
+++ dcplusplus/trunk/win32/Advanced3Page.cpp 2008-04-07 19:24:43 UTC (rev 1113)
@@ -117,7 +117,7 @@
PropPage::translate(handle(), texts);
PropPage::read(handle(), items, 0, 0);
- SpinnerPtr spinner = attachChild<SmartWin::Spinner>(IDC_SEARCH_HISTORY_SPIN);
+ SpinnerPtr spinner = attachChild<Spinner>(IDC_SEARCH_HISTORY_SPIN);
spinner->setRange(0, 100);
attachTextBox(IDC_ROLLBACK);
Modified: dcplusplus/trunk/win32/CommandDlg.cpp
===================================================================
--- dcplusplus/trunk/win32/CommandDlg.cpp 2008-04-07 19:23:14 UTC (rev 1112)
+++ dcplusplus/trunk/win32/CommandDlg.cpp 2008-04-07 19:24:43 UTC (rev 1113)
@@ -99,19 +99,19 @@
setItemText(IDC_SETTINGS_TO, T_("To"));
setItemText(IDC_USER_CMD_PREVIEW, T_("Text sent to hub"));
- separator = attachRadioButton(IDC_SETTINGS_SEPARATOR);
+ attachChild(separator, IDC_SETTINGS_SEPARATOR);
separator->setText(T_("Separator"));
separator->onClicked(std::tr1::bind(&CommandDlg::handleTypeChanged, this));
- raw = attachRadioButton(IDC_SETTINGS_RAW);
+ attachChild(raw, IDC_SETTINGS_RAW);
raw->setText(T_("Raw"));
raw->onClicked(std::tr1::bind(&CommandDlg::handleTypeChanged, this));
- chat = attachRadioButton(IDC_SETTINGS_CHAT);
+ attachChild(chat, IDC_SETTINGS_CHAT);
chat->setText(T_("Chat"));
chat->onClicked(std::tr1::bind(&CommandDlg::handleTypeChanged, this));
- PM = attachRadioButton(IDC_SETTINGS_PM);
+ attachChild(PM, IDC_SETTINGS_PM);
PM->setText(T_("PM"));
PM->onClicked(std::tr1::bind(&CommandDlg::handleTypeChanged, this));
Modified: dcplusplus/trunk/win32/DownloadPage.cpp
===================================================================
--- dcplusplus/trunk/win32/DownloadPage.cpp 2008-04-07 19:23:14 UTC (rev 1112)
+++ dcplusplus/trunk/win32/DownloadPage.cpp 2008-04-07 19:24:43 UTC (rev 1113)
@@ -86,7 +86,7 @@
attachButton(IDC_SETTINGS_LIST_CONFIG)->onClicked(std::tr1::bind(&DownloadPage::handleConfigHubLists, this));
- SpinnerPtr spinner = attachChild<SmartWin::Spinner>(IDC_SLOTSSPIN);
+ SpinnerPtr spinner = attachChild<Spinner>(IDC_SLOTSSPIN);
spinner->setRange(0, 100);
attachChild(spinner, IDC_SPEEDSPIN);
Modified: dcplusplus/trunk/win32/MagnetDlg.cpp
===================================================================
--- dcplusplus/trunk/win32/MagnetDlg.cpp 2008-04-07 19:23:14 UTC (rev 1112)
+++ dcplusplus/trunk/win32/MagnetDlg.cpp 2008-04-07 19:24:43 UTC (rev 1113)
@@ -53,12 +53,12 @@
//queue->onClicked(std::tr1::bind(&MagnetDlg::handleRadioButtonClicked, this, queue));
::ShowWindow(getItem(IDC_MAGNET_1_QUEUE), false);
- search = attachRadioButton(IDC_MAGNET_2_SEARCH);
+ attachChild(search, IDC_MAGNET_2_SEARCH);
search->setText(T_("Start a search for this file"));
search->setFocus();
//search->onClicked(std::tr1::bind(&MagnetDlg::handleRadioButtonClicked, this, search));
- doNothing = attachRadioButton(IDC_MAGNET_3_NOTHING);
+ attachChild(doNothing, IDC_MAGNET_3_NOTHING);
doNothing->setText(T_("Do nothing"));
//doNothing->onClicked(std::tr1::bind(&MagnetDlg::handleRadioButtonClicked, this, doNothing));
Modified: dcplusplus/trunk/win32/NetworkPage.cpp
===================================================================
--- dcplusplus/trunk/win32/NetworkPage.cpp 2008-04-07 19:23:14 UTC (rev 1112)
+++ dcplusplus/trunk/win32/NetworkPage.cpp 2008-04-07 19:24:43 UTC (rev 1113)
@@ -121,7 +121,7 @@
fixControls();
-#define RADIO_ATTACH(id) attachRadioButton(id)->onClicked((std::tr1::bind(&NetworkPage::fixControls, this)))
+#define RADIO_ATTACH(id) attachChild<RadioButton>(id)->onClicked((std::tr1::bind(&NetworkPage::fixControls, this)))
RADIO_ATTACH(IDC_DIRECT);
RADIO_ATTACH(IDC_FIREWALL_UPNP);
RADIO_ATTACH(IDC_FIREWALL_NAT);
Modified: dcplusplus/trunk/win32/stdafx.h
===================================================================
--- dcplusplus/trunk/win32/stdafx.h 2008-04-07 19:23:14 UTC (rev 1112)
+++ dcplusplus/trunk/win32/stdafx.h 2008-04-07 19:24:43 UTC (rev 1113)
@@ -35,6 +35,7 @@
#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/TextBox.h>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2008-04-07 19:23:29
|
Revision: 1112
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1112&view=rev
Author: arnetheduck
Date: 2008-04-07 12:23:14 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
Fix bad translations crashing the whole thing
Modified Paths:
--------------
dcplusplus/trunk/changelog.txt
dcplusplus/trunk/dcpp/DCPlusPlus.h
dcplusplus/trunk/win32/stdafx.h
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-02 10:45:15.788000107 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
+ timestamp: 2008-04-02 15:31:05.088000059 +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
+ 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
Modified: dcplusplus/trunk/changelog.txt
===================================================================
--- dcplusplus/trunk/changelog.txt 2008-04-07 19:22:07 UTC (rev 1111)
+++ dcplusplus/trunk/changelog.txt 2008-04-07 19:23:14 UTC (rev 1112)
@@ -18,7 +18,8 @@
* [L#208684] Made the Alt key work again for line history in hub window (poy)
* [L#209684] Fixed parsing of non-XML hub lists (poy)
* [L#205660] Readded hub column to transfers (thanks mikejj)
-* Fixed file list refresh happenning 1 minute later than expected (poy)
+* Fixed file list refresh happening 1 minute later than expected (poy)
+* [L#209277] Fixed crash on bad translation
-- 0.705 2008-03-14 --
* Several patches for better *nix compatibility of the core (thanks steven sheehy et al)
Modified: dcplusplus/trunk/dcpp/DCPlusPlus.h
===================================================================
--- dcplusplus/trunk/dcpp/DCPlusPlus.h 2008-04-07 19:22:07 UTC (rev 1111)
+++ dcplusplus/trunk/dcpp/DCPlusPlus.h 2008-04-07 19:23:14 UTC (rev 1112)
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef DCPP_DCPLUSPLUS_H
-#define DCPP_DCPLUSPLUS_H
+#ifndef DCPLUSPLUS_DCPP_DCPLUSPLUS_H
+#define DCPLUSPLUS_DCPP_DCPLUSPLUS_H
#ifdef _WIN32
#ifndef snprintf
@@ -77,12 +77,12 @@
namespace dcpp {
-typedef vector<string> StringList;
+typedef std::vector<string> StringList;
typedef StringList::iterator StringIter;
typedef StringList::const_iterator StringIterC;
-typedef pair<string, string> StringPair;
-typedef vector<StringPair> StringPairList;
+typedef std::pair<string, string> StringPair;
+typedef std::vector<StringPair> StringPairList;
typedef StringPairList::iterator StringPairIter;
typedef std::tr1::unordered_map<string, string> StringMap;
@@ -91,16 +91,28 @@
typedef std::tr1::unordered_set<string> StringSet;
typedef StringSet::iterator StringSetIter;
-typedef vector<wstring> WStringList;
+typedef std::vector<wstring> WStringList;
typedef WStringList::iterator WStringIter;
typedef WStringList::const_iterator WStringIterC;
-typedef pair<wstring, wstring> WStringPair;
-typedef vector<WStringPair> WStringPairList;
+typedef std::pair<wstring, wstring> WStringPair;
+typedef std::vector<WStringPair> WStringPairList;
typedef WStringPairList::iterator WStringPairIter;
-typedef vector<uint8_t> ByteVector;
+typedef std::vector<uint8_t> ByteVector;
+template<typename T>
+boost::basic_format<T> dcpp_fmt(const T* t) {
+ boost::basic_format<T> fmt(t);
+ fmt.exceptions(boost::io::no_error_bits);
+ return fmt;
+}
+
+template<typename T>
+boost::basic_format<T> dcpp_fmt(const std::basic_string<T>& t) {
+ return dcpp_fmt(t.c_str());
+}
+
#if defined(_MSC_VER) || defined(__MINGW32__)
#define _LL(x) x##ll
#define _ULL(x) x##ull
@@ -172,8 +184,8 @@
#define PACKAGE "libdcpp"
#define LOCALEDIR Util::getLocalePath().c_str()
#define _(String) dgettext(PACKAGE, String)
-#define F_(String) boost::format(dgettext(PACKAGE, String))
-#define FN_(String1,String2, N) boost::format(dngettext(PACKAGE, String1, String2, N))
+#define F_(String) dcpp_fmt(dgettext(PACKAGE, String))
+#define FN_(String1,String2, N) dcpp_fmt(dngettext(PACKAGE, String1, String2, N))
#endif
Modified: dcplusplus/trunk/win32/stdafx.h
===================================================================
--- dcplusplus/trunk/win32/stdafx.h 2008-04-07 19:22:07 UTC (rev 1111)
+++ dcplusplus/trunk/win32/stdafx.h 2008-04-07 19:23:14 UTC (rev 1112)
@@ -63,13 +63,13 @@
#define N_(String) gettext_noop (String)
#define T_(String) Text::toT(gettext(String))
#define CT_(String) T_(String).c_str()
-#define F_(String) boost::format(gettext(String))
-#define FN_(String1,String2, N) boost::format(ngettext(String1, String2, N))
+#define F_(String) dcpp_fmt(gettext(String))
+#define FN_(String1,String2, N) dcpp_fmt(ngettext(String1, String2, N))
#ifdef UNICODE
-#define TF_(String) boost::wformat(Text::toT(gettext(String)))
-#define TFN_(String1,String2, N) boost::wformat(Text::toT(ngettext(String1, String2, N)))
+#define TF_(String) dcpp_fmt(Text::toT(gettext(String)))
+#define TFN_(String1,String2, N) dcpp_fmt(Text::toT(ngettext(String1, String2, N)))
#else
-#define TF_(String) boost::format(Text::toT(gettext(String)))
-#define TFN_(String1,String2, N) boost::format(Text::toT(ngettext(String1, String2, N)))
+#define TF_(String) dcpp_fmt(Text::toT(gettext(String)))
+#define TFN_(String1,String2, N) dcpp_fmt(Text::toT(ngettext(String1, String2, N)))
#endif
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2008-04-07 19:22:55
|
Revision: 1111
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1111&view=rev
Author: arnetheduck
Date: 2008-04-07 12:22:07 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
Include fixes, make compilable again
Modified Paths:
--------------
dcplusplus/trunk/smartwin/include/smartwin/WidgetCreator.h
dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectDialog.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/CoolBar.h
dcplusplus/trunk/smartwin/source/widgets/CoolBar.cpp
dcplusplus/trunk/win32/Advanced3Page.cpp
dcplusplus/trunk/win32/DownloadPage.cpp
dcplusplus/trunk/win32/stdafx.h
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-01 23:26:16.296000004 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
+ timestamp: 2008-04-02 10:45:15.788000107 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
Name: bzr:file-ids
- smartwin/include/smartwin/forward.h forward.h-20080401212555-mepp3hg0ki55396w-1
+
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
+ 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
Modified: dcplusplus/trunk/smartwin/include/smartwin/WidgetCreator.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/WidgetCreator.h 2008-04-07 19:20:49 UTC (rev 1110)
+++ dcplusplus/trunk/smartwin/include/smartwin/WidgetCreator.h 2008-04-07 19:22:07 UTC (rev 1111)
@@ -28,6 +28,8 @@
#ifndef WidgetCreator_h
#define WidgetCreator_h
+#include "Widget.h"
+
namespace SmartWin
{
// begin namespace SmartWin
Modified: dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectDialog.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectDialog.h 2008-04-07 19:20:49 UTC (rev 1110)
+++ dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectDialog.h 2008-04-07 19:22:07 UTC (rev 1111)
@@ -2,6 +2,7 @@
#define ASPECTDIALOG_H_
#include "../../SmartUtil.h"
+#include "../WidgetCreator.h"
#include <type_traits>
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/CoolBar.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/CoolBar.h 2008-04-07 19:20:49 UTC (rev 1110)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/CoolBar.h 2008-04-07 19:22:07 UTC (rev 1111)
@@ -30,9 +30,9 @@
#ifndef WINCE // Doesn't exist in Windows CE based systems
-#include "../Widget.h"
-#include "../Point.h"
+#include "../Policies.h"
#include "../aspects/AspectEnabled.h"
+#include "../aspects/AspectFocus.h"
#include "../aspects/AspectFont.h"
#include "../aspects/AspectRaw.h"
#include "../aspects/AspectSizable.h"
Modified: dcplusplus/trunk/smartwin/source/widgets/CoolBar.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/CoolBar.cpp 2008-04-07 19:20:49 UTC (rev 1110)
+++ dcplusplus/trunk/smartwin/source/widgets/CoolBar.cpp 2008-04-07 19:22:07 UTC (rev 1111)
@@ -1,5 +1,3 @@
-#include "../../include/smartwin/Policies.h"
-#include "../../include/smartwin/aspects/AspectFocus.h"
#include "../../include/smartwin/widgets/CoolBar.h"
namespace SmartWin {
Modified: dcplusplus/trunk/win32/Advanced3Page.cpp
===================================================================
--- dcplusplus/trunk/win32/Advanced3Page.cpp 2008-04-07 19:20:49 UTC (rev 1110)
+++ dcplusplus/trunk/win32/Advanced3Page.cpp 2008-04-07 19:22:07 UTC (rev 1111)
@@ -117,7 +117,7 @@
PropPage::translate(handle(), texts);
PropPage::read(handle(), items, 0, 0);
- SpinnerPtr spinner = attachSpinner(IDC_SEARCH_HISTORY_SPIN);
+ SpinnerPtr spinner = attachChild<SmartWin::Spinner>(IDC_SEARCH_HISTORY_SPIN);
spinner->setRange(0, 100);
attachTextBox(IDC_ROLLBACK);
Modified: dcplusplus/trunk/win32/DownloadPage.cpp
===================================================================
--- dcplusplus/trunk/win32/DownloadPage.cpp 2008-04-07 19:20:49 UTC (rev 1110)
+++ dcplusplus/trunk/win32/DownloadPage.cpp 2008-04-07 19:22:07 UTC (rev 1111)
@@ -86,10 +86,10 @@
attachButton(IDC_SETTINGS_LIST_CONFIG)->onClicked(std::tr1::bind(&DownloadPage::handleConfigHubLists, this));
- SpinnerPtr spinner = attachSpinner(IDC_SLOTSSPIN);
+ SpinnerPtr spinner = attachChild<SmartWin::Spinner>(IDC_SLOTSSPIN);
spinner->setRange(0, 100);
- spinner = attachSpinner(IDC_SPEEDSPIN);
+ attachChild(spinner, IDC_SPEEDSPIN);
spinner->setRange(0, 10000);
attachTextBox(IDC_DOWNLOADDIR);
Modified: dcplusplus/trunk/win32/stdafx.h
===================================================================
--- dcplusplus/trunk/win32/stdafx.h 2008-04-07 19:20:49 UTC (rev 1110)
+++ dcplusplus/trunk/win32/stdafx.h 2008-04-07 19:22:07 UTC (rev 1111)
@@ -29,6 +29,7 @@
#include <smartwin/WidgetFactory.h>
#include <smartwin/resources/Accelerator.h>
+#include <smartwin/resources/Pen.h>
#include <smartwin/widgets/Button.h>
#include <smartwin/widgets/ComboBox.h>
#include <smartwin/widgets/Label.h>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2008-04-07 19:21:16
|
Revision: 1110
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1110&view=rev
Author: arnetheduck
Date: 2008-04-07 12:20:49 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
reducing include set
Modified Paths:
--------------
dcplusplus/trunk/smartwin/include/smartwin/SmartWin.h
dcplusplus/trunk/smartwin/include/smartwin/Widget.h
dcplusplus/trunk/smartwin/include/smartwin/WidgetFactory.h
dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectDialog.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/Button.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/Composite.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/DateTime.h
dcplusplus/trunk/win32/UploadPage.cpp
dcplusplus/trunk/win32/stdafx.h
Added Paths:
-----------
dcplusplus/trunk/smartwin/include/smartwin/forward.h
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-01 20:55:30.028000116 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
+ timestamp: 2008-04-01 23:26:16.296000004 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
Name: bzr:file-ids
-
+ smartwin/include/smartwin/forward.h forward.h-20080401212555-mepp3hg0ki55396w-1
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
+ 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
Modified: dcplusplus/trunk/smartwin/include/smartwin/SmartWin.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/SmartWin.h 2008-04-07 19:19:11 UTC (rev 1109)
+++ dcplusplus/trunk/smartwin/include/smartwin/SmartWin.h 2008-04-07 19:20:49 UTC (rev 1110)
@@ -65,6 +65,12 @@
#include "resources/Pen.h"
#include "widgets/ModalDialog.h"
#include "widgets/ModelessDialog.h"
+#include "widgets/DateTime.h"
+#include "widgets/Slider.h"
+#include "widgets/Spinner.h"
+#include "widgets/MDIChild.h"
+#include "widgets/MDIFrame.h"
+#include "widgets/MDIParent.h"
namespace sw = SmartWin;
Modified: dcplusplus/trunk/smartwin/include/smartwin/Widget.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/Widget.h 2008-04-07 19:19:11 UTC (rev 1109)
+++ dcplusplus/trunk/smartwin/include/smartwin/Widget.h 2008-04-07 19:20:49 UTC (rev 1110)
@@ -28,6 +28,7 @@
#ifndef Widget_h
#define Widget_h
+#include "forward.h"
#include "Atom.h"
#include "Rectangle.h"
#include "Message.h"
Modified: dcplusplus/trunk/smartwin/include/smartwin/WidgetFactory.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/WidgetFactory.h 2008-04-07 19:19:11 UTC (rev 1109)
+++ dcplusplus/trunk/smartwin/include/smartwin/WidgetFactory.h 2008-04-07 19:20:49 UTC (rev 1110)
@@ -37,17 +37,11 @@
#include "widgets/ComboBox.h"
#include "widgets/Container.h"
#include "widgets/Table.h"
-#include "widgets/DateTime.h"
#include "widgets/GroupBox.h"
#include "widgets/LoadDialog.h"
-#include "widgets/MDIChild.h"
-#include "widgets/MDIFrame.h"
-#include "widgets/MDIParent.h"
#include "widgets/ProgressBar.h"
#include "widgets/RadioButton.h"
#include "widgets/SaveDialog.h"
-#include "widgets/Slider.h"
-#include "widgets/Spinner.h"
#include "widgets/Label.h"
#include "widgets/StatusBar.h"
#include "widgets/WidgetTabView.h"
@@ -56,7 +50,6 @@
#include "widgets/Tree.h"
#include "widgets/ToolTip.h"
#include "widgets/Window.h"
-#include "widgets/Frame.h"
#include "WidgetFactoryPlatformImplementation.h"
#include "WidgetCreator.h"
@@ -136,12 +129,6 @@
/// StatusBarSections object type.
typedef typename StatusBarSections::ObjectType StatusBarSectionsPtr;
- /// MDIWindow class type.
- typedef SmartWin::MDIParent MDIParent;
-
- /// MDIWindow object type.
- typedef typename MDIParent::ObjectType MDIParentPtr;
-
/// TabView class type.
typedef SmartWin::WidgetTabView WidgetTabView;
@@ -154,18 +141,6 @@
/// TabSheet object type.
typedef typename TabSheet::ObjectType TabSheetPtr;
- /// Slider class type.
- typedef SmartWin::Slider Slider;
-
- /// Slider object type.
- typedef typename Slider::ObjectType SliderPtr;
-
- /// Spinner class type.
- typedef SmartWin::Spinner Spinner;
-
- /// Spinner object type.
- typedef typename Spinner::ObjectType SpinnerPtr;
-
/// GroupBox class type.
typedef SmartWin::GroupBox GroupBox;
@@ -205,12 +180,6 @@
/// CheckBox object type.
typedef typename CheckBox::ObjectType CheckBoxPtr;
- /// DateTimePicker class type.
- typedef SmartWin::DateTime DateTime;
-
- /// DateTimePicker object type.
- typedef typename DateTime::ObjectType DateTimePtr;
-
/// WidgetChildWindow class type.
typedef SmartWin::Container Container;
@@ -223,12 +192,6 @@
/// Window object type.
typedef typename Window::ObjectType WindowPtr;
- /// MDIFrame class type.
- typedef SmartWin::MDIFrame MDIFrame;
-
- /// Window object type.
- typedef typename MDIFrame::ObjectType MDIFramePtr;
-
/// ProgressBar class type.
typedef SmartWin::ProgressBar ProgressBar;
@@ -345,11 +308,6 @@
*/
ButtonPtr createButton( const typename Button::Seed & cs = Button::Seed() );
- /// Creates a Button Control and returns a pointer to it.
- /** DON'T delete the returned pointer!!!
- */
- MDIParentPtr createMDIParent( const typename MDIParent::Seed & cs = MDIParent::Seed() );
-
/// Creates a Tab View and returns a pointer to it.
/** DON'T delete the returned pointer!!!
*/
@@ -360,16 +318,6 @@
*/
TabSheetPtr createTabSheet( const typename TabSheet::Seed & cs = TabSheet::Seed() );
- /// Creates a Slider Control and returns a pointer to it.
- /** DON'T delete the returned pointer!!!
- */
- SliderPtr createSlider( const typename Slider::Seed & cs = Slider::Seed() );
-
- /// Creates a Spinner Control and returns a pointer to it.
- /** DON'T delete the returned pointer!!!
- */
- SpinnerPtr createSpinner( const typename Spinner::Seed & cs = Spinner::Seed() );
-
/// Creates a Progress Bar Control and returns a pointer to it.
/** DON'T delete the returned pointer!!!
*/
@@ -389,22 +337,6 @@
*/
ProgressBarPtr attachProgressBar( unsigned id );
- /// \ingroup SubclassDialog
- /// Subclasses a Slider 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.
- */
- SliderPtr attachSlider( unsigned id );
-
- /// \ingroup SubclassDialog
- /// Subclasses a Spinner 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.
- */
- SpinnerPtr attachSpinner( unsigned id );
-
/// Creates a Group Box Control and returns a pointer to it.
/** DON'T delete the returned pointer!!!
*/
@@ -415,16 +347,6 @@
*/
GroupBoxPtr attachGroupBox( unsigned id );
- /// Creates a DateTime Picker Control and returns a pointer to it.
- /** DON'T delete the returned pointer!!!
- */
- DateTimePtr createDateTimePicker( const typename DateTime::Seed & cs = DateTime::Seed() );
-
- /// Suvclasses a DateTime Picker Control and returns a pointer to it.
- /** DON'T delete the returned pointer!!!
- */
- DateTimePtr attachDateTimePicker( unsigned id );
-
/// Creates a Radio Button Control and returns a pointer to it.
/** DON'T delete the returned pointer!!!
*/
@@ -597,13 +519,6 @@
}
template<typename ContainerWidgetType>
-typename WidgetFactory< ContainerWidgetType >::MDIParentPtr
-WidgetFactory< ContainerWidgetType >::createMDIParent( const typename MDIParent::Seed & cs )
-{
- return WidgetCreator< MDIParent >::create( this, cs );
-}
-
-template<typename ContainerWidgetType>
typename WidgetFactory< ContainerWidgetType >::WidgetTabViewPtr
WidgetFactory< ContainerWidgetType >::createTabView( const typename WidgetTabView::Seed & cs )
{
@@ -618,20 +533,6 @@
}
template<typename ContainerWidgetType>
-typename WidgetFactory< ContainerWidgetType >::SliderPtr
-WidgetFactory< ContainerWidgetType >::createSlider( const typename Slider::Seed & cs )
-{
- return WidgetCreator< Slider >::create( this, cs );
-}
-
-template<typename ContainerWidgetType>
-typename WidgetFactory< ContainerWidgetType >::SpinnerPtr
-WidgetFactory< ContainerWidgetType >::createSpinner( const typename Spinner::Seed & cs )
-{
- return WidgetCreator< Spinner >::create( this, cs );
-}
-
-template<typename ContainerWidgetType>
typename WidgetFactory< ContainerWidgetType >::ProgressBarPtr
WidgetFactory< ContainerWidgetType >::createProgressBar( const typename ProgressBar::Seed & cs )
{
@@ -653,20 +554,6 @@
}
template<typename ContainerWidgetType>
-typename WidgetFactory< ContainerWidgetType >::SliderPtr
-WidgetFactory< ContainerWidgetType >::attachSlider( unsigned id )
-{
- return WidgetCreator< Slider >::attach( this, id );
-}
-
-template<typename ContainerWidgetType>
-typename WidgetFactory< ContainerWidgetType >::SpinnerPtr
-WidgetFactory< ContainerWidgetType >::attachSpinner( unsigned id )
-{
- return WidgetCreator< Spinner >::attach( this, id );
-}
-
-template<typename ContainerWidgetType>
typename WidgetFactory< ContainerWidgetType >::GroupBoxPtr
WidgetFactory< ContainerWidgetType >::createGroupBox( const typename GroupBox::Seed & cs )
{
@@ -681,20 +568,6 @@
}
template<typename ContainerWidgetType>
-typename WidgetFactory< ContainerWidgetType >::DateTimePtr
-WidgetFactory< ContainerWidgetType >::createDateTimePicker( const typename DateTime::Seed & cs )
-{
- return WidgetCreator< DateTime >::create( this, cs );
-}
-
-template<typename ContainerWidgetType>
-typename WidgetFactory< ContainerWidgetType >::DateTimePtr
-WidgetFactory< ContainerWidgetType >::attachDateTimePicker( unsigned id )
-{
- return WidgetCreator< DateTime >::attach( this, id );
-}
-
-template<typename ContainerWidgetType>
typename WidgetFactory< ContainerWidgetType >::RadioButtonPtr
WidgetFactory< ContainerWidgetType >::createRadioButton( GroupBoxPtr parent, const typename RadioButton::Seed & cs )
{
Modified: dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectDialog.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectDialog.h 2008-04-07 19:19:11 UTC (rev 1109)
+++ dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectDialog.h 2008-04-07 19:20:49 UTC (rev 1110)
@@ -3,18 +3,34 @@
#include "../../SmartUtil.h"
+#include <type_traits>
+
namespace SmartWin {
-template<typename T>
+template<typename WidgetType>
class AspectDialog {
+ WidgetType& W() { return *static_cast<WidgetType*>(this); }
+ HWND H() { return W().handle(); }
+
public:
HWND getItem(int id) {
- return ::GetDlgItem(static_cast<T*>(this)->handle(), id);
+ return ::GetDlgItem(H(), id);
}
void setItemText(int id, const SmartUtil::tstring& text) {
- ::SetDlgItemText(static_cast<T*>(this)->handle(), id, text.c_str());
+ ::SetDlgItemText(H(), id, text.c_str());
}
+
+ template<typename T>
+ void attachChild(T& childPtr, int id) {
+ childPtr = attachChild<typename std::tr1::remove_pointer<T>::type >(id);
+ }
+
+ template<typename T>
+ typename T::ObjectType attachChild(int id) {
+ return WidgetCreator<T>::attach(&W(), id);
+ }
+
};
}
Added: dcplusplus/trunk/smartwin/include/smartwin/forward.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/forward.h (rev 0)
+++ dcplusplus/trunk/smartwin/include/smartwin/forward.h 2008-04-07 19:20:49 UTC (rev 1110)
@@ -0,0 +1,44 @@
+#ifndef FORWARD_H_
+#define FORWARD_H_
+
+namespace SmartWin {
+
+template< class WidgetType >
+class WidgetCreator;
+
+class Button;
+typedef Button* ButtonPtr;
+
+class CheckBox;
+typedef CheckBox* CheckBoxPtr;
+
+class DateTime;
+typedef DateTime* DateTimePtr;
+
+class Label;
+typedef Label* LabelPtr;
+
+class MDIChild;
+typedef MDIChild* MDIChildPtr;
+
+class MDIFrame;
+typedef MDIFrame* MDIFramePtr;
+
+class MDIParent;
+typedef MDIParent* MDIParentPtr;
+
+class Spinner;
+typedef Spinner* SpinnerPtr;
+
+class Slider;
+typedef Slider* SliderPtr;
+
+class Table;
+typedef Table* TablePtr;
+
+class Tree;
+typedef Tree* TreePtr;
+
+
+}
+#endif /*FORWARD_H_*/
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Button.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Button.h 2008-04-07 19:19:11 UTC (rev 1109)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Button.h 2008-04-07 19:20:49 UTC (rev 1110)
@@ -13,8 +13,6 @@
namespace SmartWin {
// Forward declaring friends
-template< class WidgetType >
-class WidgetCreator;
/** Common stuff for all buttons */
class Button :
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Composite.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Composite.h 2008-04-07 19:19:11 UTC (rev 1109)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Composite.h 2008-04-07 19:20:49 UTC (rev 1110)
@@ -1,6 +1,8 @@
#ifndef COMPOSITE_H_
#define COMPOSITE_H_
+#include "../forward.h"
+
#include "../aspects/AspectActivate.h"
#include "../aspects/AspectCommand.h"
#include "../aspects/AspectDragDrop.h"
@@ -39,6 +41,16 @@
typedef Control<Policy> BaseType;
+ // TODO Maybe move this to a separate class?
+
+ typedef SmartWin::ButtonPtr ButtonPtr;
+ typedef SmartWin::CheckBoxPtr CheckBoxPtr;
+ typedef SmartWin::DateTimePtr DateTimePtr;
+ typedef SmartWin::LabelPtr LabelPtr;
+ typedef SmartWin::TablePtr TablePtr;
+ typedef SmartWin::TreePtr TreePtr;
+ typedef SmartWin::SpinnerPtr SpinnerPtr;
+
/// 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
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/DateTime.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/DateTime.h 2008-04-07 19:19:11 UTC (rev 1109)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/DateTime.h 2008-04-07 19:20:49 UTC (rev 1110)
@@ -39,10 +39,6 @@
{
// begin namespace SmartWin
-// Forward declaring friends
-template< class WidgetType >
-class WidgetCreator;
-
/// DateTimePicker Control class
/** \ingroup WidgetControls
* \WidgetUsageInfo
Modified: dcplusplus/trunk/win32/UploadPage.cpp
===================================================================
--- dcplusplus/trunk/win32/UploadPage.cpp 2008-04-07 19:19:11 UTC (rev 1109)
+++ dcplusplus/trunk/win32/UploadPage.cpp 2008-04-07 19:20:49 UTC (rev 1110)
@@ -111,19 +111,20 @@
total = attachLabel(IDC_TOTAL);
total->setText(Text::toT(Util::formatBytes(ShareManager::getInstance()->getShareSize())));
- ButtonPtr button = attachButton(IDC_RENAME);
+ ButtonPtr button = attachChild<SmartWin::Button>(IDC_RENAME);
button->onClicked(std::tr1::bind(&UploadPage::handleRenameClicked, this));
- button = attachButton(IDC_REMOVE);
+ attachChild(button, IDC_REMOVE);
button->onClicked(std::tr1::bind(&UploadPage::handleRemoveClicked, this));
- button = attachButton(IDC_ADD);
+ attachChild(button, IDC_ADD);
button->onClicked(std::tr1::bind(&UploadPage::handleAddClicked, this));
- SpinnerPtr spinner = attachSpinner(IDC_SLOTSPIN);
+ SpinnerPtr spinner;
+ attachChild(spinner, IDC_SLOTSPIN);
spinner->setRange(1, UD_MAXVAL);
- spinner = attachSpinner(IDC_MIN_UPLOAD_SPIN);
+ attachChild(spinner, IDC_MIN_UPLOAD_SPIN);
spinner->setRange(0, UD_MAXVAL);
attachTextBox(IDC_MIN_UPLOAD_SPEED);
Modified: dcplusplus/trunk/win32/stdafx.h
===================================================================
--- dcplusplus/trunk/win32/stdafx.h 2008-04-07 19:19:11 UTC (rev 1109)
+++ dcplusplus/trunk/win32/stdafx.h 2008-04-07 19:20:49 UTC (rev 1110)
@@ -22,12 +22,23 @@
#include <dcpp/stdinc.h>
#include <dcpp/DCPlusPlus.h>
-#include <SmartWin.h>
#include <shlobj.h>
#include <malloc.h>
#include <htmlhelp.h>
#include <libintl.h>
+#include <smartwin/WidgetFactory.h>
+#include <smartwin/resources/Accelerator.h>
+#include <smartwin/widgets/Button.h>
+#include <smartwin/widgets/ComboBox.h>
+#include <smartwin/widgets/Label.h>
+#include <smartwin/widgets/ModalDialog.h>
+#include <smartwin/widgets/ModelessDialog.h>
+#include <smartwin/widgets/Spinner.h>
+#include <smartwin/widgets/Table.h>
+#include <smartwin/widgets/TextBox.h>
+#include <smartwin/widgets/Tree.h>
+
enum {
WM_SPEAKER = WM_APP + 500
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2008-04-07 19:19:47
|
Revision: 1109
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1109&view=rev
Author: arnetheduck
Date: 2008-04-07 12:19:11 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
fix colors when not handling color
Modified Paths:
--------------
dcplusplus/trunk/smartwin/include/smartwin/Policies.h
dcplusplus/trunk/smartwin/source/Message.cpp
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-01 17:46:10.145999908 +0200
committer: zouzou123gen
properties:
branch-nick: bzr
+ timestamp: 2008-04-01 20:55:30.028000116 +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
+ 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
Modified: dcplusplus/trunk/smartwin/include/smartwin/Policies.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/Policies.h 2008-04-07 19:17:43 UTC (rev 1108)
+++ dcplusplus/trunk/smartwin/include/smartwin/Policies.h 2008-04-07 19:19:11 UTC (rev 1109)
@@ -85,18 +85,18 @@
}
private:
- static HWND getHandler(HWND hwnd, UINT& uMsg, WPARAM& wParam, LPARAM& lParam) {
+ static HWND getHandler(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) {
HWND handler;
// Check who should handle the message - parent or child
switch(uMsg) {
- case WM_CTLCOLORSTATIC :
- case WM_CTLCOLORBTN :
- case WM_CTLCOLOREDIT :
- case WM_CTLCOLORLISTBOX :
- case WM_CTLCOLORSCROLLBAR : {
+ case WM_CTLCOLORBTN:
+ case WM_CTLCOLORDLG:
+ case WM_CTLCOLOREDIT:
+ case WM_CTLCOLORLISTBOX:
+ case WM_CTLCOLORMSGBOX:
+ case WM_CTLCOLORSCROLLBAR:
+ case WM_CTLCOLORSTATIC: {
handler = reinterpret_cast<HWND>(lParam);
- // We change message to avoid handling different messages of read-only vs normal edit controls
- uMsg = WM_CTLCOLOR;
} break;
case WM_NOTIFY : {
NMHDR* nmhdr = reinterpret_cast<NMHDR*>(lParam);
Modified: dcplusplus/trunk/smartwin/source/Message.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/Message.cpp 2008-04-07 19:17:43 UTC (rev 1108)
+++ dcplusplus/trunk/smartwin/source/Message.cpp 2008-04-07 19:19:11 UTC (rev 1109)
@@ -60,22 +60,33 @@
{
switch ( msg ) {
case WM_NOTIFY: {
- NMHDR * ptrOriginal = reinterpret_cast< NMHDR * >( msg_.lParam );
- param = ptrOriginal->code;
- } break;
+ NMHDR * ptrOriginal = reinterpret_cast< NMHDR * >( msg_.lParam );
+ param = ptrOriginal->code;
+ } break;
case WM_SYSCOMMAND: {
- param = msg_.wParam & 0xfff0;
- } break;
+ param = msg_.wParam & 0xfff0;
+ } break;
case WM_TIMER: {
- param = msg_.wParam;
- } break;
+ param = msg_.wParam;
+ } break;
case WM_COMMAND: {
- if(msg_.lParam == 0) {
- param = LOWORD(msg_.wParam);
- } else {
- param = HIWORD(msg_.wParam);
- }
- } break;
+ if(msg_.lParam == 0) {
+ param = LOWORD(msg_.wParam);
+ } else {
+ param = HIWORD(msg_.wParam);
+ }
+ } break;
+ case WM_CTLCOLORBTN:
+ case WM_CTLCOLORDLG:
+ case WM_CTLCOLOREDIT:
+ case WM_CTLCOLORLISTBOX:
+ case WM_CTLCOLORMSGBOX:
+ case WM_CTLCOLORSCROLLBAR:
+ case WM_CTLCOLORSTATIC: {
+ // We change message to avoid handling different messages of read-only vs normal edit controls
+ msg = WM_CTLCOLOR;
+ } break;
+
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2008-04-07 19:18:25
|
Revision: 1108
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1108&view=rev
Author: arnetheduck
Date: 2008-04-07 12:17:43 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
fix errors, more addChild&Seed stuff; now compiles and runs
Modified Paths:
--------------
dcplusplus/trunk/smartwin/include/smartwin/widgets/Button.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/CheckBox.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/Container.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/Control.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/TabSheet.h
dcplusplus/trunk/smartwin/source/widgets/TabSheet.cpp
dcplusplus/trunk/win32/DirectoryListingFrame.cpp
dcplusplus/trunk/win32/FinishedFrameBase.h
dcplusplus/trunk/win32/HubFrame.cpp
dcplusplus/trunk/win32/PublicHubsFrame.cpp
dcplusplus/trunk/win32/QueueFrame.cpp
dcplusplus/trunk/win32/SearchFrame.cpp
dcplusplus/trunk/win32/TransferView.cpp
dcplusplus/trunk/win32/TypedTable.h
dcplusplus/trunk/win32/TypedTree.h
dcplusplus/trunk/win32/UsersFrame.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-01 15:31:46.911999941 +0200
committer: zouzou123gen
properties:
branch-nick: bzr
+ timestamp: 2008-04-01 17:46:10.145999908 +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
+ 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
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Button.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Button.h 2008-04-07 19:14:27 UTC (rev 1107)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Button.h 2008-04-07 19:17:43 UTC (rev 1108)
@@ -85,7 +85,7 @@
template<typename SeedType>
void Button::create( const SeedType & cs ) {
- ControlType::create(cs);
+ BaseType::create(cs);
if(cs.font)
setFont( cs.font );
}
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/CheckBox.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/CheckBox.h 2008-04-07 19:14:27 UTC (rev 1107)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/CheckBox.h 2008-04-07 19:17:43 UTC (rev 1108)
@@ -69,8 +69,6 @@
*/
struct Seed : public BaseType::Seed {
typedef ThisType WidgetType;
-
- FontPtr font;
/// Fills with default parameters
Seed(const SmartUtil::tstring& caption_ = SmartUtil::tstring());
@@ -111,7 +109,7 @@
}
inline CheckBox::CheckBox( SmartWin::Widget * parent )
- : ButtonType( parent )
+ : BaseType( parent )
{
}
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Container.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Container.h 2008-04-07 19:14:27 UTC (rev 1107)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Container.h 2008-04-07 19:17:43 UTC (rev 1108)
@@ -30,7 +30,7 @@
Container(Widget* parent) : BaseType(parent) { }
};
-inline Container::Seed::Seed() : BaseType::Seed(NULL, WS_CHILD | WS_CLIPSIBLINGS, 0) {
+inline Container::Seed::Seed() : BaseType::Seed(SmartUtil::tstring(), WS_CHILD | WS_CLIPSIBLINGS, 0) {
}
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Control.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Control.h 2008-04-07 19:14:27 UTC (rev 1107)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Control.h 2008-04-07 19:17:43 UTC (rev 1108)
@@ -51,7 +51,7 @@
typedef Control<Policies::Subclassed> CommonControl;
template<typename Policy>
-Control<Policy>::Control(Widget* parent) : MessageMap<Policy>(parent) {
+Control<Policy>::Control(Widget* parent) : BaseType(parent) {
}
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/TabSheet.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/TabSheet.h 2008-04-07 19:14:27 UTC (rev 1107)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/TabSheet.h 2008-04-07 19:17:43 UTC (rev 1108)
@@ -124,7 +124,6 @@
* should define one of these.
*/
struct Seed : public BaseType::Seed {
- public:
typedef ThisType WidgetType;
FontPtr font;
@@ -332,7 +331,7 @@
}
inline TabSheet::TabSheet( SmartWin::Widget * parent )
- : ControlType( parent )
+ : BaseType( parent )
{
}
Modified: dcplusplus/trunk/smartwin/source/widgets/TabSheet.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/TabSheet.cpp 2008-04-07 19:14:27 UTC (rev 1107)
+++ dcplusplus/trunk/smartwin/source/widgets/TabSheet.cpp 2008-04-07 19:17:43 UTC (rev 1108)
@@ -10,7 +10,7 @@
void TabSheet::create( const Seed & cs )
{
- ControlType::create(cs);
+ BaseType::create(cs);
if(cs.font)
setFont( cs.font );
}
Modified: dcplusplus/trunk/win32/DirectoryListingFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/DirectoryListingFrame.cpp 2008-04-07 19:14:27 UTC (rev 1107)
+++ dcplusplus/trunk/win32/DirectoryListingFrame.cpp 2008-04-07 19:17:43 UTC (rev 1108)
@@ -127,7 +127,7 @@
paned->setRelativePos(0.3);
{
- dirs = SmartWin::WidgetCreator<WidgetDirs>::create(this, WinUtil::Seeds::treeView);
+ dirs = addChild(WidgetDirs::Seed());
dirs->setHelpId(IDH_FILE_LIST_DIRS);
addWidget(dirs);
paned->setFirst(dirs);
@@ -137,7 +137,7 @@
}
{
- files = SmartWin::WidgetCreator<WidgetFiles>::create(this, WinUtil::Seeds::Table);
+ files = addChild(WidgetFiles::Seed());
files->setHelpId(IDH_FILE_LIST_FILES);
addWidget(files);
paned->setSecond(files);
Modified: dcplusplus/trunk/win32/FinishedFrameBase.h
===================================================================
--- dcplusplus/trunk/win32/FinishedFrameBase.h 2008-04-07 19:14:27 UTC (rev 1107)
+++ dcplusplus/trunk/win32/FinishedFrameBase.h 2008-04-07 19:17:43 UTC (rev 1108)
@@ -54,10 +54,7 @@
totalTime(0)
{
{
- typename MDIChildType::Table::Seed cs;
- cs.style = WS_CHILD | WS_VISIBLE | WS_HSCROLL | WS_VSCROLL | LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS;
- cs.exStyle = WS_EX_CLIENTEDGE;
- items = SmartWin::WidgetCreator<WidgetItems>::create(static_cast<T*>(this), cs);
+ items = static_cast<T*>(this)->addChild(typename WidgetItems::Seed());
items->setTableStyle(LVS_EX_LABELTIP | LVS_EX_HEADERDRAGDROP | LVS_EX_FULLROWSELECT);
addWidget(items);
Modified: dcplusplus/trunk/win32/HubFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/HubFrame.cpp 2008-04-07 19:14:27 UTC (rev 1107)
+++ dcplusplus/trunk/win32/HubFrame.cpp 2008-04-07 19:17:43 UTC (rev 1108)
@@ -137,7 +137,7 @@
}
{
- users = SmartWin::WidgetCreator<WidgetUsers>::create(this, WinUtil::Seeds::Table);
+ users = addChild(WidgetUsers::Seed());
addWidget(users);
paned->setSecond(users);
Modified: dcplusplus/trunk/win32/PublicHubsFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/PublicHubsFrame.cpp 2008-04-07 19:14:27 UTC (rev 1107)
+++ dcplusplus/trunk/win32/PublicHubsFrame.cpp 2008-04-07 19:17:43 UTC (rev 1108)
@@ -103,9 +103,9 @@
users(0)
{
{
- Table::Seed cs = WinUtil::Seeds::Table;
+ WidgetHubs::Seed cs;
cs.style |= LVS_SINGLESEL;
- hubs = SmartWin::WidgetCreator<WidgetHubs>::create(this, cs);
+ hubs = addChild(cs);
addWidget(hubs);
hubs->createColumns(WinUtil::getStrings(columnNames));
Modified: dcplusplus/trunk/win32/QueueFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/QueueFrame.cpp 2008-04-07 19:14:27 UTC (rev 1107)
+++ dcplusplus/trunk/win32/QueueFrame.cpp 2008-04-07 19:17:43 UTC (rev 1108)
@@ -65,10 +65,11 @@
queueItems(0),
fileLists(0)
{
- paned = createVPaned();
+ paned = addChild(WidgetVPaned::Seed());
paned->setRelativePos(0.3);
+
{
- dirs = SmartWin::WidgetCreator<WidgetDirs>::create(this, WinUtil::Seeds::treeView);
+ dirs = addChild(WidgetDirs::Seed());
addWidget(dirs);
paned->setFirst(dirs);
@@ -80,7 +81,7 @@
}
{
- files = SmartWin::WidgetCreator<WidgetFiles>::create(this, WinUtil::Seeds::Table);
+ files = addChild(WidgetFiles::Seed());
addWidget(files, true);
paned->setSecond(files);
Modified: dcplusplus/trunk/win32/SearchFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/SearchFrame.cpp 2008-04-07 19:14:27 UTC (rev 1107)
+++ dcplusplus/trunk/win32/SearchFrame.cpp 2008-04-07 19:17:43 UTC (rev 1108)
@@ -213,10 +213,10 @@
}
{
- Table::Seed cs = WinUtil::Seeds::Table;
+ WidgetHubs::Seed cs;
cs.style |= LVS_NOCOLUMNHEADER;
cs.lvStyle |= LVS_EX_CHECKBOXES;
- hubs = SmartWin::WidgetCreator<WidgetHubs>::create(this, cs);
+ hubs = addChild(cs);
hubs->setHelpId(IDH_SEARCH_HUBS);
addWidget(hubs);
@@ -231,7 +231,7 @@
}
{
- results = SmartWin::WidgetCreator<WidgetResults>::create(this, WinUtil::Seeds::Table);
+ results = addChild(WidgetResults::Seed());
addWidget(results);
results->createColumns(WinUtil::getStrings(columnNames));
Modified: dcplusplus/trunk/win32/TransferView.cpp
===================================================================
--- dcplusplus/trunk/win32/TransferView.cpp 2008-04-07 19:14:27 UTC (rev 1107)
+++ dcplusplus/trunk/win32/TransferView.cpp 2008-04-07 19:17:43 UTC (rev 1108)
@@ -72,23 +72,20 @@
{
TabSheet::Seed tcs;
- tcs.style = WS_CHILD | WS_CLIPCHILDREN | WS_VISIBLE |
- TCS_HOTTRACK | TCS_RAGGEDRIGHT | TCS_TOOLTIPS | TCS_FOCUSNEVER;
+ tcs.style |= TCS_HOTTRACK | TCS_RAGGEDRIGHT | TCS_FOCUSNEVER;
tabs = addChild(tcs);
tabs->onSelectionChanged(std::tr1::bind(&TransferView::handleTabSelected, this));
}
{
Container::Seed cs;
- cs.style |= WS_CLIPCHILDREN | WS_VISIBLE;
+ cs.style |= WS_VISIBLE;
cs.caption = T_("Connections");
cs.background = (HBRUSH)(COLOR_3DFACE + 1);
cs.location = tabs->getUsableArea(true);
-
connectionsWindow = SmartWin::WidgetCreator<Container>::create(tabs, cs);
-
tabs->addPage(T_("Connections"), 0);
-
+
cs.style &= ~WS_VISIBLE;
cs.caption = T_("Downloads");
downloadsWindow = SmartWin::WidgetCreator<Container>::create(tabs, cs);
@@ -101,7 +98,7 @@
arrows->add(tmp, RGB(255, 0, 255));
}
{
- connections = SmartWin::WidgetCreator<WidgetConnections>::create(connectionsWindow, WinUtil::Seeds::Table);
+ connections = connectionsWindow->addChild(WidgetConnections::Seed());
connections->setSmallImageList(arrows);
connections->createColumns(WinUtil::getStrings(connectionNames));
@@ -115,7 +112,7 @@
}
{
- downloads = SmartWin::WidgetCreator<WidgetDownloads>::create(downloadsWindow, WinUtil::Seeds::Table);
+ downloads = downloadsWindow->addChild(WidgetDownloads::Seed());
downloads->createColumns(WinUtil::getStrings(downloadNames));
downloads->setColumnOrder(WinUtil::splitTokens(SETTING(DOWNLOADS_ORDER), downloadIndexes));
Modified: dcplusplus/trunk/win32/TypedTable.h
===================================================================
--- dcplusplus/trunk/win32/TypedTable.h 2008-04-07 19:14:27 UTC (rev 1107)
+++ dcplusplus/trunk/win32/TypedTable.h 2008-04-07 19:17:43 UTC (rev 1108)
@@ -19,7 +19,7 @@
#ifndef DCPLUSPLUS_WIN32_TYPED_LIST_VIEW_H
#define DCPLUSPLUS_WIN32_TYPED_LIST_VIEW_H
-#include <dcpp/Util.h>
+#include "WinUtil.h"
template<class ContentType, bool managed = true>
class TypedTable : public SmartWin::Table
@@ -34,7 +34,19 @@
explicit TypedTable( SmartWin::Widget * parent ) : BaseType(parent) {
}
-
+
+ struct Seed : public BaseType::Seed {
+ typedef ThisType WidgetType;
+
+ Seed() : BaseType::Seed() {
+ // @todo find a better way to directly use styles set in WinUtil...
+ style = WinUtil::Seeds::Table.style;
+ exStyle = WinUtil::Seeds::Table.exStyle;
+ lvStyle = WinUtil::Seeds::Table.lvStyle;
+ font = WinUtil::Seeds::Table.font;
+ }
+ };
+
~TypedTable() {
if(managed)
this->clear();
Modified: dcplusplus/trunk/win32/TypedTree.h
===================================================================
--- dcplusplus/trunk/win32/TypedTree.h 2008-04-07 19:14:27 UTC (rev 1107)
+++ dcplusplus/trunk/win32/TypedTree.h 2008-04-07 19:17:43 UTC (rev 1108)
@@ -19,6 +19,7 @@
#ifndef DCPLUSPLUS_WIN32_TYPED_TREE_VIEW_H
#define DCPLUSPLUS_WIN32_TYPED_TREE_VIEW_H
+#include "WinUtil.h"
template<class ContentType>
class TypedTree : public SmartWin::Tree
@@ -31,7 +32,18 @@
typedef ThisType* ObjectType;
explicit TypedTree( SmartWin::Widget* parent ) : BaseType(parent) { }
-
+
+ struct Seed : public BaseType::Seed {
+ typedef ThisType WidgetType;
+
+ Seed() : BaseType::Seed() {
+ // @todo find a better way to directly use styles set in WinUtil...
+ style = WinUtil::Seeds::treeView.style;
+ exStyle = WinUtil::Seeds::treeView.exStyle;
+ font = WinUtil::Seeds::treeView.font;
+ }
+ };
+
void create( const typename BaseType::Seed & cs = BaseType::Seed() ) {
BaseType::create(cs);
this->addCallback(
Modified: dcplusplus/trunk/win32/UsersFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/UsersFrame.cpp 2008-04-07 19:14:27 UTC (rev 1107)
+++ dcplusplus/trunk/win32/UsersFrame.cpp 2008-04-07 19:17:43 UTC (rev 1108)
@@ -40,9 +40,9 @@
startup(true)
{
{
- WidgetUsers::Seed cs = WinUtil::Seeds::Table;
+ WidgetUsers::Seed cs;
cs.lvStyle |= LVS_EX_CHECKBOXES;
- users = SmartWin::WidgetCreator<WidgetUsers>::create(this, cs);
+ users = addChild(cs);
addWidget(users);
users->createColumns(WinUtil::getStrings(columnNames));
Modified: dcplusplus/trunk/win32/WidgetPaned.h
===================================================================
--- dcplusplus/trunk/win32/WidgetPaned.h 2008-04-07 19:14:27 UTC (rev 1107)
+++ dcplusplus/trunk/win32/WidgetPaned.h 2008-04-07 19:17:43 UTC (rev 1108)
@@ -19,8 +19,6 @@
#ifndef DCPLUSPLUS_WIN32_WIDGETPANED_H_
#define DCPLUSPLUS_WIN32_WIDGETPANED_H_
-#include <boost/scoped_ptr.hpp>
-
template< bool horizontal >
class WidgetPaned :
public SmartWin::MessageMap< SmartWin::Policies::Normal >,
Modified: dcplusplus/trunk/win32/WinUtil.cpp
===================================================================
--- dcplusplus/trunk/win32/WinUtil.cpp 2008-04-07 19:14:27 UTC (rev 1107)
+++ dcplusplus/trunk/win32/WinUtil.cpp 2008-04-07 19:17:43 UTC (rev 1108)
@@ -147,7 +147,6 @@
xtreeView.style |= TVS_HASBUTTONS | TVS_LINESATROOT | TVS_HASLINES | TVS_SHOWSELALWAYS | TVS_DISABLEDRAGDROP;
xtreeView.exStyle = WS_EX_CLIENTEDGE;
xtreeView.font = font;
-
::HtmlHelp(NULL, NULL, HH_INITIALIZE, (DWORD)&helpCookie);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2008-04-07 19:15:06
|
Revision: 1107
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1107&view=rev
Author: arnetheduck
Date: 2008-04-07 12:14:27 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
more Seed updates, no ::CreateWindowEx error anymore
Modified Paths:
--------------
dcplusplus/trunk/smartwin/include/smartwin/widgets/Control.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/ToolBar.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/ToolTip.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/Window.h
dcplusplus/trunk/smartwin/source/widgets/ToolBar.cpp
dcplusplus/trunk/smartwin/source/widgets/ToolTip.cpp
dcplusplus/trunk/smartwin/source/widgets/Window.cpp
dcplusplus/trunk/win32/AspectStatus.h
dcplusplus/trunk/win32/MainWindow.cpp
dcplusplus/trunk/win32/WidgetPaned.h
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-01 10:41:17.615000010 +0200
committer: zouzou123gen
properties:
branch-nick: bzr
+ timestamp: 2008-04-01 15:31:46.911999941 +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
+ 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
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Control.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Control.h 2008-04-07 19:11:56 UTC (rev 1106)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Control.h 2008-04-07 19:14:27 UTC (rev 1107)
@@ -57,7 +57,7 @@
template<typename Policy>
Control<Policy>::Seed::Seed(LPCTSTR className, DWORD style, DWORD exStyle, const SmartUtil::tstring& caption) :
- BaseType::Seed(NULL, style | WS_VISIBLE, exStyle, caption)
+ BaseType::Seed(className, style | WS_VISIBLE, exStyle, caption)
{
}
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/ToolBar.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/ToolBar.h 2008-04-07 19:11:56 UTC (rev 1106)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/ToolBar.h 2008-04-07 19:14:27 UTC (rev 1107)
@@ -59,15 +59,13 @@
* to view the log of URL's you have been to etc...
*/
class ToolBar :
-public CommonControl,
+ public CommonControl,
// Aspects
public AspectFocus< ToolBar >,
public AspectFont< ToolBar >
{
typedef Dispatchers::VoidVoid<> Dispatcher;
- typedef SmartWin::AspectSizable< ToolBar > AspectSizable;
friend class WidgetCreator< ToolBar >;
- friend class SmartWin::AspectSizable<ToolBar>;
public:
/// Class type
typedef ToolBar ThisType;
@@ -75,15 +73,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;
+
/// Fills with default parameters
Seed();
};
@@ -293,7 +292,7 @@
}
inline ToolBar::ToolBar( SmartWin::Widget * parent )
- : ControlType( parent )
+ : BaseType( parent )
{
}
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/ToolTip.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/ToolTip.h 2008-04-07 19:11:56 UTC (rev 1106)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/ToolTip.h 2008-04-07 19:14:27 UTC (rev 1107)
@@ -46,10 +46,11 @@
/// Object type
typedef ThisType * ObjectType;
- class Seed
- : public Widget::Seed
- {
- public:
+ typedef MessageMap< Policies::Subclassed > BaseType;
+
+ struct Seed : public BaseType::Seed {
+ typedef ThisType WidgetType;
+
/// Fills with default parameters
Seed();
};
@@ -78,7 +79,7 @@
};
inline ToolTip::ToolTip( Widget * parent )
- : PolicyType( parent )
+ : BaseType( parent )
{
// Can't have a text box without a parent...
xAssert( parent, _T( "Can't have a ToolTip without a parent..." ) );
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Window.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Window.h 2008-04-07 19:11:56 UTC (rev 1106)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Window.h 2008-04-07 19:14:27 UTC (rev 1107)
@@ -85,11 +85,10 @@
* should define one of these.
*/
struct Seed : public BaseType::Seed {
- public:
- typedef Window::ThisType WidgetType;
+ typedef ThisType WidgetType;
/// Fills with default parameters
- Seed();
+ Seed(const SmartUtil::tstring& caption = SmartUtil::tstring());
};
/// Actually creates the window
@@ -99,7 +98,7 @@
* The simple version "create()" uses a default Seed for the window attributes.
* The seed is not taken a constant because the class name will be generated at registration.
*/
- virtual void create( const Seed& cs = Seed() );
+ void create( const Seed& cs = Seed() );
// TODO: Check up if the CREATESTRUCT * actualy IS modyfiable...!!
/// Setting the event handler for the "create" event
Modified: dcplusplus/trunk/smartwin/source/widgets/ToolBar.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/ToolBar.cpp 2008-04-07 19:11:56 UTC (rev 1106)
+++ dcplusplus/trunk/smartwin/source/widgets/ToolBar.cpp 2008-04-07 19:14:27 UTC (rev 1107)
@@ -3,13 +3,13 @@
namespace SmartWin {
ToolBar::Seed::Seed() :
- Widget::Seed(TOOLBARCLASSNAME, WS_CHILD | WS_VISIBLE | TBSTYLE_LIST | TBSTYLE_TOOLTIPS)
+ BaseType::Seed(TOOLBARCLASSNAME, WS_CHILD | TBSTYLE_LIST | TBSTYLE_TOOLTIPS)
{
}
void ToolBar::create( const Seed & cs )
{
- ControlType::create(cs);
+ BaseType::create(cs);
this->sendMessage(TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_MIXEDBUTTONS);
Modified: dcplusplus/trunk/smartwin/source/widgets/ToolTip.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/ToolTip.cpp 2008-04-07 19:11:56 UTC (rev 1106)
+++ dcplusplus/trunk/smartwin/source/widgets/ToolTip.cpp 2008-04-07 19:14:27 UTC (rev 1107)
@@ -3,7 +3,7 @@
namespace SmartWin {
ToolTip::Seed::Seed() :
- Widget::Seed(TOOLTIPS_CLASS, WS_POPUP | TTS_ALWAYSTIP | TTS_NOPREFIX, WS_EX_TRANSPARENT)
+ BaseType::Seed(TOOLTIPS_CLASS, WS_POPUP | TTS_ALWAYSTIP | TTS_NOPREFIX, WS_EX_TRANSPARENT)
{
}
@@ -11,7 +11,7 @@
{
xAssert((cs.style & WS_POPUP) == WS_POPUP, _T("Widget must have WS_POPUP style"));
- PolicyType::create(cs);
+ BaseType::create(cs);
}
void ToolTip::relayEvent(const MSG& msg) {
Modified: dcplusplus/trunk/smartwin/source/widgets/Window.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/Window.cpp 2008-04-07 19:11:56 UTC (rev 1106)
+++ dcplusplus/trunk/smartwin/source/widgets/Window.cpp 2008-04-07 19:14:27 UTC (rev 1107)
@@ -2,9 +2,7 @@
namespace SmartWin {
-// TODO add caption
-Window::Seed::Seed() : BaseType::Seed(SmartUtil::tstring(), 0, 0) {
-
+Window::Seed::Seed(const SmartUtil::tstring& caption) : BaseType::Seed(caption, 0, 0) {
}
void Window::create(const Seed& cs) {
Modified: dcplusplus/trunk/win32/AspectStatus.h
===================================================================
--- dcplusplus/trunk/win32/AspectStatus.h 2008-04-07 19:11:56 UTC (rev 1106)
+++ dcplusplus/trunk/win32/AspectStatus.h 2008-04-07 19:14:27 UTC (rev 1107)
@@ -38,7 +38,7 @@
void initStatus(bool sizeGrip = false) {
status = static_cast<WidgetType*>(this)->addChild(StatusBarSections::Seed(sizeGrip));
- statusTip = static_cast<WidgetType*>(this)->createToolTip();
+ statusTip = static_cast<WidgetType*>(this)->addChild(SmartWin::ToolTip::Seed());
statusTip->setTool(status, std::tr1::bind(&ThisType::handleToolTip, this));
}
Modified: dcplusplus/trunk/win32/MainWindow.cpp
===================================================================
--- dcplusplus/trunk/win32/MainWindow.cpp 2008-04-07 19:11:56 UTC (rev 1106)
+++ dcplusplus/trunk/win32/MainWindow.cpp 2008-04-07 19:14:27 UTC (rev 1107)
@@ -145,16 +145,15 @@
}
void MainWindow::initWindow() {
-
// Create main window
dcdebug("initWindow\n");
- Seed cs;
- int pos_x= SETTING(MAIN_WINDOW_POS_X);
- int pos_y= SETTING(MAIN_WINDOW_POS_Y);
- int size_x= SETTING(MAIN_WINDOW_SIZE_X);
- int size_y= SETTING(MAIN_WINDOW_SIZE_Y);
+ Seed cs(_T(APPNAME) _T(" ") _T(VERSIONSTRING));
+ int pos_x = SETTING(MAIN_WINDOW_POS_X);
+ int pos_y = SETTING(MAIN_WINDOW_POS_Y);
+ int size_x = SETTING(MAIN_WINDOW_SIZE_X);
+ int size_y = SETTING(MAIN_WINDOW_SIZE_Y);
if ( (pos_x != static_cast<int>(CW_USEDEFAULT)) &&(pos_y != static_cast<int>(CW_USEDEFAULT))&&(size_x
!= static_cast<int>(CW_USEDEFAULT))&&(size_y != static_cast<int>(CW_USEDEFAULT))&&(pos_x > 0&& pos_y > 0)
&&(size_x > 10&& size_y > 10)) {
@@ -165,15 +164,13 @@
if (ResourceManager::getInstance()->isRTL())
cs.exStyle |= WS_EX_RTLREADING;
- // Set window name
- cs.caption = _T(APPNAME) _T(" ") _T(VERSIONSTRING);
cs.icon = SmartWin::IconPtr(new SmartWin::Icon(IDR_MAINFRAME));
cs.background = (HBRUSH)(COLOR_3DFACE + 1);
create(cs);
setHelpId(IDH_STARTPAGE);
- paned = createHPaned();
+ paned = addChild(WidgetHPaned::Seed());
paned->setRelativePos(0.7);
}
@@ -265,7 +262,7 @@
ToolBar::Seed cs;
cs.style |= TBSTYLE_FLAT;
- toolbar = createToolbar(cs);
+ toolbar = addChild(cs);
{
SmartWin::ImageListPtr list(new SmartWin::ImageList(20, 20, ILC_COLOR32 | ILC_MASK));
SmartWin::Bitmap bmp(IDB_TOOLBAR20);
Modified: dcplusplus/trunk/win32/WidgetPaned.h
===================================================================
--- dcplusplus/trunk/win32/WidgetPaned.h 2008-04-07 19:11:56 UTC (rev 1106)
+++ dcplusplus/trunk/win32/WidgetPaned.h 2008-04-07 19:14:27 UTC (rev 1107)
@@ -34,15 +34,14 @@
/// Class type
typedef WidgetPaned< horizontal > ThisType;
- typedef SmartWin::MessageMap< SmartWin::Policies::Normal > PolicyType;
-
/// Object type
typedef ThisType * ObjectType;
- class Seed
- : public Widget::Seed
- {
- public:
+ typedef SmartWin::MessageMap< SmartWin::Policies::Normal > BaseType;
+
+ struct Seed : public BaseType::Seed {
+ typedef ThisType WidgetType;
+
explicit Seed();
};
@@ -123,13 +122,13 @@
SmartWin::IconPtr(), SmartWin::IconPtr(), LoadCursor( 0, horizontal ? IDC_SIZENS : IDC_SIZEWE ));
template< bool horizontal >
-WidgetPaned< horizontal >::Seed::Seed() : SmartWin::Widget::Seed(windowClass.getClassName(), WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS)
+WidgetPaned< horizontal >::Seed::Seed() : BaseType::Seed(windowClass.getClassName(), WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS)
{
}
template< bool horizontal >
WidgetPaned< horizontal >::WidgetPaned( SmartWin::Widget * parent )
- : PolicyType( parent )
+ : BaseType( parent )
, pos(0.5)
, moving(false)
{
@@ -139,7 +138,7 @@
template< bool horizontal >
void WidgetPaned< horizontal >::create( const Seed & cs )
{
- PolicyType::create(cs);
+ BaseType::create(cs);
onLeftMouseDown(std::tr1::bind(&ThisType::handleLButtonDown, this, _1));
onMouseMove(std::tr1::bind(&ThisType::handleMouseMove, this, _1));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2008-04-07 19:12:36
|
Revision: 1106
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1106&view=rev
Author: arnetheduck
Date: 2008-04-07 12:11:56 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
update TabView's Seed
Modified Paths:
--------------
dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTabView.h
dcplusplus/trunk/smartwin/source/widgets/WidgetTabView.cpp
dcplusplus/trunk/win32/MainWindow.cpp
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-01 10:12:47.505000114 +0200
committer: zouzou123gen
properties:
branch-nick: bzr
+ timestamp: 2008-04-01 10:41:17.615000010 +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
+ 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
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTabView.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTabView.h 2008-04-07 19:09:37 UTC (rev 1105)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTabView.h 2008-04-07 19:11:56 UTC (rev 1106)
@@ -29,14 +29,15 @@
/// Object type
typedef ThisType * ObjectType;
- typedef MessageMap<Policies::Normal> PolicyType;
+ typedef MessageMap<Policies::Normal> BaseType;
- class Seed : public Widget::Seed {
- public:
- /// Fills with default parameters
- Seed();
+ struct Seed : public BaseType::Seed {
+ typedef ThisType WidgetType;
bool toggleActive;
+
+ /// Fills with default parameters
+ Seed(bool toggleActive_ = false);
};
void add(Container* w, const IconPtr& icon);
Modified: dcplusplus/trunk/smartwin/source/widgets/WidgetTabView.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/WidgetTabView.cpp 2008-04-07 19:09:37 UTC (rev 1105)
+++ dcplusplus/trunk/smartwin/source/widgets/WidgetTabView.cpp 2008-04-07 19:11:56 UTC (rev 1106)
@@ -5,14 +5,14 @@
WindowClass WidgetTabView::windowClass(_T("WidgetTabView"), &WidgetTabView::wndProc, NULL, ( HBRUSH )( COLOR_WINDOW + 1 ));
-WidgetTabView::Seed::Seed() :
- Widget::Seed(windowClass.getClassName(), WS_CHILD | WS_CLIPCHILDREN | WS_VISIBLE),
- toggleActive(false)
+WidgetTabView::Seed::Seed(bool toggleActive_) :
+ BaseType::Seed(windowClass.getClassName(), WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_VISIBLE),
+ toggleActive(toggleActive_)
{
}
WidgetTabView::WidgetTabView(Widget* w) :
- PolicyType(w),
+ BaseType(w),
tab(0),
tip(0),
toggleActive(false),
Modified: dcplusplus/trunk/win32/MainWindow.cpp
===================================================================
--- dcplusplus/trunk/win32/MainWindow.cpp 2008-04-07 19:09:37 UTC (rev 1105)
+++ dcplusplus/trunk/win32/MainWindow.cpp 2008-04-07 19:11:56 UTC (rev 1106)
@@ -261,6 +261,8 @@
}
void MainWindow::initToolbar() {
+ dcdebug("initToolbar\n");
+
ToolBar::Seed cs;
cs.style |= TBSTYLE_FLAT;
toolbar = createToolbar(cs);
@@ -314,10 +316,8 @@
}
void MainWindow::initTabs() {
- WidgetTabView::Seed cs;
- cs.style = WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_VISIBLE;
- cs.toggleActive = BOOLSETTING(TOGGLE_ACTIVE_WINDOW);
- tabs = createTabView(cs);
+ dcdebug("initTabs\n");
+ tabs = addChild(WidgetTabView::Seed(BOOLSETTING(TOGGLE_ACTIVE_WINDOW)));
tabs->onTitleChanged(std::tr1::bind(&MainWindow::handleTabsTitleChanged, this, _1));
tabs->onHelp(std::tr1::bind(&WinUtil::help, _1, _2));
paned->setFirst(tabs);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2008-04-07 19:10:29
|
Revision: 1105
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1105&view=rev
Author: arnetheduck
Date: 2008-04-07 12:09:37 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
Fixed file list refresh happenning 1 minute later than expected
Modified Paths:
--------------
dcplusplus/trunk/changelog.txt
dcplusplus/trunk/dcpp/ShareManager.cpp
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-01 10:10:01.834000111 +0200
committer: zouzou123gen
properties:
branch-nick: bzr
+ timestamp: 2008-04-01 10:12:47.505000114 +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
+ 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
Modified: dcplusplus/trunk/changelog.txt
===================================================================
--- dcplusplus/trunk/changelog.txt 2008-04-07 19:08:26 UTC (rev 1104)
+++ dcplusplus/trunk/changelog.txt 2008-04-07 19:09:37 UTC (rev 1105)
@@ -18,6 +18,7 @@
* [L#208684] Made the Alt key work again for line history in hub window (poy)
* [L#209684] Fixed parsing of non-XML hub lists (poy)
* [L#205660] Readded hub column to transfers (thanks mikejj)
+* Fixed file list refresh happenning 1 minute later than expected (poy)
-- 0.705 2008-03-14 --
* Several patches for better *nix compatibility of the core (thanks steven sheehy et al)
Modified: dcplusplus/trunk/dcpp/ShareManager.cpp
===================================================================
--- dcplusplus/trunk/dcpp/ShareManager.cpp 2008-04-07 19:08:26 UTC (rev 1104)
+++ dcplusplus/trunk/dcpp/ShareManager.cpp 2008-04-07 19:09:37 UTC (rev 1105)
@@ -1401,7 +1401,7 @@
void ShareManager::on(TimerManagerListener::Minute, uint32_t tick) throw() {
if(SETTING(AUTO_REFRESH_TIME) > 0) {
- if(lastFullUpdate + SETTING(AUTO_REFRESH_TIME) * 60 * 1000 < tick) {
+ if(lastFullUpdate + SETTING(AUTO_REFRESH_TIME) * 60 * 1000 <= tick) {
refresh(true, true);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2008-04-07 19:08:50
|
Revision: 1104
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1104&view=rev
Author: arnetheduck
Date: 2008-04-07 12:08:26 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
use addChild, update&add Seeds
Modified Paths:
--------------
dcplusplus/trunk/smartwin/include/smartwin/widgets/Button.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/Frame.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/StatusBar.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/TabSheet.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/Table.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTabView.h
dcplusplus/trunk/smartwin/source/widgets/CoolBar.cpp
dcplusplus/trunk/smartwin/source/widgets/TabSheet.cpp
dcplusplus/trunk/smartwin/source/widgets/Table.cpp
dcplusplus/trunk/win32/ADLSearchFrame.cpp
dcplusplus/trunk/win32/AspectStatus.h
dcplusplus/trunk/win32/ComboBox.cpp
dcplusplus/trunk/win32/ComboBox.h
dcplusplus/trunk/win32/DirectoryListingFrame.cpp
dcplusplus/trunk/win32/FavHubsFrame.cpp
dcplusplus/trunk/win32/HubFrame.cpp
dcplusplus/trunk/win32/MainWindow.cpp
dcplusplus/trunk/win32/NotepadFrame.cpp
dcplusplus/trunk/win32/PrivateFrame.cpp
dcplusplus/trunk/win32/PublicHubsFrame.cpp
dcplusplus/trunk/win32/QueueFrame.cpp
dcplusplus/trunk/win32/SearchFrame.cpp
dcplusplus/trunk/win32/SettingsDialog.cpp
dcplusplus/trunk/win32/SettingsDialog.h
dcplusplus/trunk/win32/SplashWindow.cpp
dcplusplus/trunk/win32/SpyFrame.cpp
dcplusplus/trunk/win32/SystemFrame.cpp
dcplusplus/trunk/win32/TextBox.cpp
dcplusplus/trunk/win32/TextBox.h
dcplusplus/trunk/win32/TextFrame.cpp
dcplusplus/trunk/win32/TransferView.cpp
dcplusplus/trunk/win32/WinUtil.cpp
dcplusplus/trunk/win32/WinUtil.h
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-01 00:06:48.601000071 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
+ timestamp: 2008-04-01 10:10:01.834000111 +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
+ 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
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Button.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Button.h 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Button.h 2008-04-07 19:08:26 UTC (rev 1104)
@@ -38,6 +38,8 @@
/// 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
@@ -54,6 +56,7 @@
template<typename SeedType>
void create(const SeedType& cs = SeedType());
+
protected:
typedef Button ButtonType;
@@ -76,7 +79,7 @@
return Message( WM_COMMAND, MAKEWPARAM(0, BN_DBLCLK) );
}
-inline Button::Button(Widget* parent) : ControlType(parent) {
+inline Button::Button(Widget* parent) : BaseType(parent) {
}
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Frame.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Frame.h 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Frame.h 2008-04-07 19:08:26 UTC (rev 1104)
@@ -147,7 +147,7 @@
template<typename Policy>
Frame<Policy>::Seed::Seed(const SmartUtil::tstring& caption, DWORD style, DWORD exStyle) :
- BaseType::Seed(caption, WS_OVERLAPPEDWINDOW, exStyle)
+ BaseType::Seed(caption, style | WS_OVERLAPPEDWINDOW, exStyle)
{
}
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/StatusBar.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/StatusBar.h 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/StatusBar.h 2008-04-07 19:08:26 UTC (rev 1104)
@@ -122,19 +122,20 @@
/// 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
- explicit Seed();
+ explicit Seed(bool sizeGrip = true);
};
/// Refreshes the status bar, must be called after main window has been resized
@@ -175,8 +176,10 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
template< class TypeOfStatusBar >
-StatusBar< TypeOfStatusBar >::Seed::Seed() : Widget::Seed(STATUSCLASSNAME, WS_CHILD | WS_VISIBLE | SBARS_SIZEGRIP | WS_CLIPSIBLINGS) {
-
+StatusBar< TypeOfStatusBar >::Seed::Seed(bool sizeGrip) : BaseType::Seed(STATUSCLASSNAME, WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS) {
+ if(sizeGrip) {
+ style |= SBARS_SIZEGRIP;
+ }
}
inline void Section::setSections( const std::vector< unsigned > & width )
@@ -235,14 +238,14 @@
template< class TypeOfStatusBar >
StatusBar< TypeOfStatusBar >::StatusBar( SmartWin::Widget * parent )
- : ControlType( parent )
+ : BaseType( parent )
{
}
template< class TypeOfStatusBar >
void StatusBar< TypeOfStatusBar >::create( const Seed & cs )
{
- ControlType::create(cs);
+ BaseType::create(cs);
if(cs.font)
setFont( cs.font );
}
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/TabSheet.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/TabSheet.h 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/TabSheet.h 2008-04-07 19:08:26 UTC (rev 1104)
@@ -116,15 +116,17 @@
/// 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
- {
+ struct Seed : public BaseType::Seed {
public:
+ typedef ThisType WidgetType;
+
FontPtr font;
/// Fills with default parameters
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Table.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Table.h 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Table.h 2008-04-07 19:08:26 UTC (rev 1104)
@@ -108,6 +108,8 @@
/// Object type
typedef ThisType* ObjectType;
+ typedef CommonControl BaseType;
+
typedef std::tr1::function<int (LPARAM a, LPARAM b)> SortFunction;
/// Seed class
@@ -115,10 +117,9 @@
* 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;
/// List view extended styles (LVS_EX_*)
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTabView.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTabView.h 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTabView.h 2008-04-07 19:08:26 UTC (rev 1104)
@@ -56,7 +56,7 @@
titleChangedFunction = f;
}
- void onTabContextMenu(Container* w, const std::tr1::function<bool (const ScreenCoordinate& pt)>& f);
+ void onTabContextMenu(Container* w, const ContextMenuFunction& f);
void onHelp(const HelpFunction& f) {
helpFunction = f;
Modified: dcplusplus/trunk/smartwin/source/widgets/CoolBar.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/CoolBar.cpp 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/smartwin/source/widgets/CoolBar.cpp 2008-04-07 19:08:26 UTC (rev 1104)
@@ -5,7 +5,7 @@
namespace SmartWin {
CoolBar::Seed::Seed() :
- Widget::Seed(REBARCLASSNAME, WS_CHILD | WS_VISIBLE | RBS_VARHEIGHT | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | CCS_NODIVIDER)
+ BaseType::Seed(REBARCLASSNAME, WS_CHILD | WS_VISIBLE | RBS_VARHEIGHT | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | CCS_NODIVIDER)
{
}
Modified: dcplusplus/trunk/smartwin/source/widgets/TabSheet.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/TabSheet.cpp 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/smartwin/source/widgets/TabSheet.cpp 2008-04-07 19:08:26 UTC (rev 1104)
@@ -3,7 +3,7 @@
namespace SmartWin {
TabSheet::Seed::Seed() :
- Widget::Seed(WC_TABCONTROL, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN),
+ BaseType::Seed(WC_TABCONTROL, WS_CHILD | WS_TABSTOP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN),
font(new Font(DefaultGuiFont))
{
}
Modified: dcplusplus/trunk/smartwin/source/widgets/Table.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/Table.cpp 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/smartwin/source/widgets/Table.cpp 2008-04-07 19:08:26 UTC (rev 1104)
@@ -11,7 +11,7 @@
bool Table::ComCtl6 = false;
Table::Seed::Seed() :
- Widget::Seed(WC_LISTVIEW, WS_CHILD | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_EDITLABELS),
+ BaseType::Seed(WC_LISTVIEW, WS_CHILD | WS_TABSTOP | LVS_REPORT | LVS_EDITLABELS),
font(new Font(DefaultGuiFont)),
lvStyle(0)
{
@@ -37,7 +37,7 @@
}
Table::Table( SmartWin::Widget * parent )
- : ControlType( parent ),
+ : BaseType( parent ),
itsEditRow(0),
itsEditColumn(0),
itsXMousePosition(0),
Modified: dcplusplus/trunk/win32/ADLSearchFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/ADLSearchFrame.cpp 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/ADLSearchFrame.cpp 2008-04-07 19:08:26 UTC (rev 1104)
@@ -48,7 +48,7 @@
{
Table::Seed cs = WinUtil::Seeds::Table;
cs.lvStyle |= LVS_EX_CHECKBOXES;
- items = createTable(cs);
+ items = addChild(cs);
addWidget(items);
items->createColumns(WinUtil::getStrings(columnNames));
@@ -65,37 +65,37 @@
Button::Seed cs = WinUtil::Seeds::button;
cs.caption = T_("&New...");
- add = createButton(cs);
+ add = addChild(cs);
add->setHelpId(IDH_ADLS_NEW);
add->onClicked(std::tr1::bind(&ADLSearchFrame::handleAdd, this));
addWidget(add);
cs.caption = T_("&Properties");
- properties = createButton(cs);
+ properties = addChild(cs);
properties->setHelpId(IDH_ADLS_PROPERTIES);
properties->onClicked(std::tr1::bind(&ADLSearchFrame::handleProperties, this));
addWidget(properties);
cs.caption = T_("Move &Up");
- up = createButton(cs);
+ up = addChild(cs);
up->setHelpId(IDH_ADLS_MOVE_UP);
up->onClicked(std::tr1::bind(&ADLSearchFrame::handleUp, this));
addWidget(up);
cs.caption = T_("Move &Down");
- down = createButton(cs);
+ down = addChild(cs);
down->setHelpId(IDH_ADLS_MOVE_DOWN);
down->onClicked(std::tr1::bind(&ADLSearchFrame::handleDown, this));
addWidget(down);
cs.caption = T_("&Remove");
- remove = createButton(cs);
+ remove = addChild(cs);
remove->setHelpId(IDH_ADLS_REMOVE);
remove->onClicked(std::tr1::bind(&ADLSearchFrame::handleRemove, this));
addWidget(remove);
cs.caption = T_("&Help");
- help = createButton(cs);
+ help = addChild(cs);
help->setHelpId(IDH_DCPP_HELP);
help->onClicked(std::tr1::bind(&WinUtil::help, handle(), IDH_ADL_SEARCH));
addWidget(help);
Modified: dcplusplus/trunk/win32/AspectStatus.h
===================================================================
--- dcplusplus/trunk/win32/AspectStatus.h 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/AspectStatus.h 2008-04-07 19:08:26 UTC (rev 1104)
@@ -36,12 +36,7 @@
}
void initStatus(bool sizeGrip = false) {
- StatusBarSections::Seed cs;
- cs.style = WS_VISIBLE | WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS;
- if(sizeGrip) {
- cs.style |= SBARS_SIZEGRIP;
- }
- status = static_cast<WidgetType*>(this)->createStatusBarSections(cs);
+ status = static_cast<WidgetType*>(this)->addChild(StatusBarSections::Seed(sizeGrip));
statusTip = static_cast<WidgetType*>(this)->createToolTip();
statusTip->setTool(status, std::tr1::bind(&ThisType::handleToolTip, this));
Modified: dcplusplus/trunk/win32/ComboBox.cpp
===================================================================
--- dcplusplus/trunk/win32/ComboBox.cpp 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/ComboBox.cpp 2008-04-07 19:08:26 UTC (rev 1104)
@@ -20,6 +20,11 @@
#include "ComboBox.h"
+ComboBox::Seed::Seed() :
+ BaseType::Seed()
+{
+}
+
ComboBox::ComboBox( SmartWin::Widget * parent ) : BaseType(parent), textBox(0) {
}
Modified: dcplusplus/trunk/win32/ComboBox.h
===================================================================
--- dcplusplus/trunk/win32/ComboBox.h 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/ComboBox.h 2008-04-07 19:08:26 UTC (rev 1104)
@@ -22,13 +22,19 @@
#include "TextBox.h"
class ComboBox : public SmartWin::ComboBox {
-private:
typedef SmartWin::ComboBox BaseType;
+
public:
typedef ComboBox ThisType;
typedef ThisType* ObjectType;
+ struct Seed : public BaseType::Seed {
+ typedef ThisType WidgetType;
+
+ Seed();
+ };
+
explicit ComboBox( SmartWin::Widget * parent );
typedef TextBox::ObjectType TextBoxPtr;
Modified: dcplusplus/trunk/win32/DirectoryListingFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/DirectoryListingFrame.cpp 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/DirectoryListingFrame.cpp 2008-04-07 19:08:26 UTC (rev 1104)
@@ -158,22 +158,22 @@
Button::Seed cs = WinUtil::Seeds::button;
cs.caption = T_("Subtract list");
- listDiff = createButton(cs);
+ listDiff = addChild(cs);
listDiff->setHelpId(IDH_FILE_LIST_SUBSTRACT);
listDiff->onClicked(std::tr1::bind(&DirectoryListingFrame::handleListDiff, this));
cs.caption = T_("Match queue");
- matchQueue = createButton(cs);
+ matchQueue = addChild(cs);
matchQueue->setHelpId(IDH_FILE_LIST_MATCH_QUEUE);
matchQueue->onClicked(std::tr1::bind(&DirectoryListingFrame::handleMatchQueue, this));
cs.caption = T_("Find");
- find = createButton(cs);
+ find = addChild(cs);
find->setHelpId(IDH_FILE_LIST_FIND);
find->onClicked(std::tr1::bind(&DirectoryListingFrame::handleFind, this));
cs.caption = T_("Next");
- findNext = createButton(cs);
+ findNext = addChild(cs);
findNext->setHelpId(IDH_FILE_LIST_NEXT);
findNext->onClicked(std::tr1::bind(&DirectoryListingFrame::handleFindNext, this));
}
Modified: dcplusplus/trunk/win32/FavHubsFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/FavHubsFrame.cpp 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/FavHubsFrame.cpp 2008-04-07 19:08:26 UTC (rev 1104)
@@ -52,7 +52,7 @@
Table::Seed cs = WinUtil::Seeds::Table;
cs.style |= LVS_NOSORTHEADER;
cs.lvStyle |= LVS_EX_CHECKBOXES;
- hubs = createTable(cs);
+ hubs = addChild(cs);
addWidget(hubs);
hubs->createColumns(WinUtil::getStrings(columnNames));
@@ -69,37 +69,37 @@
Button::Seed cs = WinUtil::Seeds::button;
cs.caption = T_("&Connect");
- connect = createButton(cs);
+ connect = addChild(cs);
connect->setHelpId(IDH_FAVORITE_HUBS_CONNECT);
connect->onClicked(std::tr1::bind(&FavHubsFrame::openSelected, this));
addWidget(connect);
cs.caption = T_("&New...");
- add = createButton(cs);
+ add = addChild(cs);
add->setHelpId(IDH_FAVORITE_HUBS_NEW);
add->onClicked(std::tr1::bind(&FavHubsFrame::handleAdd, this));
addWidget(add);
cs.caption = T_("&Properties");
- properties = createButton(cs);
+ properties = addChild(cs);
properties->setHelpId(IDH_FAVORITE_HUBS_PROPERTIES);
properties->onClicked(std::tr1::bind(&FavHubsFrame::handleProperties, this));
addWidget(properties);
cs.caption = T_("Move &Up");
- up = createButton(cs);
+ up = addChild(cs);
up->setHelpId(IDH_FAVORITE_HUBS_MOVE_UP);
up->onClicked(std::tr1::bind(&FavHubsFrame::handleUp, this));
addWidget(up);
cs.caption = T_("Move &Down");
- down = createButton(cs);
+ down = addChild(cs);
down->setHelpId(IDH_FAVORITE_HUBS_MOVE_DOWN);
down->onClicked(std::tr1::bind(&FavHubsFrame::handleDown, this));
addWidget(down);
cs.caption = T_("&Remove");
- remove = createButton(cs);
+ remove = addChild(cs);
remove->setHelpId(IDH_FAVORITE_HUBS_REMOVE);
remove->onClicked(std::tr1::bind(&FavHubsFrame::handleRemove, this));
addWidget(remove);
Modified: dcplusplus/trunk/win32/HubFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/HubFrame.cpp 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/HubFrame.cpp 2008-04-07 19:08:26 UTC (rev 1104)
@@ -94,7 +94,7 @@
{
TextBox::Seed cs = WinUtil::Seeds::textBox;
cs.style = WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_MULTILINE;
- message = createTextBox(cs);
+ message = addChild(cs);
message->setHelpId(IDH_HUB_MESSAGE);
addWidget(message, true, false);
message->onRaw(std::tr1::bind(&HubFrame::handleMessageGetDlgCode, this), SmartWin::Message(WM_GETDLGCODE));
@@ -106,14 +106,14 @@
{
TextBox::Seed cs = WinUtil::Seeds::textBox;
cs.style = WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL;
- filter = createTextBox(cs);
+ filter = addChild(cs);
filter->setHelpId(IDH_HUB_FILTER);
addWidget(filter);
filter->onKeyUp(std::tr1::bind(&HubFrame::handleFilterKey, this, _1));
}
{
- filterType = createComboBox(WinUtil::Seeds::comboBoxStatic);
+ filterType = addChild(WinUtil::Seeds::comboBoxStatic);
filterType->setHelpId(IDH_HUB_FILTER);
addWidget(filterType);
@@ -128,7 +128,7 @@
{
TextBox::Seed cs = WinUtil::Seeds::textBox;
cs.style = WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | ES_MULTILINE | ES_NOHIDESEL | ES_READONLY;
- chat = createTextBox(cs);
+ chat = addChild(cs);
chat->setHelpId(IDH_HUB_CHAT);
chat->setTextLimit(0);
addWidget(chat);
@@ -156,7 +156,7 @@
{
CheckBox::Seed cs(_T("+/-"));
cs.style &= ~WS_TABSTOP;
- showUsers = createCheckBox(cs);
+ showUsers = addChild(cs);
showUsers->setChecked(BOOLSETTING(GET_USER_INFO));
}
Modified: dcplusplus/trunk/win32/MainWindow.cpp
===================================================================
--- dcplusplus/trunk/win32/MainWindow.cpp 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/MainWindow.cpp 2008-04-07 19:08:26 UTC (rev 1104)
@@ -161,8 +161,7 @@
cs.location = SmartWin::Rectangle(pos_x, pos_y, size_x, size_y);
}
- cs.style = WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN;
- cs.exStyle = WS_EX_APPWINDOW | WS_EX_WINDOWEDGE;
+ cs.exStyle |= WS_EX_APPWINDOW;
if (ResourceManager::getInstance()->isRTL())
cs.exStyle |= WS_EX_RTLREADING;
Modified: dcplusplus/trunk/win32/NotepadFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/NotepadFrame.cpp 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/NotepadFrame.cpp 2008-04-07 19:08:26 UTC (rev 1104)
@@ -30,7 +30,7 @@
{
TextBox::Seed cs = WinUtil::Seeds::textBox;
cs.style = WS_CHILD | WS_VISIBLE | WS_VSCROLL | ES_MULTILINE | ES_AUTOVSCROLL | ES_NOHIDESEL | ES_WANTRETURN;
- pad = createTextBox(cs);
+ pad = addChild(cs);
addWidget(pad);
}
Modified: dcplusplus/trunk/win32/PrivateFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/PrivateFrame.cpp 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/PrivateFrame.cpp 2008-04-07 19:08:26 UTC (rev 1104)
@@ -100,7 +100,7 @@
{
TextBox::Seed cs = WinUtil::Seeds::textBox;
cs.style = WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_MULTILINE;
- message = createTextBox(cs);
+ message = addChild(cs);
message->setHelpId(IDH_PM_MESSAGE);
addWidget(message, true);
message->onKeyDown(std::tr1::bind(&PrivateFrame::handleKeyDown, this, _1));
@@ -110,7 +110,7 @@
{
TextBox::Seed cs = WinUtil::Seeds::textBox;
cs.style = WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | ES_MULTILINE | ES_NOHIDESEL | ES_READONLY;
- chat = createTextBox(cs);
+ chat = addChild(cs);
chat->setHelpId(IDH_PM_CHAT);
chat->setTextLimit(0);
addWidget(chat);
Modified: dcplusplus/trunk/win32/PublicHubsFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/PublicHubsFrame.cpp 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/PublicHubsFrame.cpp 2008-04-07 19:08:26 UTC (rev 1104)
@@ -121,14 +121,14 @@
{
TextBox::Seed cs = WinUtil::Seeds::textBox;
cs.style = WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL;
- filter = createTextBox(cs);
+ filter = addChild(cs);
filter->setHelpId(IDH_PUBLIC_HUBS_FILTER);
addWidget(filter);
filter->onKeyDown(std::tr1::bind(&PublicHubsFrame::handleFilterKeyDown, this, _1));
}
{
- filterSel = createComboBox(WinUtil::Seeds::comboBoxStatic);
+ filterSel = addChild(WinUtil::Seeds::comboBoxStatic);
filterSel->setHelpId(IDH_PUBLIC_HUBS_FILTER);
addWidget(filterSel);
@@ -140,7 +140,7 @@
filterSel->setSelected(COLUMN_LAST);
filterSel->onSelectionChanged(std::tr1::bind(&PublicHubsFrame::updateList, this));
- pubLists = createComboBox(WinUtil::Seeds::comboBoxStatic);
+ pubLists = addChild(WinUtil::Seeds::comboBoxStatic);
pubLists->setHelpId(IDH_PUBLIC_HUBS_LISTS);
addWidget(pubLists);
pubLists->onSelectionChanged(std::tr1::bind(&PublicHubsFrame::handleListSelChanged, this));
@@ -150,14 +150,14 @@
Button::Seed cs = WinUtil::Seeds::button;
cs.caption = T_("&Configure");
- configure = createButton(cs);
+ 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 = createButton(cs);
+ refresh = addChild(cs);
refresh->setHelpId(IDH_PUBLIC_HUBS_REFRESH);
refresh->setFont(WinUtil::font);
addWidget(refresh);
@@ -167,12 +167,12 @@
cs.exStyle = WS_EX_TRANSPARENT;
cs.caption = T_("F&ilter");
- filterDesc = createButton(cs);
+ filterDesc = addChild(cs);
filterDesc->setHelpId(IDH_PUBLIC_HUBS_FILTER);
filterDesc->setFont(WinUtil::font);
cs.caption = T_("Configured Public Hub Lists");
- lists = createButton(cs);
+ lists = addChild(cs);
lists->setHelpId(IDH_PUBLIC_HUBS_LISTS);
lists->setFont(WinUtil::font);
}
Modified: dcplusplus/trunk/win32/QueueFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/QueueFrame.cpp 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/QueueFrame.cpp 2008-04-07 19:08:26 UTC (rev 1104)
@@ -98,7 +98,7 @@
{
CheckBox::Seed cs;
cs.caption = _T("+/-");
- showTree = createCheckBox(cs);
+ 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:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/SearchFrame.cpp 2008-04-07 19:08:26 UTC (rev 1104)
@@ -117,23 +117,23 @@
searchLabel->setHelpId(IDH_SEARCH_SEARCH_FOR);
cs.caption = T_("Size");
- sizeLabel = createLabel(cs);
+ sizeLabel = addChild(cs);
sizeLabel->setHelpId(IDH_SEARCH_SIZE);
cs.caption = T_("File type");
- typeLabel = createLabel(cs);
+ typeLabel = addChild(cs);
typeLabel->setHelpId(IDH_SEARCH_TYPE);
cs.caption = T_("Search options");
- optionLabel = createLabel(cs);
+ optionLabel = addChild(cs);
cs.caption = T_("Hubs");
- hubsLabel = createLabel(cs);
+ hubsLabel = addChild(cs);
hubsLabel->setHelpId(IDH_SEARCH_HUBS);
}
{
- searchBox = createComboBox(WinUtil::Seeds::comboBoxEdit);
+ searchBox = addChild(WinUtil::Seeds::comboBoxEdit);
searchBox->setHelpId(IDH_SEARCH_SEARCH_FOR);
addWidget(searchBox);
@@ -146,19 +146,19 @@
{
Button::Seed cs = WinUtil::Seeds::button;
cs.caption = T_("Purge");
- purge = createButton(cs);
+ purge = addChild(cs);
purge->setHelpId(IDH_SEARCH_PURGE);
purge->onClicked(std::tr1::bind(&SearchFrame::handlePurgeClicked, this));
cs.style |= BS_DEFPUSHBUTTON;
cs.caption = T_("Search");
- doSearch = createButton(cs);
+ doSearch = addChild(cs);
doSearch->setHelpId(IDH_SEARCH_SEARCH);
doSearch->onClicked(std::tr1::bind(&SearchFrame::runSearch, this));
}
{
- mode = createComboBox(WinUtil::Seeds::comboBoxStatic);
+ mode = addChild(WinUtil::Seeds::comboBoxStatic);
mode->setHelpId(IDH_SEARCH_SIZE);
addWidget(mode);
@@ -170,13 +170,13 @@
{
TextBox::Seed cs = WinUtil::Seeds::textBox;
cs.style |= ES_AUTOHSCROLL | ES_NUMBER;
- size = createTextBox(cs);
+ size = addChild(cs);
size->setHelpId(IDH_SEARCH_SIZE);
addWidget(size);
}
{
- sizeMode = createComboBox(WinUtil::Seeds::comboBoxStatic);
+ sizeMode = addChild(WinUtil::Seeds::comboBoxStatic);
sizeMode->setHelpId(IDH_SEARCH_SIZE);
addWidget(sizeMode);
@@ -188,7 +188,7 @@
}
{
- fileType = createComboBox(WinUtil::Seeds::comboBoxStatic);
+ fileType = addChild(WinUtil::Seeds::comboBoxStatic);
fileType->setHelpId(IDH_SEARCH_TYPE);
addWidget(fileType);
@@ -205,7 +205,7 @@
{
CheckBox::Seed cs(T_("Only users with free slots"));
- slots = createCheckBox(cs);
+ slots = addChild(cs);
slots->setHelpId(IDH_SEARCH_SLOTS);
slots->setChecked(onlyFree);
@@ -247,7 +247,7 @@
{
CheckBox::Seed cs(_T("+/-"));
- showUI = createCheckBox(cs);
+ showUI = addChild(cs);
showUI->setChecked(bShowUI);
showUI->onClicked(std::tr1::bind(&SearchFrame::handleShowUIClicked, this));
Modified: dcplusplus/trunk/win32/SettingsDialog.cpp
===================================================================
--- dcplusplus/trunk/win32/SettingsDialog.cpp 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/SettingsDialog.cpp 2008-04-07 19:08:26 UTC (rev 1104)
@@ -114,7 +114,7 @@
void SettingsDialog::addPage(const tstring& title, PropPage* page) {
pages.push_back(page);
- createTree(title, TVI_ROOT, page);
+ addChild(title, TVI_ROOT, page);
}
void SettingsDialog::handleOKClicked() {
@@ -148,7 +148,7 @@
}
}
-HTREEITEM SettingsDialog::createTree(const tstring& str, HTREEITEM parent, PropPage* page) {
+HTREEITEM SettingsDialog::addChild(const tstring& str, HTREEITEM parent, PropPage* page) {
TVINSERTSTRUCT tvi;
tvi.hInsertAfter = TVI_LAST;
tvi.hParent = parent;
@@ -185,7 +185,7 @@
}
TreeView_Expand(pageTree->handle(), parent, TVE_EXPAND);
// Recurse...
- return createTree(str.substr(i+1), item, page);
+ return addChild(str.substr(i+1), item, page);
}
}
Modified: dcplusplus/trunk/win32/SettingsDialog.h
===================================================================
--- dcplusplus/trunk/win32/SettingsDialog.h 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/SettingsDialog.h 2008-04-07 19:08:26 UTC (rev 1104)
@@ -47,7 +47,7 @@
void selectionChanged();
void showPage(PropPage* page);
- HTREEITEM createTree(const tstring& str, HTREEITEM parent, PropPage* page);
+ HTREEITEM addChild(const tstring& str, HTREEITEM parent, PropPage* page);
HTREEITEM find(const tstring& str, HTREEITEM start);
};
Modified: dcplusplus/trunk/win32/SplashWindow.cpp
===================================================================
--- dcplusplus/trunk/win32/SplashWindow.cpp 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/SplashWindow.cpp 2008-04-07 19:08:26 UTC (rev 1104)
@@ -47,7 +47,7 @@
TextBox::Seed cs;
cs.style = WS_CHILD | ES_CENTER | ES_READONLY;
cs.exStyle = WS_EX_STATICEDGE;
- text = createTextBox(cs);
+ text = addChild(cs);
}
text->setFont(SmartWin::DefaultGuiFont);
Modified: dcplusplus/trunk/win32/SpyFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/SpyFrame.cpp 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/SpyFrame.cpp 2008-04-07 19:08:26 UTC (rev 1104)
@@ -49,7 +49,7 @@
{
Table::Seed cs = WinUtil::Seeds::Table;
cs.style |= LVS_SINGLESEL;
- searches = createTable(cs);
+ searches = addChild(cs);
addWidget(searches);
searches->createColumns(WinUtil::getStrings(columnNames));
@@ -62,7 +62,7 @@
{
CheckBox::Seed cs(T_("Ignore TTH searches"));
- ignoreTTH = createCheckBox(cs);
+ ignoreTTH = addChild(cs);
ignoreTTH->setHelpId(IDH_SPY_IGNORE_TTH);
ignoreTTH->setChecked(bIgnoreTTH);
ignoreTTH->onClicked(std::tr1::bind(&SpyFrame::handleIgnoreTTHClicked, this));
Modified: dcplusplus/trunk/win32/SystemFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/SystemFrame.cpp 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/SystemFrame.cpp 2008-04-07 19:08:26 UTC (rev 1104)
@@ -29,7 +29,7 @@
{
TextBox::Seed cs = WinUtil::Seeds::textBox;
cs.style = WS_CHILD | WS_VISIBLE | WS_VSCROLL | ES_AUTOVSCROLL | ES_MULTILINE | ES_NOHIDESEL | ES_READONLY;
- log = createTextBox(cs);
+ log = addChild(cs);
addWidget(log);
}
Modified: dcplusplus/trunk/win32/TextBox.cpp
===================================================================
--- dcplusplus/trunk/win32/TextBox.cpp 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/TextBox.cpp 2008-04-07 19:08:26 UTC (rev 1104)
@@ -22,6 +22,11 @@
#include "WinUtil.h"
+TextBox::Seed::Seed(const SmartUtil::tstring& caption) :
+ BaseType::Seed(caption)
+{
+}
+
TextBox::TextBox( SmartWin::Widget * parent ) : BaseType(parent), menuOpened(false) {
this->onLeftMouseDblClick(std::tr1::bind(&TextBox::handleLeftDblClick, this, _1));
Modified: dcplusplus/trunk/win32/TextBox.h
===================================================================
--- dcplusplus/trunk/win32/TextBox.h 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/TextBox.h 2008-04-07 19:08:26 UTC (rev 1104)
@@ -21,13 +21,19 @@
/** Our own flavour of text boxes that handle double clicks and have fancy menus */
class TextBox : public SmartWin::TextBox {
-private:
typedef SmartWin::TextBox BaseType;
+
public:
typedef TextBox ThisType;
typedef ThisType* ObjectType;
+ struct Seed : public BaseType::Seed {
+ typedef ThisType WidgetType;
+
+ Seed(const SmartUtil::tstring& caption = SmartUtil::tstring());
+ };
+
explicit TextBox( SmartWin::Widget * parent );
private:
Modified: dcplusplus/trunk/win32/TextFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/TextFrame.cpp 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/TextFrame.cpp 2008-04-07 19:08:26 UTC (rev 1104)
@@ -32,7 +32,7 @@
TextBox::Seed cs = WinUtil::Seeds::textBox;
cs.style = WS_CHILD | WS_VISIBLE | WS_VSCROLL | ES_AUTOVSCROLL | ES_MULTILINE | ES_NOHIDESEL | ES_READONLY;
cs.font = WinUtil::monoFont;
- pad = createTextBox(cs);
+ pad = addChild(cs);
addWidget(pad);
pad->setTextLimit(0);
Modified: dcplusplus/trunk/win32/TransferView.cpp
===================================================================
--- dcplusplus/trunk/win32/TransferView.cpp 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/TransferView.cpp 2008-04-07 19:08:26 UTC (rev 1104)
@@ -74,7 +74,7 @@
TabSheet::Seed tcs;
tcs.style = WS_CHILD | WS_CLIPCHILDREN | WS_VISIBLE |
TCS_HOTTRACK | TCS_RAGGEDRIGHT | TCS_TOOLTIPS | TCS_FOCUSNEVER;
- tabs = createTabSheet(tcs);
+ tabs = addChild(tcs);
tabs->onSelectionChanged(std::tr1::bind(&TransferView::handleTabSelected, this));
}
Modified: dcplusplus/trunk/win32/WinUtil.cpp
===================================================================
--- dcplusplus/trunk/win32/WinUtil.cpp 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/WinUtil.cpp 2008-04-07 19:08:26 UTC (rev 1104)
@@ -59,11 +59,11 @@
DWORD WinUtil::helpCookie = 0;
const SmartWin::Button::Seed WinUtil::Seeds::button;
-const SmartWin::ComboBox::Seed WinUtil::Seeds::comboBoxStatic;
-const SmartWin::ComboBox::Seed WinUtil::Seeds::comboBoxEdit;
+const ComboBox::Seed WinUtil::Seeds::comboBoxStatic;
+const ComboBox::Seed WinUtil::Seeds::comboBoxEdit;
const SmartWin::Table::Seed WinUtil::Seeds::Table;
const SmartWin::WidgetMenu::Seed WinUtil::Seeds::menu;
-const SmartWin::TextBox::Seed WinUtil::Seeds::textBox;
+const TextBox::Seed WinUtil::Seeds::textBox;
const SmartWin::Tree::Seed WinUtil::Seeds::treeView;
void WinUtil::init() {
@@ -121,11 +121,11 @@
// 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::ComboBox::Seed& xcomboBoxEdit = const_cast<SmartWin::ComboBox::Seed&>(Seeds::comboBoxEdit);
- SmartWin::ComboBox::Seed& xcomboBoxStatic = const_cast<SmartWin::ComboBox::Seed&>(Seeds::comboBoxStatic);
+ 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);
SmartWin::WidgetMenu::Seed& xmenu = const_cast<SmartWin::WidgetMenu::Seed&>(Seeds::menu);
- SmartWin::TextBox::Seed& xtextBox = const_cast<SmartWin::TextBox::Seed&>(Seeds::textBox);
+ 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;
Modified: dcplusplus/trunk/win32/WinUtil.h
===================================================================
--- dcplusplus/trunk/win32/WinUtil.h 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/WinUtil.h 2008-04-07 19:08:26 UTC (rev 1104)
@@ -23,6 +23,7 @@
#include <dcpp/Util.h>
#include <dcpp/forward.h>
#include <dcpp/MerkleTree.h>
+#include "WidgetFactory.h"
#ifdef PORT_ME
// Some utilities for handling HLS colors, taken from Jean-Michel LE FOL's codeproject
@@ -68,11 +69,11 @@
struct Seeds {
static const SmartWin::Button::Seed button;
- static const SmartWin::ComboBox::Seed comboBoxStatic;
- static const SmartWin::ComboBox::Seed comboBoxEdit;
+ static const ComboBox::Seed comboBoxStatic;
+ static const ComboBox::Seed comboBoxEdit;
static const SmartWin::Table::Seed Table;
static const SmartWin::WidgetMenu::Seed menu;
- static const SmartWin::TextBox::Seed textBox;
+ static const TextBox::Seed textBox;
static const SmartWin::Tree::Seed treeView;
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2008-04-07 19:05:13
|
Revision: 1103
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1103&view=rev
Author: arnetheduck
Date: 2008-04-07 12:04:50 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
Rework seeds, needs more work
Modified Paths:
--------------
dcplusplus/trunk/smartwin/include/smartwin/Widget.h
dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectText.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/Button.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/CheckBox.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/ComboBox.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/Composite.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/Container.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/Control.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/CoolBar.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/DateTime.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/Frame.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/GroupBox.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/Label.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/MDIChild.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/MDIFrame.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/MDIParent.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/ModelessDialog.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/RadioButton.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/TextBox.h
dcplusplus/trunk/smartwin/source/widgets/Button.cpp
dcplusplus/trunk/smartwin/source/widgets/CheckBox.cpp
dcplusplus/trunk/smartwin/source/widgets/ComboBox.cpp
dcplusplus/trunk/smartwin/source/widgets/CoolBar.cpp
dcplusplus/trunk/smartwin/source/widgets/DateTime.cpp
dcplusplus/trunk/smartwin/source/widgets/GroupBox.cpp
dcplusplus/trunk/smartwin/source/widgets/Label.cpp
dcplusplus/trunk/smartwin/source/widgets/MDIChild.cpp
dcplusplus/trunk/smartwin/source/widgets/MDIFrame.cpp
dcplusplus/trunk/smartwin/source/widgets/MDIParent.cpp
dcplusplus/trunk/smartwin/source/widgets/ProgressBar.cpp
dcplusplus/trunk/smartwin/source/widgets/RadioButton.cpp
dcplusplus/trunk/smartwin/source/widgets/TextBox.cpp
dcplusplus/trunk/smartwin/source/widgets/Window.cpp
dcplusplus/trunk/win32/SearchFrame.cpp
dcplusplus/trunk/win32/SystemFrame.cpp
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-03-31 20:44:36.398000002 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
+ timestamp: 2008-04-01 00:06:48.601000071 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
Name: bzr:file-ids
- smartwin/include/smartwin/aspects/AspectCloseable.h aspectcloseable.h-20080331184314-ain6peu31zweti0t-1
smartwin/include/smartwin/aspects/AspectTimer.h aspecttimer.h-20080331184314-ain6peu31zweti0t-2
smartwin/include/smartwin/widgets/Composite.h composite.h-20080331184314-ain6peu31zweti0t-3
smartwin/include/smartwin/widgets/Container.h container.h-20080331184314-ain6peu31zweti0t-4
smartwin/source/widgets/ModalDialog.cpp 800@f586c4b0-9d0d-0410-bc51-f1fe239209fc:dcplusplus%2Ftrunk:smartwin%2Fsource%2Fwidgets%2FWidgetModalDialog.cpp
smartwin/source/widgets/ModelessDialog.cpp 800@f586c4b0-9d0d-0410-bc51-f1fe239209fc:dcplusplus%2Ftrunk:smartwin%2Fsource%2Fwidgets%2FWidgetDialog.cpp
smartwin/source/widgets/Window.cpp 800@f586c4b0-9d0d-0410-bc51-f1fe239209fc:dcplusplus%2Ftrunk:smartwin%2Fsource%2Fwidgets%2FWidgetWindow.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
+ 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
Modified: dcplusplus/trunk/smartwin/include/smartwin/Widget.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/Widget.h 2008-04-07 18:56:50 UTC (rev 1102)
+++ dcplusplus/trunk/smartwin/include/smartwin/Widget.h 2008-04-07 19:04:50 UTC (rev 1103)
@@ -64,45 +64,6 @@
: public boost::noncopyable
{
public:
- /** Most Widgets can override the creational parameters which sets the style and the
- * initial position of the Widget, those Widgets will take an object of this type to
- * their creational function(s).
- */
- struct Seed {
- LPCTSTR className;
-
- /// Initial caption
- /** Windows with a title bar will use this string in the title bar. Controls with
- * caption (e.g. static control, edit control) will use it in the control. <br>
- * It is feed directly to CreateWindowEx, this means that it follows its
- * conventions. In particular, the string "#num" has a special meaning.
- */
- SmartUtil::tstring caption;
-
- /// The style of the object (starts with WS_ or BS_ etc...)
- /** WARNING: The creation of most of the controls require WS_CHILD to be set.
- * This is done, by default, in the appropriate controls. If you override the
- * default style, then be sure that WS_CHILD is set (if needed).
- */
- DWORD style;
-
- /// The Extended Style of the object (starts often with WS_EX_ etc)
- DWORD exStyle;
-
- /// The initial position / size of the Widget
- Rectangle location;
-
- HMENU menuHandle;
-
- /// Constructor initializing all member variables to default values
- Seed(LPCTSTR className_, DWORD style_ = WS_VISIBLE, DWORD exStyle_ = 0,
- const SmartUtil::tstring& caption_ = SmartUtil::tstring(),
- const Rectangle& location_ = letTheSystemDecide, HMENU menuHandle_ = NULL)
- : className(className_), caption(caption_), style( style_ ), exStyle( exStyle_ ), location( location_ ), menuHandle( menuHandle_ )
- {}
-
- };
-
/// Returns the HWND to the Widget
/** Returns the HWND to the inner window of the Widget. <br>
* If you need to do directly manipulation of the window use this function to
@@ -178,17 +139,58 @@
*/
void attach( unsigned id );
- virtual void attach(HWND wnd);
+protected:
+ /** Most Widgets can override the creational parameters which sets the style and the
+ * initial position of the Widget, those Widgets will take an object of this type to
+ * their creational function(s).
+ */
+ struct Seed {
+ LPCTSTR className;
-protected:
+ /// Initial caption
+ /** Windows with a title bar will use this string in the title bar. Controls with
+ * caption (e.g. static control, edit control) will use it in the control. <br>
+ * It is feed directly to CreateWindowEx, this means that it follows its
+ * conventions. In particular, the string "#num" has a special meaning.
+ */
+ SmartUtil::tstring caption;
+
+ /// The style of the object (starts with WS_ or BS_ etc...)
+ /** WARNING: The creation of most of the controls require WS_CHILD to be set.
+ * This is done, by default, in the appropriate controls. If you override the
+ * default style, then be sure that WS_CHILD is set (if needed).
+ */
+ DWORD style;
+
+ /// The Extended Style of the object (starts often with WS_EX_ etc)
+ DWORD exStyle;
+
+ /// The initial position / size of the Widget
+ Rectangle location;
+
+ HMENU menuHandle;
+
+ /// Constructor initializing all member variables to default values
+ Seed(LPCTSTR className_, DWORD style_ = WS_VISIBLE, DWORD exStyle_ = 0,
+ const SmartUtil::tstring& caption_ = SmartUtil::tstring(),
+ const Rectangle& location_ = letTheSystemDecide, HMENU menuHandle_ = NULL)
+ : className(className_), caption(caption_), style( style_ ), exStyle( exStyle_ ), location( location_ ), menuHandle( menuHandle_ )
+ {}
+
+ };
+
+
+
Widget(Widget * parent);
virtual ~Widget();
- // Creates the Widget, should NOT be called directly but overridden in the
- // derived class (with no parameters)
- virtual HWND create( const Seed & cs );
+ // Creates the Widget, should not be called directly but overridden in the
+ // derived class - otherwise the wrong seed will be used
+ HWND create(const Seed & cs);
+ virtual void attach(HWND wnd);
+
private:
friend class Application;
template<typename T> friend T hwnd_cast(HWND hwnd);
Modified: dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectText.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectText.h 2008-04-07 18:56:50 UTC (rev 1102)
+++ dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectText.h 2008-04-07 19:04:50 UTC (rev 1103)
@@ -41,35 +41,24 @@
* E.g. the AspectTextBox have a "text" Aspect therefore they realize the AspectText
* through inheritance.
*/
-template< class WidgetType >
+template<typename WidgetType>
class AspectText
{
WidgetType& W() { return *static_cast<WidgetType*>(this); }
const WidgetType& W() const { return *static_cast<const WidgetType*>(this); }
- static SmartUtil::tstring isActive(const MSG& msg) {
+ static SmartUtil::tstring getText(const MSG& msg) {
return SmartUtil::tstring( reinterpret_cast< TCHAR * >( msg.lParam ) );
}
- typedef Dispatchers::ConvertBase<SmartUtil::tstring, &AspectText<WidgetType>::isActive, false> Dispatcher;
- friend class Dispatchers::ConvertBase<SmartUtil::tstring, &AspectText<WidgetType>::isActive, false>;
+ typedef Dispatchers::ConvertBase<SmartUtil::tstring, &AspectText<WidgetType>::getText, false> Dispatcher;
+ friend class Dispatchers::ConvertBase<SmartUtil::tstring, &AspectText<WidgetType>::getText, false>;
public:
/// Sets the text of the AspectText realizing class
/** The txt parameter is the new text to put into the realizing object.
*/
void setText( const SmartUtil::tstring & txt );
- /// Sets the text in the Edit Control so that endl causes a new line.
- /** Just the same as setText except that CR are expanded to LF CR
- * Replaces \n with \r\n so that Windows textbox understands "endl"
- */
- void setTextLines( const SmartUtil::tstring & txt );
-
- /// Returns a string in which \n is replaced with with \r\n
- /** The purpose is to enable Windows textboxs to understand "endl"
- */
- static SmartUtil::tstring replaceEndlWithLfCr( const SmartUtil::tstring & txt );
-
/// Gets the text of the AspectText realizing class
/** The Return value is the text of the realizing class.
*/
@@ -87,7 +76,6 @@
void onTextChanging(const typename Dispatcher::F& f) {
W().addCallback(Message( WM_SETTEXT ), Dispatcher(f));
}
-
protected:
virtual ~AspectText()
{}
@@ -97,38 +85,11 @@
// Implementation of class
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
template< class WidgetType >
-void AspectText< WidgetType >::setText( const SmartUtil::tstring & txt )
-{
+void AspectText< WidgetType >::setText( const SmartUtil::tstring & txt ) {
W().sendMessage(WM_SETTEXT, 0, reinterpret_cast< LPARAM >(txt.c_str()) );
}
-
template< class WidgetType >
-SmartUtil::tstring AspectText< WidgetType >::replaceEndlWithLfCr( const SmartUtil::tstring & txt )
-{
- // Replaces \n with \r\n so that Windows textbox understands "endl"
- SmartUtil::tstring txtEndl= txt;
-
- SmartUtil::tstring::size_type pos= txtEndl.find( _T('\n'), 0 );
- while ( SmartUtil::tstring::npos != pos ) {
- if(pos > 0 && txtEndl[pos-1] != _T('\r')) {
- txtEndl.replace( pos, 1, _T("\r\n") );
- pos += 2; // Don't find the replacement \n.
- } else {
- pos++;
- }
- pos = txtEndl.find( _T('\n'), pos );
- }
- return txtEndl;
-}
-
-template< class WidgetType >
-void AspectText< WidgetType >::setTextLines( const SmartUtil::tstring & inTxt )
-{
- setText( replaceEndlWithLfCr( inTxt ) );
-}
-
-template< class WidgetType >
size_t AspectText< WidgetType >::length( ) const {
return W().sendMessage(WM_GETTEXTLENGTH);
}
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Button.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Button.h 2008-04-07 18:56:50 UTC (rev 1102)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Button.h 2008-04-07 19:04:50 UTC (rev 1103)
@@ -43,17 +43,17 @@
* 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
- Seed(const SmartUtil::tstring& caption_ = SmartUtil::tstring());
+ Seed(const SmartUtil::tstring& caption_ = SmartUtil::tstring(), DWORD style = 0);
};
template<typename SeedType>
- void create(const SeedType& cs);
-
+ void create(const SeedType& cs = SeedType());
protected:
typedef Button ButtonType;
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/CheckBox.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/CheckBox.h 2008-04-07 18:56:50 UTC (rev 1102)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/CheckBox.h 2008-04-07 19:04:50 UTC (rev 1103)
@@ -59,14 +59,17 @@
/// Object type
typedef ThisType* ObjectType;
+
+ typedef Button 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
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/ComboBox.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/ComboBox.h 2008-04-07 18:56:50 UTC (rev 1102)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/ComboBox.h 2008-04-07 19:04:50 UTC (rev 1103)
@@ -82,16 +82,17 @@
/// 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;
/// Use extended ui
@@ -101,11 +102,6 @@
Seed();
};
- /// Return the selected value of the ComboBox
- /** If no item is actually selected the return value is "".
- */
- SmartUtil::tstring getSelectedValue();
-
/// Appends a value to the ComboBox.
/** The return value is the index of the new item appended.
*/
@@ -185,14 +181,6 @@
ComboBox_SetCurSel( handle(), idx );
}
-inline SmartUtil::tstring ComboBox::getSelectedValue()
-{
- int txtLength = ::GetWindowTextLength( handle() );
- SmartUtil::tstring retVal(txtLength, '\0');
- ::GetWindowText( handle(), &retVal[0], txtLength );
- return retVal;
-}
-
inline void ComboBox::clearImpl()
{
ComboBox_ResetContent( handle() );
@@ -229,17 +217,8 @@
return static_cast<size_t>(ComboBox_GetCount( handle() )); // Number of items present.
}
-inline SmartUtil::tstring ComboBox::getValue( int index )
-{
- // Uses CB_GETLBTEXTLEN and CB_GETLBTEXT
- int txtLength = ComboBox_GetLBTextLen( handle(), index );
- SmartUtil::tstring retVal(txtLength, '\0');
- ComboBox_GetLBText( handle(), index, &retVal[0] );
- return retVal;
-}
-
inline ComboBox::ComboBox( Widget * parent )
- : ControlType( parent )
+ : BaseType( parent )
{
}
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Composite.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Composite.h 2008-04-07 18:56:50 UTC (rev 1102)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Composite.h 2008-04-07 19:04:50 UTC (rev 1103)
@@ -52,13 +52,12 @@
HCURSOR cursor;
/// Fills with default parameters
- Seed(DWORD style);
+ Seed(const SmartUtil::tstring& caption, DWORD style, DWORD exStyle);
};
-
- template<typename ChildSeed>
- typename ChildSeed::ObjectType add(const ChildSeed& seed) {
- return WidgetCreator<typename ChildSeed::WidgetType>::create(this, seed);
+ template<typename SeedType>
+ typename SeedType::WidgetType::ObjectType addChild(const SeedType& seed) {
+ return WidgetCreator<typename SeedType::WidgetType>::create(this, seed);
}
virtual void create(const Seed& cs);
@@ -73,8 +72,8 @@
};
template<typename Policy>
-Composite<Policy>::Seed::Seed(DWORD style) :
- BaseType::Seed(NULL, style | WS_CLIPCHILDREN),
+Composite<Policy>::Seed::Seed(const SmartUtil::tstring& caption, DWORD style, DWORD exStyle) :
+ BaseType::Seed(NULL, style | WS_CLIPCHILDREN, 0, caption),
background(( HBRUSH )( COLOR_APPWORKSPACE + 1 )),
menuName(NULL),
cursor(NULL)
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Container.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Container.h 2008-04-07 18:56:50 UTC (rev 1102)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Container.h 2008-04-07 19:04:50 UTC (rev 1103)
@@ -18,17 +18,19 @@
typedef Composite<Policies::Normal> BaseType;
struct Seed : public BaseType::Seed {
+ typedef ThisType WidgetType;
+
Seed();
};
// Use our seed type
- virtual void create( const Seed& cs = Seed() );
+ void create( const Seed& cs = Seed() );
protected:
Container(Widget* parent) : BaseType(parent) { }
};
-inline Container::Seed::Seed() : BaseType::Seed(WS_CHILD | WS_CLIPSIBLINGS) {
+inline Container::Seed::Seed() : BaseType::Seed(NULL, WS_CHILD | WS_CLIPSIBLINGS, 0) {
}
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Control.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Control.h 2008-04-07 18:56:50 UTC (rev 1102)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Control.h 2008-04-07 19:04:50 UTC (rev 1103)
@@ -38,26 +38,26 @@
public:
typedef MessageMap<Policy> BaseType;
+protected:
struct Seed : public BaseType::Seed {
- Seed(LPCTSTR className, DWORD style);
+ Seed(LPCTSTR className, DWORD style, DWORD exStyle = 0, const SmartUtil::tstring& caption = SmartUtil::tstring());
};
-protected:
typedef Control<Policy> ControlType;
Control(Widget* parent);
};
+typedef Control<Policies::Subclassed> CommonControl;
+
template<typename Policy>
Control<Policy>::Control(Widget* parent) : MessageMap<Policy>(parent) {
}
-typedef Control<Policies::Subclassed> CommonControl;
-
template<typename Policy>
-Control<Policy>::Seed::Seed(LPCTSTR className, DWORD style) :
- BaseType::Seed(NULL, style | WS_VISIBLE)
+Control<Policy>::Seed::Seed(LPCTSTR className, DWORD style, DWORD exStyle, const SmartUtil::tstring& caption) :
+ BaseType::Seed(NULL, style | WS_VISIBLE, exStyle, caption)
{
}
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/CoolBar.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/CoolBar.h 2008-04-07 18:56:50 UTC (rev 1102)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/CoolBar.h 2008-04-07 19:04:50 UTC (rev 1103)
@@ -38,16 +38,6 @@
#include "../aspects/AspectSizable.h"
#include "../aspects/AspectVisible.h"
#include "../xCeption.h"
-#include "Button.h"
-#include "CheckBox.h"
-#include "ComboBox.h"
-#include "DateTime.h"
-#include "GroupBox.h"
-#include "WidgetMenu.h"
-#include "Spinner.h"
-#include "TextBox.h"
-#include "Tree.h"
-#include "RadioButton.h"
namespace SmartWin
{
@@ -66,7 +56,9 @@
* of buttons, one for going "home", one to stop rendering of the current page, one
* to view the log of URL's you have been to etc... In addition to serving like a
* dockable toolbar ( see ToolBar ) a Coolbar Widget can also contain more
- * complex Widgets lke for instance a ComboBox, a TextBox and so on...
+ * complex Widgets lke for instance a ComboBox, a TextBox and so on...
+ *
+ * @todo This class needs some love...
*/
class CoolBar :
public MessageMap< Policies::Subclassed >,
@@ -99,50 +91,21 @@
typedef CoolBar ThisType;
/// Object type
- typedef ThisType * ObjectType;
+ typedef ThisType* ObjectType;
+
+ typedef MessageMap<Policies::Subclassed> 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;
+
Seed();
};
- /// ComboBox object type.
- typedef ComboBox::ObjectType ComboBoxPtr;
-
- /// TextBox object type.
- typedef TextBox::ObjectType TextBoxPtr;
-
- /// Button object type.
- typedef Button::ObjectType ButtonPtr;
-
- /// Button object type.
- typedef Tree::ObjectType TreePtr;
-
- /// CheckBox object type.
- typedef CheckBox::ObjectType CheckBoxPtr;
-
- /// Spinner object type.
- typedef Spinner::ObjectType SpinnerPtr;
-
- /// GroupBox object type.
- typedef GroupBox::ObjectType GroupBoxPtr;
-
- /// RadioButton object type.
- typedef RadioButton::ObjectType RadioButtonPtr;
-
- /// DateTimePicker object type.
- typedef DateTime::ObjectType DateTimePtr;
-
- /// Menu object type.
- typedef WidgetMenu::ObjectType WidgetMenuPtr;
-
/// Actually creates the Coolbar
/** You should call WidgetFactory::createCoolbar if you instantiate class
* directly. <br>
@@ -150,55 +113,6 @@
*/
void create( const Seed & cs = Seed() );
- RadioButtonPtr sow( GroupBoxPtr & parent, const RadioButton::Seed & cs )
- {
-#ifdef PORT_ME
- RadioButtonPtr retVal ( WidgetCreator< RadioButton >::create( parent, internal_::getTypedParentOrThrow < EventHandlerClass * >( this ), cs ) );
- retVal->setBounds( 0, 0, cs.location.width(), cs.location.size.y );
- parent->addChild( retVal );
- return retVal;
-#endif
- return NULL;
- }
-
- /// Creates a Widget using its CreationalInfo
- /** Adds up the created widget into a new band in the Coolbar control
- */
- template< class A_Seed >
- typename A_Seed::WidgetType::ObjectType sow( const /*typename*/ A_Seed & cs, const SmartUtil::tstring & label = _T("") )
- {
- typename A_Seed::WidgetType::ObjectType retVal ( WidgetCreator< typename A_Seed::WidgetType >::create( this, cs ) );
- retVal->setBounds( 0, 0, cs.location.width(), cs.location.size.y );
- this->addChild( retVal, cs.location.width(), cs.location.size.y, label );
- return retVal;
- }
-
- //TODO: update this help
- /// Creates a ComboBox Widget inside the Coolbar
- /** The returned ComboBox is roughly the same object type as a "normal"
- * ComboBox, though size and position doesn't count since the Coolbar will
- * control these properties itself. Apart from that the combobox has the same
- * properties as a normal ComboBox. The width and the openedHeight
- * properties is the width of the combobox and the height of the dropped down
- * viewable area of the ComboBox. The bandHeight is the height of the actual
- * band Note that the rect part of the CreationalStruct passed is more or less
- * ignored...
- */
-
- //template< >
- //typename CoolBar< EventHandlerClass >::ComboBoxPtr // Bug in VC++7.1 Koenig Lookup forces us to give full type of return value...
- //sow< typename CoolBar< EventHandlerClass >::ComboBox::Seed >
- // ( const typename CoolBar< EventHandlerClass >::Seed & cs, const SmartUtil::tstring & label = _T("") )
- //{
- // typename CoolBar< EventHandlerClass >::ObjectType retVal (WidgetCreator< typename CoolBar< EventHandlerClass > >::create( this, cs ));
- // retVal->setBounds( 0, 0, cs.rect.width(), cs.rect.size.y );
- // //TODO: use something like cs.itsOpenedHeight
- // this->addChild( retVal, cs.rect.width(), cs.rect.size.y, label );
- // return retVal;
- //}
-
- //TODO: Menu specialization
-
/// Refreshes the Coolbar
/** Call this one after the container widget has been resized to make sure the
* coolbar is having the right size...
@@ -223,8 +137,8 @@
// Implementation of class
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-inline CoolBar::CoolBar( SmartWin::Widget * parent )
- : PolicyType( parent )
+inline CoolBar::CoolBar( Widget * parent )
+ : BaseType( parent )
{
// Can't have a text box without a parent...
xAssert( parent, _T( "Can't have a Button without a parent..." ) );
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/DateTime.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/DateTime.h 2008-04-07 18:56:50 UTC (rev 1102)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/DateTime.h 2008-04-07 19:04:50 UTC (rev 1103)
@@ -39,7 +39,6 @@
{
// begin namespace SmartWin
-
// Forward declaring friends
template< class WidgetType >
class WidgetCreator;
@@ -84,16 +83,17 @@
/// 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;
SmartUtil::tstring format;
@@ -117,9 +117,7 @@
* when the DateTime date value is changed.
*/
void onDateTimeChanged(const Dispatcher::F& f) {
- addCallback(
- Message( WM_NOTIFY, DTN_DATETIMECHANGE ), Dispatcher(f)
- );
+ addCallback(Message( WM_NOTIFY, DTN_DATETIMECHANGE ), Dispatcher(f));
}
/// Retrieves the time value of the DateTimePicker control
@@ -221,7 +219,7 @@
return Message( WM_NOTIFY, DTN_DROPDOWN );
}
-inline SYSTEMTIME DateTime::getDateTime()
+inline SYSTEMTIME DateTime::getDateTime()
{
SYSTEMTIME st;
DateTime_GetSystemtime( this->handle(), & st );
@@ -238,8 +236,8 @@
DateTime_SetFormat( this->handle(), format.c_str() );
}
-inline DateTime::DateTime( SmartWin::Widget * parent )
- : ControlType( parent )
+inline DateTime::DateTime( Widget* parent )
+ : BaseType( parent )
{
// Can't have a text box without a parent...
xAssert( parent, _T( "Can't have a TextBox without a parent..." ) );
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Frame.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Frame.h 2008-04-07 18:56:50 UTC (rev 1102)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Frame.h 2008-04-07 19:04:50 UTC (rev 1103)
@@ -77,11 +77,6 @@
typedef Composite< Policy > BaseType;
- struct Seed : public BaseType::Seed {
- Seed(DWORD style);
- };
-
- // TODO: Outfactor to system implementation type, see e.g. WidgetFactory
#ifndef WINCE
/// Animates a window
/** Slides the window into view from either right or left depending on the
@@ -133,6 +128,10 @@
void setCursor( const SmartUtil::tstring & filePathName );
protected:
+ struct Seed : public BaseType::Seed {
+ Seed(const SmartUtil::tstring& caption, DWORD style, DWORD exStyle);
+ };
+
// Protected since this Widget we HAVE to inherit from
explicit Frame( Widget * parent = 0 );
@@ -147,7 +146,9 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
template<typename Policy>
-Frame<Policy>::Seed::Seed(DWORD style) : Frame<Policy>::BaseType::Seed(WS_OVERLAPPEDWINDOW) {
+Frame<Policy>::Seed::Seed(const SmartUtil::tstring& caption, DWORD style, DWORD exStyle) :
+ BaseType::Seed(caption, WS_OVERLAPPEDWINDOW, exStyle)
+{
}
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/GroupBox.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/GroupBox.h 2008-04-07 18:56:50 UTC (rev 1102)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/GroupBox.h 2008-04-07 19:04:50 UTC (rev 1103)
@@ -59,16 +59,17 @@
/// Object type
typedef ThisType* ObjectType;
+
+ typedef Button 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:
- FontPtr font;
-
+ struct Seed : public BaseType::Seed {
+ typedef ThisType WidgetType;
+
/// Fills with default parameters
Seed(const SmartUtil::tstring& caption_ = SmartUtil::tstring());
};
@@ -89,7 +90,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
inline GroupBox::GroupBox( Widget * parent )
- : ButtonType( parent )
+ : BaseType( parent )
{
}
// end namespace SmartWin
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Label.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Label.h 2008-04-07 18:56:50 UTC (rev 1102)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Label.h 2008-04-07 19:04:50 UTC (rev 1103)
@@ -39,8 +39,7 @@
#include "../resources/Bitmap.h"
#include "Control.h"
-namespace SmartWin
-{
+namespace SmartWin {
// begin namespace SmartWin
// Forward declaring friends
@@ -81,15 +80,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
@@ -121,8 +121,6 @@
private:
BitmapPtr itsBitmap;
- void setBitmap( HBITMAP bitmap );
-
// Contract needed by AspectClickable Aspect class
static Message getClickMessage();
@@ -139,20 +137,14 @@
}
inline Label::Label( Widget * parent )
- : ControlType( parent )
+ : BaseType( parent )
{
}
-inline void Label::setBitmap( HBITMAP bitmap )
-{
- this->addRemoveStyle( SS_BITMAP, true );
- this->sendMessage(STM_SETIMAGE, ( WPARAM ) IMAGE_BITMAP, ( LPARAM ) bitmap );
-}
-
-inline void Label::setBitmap( const BitmapPtr& bitmap )
-{
- this->setBitmap( bitmap->handle() );
+inline void Label::setBitmap( const BitmapPtr& bitmap ) {
itsBitmap = bitmap;
+ addRemoveStyle( SS_BITMAP, true );
+ sendMessage(STM_SETIMAGE, ( WPARAM ) IMAGE_BITMAP, reinterpret_cast<LPARAM>(bitmap->handle()));
}
// end namespace SmartWin
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/MDIChild.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/MDIChild.h 2008-04-07 18:56:50 UTC (rev 1102)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/MDIChild.h 2008-04-07 19:04:50 UTC (rev 1103)
@@ -31,13 +31,12 @@
#ifndef WINCE
#include "../../SmartUtil.h"
-#include "../Rectangle.h"
#include "../resources/Icon.h"
#include "../Policies.h"
#include "../WindowClass.h"
#include "MDIParent.h"
#include "Frame.h"
-#include <sstream>
+
#include <boost/scoped_ptr.hpp>
namespace SmartWin
@@ -59,11 +58,14 @@
* Related classes: <br>
* MDIParent
*/
-class MDIChild
- : public Frame< Policies::MDIChild >
+class MDIChild :
+ public Composite< Policies::MDIChild >,
+
+ public AspectMinMax<MDIChild>
+
{
public:
- typedef Frame<Policies::MDIChild> BaseType;
+ typedef Composite<Policies::MDIChild> BaseType;
/// Class type
typedef MDIChild ThisType;
@@ -76,15 +78,9 @@
* knows the type of the class whose seed values it contains. Every widget
* should define one of these.
*/
- class Seed
- : public Widget::Seed
- {
- public:
- typedef MDIChild::ThisType WidgetType;
+ struct Seed : public BaseType::Seed {
+ typedef ThisType WidgetType;
- IconPtr smallIcon;
- IconPtr icon;
- HBRUSH background;
bool activate;
/// Fills with default parameters
@@ -96,14 +92,14 @@
/** This version creates a MessageMapMDIChildWidget to plug into MDIParent
* container window.
*/
- void createMDIChild( Seed cs = Seed() );
+ void createMDIChild( const Seed& cs = Seed() );
- virtual bool tryFire(const MSG& msg, LRESULT& retVal);
-
void activate();
MDIParent* getParent() { return static_cast<MDIParent*>(PolicyType::getParent()); }
protected:
+ virtual bool tryFire(const MSG& msg, LRESULT& retVal);
+
// Protected since this Widget we HAVE to inherit from
explicit MDIChild( Widget * parent );
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/MDIFrame.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/MDIFrame.h 2008-04-07 18:56:50 UTC (rev 1102)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/MDIFrame.h 2008-04-07 19:04:50 UTC (rev 1103)
@@ -65,12 +65,10 @@
* knows the type of the class whose seed values it contains. Every widget
* should define one of these.
*/
- class Seed
- : public BaseType::Seed
+ struct Seed : public BaseType::Seed
{
- public:
/// Fills with default parameters
- Seed();
+ Seed(const SmartUtil::tstring& caption = SmartUtil::tstring());
};
/// Actually creates the window
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/MDIParent.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/MDIParent.h 2008-04-07 18:56:50 UTC (rev 1102)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/MDIParent.h 2008-04-07 19:04:50 UTC (rev 1103)
@@ -64,14 +64,8 @@
* MDIChild
*/
class MDIParent :
- public MessageMap< Policies::Subclassed >,
+ public Control< Policies::Subclassed >
- // Aspects
- public AspectSizable< MDIParent >,
- public AspectVisible< MDIParent >,
- public AspectEnabled< MDIParent >,
- public AspectFocus< MDIParent >,
- public AspectRaw< MDIParent >
{
friend class WidgetCreator< MDIParent >;
public:
@@ -80,16 +74,15 @@
/// Object type
typedef ThisType * ObjectType;
+
+ typedef Control<Policies::Subclassed> 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 {
/**
* First child id for mdi menu, must be different from any other main menu id.
* Also, the menuHandle parameter of cs should point to the menu that will receive
@@ -143,7 +136,7 @@
MDIFrame* getParent() { return static_cast<MDIFrame*>(PolicyType::getParent()); }
protected:
/// Constructor Taking pointer to parent
- explicit MDIParent( SmartWin::Widget * parent );
+ explicit MDIParent( Widget * parent );
// Protected to avoid direct instantiation, you can inherit and use WidgetFactory class which is friend
virtual ~MDIParent()
@@ -155,10 +148,10 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
inline MDIParent::MDIParent( Widget * parent )
- : PolicyType( parent )
+ : BaseType( parent )
{
// Can't have a text box without a parent...
- xAssert( parent, _T( "Can't have a Button without a parent..." ) );
+ xAssert( parent, _T( "Can't have a MDIParent without a parent..." ) );
}
// end namespace SmartWin
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/ModelessDialog.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/ModelessDialog.h 2008-04-07 18:56:50 UTC (rev 1102)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/ModelessDialog.h 2008-04-07 19:04:50 UTC (rev 1103)
@@ -49,13 +49,13 @@
public AspectDialog<ModelessDialog >
{
public:
- typedef Frame< Policies::ModelessDialog > BaseType;
/// Class type
typedef ModelessDialog ThisType;
/// Object type
typedef ThisType * ObjectType;
+ typedef Frame< Policies::ModelessDialog > BaseType;
/// Creates a Dialog Window
/** This version creates a window from the given Dialog Resource Id.
*/
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/RadioButton.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/RadioButton.h 2008-04-07 18:56:50 UTC (rev 1102)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/RadioButton.h 2008-04-07 19:04:50 UTC (rev 1103)
@@ -63,14 +63,17 @@
/// Object type
typedef ThisType* ObjectType;
+
+ typedef Button 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
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/TextBox.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/TextBox.h 2008-04-07 18:56:50 UTC (rev 1102)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/TextBox.h 2008-04-07 19:04:50 UTC (rev 1103)
@@ -98,12 +98,6 @@
*/
void addText( const SmartUtil::tstring & txt );
- /// Appends the text in the text box so that endl causes a new line.
- /** Just the same as addText except that CR are expanded to LF CR
- * Replaces \n with \r\n so that Windows textbox understands "endl"
- */
- void addTextLines( const SmartUtil::tstring & txt );
-
/// Replaces the currently selected text in the text box with the given text parameter
/** If canUndo is true this operation is stacked into the undo que ( can be
* undone ), else this operation cannot be undone. <br>
@@ -206,14 +200,13 @@
* 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
- Seed();
+ Seed(const SmartUtil::tstring& caption = SmartUtil::tstring());
};
/// Adds (or removes) the numbers property
@@ -304,12 +297,6 @@
replaceSelection( addtxt );
}
-inline void TextBoxBase::addTextLines( const SmartUtil::tstring & addtxt )
-{
- setSelection( ( long ) this->getText().size() );
- replaceSelection( this->replaceEndlWithLfCr( addtxt ) );
-}
-
inline long TextBoxBase::findText( const SmartUtil::tstring & txt, unsigned offset ) const
{
SmartUtil::tstring txtOfBox = this->getText();
Modified: dcplusplus/trunk/smartwin/source/widgets/Button.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/Button.cpp 2008-04-07 18:56:50 UTC (rev 1102)
+++ dcplusplus/trunk/smartwin/source/widgets/Button.cpp 2008-04-07 19:04:50 UTC (rev 1103)
@@ -2,8 +2,8 @@
namespace SmartWin {
-Button::Seed::Seed(const SmartUtil::tstring& caption) :
- Widget::Seed(WC_BUTTON, WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_PUSHBUTTON, 0, caption),
+Button::Seed::Seed(const SmartUtil::tstring& caption, DWORD style) :
+ BaseType::Seed(WC_BUTTON, style | WS_CHILD, 0, caption),
font(new Font(DefaultGuiFont))
{
}
Modified: dcplusplus/trunk/smartwin/source/widgets/CheckBox.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/CheckBox.cpp 2008-04-07 18:56:50 UTC (rev 1102)
+++ dcplusplus/trunk/smartwin/source/widgets/CheckBox.cpp 2008-04-07 19:04:50 UTC (rev 1103)
@@ -3,9 +3,9 @@
namespace SmartWin {
CheckBox::Seed::Seed(const SmartUtil::tstring& caption) :
- Widget::Seed(WC_BUTTON, WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_AUTOCHECKBOX | BS_CHECKBOX, 0, caption),
- font(new Font(DefaultGuiFont))
+ BaseType::Seed(caption, BS_AUTOCHECKBOX | BS_CHECKBOX)
{
+
}
}
Modified: dcplusplus/trunk/smartwin/source/widgets/ComboBox.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/ComboBox.cpp 2008-04-07 18:56:50 UTC (rev 1102)
+++ dcplusplus/trunk/smartwin/source/widgets/ComboBox.cpp 2008-04-07 19:04:50 UTC (rev 1103)
@@ -3,14 +3,13 @@
namespace SmartWin {
ComboBox::Seed::Seed() :
- Widget::Seed(WC_COMBOBOX, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_AUTOHSCROLL),
+ BaseType::Seed(WC_COMBOBOX, WS_CHILD | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_AUTOHSCROLL),
font(new Font(DefaultGuiFont)),
extended(true)
{
}
-void ComboBox::create( const Seed & cs )
-{
+void ComboBox::create( const Seed & cs ) {
ControlType::create(cs);
if(cs.font)
setFont( cs.font );
@@ -18,4 +17,12 @@
sendMessage(CB_SETEXTENDEDUI, TRUE);
}
+SmartUtil::tstring ComboBox::getValue( int index ) {
+ // Uses CB_GETLBTEXTLEN and CB_GETLBTEXT
+ int txtLength = ComboBox_GetLBTextLen( handle(), index );
+ SmartUtil::tstring retVal(txtLength, '\0');
+ ComboBox_GetLBText( handle(), index, &retVal[0] );
+ return retVal;
}
+
+}
Modified: dcplusplus/trunk/smartwin/source/widgets/CoolBar.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/CoolBar.cpp 2008-04-07 18:56:50 UTC (rev 1102)
+++ dcplusplus/trunk/smartwin/source/widgets/CoolBar.cpp 2008-04-07 19:04:50 UTC (rev 1103)
@@ -1,3 +1,5 @@
+#include "../../include/smartwin/Policies.h"
+#include "../../include/smartwin/aspects/AspectFocus.h"
#include "../../include/smartwin/widgets/CoolBar.h"
namespace SmartWin {
@@ -7,11 +9,8 @@
{
}
-void CoolBar::create( const Seed & cs )
-{
- xAssert((cs.style & WS_CHILD) == WS_CHILD, _T("Widget must have WS_CHILD style"));
- PolicyType::create(cs);
- //TODO: use CreationalInfo parameters
+void CoolBar::create( const Seed & cs ) {
+ BaseType::create(cs);
}
void CoolBar::addChild( Widget * child,
@@ -31,7 +30,7 @@
rbBand.cyMinChild = height;
rbBand.cx = width;
rbBand.fStyle = 0; //RBBS_GRIPPERALWAYS;
- if ( SendMessage( this->handle(), RB_INSERTBAND, ( WPARAM ) - 1, ( LPARAM ) & rbBand ) == 0 )
+ if ( sendMessage( RB_INSERTBAND, ( WPARAM ) - 1, ( LPARAM ) & rbBand ) == 0 )
{
throw xCeption( _T( "There was a problem when trying to insert a band into your Coolbar object!" ) );
}
Modified: dcplusplus/trunk/smartwin/source/widgets/DateTime.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/DateTime.cpp 2008-04-07 18:56:50 UTC (rev 1102)
+++ dcplusplus/trunk/smartwin/source/widgets/DateTime.cpp 2008-04-07 19:04:50 UTC (rev 1103)
@@ -3,7 +3,7 @@
namespace SmartWin {
DateTime::Seed::Seed() :
- Widget::Seed(DATETIMEPICK_CLASS, WS_CHILD | WS_VISIBLE | WS_TABSTOP | DTS_SHORTDATEFORMAT),
+ BaseType::Seed(DATETIMEPICK_CLASS, WS_CHILD | DTS_SHORTDATEFORMAT),
font(new Font(DefaultGuiFont)),
format(_T( "yyyy.MM.dd" )),
backgroundColor(0x000080),
Modified: dcplusplus/trunk/smartwin/source/widgets/GroupBox.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/GroupBox.cpp 2008-04-07 18:56:50 UTC (rev 1102)
+++ dcplusplus/trunk/smartwin/source/widgets/GroupBox.cpp 2008-04-07 19:04:50 UTC (rev 1103)
@@ -2,10 +2,10 @@
namespace SmartWin {
-GroupBox::Seed::Seed(const SmartUtil::tstring& caption) :
- Widget::Seed(WC_BUTTON, WS_CHILD | WS_VISIBLE | BS_GROUPBOX, 0, caption),
- font(new Font(DefaultGuiFont))
+GroupBox::Seed::Seed(const SmartUtil::tstring& caption) :
+ BaseType::Seed(caption, BS_GROUPBOX)
{
+
}
}
Modified: dcplusplus/trunk/smartwin/source/widgets/Label.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/Label.cpp 2008-04-07 18:56:50 UTC (rev 1102)
+++ dcplusplus/trunk/smartwin/source/widgets/Label.cpp 2008-04-07 19:04:50 UTC (rev 1103)
@@ -3,14 +3,14 @@
namespace SmartWin {
Label::Seed::Seed(const SmartUtil::tstring& caption) :
- Widget::Seed(WC_STATIC, WS_CHILD | WS_VISIBLE | SS_NOTIFY, 0, caption),
+ BaseType::Seed(WC_STATIC, WS_CHILD | SS_NOTIFY, 0, caption),
font(new Font(DefaultGuiFont))
{
}
void Label::create( const Seed & cs ) {
- ControlType::create(cs);
+ BaseType::create(cs);
if(cs.font)
setFont( cs.font );
}
Modified: dcplusplus/trunk/smartwin/source/widgets/MDIChild.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/MDIChild.cpp 2008-04-07 18:56:50 UTC (rev 1102)
+++ dcplusplus/trunk/smartwin/source/widgets/MDIChild.cpp 2008-04-07 19:04:50 UTC (rev 1103)
@@ -3,15 +3,13 @@
namespace SmartWin {
MDIChild::Seed::Seed(const SmartUtil::tstring& caption) :
- Widget::Seed(NULL, WS_OVERLAPPEDWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, WS_EX_MDICHILD, caption),
- background((HBRUSH)(COLOR_WINDOW + 1)),
+ BaseType::Seed(caption, WS_OVERLAPPEDWINDOW | WS_CLIPSIBLINGS, WS_EX_MDICHILD),
activate(true)
{
}
-void MDIChild::createMDIChild( Seed cs )
-{
- windowClass.reset(new WindowClass(WindowClass::getNewClassName(this), &ThisType::wndProc, NULL, cs.background, cs.icon, cs.smallIcon));
+void MDIChild::createMDIChild( const Seed& cs ) {
+ windowClass.reset(new WindowClass(WindowClass::getNewClassName(this), &ThisType::wndProc, NULL, cs.background, cs.icon, cs.smallIcon, cs.cursor));
getParent()->sendMessage(WM_SETREDRAW, FALSE);
HWND active = (HWND)(cs.activate ? NULL : getParent()->sendMessage(WM_MDIGETACTIVE));
Modified: dcplusplus/trunk/smartwin/source/widgets/MDIFrame.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/MDIFrame.cpp 2008-04-07 18:56:50 UTC (rev 1102)
+++ dcplusplus/trunk/smartwin/source/widgets/MDIFrame.cpp 2008-04-07 19:04:50 UTC (rev 1103)
@@ -4,8 +4,9 @@
namespace SmartWin {
-MDIFrame::Seed::Seed() :
- BaseType::Seed(0)
+// TODO Fix caption
+MDIFrame::Seed::Seed(const SmartUtil::tstring& caption) :
+ BaseType::Seed(caption, 0, 0)
{
}
Modified: dcplusplus/trunk/smartwin/source/widgets/MDIParent.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/MDIParent.cpp 2008-04-07 18:56:50 UTC (rev 1102)
+++ dcplusplus/trunk/smartwin/source/widgets/MDIParent.cpp 2008-04-07 19:04:50 UTC (rev 1103)
@@ -4,7 +4,7 @@
namespace SmartWin {
MDIParent::Seed::Seed() :
- Widget::Seed(_T("MDICLIENT"), WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_VSCROLL | WS_HSCROLL, WS_EX_CLIENTEDGE),
+ BaseType::Seed(_T("MDICLIENT"), WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_VSCROLL | WS_HSCROLL, WS_EX_CLIENTEDGE),
idFirstChild(0),
windowMenu(NULL)
{
Modified: dcplusplus/trunk/smartwin/source/widgets/ProgressBar.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/ProgressBar.cpp 2008-04-07 18:56:50 UTC (rev 1102)
+++ dcplusplus/trunk/smartwin/source/widgets/ProgressBar.cpp 2008-04-07 19:04:50 UTC (rev 1103)
@@ -3,7 +3,7 @@
namespace SmartWin {
ProgressBar::Seed::Seed() :
- Widget::Seed(PROGRESS_CLASS, WS_CHILD | WS_VISIBLE)
+ Widget::Seed(PROGRESS_CLASS, WS_CHILD)
{
}
Modified: dcplusplus/trunk/smartwin/source/widgets/RadioButton.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/RadioButton.cpp 2008-04-07 18:56:50 UTC (rev 1102)
+++ dcplusplus/trunk/smartwin/source/widgets/RadioButton.cpp 2008-04-07 19:04:50 UTC (rev 1103)
@@ -3,8 +3,7 @@
namespace SmartWin {
RadioButton::Seed::Seed(const SmartUtil::tstring& caption) :
- Widget::Seed(WC_BUTTON, WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_AUTORADIOBUTTON, 0, caption),
- font(new Font(DefaultGuiFont))
+ BaseType::Seed(caption, BS_AUTORADIOBUTTON)
{
}
Modified: dcplusplus/trunk/smartwin/source/widgets/TextBox.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/TextBox.cpp 2008-04-07 18:56:50 UTC (rev 1102)
+++ dcplusplus/trunk/smartwin/source/widgets/TextBox.cpp 2008-04-07 19:04:50 UTC (rev 1103)
@@ -2,14 +2,13 @@
namespace SmartWin {
-TextBox::Seed::Seed() :
- Widget::Seed(WC_EDIT, WS_CHILD | WS_VISIBLE | WS_TABSTOP, WS_EX_CLIENTEDGE),
+TextBox::Seed::Seed(const SmartUtil::tstring& caption) :
+ BaseType::Seed(WC_EDIT, WS_CHILD | WS_TABSTOP, WS_EX_CLIENTEDGE, caption),
font(new Font(DefaultGuiFont))
{
}
-void TextBox::create( const Seed & cs )
-{
+void TextBox::create( const Seed & cs ) {
ControlType::create(cs);
if(cs.font)
setFont( cs.font );
Modified: dcplusplus/trunk/smartwin/source/widgets/Window.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/Window.cpp 2008-04-07 18:56:50 UTC (rev 1102)
+++ dcplusplus/trunk/smartwin/source/widgets/Window.cpp 2008-04-07 19:04:50 UTC (rev 1103)
@@ -2,7 +2,8 @@
namespace SmartWin {
-Window::Seed::Seed() : BaseType::Seed(0) {
+// TODO add caption
+Window::Seed::Seed() : BaseType::Seed(SmartUtil::tstring(), 0, 0) {
}
Modified: dcplusplus/trunk/win32/SearchFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/SearchFrame.cpp 2008-04-07 18:56:50 UTC (rev 1102)
+++ dcplusplus/trunk/win32/SearchFrame.cpp 2008-04-07 19:04:50 UTC (rev 1103)
@@ -113,7 +113,7 @@
cs.exStyle = WS_EX_TRANSPARENT;
cs.caption = T_("Search for");
- searchLabel = createLabel(cs);
+ searchLabel = addChild(cs);
searchLabel->setHelpId(IDH_SEARCH_SEARCH_FOR);
cs.caption = T_("Size");
Modified: dcplusplus/trunk/win32/SystemFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/SystemFrame.cpp 2008-04-07 18:56:50 UTC (rev 1102)
+++ dcplusplus/trunk/win32/SystemFrame.cpp 2008-04-07 19:04:50 UTC (rev 1103)
@@ -61,7 +61,7 @@
log->setSelection(0, log->lineIndex(log->lineFromChar(limit / 10)));
log->replaceSelection(_T(""));
}
- log->addTextLines(Text::toT("\r\n[" + Util::getShortTimeString(t) + "] ") + msg);
+ log->addText(Text::toT("\r\n[" + Util::getShortTimeString(t) + "] ") + msg);
if(scroll)
log->sendMessage(WM_VSCROLL, SB_BOTTOM);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2008-04-07 18:56:54
|
Revision: 1102
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1102&view=rev
Author: arnetheduck
Date: 2008-04-07 11:56:50 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
Move child windows where they belong in the inheritance structure
Modified Paths:
--------------
dcplusplus/trunk/changelog.txt
dcplusplus/trunk/smartwin/include/smartwin/WidgetCreator.h
dcplusplus/trunk/smartwin/include/smartwin/WidgetFactory.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/Control.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/Frame.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/MDIFrame.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/TabSheet.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTabView.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/Window.h
dcplusplus/trunk/smartwin/source/widgets/MDIFrame.cpp
dcplusplus/trunk/smartwin/source/widgets/WidgetTabView.cpp
dcplusplus/trunk/win32/MDIChildFrame.h
dcplusplus/trunk/win32/MainWindow.cpp
dcplusplus/trunk/win32/MainWindow.h
dcplusplus/trunk/win32/MainWindowFactory.cpp
dcplusplus/trunk/win32/SplashWindow.cpp
dcplusplus/trunk/win32/TransferView.cpp
dcplusplus/trunk/win32/TransferView.h
dcplusplus/trunk/win32/WinUtil.cpp
Added Paths:
-----------
dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectCloseable.h
dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectTimer.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/Composite.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/Container.h
dcplusplus/trunk/smartwin/source/widgets/ModalDialog.cpp
dcplusplus/trunk/smartwin/source/widgets/ModelessDialog.cpp
dcplusplus/trunk/smartwin/source/widgets/Window.cpp
Removed Paths:
-------------
dcplusplus/trunk/smartwin/source/widgets/WidgetDialog.cpp
dcplusplus/trunk/smartwin/source/widgets/WidgetModalDialog.cpp
dcplusplus/trunk/smartwin/source/widgets/WidgetWindow.cpp
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-03-31 17:25:13.130000114 +0200
committer: zouzou123gen
properties:
branch-nick: bzr
bugs: https://launchpad.net/bugs/209684 fixed
+ timestamp: 2008-03-31 20:44:36.398000002 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
Name: bzr:file-ids
-
+ smartwin/include/smartwin/aspects/AspectCloseable.h aspectcloseable.h-20080331184314-ain6peu31zweti0t-1
smartwin/include/smartwin/aspects/AspectTimer.h aspecttimer.h-20080331184314-ain6peu31zweti0t-2
smartwin/include/smartwin/widgets/Composite.h composite.h-20080331184314-ain6peu31zweti0t-3
smartwin/include/smartwin/widgets/Container.h container.h-20080331184314-ain6peu31zweti0t-4
smartwin/source/widgets/ModalDialog.cpp 800@f586c4b0-9d0d-0410-bc51-f1fe239209fc:dcplusplus%2Ftrunk:smartwin%2Fsource%2Fwidgets%2FWidgetModalDialog.cpp
smartwin/source/widgets/ModelessDialog.cpp 800@f586c4b0-9d0d-0410-bc51-f1fe239209fc:dcplusplus%2Ftrunk:smartwin%2Fsource%2Fwidgets%2FWidgetDialog.cpp
smartwin/source/widgets/Window.cpp 800@f586c4b0-9d0d-0410-bc51-f1fe239209fc:dcplusplus%2Ftrunk:smartwin%2Fsource%2Fwidgets%2FWidgetWindow.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
+ 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
Modified: dcplusplus/trunk/changelog.txt
===================================================================
--- dcplusplus/trunk/changelog.txt 2008-04-07 18:54:23 UTC (rev 1101)
+++ dcplusplus/trunk/changelog.txt 2008-04-07 18:56:50 UTC (rev 1102)
@@ -17,6 +17,7 @@
* [L#209099] Fixed non-disappearing controls in search (poy)
* [L#208684] Made the Alt key work again for line history in hub window (poy)
* [L#209684] Fixed parsing of non-XML hub lists (poy)
+* [L#205660] Readded hub column to transfers (thanks mikejj)
-- 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/WidgetCreator.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/WidgetCreator.h 2008-04-07 18:54:23 UTC (rev 1101)
+++ dcplusplus/trunk/smartwin/include/smartwin/WidgetCreator.h 2008-04-07 18:56:50 UTC (rev 1102)
@@ -58,13 +58,6 @@
return retVal;
}
- static typename WidgetType::ObjectType createWindow( Widget * parent, const typename WidgetType::Seed & cs )
- {
- typename WidgetType::ObjectType retVal(new WidgetType( parent ));
- retVal->createWindow( cs );
- return retVal;
- }
-
template< class ContainerType >
static typename WidgetType::ObjectType create( Widget * parent, ContainerType * container, const typename WidgetType::Seed & cs )
{
Modified: dcplusplus/trunk/smartwin/include/smartwin/WidgetFactory.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/WidgetFactory.h 2008-04-07 18:54:23 UTC (rev 1101)
+++ dcplusplus/trunk/smartwin/include/smartwin/WidgetFactory.h 2008-04-07 18:56:50 UTC (rev 1102)
@@ -35,6 +35,7 @@
#include "widgets/MessageBox.h"
#include "widgets/CheckBox.h"
#include "widgets/ComboBox.h"
+#include "widgets/Container.h"
#include "widgets/Table.h"
#include "widgets/DateTime.h"
#include "widgets/GroupBox.h"
@@ -211,10 +212,10 @@
typedef typename DateTime::ObjectType DateTimePtr;
/// WidgetChildWindow class type.
- typedef SmartWin::WidgetChildWindow WidgetChildWindow;
+ typedef SmartWin::Container Container;
/// WidgetChildWindow object type.
- typedef typename WidgetChildWindow::ObjectType WidgetChildWindowPtr;
+ typedef typename Container::ObjectType ContainerPtr;
/// Window class type.
typedef SmartWin::Window Window;
@@ -300,7 +301,7 @@
/// Creates a child window and returns a pointer to it.
/** DON'T delete the returned pointer!!!
*/
- WidgetChildWindowPtr createWidgetChildWindow( const typename WidgetChildWindow::Seed & cs = WidgetChildWindow::Seed() );
+ ContainerPtr createContainer( const typename Container::Seed & cs = Container::Seed() );
/// Creates a Tree View and returns a pointer to it.
/** DON'T delete the returned pointer!!!
@@ -540,10 +541,10 @@
}
template<typename ContainerWidgetType>
-typename WidgetFactory< ContainerWidgetType >::WidgetChildWindowPtr
-WidgetFactory< ContainerWidgetType >::createWidgetChildWindow( const typename WidgetChildWindow::Seed & cs )
+typename WidgetFactory< ContainerWidgetType >::ContainerPtr
+WidgetFactory< ContainerWidgetType >::createContainer( const typename Container::Seed & cs )
{
- return WidgetCreator< WidgetChildWindow >::createWindow( this, cs );
+ return WidgetCreator< Container >::create( this, cs );
}
template<typename ContainerWidgetType>
Added: dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectCloseable.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectCloseable.h (rev 0)
+++ dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectCloseable.h 2008-04-07 18:56:50 UTC (rev 1102)
@@ -0,0 +1,62 @@
+#ifndef ASPECTCLOSE_H_
+#define ASPECTCLOSE_H_
+
+namespace SmartWin {
+
+template< class WidgetType >
+class AspectCloseable {
+ WidgetType& W() { return *static_cast<WidgetType*>(this); }
+
+ struct Dispatcher {
+ typedef std::tr1::function<bool ()> F;
+
+ Dispatcher(const F& f_) : f(f_) { }
+
+ bool operator()(const MSG& msg, LRESULT& ret) {
+ return !f();
+ }
+
+ F f;
+ };
+
+public:
+ /// Closes the window
+ /** Call this function to raise the "Closing" event. <br>
+ * This will normally try to close the window. <br>
+ * Note! <br>
+ * If this event is trapped and we in that event handler state that we DON'T
+ * want to close the window (by returning false) the window will not be close.
+ * <br>
+ * Note! <br>
+ * If the asyncron argument is true the message will be posted to the message
+ * que meaning that the close event will be done asyncronously and therefore the
+ * function will return immediately and the close event will be handled when the
+ * close event pops up in the event handler que.
+ */
+ void close( bool asyncron = false );
+
+ /// Event Handler setter for the Closing Event
+ /** If supplied event handler is called before the window is closed. <br>
+ * Signature of event handler must be "bool foo()" <br>
+ * If you return true from your event handler the window is closed, otherwise
+ * the window is NOT allowed to actually close!!
+ */
+ void onClosing(const typename Dispatcher::F& f);
+};
+
+template< class WidgetType >
+void AspectCloseable< WidgetType >::close( bool asyncron ) {
+ if ( asyncron )
+ W().postMessage(WM_CLOSE); // Return now
+ else
+ W().sendMessage(WM_CLOSE); // Return after close is done.
+}
+
+template<typename WidgetType>
+void AspectCloseable<WidgetType>::onClosing(const typename Dispatcher::F& f) {
+ W().addCallback(Message(WM_CLOSE), Dispatcher(f));
+}
+
+}
+
+#endif /*ASPECTCLOSE_H_*/
Added: dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectTimer.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectTimer.h (rev 0)
+++ dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectTimer.h 2008-04-07 18:56:50 UTC (rev 1102)
@@ -0,0 +1,49 @@
+#ifndef ASPECTTIMER_H_
+#define ASPECTTIMER_H_
+
+namespace SmartWin {
+
+template< class WidgetType >
+class AspectTimer {
+ WidgetType& W() { return *static_cast<WidgetType*>(this); }
+ HWND H() { return W().handle(); }
+
+ struct Dispatcher {
+ typedef std::tr1::function<bool ()> F;
+
+ Dispatcher(const F& f_) : f(f_) { }
+
+ bool operator()(const MSG& msg, LRESULT& ret) {
+ if(!f()) {
+ /// @todo remove from message map as well...
+ ::KillTimer(msg.hwnd, msg.wParam);
+ }
+ return FALSE;
+ }
+
+ F f;
+ };
+
+
+public:
+ /// Creates a timer object.
+ /** The supplied function must have the signature bool foo() <br>
+ * The event function will be called when at least milliSeconds seconds have elapsed.
+ * If your event handler returns true, it will keep getting called periodically, otherwise
+ * it will be removed.
+ */
+ void createTimer(const typename Dispatcher::F& f, unsigned int milliSeconds, unsigned int id = 0);
+
+};
+
+template< class WidgetType >
+void AspectTimer< WidgetType >::createTimer( const typename Dispatcher::F& f,
+ unsigned int milliSecond, unsigned int id)
+{
+ ::SetTimer( H(), id, static_cast< UINT >( milliSecond ), NULL);
+ W().addCallback(Message( WM_TIMER, id ), Dispatcher(f));
+}
+
+}
+
+#endif /*ASPECTTIMER_H_*/
Added: dcplusplus/trunk/smartwin/include/smartwin/widgets/Composite.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Composite.h (rev 0)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Composite.h 2008-04-07 18:56:50 UTC (rev 1102)
@@ -0,0 +1,95 @@
+#ifndef COMPOSITE_H_
+#define COMPOSITE_H_
+
+#include "../aspects/AspectActivate.h"
+#include "../aspects/AspectCommand.h"
+#include "../aspects/AspectDragDrop.h"
+#include "../aspects/AspectEraseBackground.h"
+#include "../aspects/AspectFocus.h"
+#include "../aspects/AspectFont.h"
+#include "../aspects/AspectPainting.h"
+#include "../aspects/AspectText.h"
+#include "../resources/Icon.h"
+#include "../Policies.h"
+#include "../WidgetCreator.h"
+#include "../WindowClass.h"
+#include "Control.h"
+
+#include <boost/scoped_ptr.hpp>
+
+namespace SmartWin {
+
+template<typename Policy>
+class Composite :
+ public Control<Policy>,
+ // Aspects
+ public AspectActivate< Composite< Policy > >,
+ public AspectCommand< Composite< Policy > >,
+ public AspectDragDrop< Composite< Policy > >,
+ public AspectEraseBackground< Composite< Policy > >,
+ public AspectFocus< Composite< Policy > >,
+ public AspectFont< Composite< Policy > >,
+ public AspectPainting< Composite< Policy > >,
+ public AspectText< Composite< Policy > >
+{
+public:
+ typedef Composite<Policy> ThisType;
+
+ typedef ThisType* ObjectType;
+
+ typedef Control<Policy> 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.
+ */
+ struct Seed : public BaseType::Seed {
+ IconPtr icon;
+ IconPtr smallIcon;
+ HBRUSH background;
+ LPCTSTR menuName;
+ HCURSOR cursor;
+
+ /// Fills with default parameters
+ Seed(DWORD style);
+ };
+
+
+ template<typename ChildSeed>
+ typename ChildSeed::ObjectType add(const ChildSeed& seed) {
+ return WidgetCreator<typename ChildSeed::WidgetType>::create(this, seed);
+ }
+
+ virtual void create(const Seed& cs);
+protected:
+ friend class WidgetCreator<Composite<Policy> >;
+
+ explicit Composite( Widget * parent ) : BaseType( parent )
+ {};
+
+private:
+ boost::scoped_ptr<WindowClass> windowClass;
+};
+
+template<typename Policy>
+Composite<Policy>::Seed::Seed(DWORD style) :
+ BaseType::Seed(NULL, style | WS_CLIPCHILDREN),
+ background(( HBRUSH )( COLOR_APPWORKSPACE + 1 )),
+ menuName(NULL),
+ cursor(NULL)
+{
+}
+
+template<typename Policy>
+void Composite<Policy>::create(const Seed& cs) {
+ windowClass.reset(new WindowClass(WindowClass::getNewClassName(this), &ThisType::wndProc, cs.menuName, cs.background, cs.icon, cs.smallIcon, cs.cursor));
+
+ Seed cs2 = cs;
+ cs2.className = windowClass->getClassName();
+ BaseType::create( cs2 );
+}
+
+}
+
+#endif /*COMPOSITE_H_*/
Added: dcplusplus/trunk/smartwin/include/smartwin/widgets/Container.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Container.h (rev 0)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Container.h 2008-04-07 18:56:50 UTC (rev 1102)
@@ -0,0 +1,39 @@
+#ifndef CONTAINER_H_
+#define CONTAINER_H_
+
+#include "../Policies.h"
+#include "Composite.h"
+
+namespace SmartWin {
+
+class Container :
+ public Composite<Policies::Normal>
+{
+ friend class WidgetCreator<Container>;
+public:
+ typedef Container ThisType;
+
+ typedef ThisType* ObjectType;
+
+ typedef Composite<Policies::Normal> BaseType;
+
+ struct Seed : public BaseType::Seed {
+ Seed();
+ };
+
+ // Use our seed type
+ virtual void create( const Seed& cs = Seed() );
+
+protected:
+ Container(Widget* parent) : BaseType(parent) { }
+};
+
+inline Container::Seed::Seed() : BaseType::Seed(WS_CHILD | WS_CLIPSIBLINGS) {
+
+}
+
+inline void Container::create(const Seed& cs) {
+ BaseType::create(cs);
+}
+}
+#endif /*CONTAINER_H_*/
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Control.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Control.h 2008-04-07 18:54:23 UTC (rev 1101)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Control.h 2008-04-07 18:56:50 UTC (rev 1102)
@@ -5,6 +5,7 @@
#include "../xCeption.h"
#include "../aspects/AspectBorder.h"
+#include "../aspects/AspectCloseable.h"
#include "../aspects/AspectContextMenu.h"
#include "../aspects/AspectEnabled.h"
#include "../aspects/AspectHelp.h"
@@ -12,6 +13,7 @@
#include "../aspects/AspectMouse.h"
#include "../aspects/AspectRaw.h"
#include "../aspects/AspectSizable.h"
+#include "../aspects/AspectTimer.h"
#include "../aspects/AspectVisible.h"
namespace SmartWin {
@@ -22,6 +24,7 @@
public MessageMap<Policy>,
public AspectBorder<Control<Policy> >,
+ public AspectCloseable<Control<Policy> >,
public AspectContextMenu<Control<Policy> >,
public AspectEnabled<Control<Policy> >,
public AspectHelp<Control<Policy> >,
@@ -29,10 +32,16 @@
public AspectMouse<Control<Policy> >,
public AspectRaw<Control<Policy> >,
public AspectSizable<Control<Policy> >,
+ public AspectTimer<Control<Policy> >,
public AspectVisible<Control<Policy> >
{
public:
-
+ typedef MessageMap<Policy> BaseType;
+
+ struct Seed : public BaseType::Seed {
+ Seed(LPCTSTR className, DWORD style);
+ };
+
protected:
typedef Control<Policy> ControlType;
@@ -46,6 +55,13 @@
typedef Control<Policies::Subclassed> CommonControl;
+template<typename Policy>
+Control<Policy>::Seed::Seed(LPCTSTR className, DWORD style) :
+ BaseType::Seed(NULL, style | WS_VISIBLE)
+{
+
}
+}
+
#endif /*CONTROL_H_*/
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Frame.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Frame.h 2008-04-07 18:54:23 UTC (rev 1101)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Frame.h 2008-04-07 18:56:50 UTC (rev 1102)
@@ -30,16 +30,8 @@
#include "../Application.h"
#include "../Rectangle.h"
-#include "../aspects/AspectActivate.h"
-#include "../aspects/AspectCommand.h"
-#include "../aspects/AspectDragDrop.h"
-#include "../aspects/AspectEraseBackground.h"
-#include "../aspects/AspectFocus.h"
-#include "../aspects/AspectFont.h"
#include "../aspects/AspectMinMax.h"
-#include "../aspects/AspectPainting.h"
-#include "../aspects/AspectText.h"
-#include "Control.h"
+#include "Composite.h"
namespace SmartWin
{
@@ -73,102 +65,22 @@
*/
template< class Policy >
class Frame :
- public Control< Policy >,
-
- // Aspects
- public AspectActivate< Frame< Policy > >,
- public AspectCommand< Frame< Policy > >,
- public AspectDragDrop< Frame< Policy > >,
- public AspectEraseBackground< Frame< Policy > >,
- public AspectFocus< Frame< Policy > >,
- public AspectFont< Frame< Policy > >,
- public AspectMinMax<Frame<Policy> >,
- public AspectPainting< Frame< Policy > >,
- public AspectText< Frame< Policy > >
+ public Composite< Policy >,
+ public AspectMinMax<Frame<Policy> >
{
- struct CloseDispatcher
- {
- typedef std::tr1::function<bool ()> F;
-
- CloseDispatcher(const F& f_, Widget* widget_) : f(f_), widget(widget_) { }
-
- bool operator()(const MSG& msg, LRESULT& ret) {
- bool destroy = f();
-
- if ( destroy ) {
- return false;
- }
-
- return true;
- }
-
- F f;
- Widget* widget;
- };
-
- struct TimerDispatcher
- {
- typedef std::tr1::function<bool ()> F;
-
- TimerDispatcher(const F& f_) : f(f_) { }
-
- bool operator()(const MSG& msg, LRESULT& ret) {
- bool keep = f();
-
- if(!keep) {
- ::KillTimer(msg.hwnd, msg.wParam);
- // TODO remove from message map as well...
- }
- return FALSE;
- }
-
- F f;
- };
-
public:
/// Class type
typedef Frame< Policy > ThisType;
/// Object type
typedef ThisType * ObjectType;
+
+ typedef Composite< Policy > BaseType;
+
+ struct Seed : public BaseType::Seed {
+ Seed(DWORD style);
+ };
- // TODO: Outfactor into WidgetClosable
- /// Event Handler setter for the Closing Event
- /** If supplied event handler is called before the window is closed. <br>
- * Signature of event handler must be "bool foo()" <br>
- * If you return true from your event handler the window is closed, otherwise
- * the window is NOT allowed to actually close!!
- */
- void onClosing(const typename CloseDispatcher::F& f) {
- this->addCallback(
- Message( WM_CLOSE ), CloseDispatcher(f, this)
- );
- }
-
- // TODO: Outfactor into "time Aspect" class
- /// Creates a timer object.
- /** The supplied function must have the signature bool foo() <br>
- * The event function will be called when at least milliSeconds seconds have elapsed.
- * If your event handler returns true, it will keep getting called periodically, otherwise
- * it will be removed.
- */
- void createTimer(const typename TimerDispatcher::F& f, unsigned int milliSeconds, unsigned int id = 0);
-
- /// Closes the window
- /** Call this function to raise the "Closing" event. <br>
- * This will normally try to close the window. <br>
- * Note! <br>
- * If this event is trapped and we in that event handler state that we DON'T
- * want to close the window (by returning false) the window will not be close.
- * <br>
- * Note! <br>
- * If the asyncron argument is true the message will be posted to the message
- * que meaning that the close event will be done asyncronously and therefore the
- * function will return immediately and the close event will be handled when the
- * close event pops up in the event handler que.
- */
- void close( bool asyncron = false );
-
// TODO: Outfactor to system implementation type, see e.g. WidgetFactory
#ifndef WINCE
/// Animates a window
@@ -228,34 +140,17 @@
// directly
virtual ~Frame()
{}
-
-
};
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Implementation of class
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-template< class Policy >
-void Frame< Policy >::createTimer( const typename TimerDispatcher::F& f,
- unsigned int milliSecond, unsigned int id)
-{
-
- ::SetTimer( this->handle(), id, static_cast< UINT >( milliSecond ), NULL);
- addCallback(
- Message( WM_TIMER, id ), TimerDispatcher(f)
- );
+template<typename Policy>
+Frame<Policy>::Seed::Seed(DWORD style) : Frame<Policy>::BaseType::Seed(WS_OVERLAPPEDWINDOW) {
+
}
-template< class Policy >
-void Frame< Policy >::close( bool asyncron )
-{
- if ( asyncron )
- this->postMessage(WM_CLOSE); // Return now
- else
- this->sendMessage(WM_CLOSE); // Return after close is done.
-}
-
#ifndef WINCE
template< class Policy >
void Frame< Policy >::animateSlide( bool show, bool left, unsigned int time )
@@ -340,7 +235,7 @@
template< class Policy >
Frame< Policy >::Frame( Widget * parent )
- : Control<Policy>( parent )
+ : Composite<Policy>( parent )
{
}
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/MDIFrame.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/MDIFrame.h 2008-04-07 18:54:23 UTC (rev 1101)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/MDIFrame.h 2008-04-07 18:56:50 UTC (rev 1102)
@@ -28,11 +28,7 @@
#ifndef MDIFrame_h
#define MDIFrame_h
-#include "../WindowsHeaders.h"
-#include "../Rectangle.h"
-#include "../WindowClass.h"
#include "Frame.h"
-#include <boost/scoped_ptr.hpp>
namespace SmartWin
{
@@ -53,10 +49,8 @@
* features of MDIFrameBase.
*/
class MDIFrame
- : public Frame< Policies::MDIFrame<MDIFrame > >
+ : public Frame< Policies::MDIFrame<MDIFrame> >
{
- typedef Frame< Policies::MDIFrame<MDIFrame > > BaseType;
-
public:
/// Class type
typedef MDIFrame ThisType;
@@ -64,58 +58,30 @@
/// Object type
typedef ThisType* ObjectType;
+ typedef Frame< Policies::MDIFrame<MDIFrame> > 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 BaseType::Seed
{
public:
- IconPtr icon;
- IconPtr iconSmall;
- HBRUSH background;
- LPCTSTR menuName;
- HCURSOR cursor;
-
/// Fills with default parameters
- // explicit to avoid conversion through SmartWin::CreationalStruct
Seed();
-
};
/// Actually creates the window
/** This one creates the window. <br>
* All MDIFrames, and classes derived from them must create the Window
* before using it with functions such as setBounds() or setVisible( false ). <br>
- * The simple version "createWindow()" uses a default Seed for the window attributes.
+ * The simple version "create()" uses a default Seed for the window attributes.
* The seed is not taken a constant because the class name will be generated at registration.
*/
- void createWindow( Seed = Seed() );
+ void create( const Seed& cs = Seed() );
- /// Creates an invisible window, for quiet initialization.
- /** Same as createWindow, except that the window lacks WS_VISIBLE.
- * Since you must create the window before you add other Widgets,
- * and doing so causes a bit of screen flash before the final window
- * is ready, createInvisibleWindow() lets you add Widgets while
- * the main Widget is not visible. Of course you could do code like <br>
- *
- * Seed defInvisible = Seed(); <br>
- * defInvisible.style= defInvisible.style & ( ~ WS_VISIBLE ); <br>
- * createWindow( defInvisible ); <br>
- *
- * but this is cleaner: <br>
- *
- * createInvisibleWindow(); <br>
- * do init <br>
- * setVisible( true ); <br>
- *
- * The other styles are either defaulted with createInvisibleWindow()
- * or specified with createInvisibleWindow( Seed ).
- */
- void createInvisibleWindow( Seed seed = Seed() );
-
MDIParent* getMDIParent() { return mdi; }
protected:
// Protected since this Widget we HAVE to inherit from
@@ -123,7 +89,6 @@
virtual ~MDIFrame();
private:
- boost::scoped_ptr<WindowClass> windowClass;
MDIParent* mdi;
};
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/TabSheet.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/TabSheet.h 2008-04-07 18:54:23 UTC (rev 1101)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/TabSheet.h 2008-04-07 18:56:50 UTC (rev 1102)
@@ -59,7 +59,7 @@
* the code area where the user can switch between the different opened files. Use
* the onSelectionChanged event to make visible/invisible the different controls you
* wish to use in the different tab pages! <br>
- * Normally you would add up one WidgetChildWindow for each Tab Page the Tab Control
+ * Normally you would add up one Container for each Tab Page the Tab Control
* has.
*/
class TabSheet :
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTabView.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTabView.h 2008-04-07 18:54:23 UTC (rev 1101)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTabView.h 2008-04-07 18:56:50 UTC (rev 1102)
@@ -3,7 +3,7 @@
#include "TabSheet.h"
#include "ToolTip.h"
-#include "Window.h"
+#include "Container.h"
#include "../WindowClass.h"
#include <list>
#include <vector>
@@ -39,29 +39,29 @@
bool toggleActive;
};
- void add(WidgetChildWindow* w, const IconPtr& icon);
+ void add(Container* w, const IconPtr& icon);
- void mark(WidgetChildWindow* w);
+ void mark(Container* w);
- void remove(WidgetChildWindow* w);
+ void remove(Container* w);
void next(bool reverse = false);
- WidgetChildWindow* getActive();
- void setActive(WidgetChildWindow* w) { setActive(findTab(w)); }
+ Container* getActive();
+ void setActive(Container* w) { setActive(findTab(w)); }
- SmartUtil::tstring getTabText(WidgetChildWindow* w);
+ SmartUtil::tstring getTabText(Container* w);
void onTitleChanged(const TitleChangedFunction& f) {
titleChangedFunction = f;
}
+ void onTabContextMenu(Container* w, const std::tr1::function<bool (const ScreenCoordinate& pt)>& f);
+
void onHelp(const HelpFunction& f) {
helpFunction = f;
}
- void onTabContextMenu(WidgetChildWindow* w, const ContextMenuFunction& f);
-
bool filter(const MSG& msg);
TabSheet::ObjectType getTab();
@@ -81,8 +81,8 @@
enum { MAX_TITLE_LENGTH = 20 };
struct TabInfo {
- TabInfo(WidgetChildWindow* w_) : w(w_) { }
- WidgetChildWindow* w;
+ TabInfo(Container* w_) : w(w_) { }
+ Container* w;
ContextMenuFunction handleContextMenu;
};
@@ -98,24 +98,24 @@
bool inTab;
- typedef std::list<WidgetChildWindow*> WindowList;
+ typedef std::list<Container*> WindowList;
typedef WindowList::iterator WindowIter;
WindowList viewOrder;
Rectangle clientSize;
std::vector<IconPtr> icons;
int active;
- WidgetChildWindow* dragging;
+ Container* dragging;
SmartUtil::tstring tipText;
- int findTab(WidgetChildWindow* w);
+ int findTab(Container* w);
void setActive(int i);
- TabInfo* getTabInfo(WidgetChildWindow* w);
+ TabInfo* getTabInfo(Container* w);
TabInfo* getTabInfo(int i);
- void setTop(WidgetChildWindow* w);
+ void setTop(Container* w);
- bool handleTextChanging(WidgetChildWindow* w, const SmartUtil::tstring& newText);
+ bool handleTextChanging(Container* w, const SmartUtil::tstring& newText);
void handleSized(const SizedEvent&);
void handleTabSelected();
LRESULT handleToolTip(LPARAM lParam);
@@ -129,7 +129,7 @@
void layout();
int addIcon(const IconPtr& icon);
- void swapWidgets(WidgetChildWindow* oldW, WidgetChildWindow* newW);
+ void swapWidgets(Container* oldW, Container* newW);
};
inline TabSheet::ObjectType WidgetTabView::getTab()
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Window.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Window.h 2008-04-07 18:54:23 UTC (rev 1101)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Window.h 2008-04-07 18:56:50 UTC (rev 1102)
@@ -28,12 +28,8 @@
#ifndef Window_h
#define Window_h
-#include "../Rectangle.h"
-#include "../WindowClass.h"
#include "Frame.h"
-#include <boost/scoped_ptr.hpp>
-
namespace SmartWin
{
// begin namespace SmartWin
@@ -56,7 +52,6 @@
class Window
: public Frame< Policies::Normal >
{
- typedef Frame< Policies::Normal > BaseType;
struct CreateDispatcher
{
typedef std::tr1::function<void (const CREATESTRUCT&)> F;
@@ -81,24 +76,18 @@
/// Object type
typedef ThisType* ObjectType;
+
+ typedef Frame<Policies::Normal> 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
- {
+ struct Seed : public BaseType::Seed {
public:
typedef Window::ThisType WidgetType;
- IconPtr icon;
- IconPtr smallIcon;
- HBRUSH background;
- LPCTSTR menuName;
- HCURSOR cursor;
-
/// Fills with default parameters
Seed();
};
@@ -107,33 +96,11 @@
/** This one creates the window. <br>
* All Windows, and classes derived from them must create the Window
* before using it with functions such as setBounds() or setVisible( false ). <br>
- * The simple version "createWindow()" uses a default Seed for the window attributes.
+ * The simple version "create()" uses a default Seed for the window attributes.
* The seed is not taken a constant because the class name will be generated at registration.
*/
- void createWindow( Seed cs = Seed() );
+ virtual void create( const Seed& cs = Seed() );
- /// Creates an invisible window, for quiet initialization.
- /** Same as createWindow, except that the window lacks WS_VISIBLE.
- * Since you must create the window before you add other Widgets,
- * and doing so causes a bit of screen flash before the final window
- * is ready, createInvisibleWindow() lets you add Widgets while
- * the main Widget is not visible. Of course you could do code like <br>
- *
- * Seed defInvisible = Seed(); <br>
- * defInvisible.style= defInvisible.style & ( ~ WS_VISIBLE ); <br>
- * createWindow( defInvisible ); <br>
- *
- * but this is cleaner: <br>
- *
- * createInvisibleWindow(); <br>
- * do init <br>
- * setVisible( true ); <br>
- *
- * The other styles are either defaulted with createInvisibleWindow()
- * or specified with createInvisibleWindow( Seed ).
- */
- void createInvisibleWindow( Seed cs = Seed() );
-
// TODO: Check up if the CREATESTRUCT * actualy IS modyfiable...!!
/// Setting the event handler for the "create" event
/** The event handler must have the signature "void foo( CREATESTRUCT * )" where
@@ -163,50 +130,8 @@
explicit Window( Widget * parent = 0 );
virtual ~Window();
-private:
- boost::scoped_ptr<WindowClass> windowClass;
};
-class WidgetChildWindow
- : public Window
-{
-public:
- typedef WidgetChildWindow ThisType;
- typedef ThisType* ObjectType;
-
- /// Seed class
- /** This class contains all of the values needed to create the widget. It also
- * knows the type of the class whose seed values it contains. Every widget
- * should define one of these.
- */
- class Seed
- : public Window::Seed
- {
- public:
- /// Fills with default parameters
- Seed();
- };
-
- //TODO: This could be specialized to take WNDPROC from MessageMap
- /// Actually creates the window
- /** This one creates the window. It is implemented in case somebody wants to use
- * createWindow() without parameters. If it wasn't declared, the compiler would
- * call Window::create with Window::Seed, which wouldn't
- * create a child window.
- */
- void createWindow( const Seed& cs = Seed() )
- {
- Window::createWindow( cs );
- }
-
-protected:
- friend class WidgetCreator<WidgetChildWindow>;
-
- // Unlike Window, WidgetChildWindow must have a parent!!!
- explicit WidgetChildWindow( Widget * parent ) : Window( parent )
- {};
-};
-
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Implementation of class
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -219,12 +144,6 @@
{
}
-inline void Window::createInvisibleWindow( Seed cs )
-{
- cs.style= cs.style & ( ~ WS_VISIBLE );
- Window::createWindow( cs );
-}
-
inline void Window::activatePreviousInstance()
{
#ifdef PORT_ME
@@ -247,11 +166,6 @@
#endif
}
-inline WidgetChildWindow::Seed::Seed()
-{
- this->style = WS_VISIBLE | WS_CHILD;
-}
-
// end namespace SmartWin
}
Modified: dcplusplus/trunk/smartwin/source/widgets/MDIFrame.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/MDIFrame.cpp 2008-04-07 18:54:23 UTC (rev 1101)
+++ dcplusplus/trunk/smartwin/source/widgets/MDIFrame.cpp 2008-04-07 18:56:50 UTC (rev 1102)
@@ -5,24 +5,13 @@
namespace SmartWin {
MDIFrame::Seed::Seed() :
- Widget::Seed(NULL, WS_VISIBLE | WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN),
- background(( HBRUSH )( COLOR_APPWORKSPACE + 1 )),
- menuName(NULL),
- cursor(NULL)
+ BaseType::Seed(0)
{
}
-void MDIFrame::createInvisibleWindow( Seed cs )
+void MDIFrame::create( const Seed& cs )
{
- cs.style= cs.style & ( ~ WS_VISIBLE );
- MDIFrame::createWindow( cs );
-}
-
-void MDIFrame::createWindow( Seed cs )
-{
- windowClass.reset(new WindowClass(WindowClass::getNewClassName(this), &ThisType::wndProc, cs.menuName, cs.background, cs.icon, cs.iconSmall, cs.cursor));
- cs.className = windowClass->getClassName();
- Widget::create( cs );
+ BaseType::create(cs);
mdi = WidgetCreator<MDIParent>::create(this);
}
Copied: dcplusplus/trunk/smartwin/source/widgets/ModalDialog.cpp (from rev 1101, dcplusplus/trunk/smartwin/source/widgets/WidgetModalDialog.cpp)
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/ModalDialog.cpp (rev 0)
+++ dcplusplus/trunk/smartwin/source/widgets/ModalDialog.cpp 2008-04-07 18:56:50 UTC (rev 1102)
@@ -0,0 +1,45 @@
+#include "../../include/smartwin/widgets/ModalDialog.h"
+
+namespace SmartWin {
+
+int ModalDialog::createDialog( unsigned resourceId )
+{
+ // this will not return until the dialog is closed by calling endDialog() with
+ // a retv
+ //
+ INT_PTR retv = ::DialogBoxParam
+ ( ( Application::instance().getAppHandle() )
+ , ( MAKEINTRESOURCE( resourceId ) )
+ , ( this->getParent() ? this->getParent()->handle() : 0 )
+ , ( (DLGPROC)&ThisType::wndProc )
+ , ( reinterpret_cast< LPARAM >( dynamic_cast< Widget * >( this ) ) )
+ );
+ if ( retv == - 1 )
+ {
+ throw xCeption( _T( "Couldn't create modal dialog" ) );
+ }
+ return static_cast< int >( retv );
+}
+
+int ModalDialog::createDialog()
+{
+ // Arrange so the DLGTEMPLATE is followed by 0000 for menu, winclass and title.
+ unsigned char dlg_menu_winclass_title[ sizeof( DLGTEMPLATE ) + 30 ];
+ memset( dlg_menu_winclass_title, 0, sizeof( dlg_menu_winclass_title ) );
+ memcpy( dlg_menu_winclass_title, & itsDefaultDlgTemplate, sizeof( DLGTEMPLATE ) );
+
+ // this will not return until the dialog is closed by calling endDialog() with
+ // a retv
+ //
+ INT_PTR retv = ::DialogBoxIndirectParam
+ ( Application::instance().getAppHandle() // HINSTANCE hInstance
+ , ( DLGTEMPLATE * ) dlg_menu_winclass_title // LPCDLGTEMPLATE hDialogTemplate
+ , this->getParent() ? this->getParent()->handle() : 0 // HWND hWndParent
+ , (DLGPROC)&ThisType::wndProc // DLGPROC lpDialogFunc
+ , reinterpret_cast< LPARAM >( dynamic_cast< Widget * >( this ) )
+ ); // LPARAM dwInitParam
+
+ return static_cast< int >( retv );
+}
+
+}
Copied: dcplusplus/trunk/smartwin/source/widgets/ModelessDialog.cpp (from rev 1101, dcplusplus/trunk/smartwin/source/widgets/WidgetDialog.cpp)
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/ModelessDialog.cpp (rev 0)
+++ dcplusplus/trunk/smartwin/source/widgets/ModelessDialog.cpp 2008-04-07 18:56:50 UTC (rev 1102)
@@ -0,0 +1,18 @@
+#include "../../include/smartwin/widgets/ModelessDialog.h"
+
+namespace SmartWin {
+
+void ModelessDialog::createDialog( unsigned resourceId )
+{
+ HWND wnd = ::CreateDialogParam( Application::instance().getAppHandle(),
+ MAKEINTRESOURCE( resourceId ),
+ ( this->getParent() ? this->getParent()->handle() : 0 ),
+ ( (DLGPROC)&ThisType::wndProc ),
+ reinterpret_cast< LPARAM >( static_cast< Widget * >( this ) ) );
+
+ if ( !wnd ) {
+ throw xCeption( _T( "CreateDialogParam failed." ) );
+ }
+}
+
+}
Deleted: dcplusplus/trunk/smartwin/source/widgets/WidgetDialog.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/WidgetDialog.cpp 2008-04-07 18:54:23 UTC (rev 1101)
+++ dcplusplus/trunk/smartwin/source/widgets/WidgetDialog.cpp 2008-04-07 18:56:50 UTC (rev 1102)
@@ -1,18 +0,0 @@
-#include "../../include/smartwin/widgets/ModelessDialog.h"
-
-namespace SmartWin {
-
-void ModelessDialog::createDialog( unsigned resourceId )
-{
- HWND wnd = ::CreateDialogParam( Application::instance().getAppHandle(),
- MAKEINTRESOURCE( resourceId ),
- ( this->getParent() ? this->getParent()->handle() : 0 ),
- ( (DLGPROC)&ThisType::wndProc ),
- reinterpret_cast< LPARAM >( static_cast< Widget * >( this ) ) );
-
- if ( !wnd ) {
- throw xCeption( _T( "CreateDialogParam failed." ) );
- }
-}
-
-}
Deleted: dcplusplus/trunk/smartwin/source/widgets/WidgetModalDialog.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/WidgetModalDialog.cpp 2008-04-07 18:54:23 UTC (rev 1101)
+++ dcplusplus/trunk/smartwin/source/widgets/WidgetModalDialog.cpp 2008-04-07 18:56:50 UTC (rev 1102)
@@ -1,45 +0,0 @@
-#include "../../include/smartwin/widgets/ModalDialog.h"
-
-namespace SmartWin {
-
-int ModalDialog::createDialog( unsigned resourceId )
-{
- // this will not return until the dialog is closed by calling endDialog() with
- // a retv
- //
- INT_PTR retv = ::DialogBoxParam
- ( ( Application::instance().getAppHandle() )
- , ( MAKEINTRESOURCE( resourceId ) )
- , ( this->getParent() ? this->getParent()->handle() : 0 )
- , ( (DLGPROC)&ThisType::wndProc )
- , ( reinterpret_cast< LPARAM >( dynamic_cast< Widget * >( this ) ) )
- );
- if ( retv == - 1 )
- {
- throw xCeption( _T( "Couldn't create modal dialog" ) );
- }
- return static_cast< int >( retv );
-}
-
-int ModalDialog::createDialog()
-{
- // Arrange so the DLGTEMPLATE is followed by 0000 for menu, winclass and title.
- unsigned char dlg_menu_winclass_title[ sizeof( DLGTEMPLATE ) + 30 ];
- memset( dlg_menu_winclass_title, 0, sizeof( dlg_menu_winclass_title ) );
- memcpy( dlg_menu_winclass_title, & itsDefaultDlgTemplate, sizeof( DLGTEMPLATE ) );
-
- // this will not return until the dialog is closed by calling endDialog() with
- // a retv
- //
- INT_PTR retv = ::DialogBoxIndirectParam
- ( Application::instance().getAppHandle() // HINSTANCE hInstance
- , ( DLGTEMPLATE * ) dlg_menu_winclass_title // LPCDLGTEMPLATE hDialogTemplate
- , this->getParent() ? this->getParent()->handle() : 0 // HWND hWndParent
- , (DLGPROC)&ThisType::wndProc // DLGPROC lpDialogFunc
- , reinterpret_cast< LPARAM >( dynamic_cast< Widget * >( this ) )
- ); // LPARAM dwInitParam
-
- return static_cast< int >( retv );
-}
-
-}
Modified: dcplusplus/trunk/smartwin/source/widgets/WidgetTabView.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/WidgetTabView.cpp 2008-04-07 18:54:23 UTC (rev 1101)
+++ dcplusplus/trunk/smartwin/source/widgets/WidgetTabView.cpp 2008-04-07 18:56:50 UTC (rev 1102)
@@ -1,6 +1,5 @@
#include "../../include/smartwin/widgets/WidgetTabView.h"
#include "../../include/smartwin/WidgetCreator.h"
-#include "../../include/smartwin/WindowClass.h"
namespace SmartWin {
@@ -46,7 +45,7 @@
}
}
-void WidgetTabView::add(WidgetChildWindow* w, const IconPtr& icon) {
+void WidgetTabView::add(Container* w, const IconPtr& icon) {
int image = addIcon(icon);
size_t tabs = tab->size();
TabInfo* ti = new TabInfo(w);
@@ -68,17 +67,17 @@
w->onTextChanging(std::tr1::bind(&WidgetTabView::handleTextChanging, this, w, _1));
}
-WidgetChildWindow* WidgetTabView::getActive() {
+Container* WidgetTabView::getActive() {
TabInfo* ti = getTabInfo(tab->getSelected());
return ti ? ti->w : 0;
}
-void WidgetTabView::remove(WidgetChildWindow* w) {
+void WidgetTabView::remove(Container* w) {
if(viewOrder.size() > 1 && viewOrder.back() == w) {
setActive(*(--(--viewOrder.end())));
}
- WidgetChildWindow* cur = getTabInfo(tab->getSelected())->w;
+ Container* cur = getTabInfo(tab->getSelected())->w;
viewOrder.remove(w);
@@ -98,14 +97,14 @@
titleChangedFunction(SmartUtil::tstring());
}
-SmartUtil::tstring WidgetTabView::getTabText(WidgetChildWindow* w) {
+SmartUtil::tstring WidgetTabView::getTabText(Container* w) {
int i = findTab(w);
if(i != -1)
return tab->getText(i);
return SmartUtil::tstring();
}
-void WidgetTabView::onTabContextMenu(WidgetChildWindow* w, const ContextMenuFunction& f) {
+void WidgetTabView::onTabContextMenu(Container* w, const ContextMenuFunction& f) {
TabInfo* ti = getTabInfo(w);
if(ti) {
ti->handleContextMenu = f;
@@ -120,7 +119,7 @@
handleTabSelected();
}
-void WidgetTabView::swapWidgets(WidgetChildWindow* oldW, WidgetChildWindow* newW) {
+void WidgetTabView::swapWidgets(Container* oldW, Container* newW) {
sendMessage(WM_SETREDRAW, FALSE);
if(oldW) {
@@ -161,14 +160,14 @@
titleChangedFunction(ti->w->getText());
}
-void WidgetTabView::mark(WidgetChildWindow* w) {
+void WidgetTabView::mark(Container* w) {
int i = findTab(w);
if(i != -1 && i != tab->getSelected()) {
tab->setHighlight(i, true);
}
}
-int WidgetTabView::findTab(WidgetChildWindow* w) {
+int WidgetTabView::findTab(Container* w) {
for(size_t i = 0; i < tab->size(); ++i) {
if(getTabInfo(i)->w == w) {
return static_cast<int>(i);
@@ -177,7 +176,7 @@
return -1;
}
-WidgetTabView::TabInfo* WidgetTabView::getTabInfo(WidgetChildWindow* w) {
+WidgetTabView::TabInfo* WidgetTabView::getTabInfo(Container* w) {
return getTabInfo(findTab(w));
}
@@ -185,7 +184,7 @@
return i == -1 ? 0 : reinterpret_cast<TabInfo*>(tab->getData(i));
}
-bool WidgetTabView::handleTextChanging(WidgetChildWindow* w, const SmartUtil::tstring& newText) {
+bool WidgetTabView::handleTextChanging(Container* w, const SmartUtil::tstring& newText) {
int i = findTab(w);
if(i != -1) {
tab->setText(i, formatTitle(newText));
@@ -223,7 +222,7 @@
if(viewOrder.size() < 2) {
return;
}
- WidgetChildWindow* wnd = getActive();
+ Container* wnd = getActive();
if(!wnd) {
return;
}
@@ -258,7 +257,7 @@
return;
}
-void WidgetTabView::setTop(WidgetChildWindow* wnd) {
+void WidgetTabView::setTop(Container* wnd) {
WindowIter i = std::find(viewOrder.begin(), viewOrder.end(), wnd);
if(i != viewOrder.end() && i != --viewOrder.end()) {
viewOrder.erase(i);
Deleted: dcplusplus/trunk/smartwin/source/widgets/WidgetWindow.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/WidgetWindow.cpp 2008-04-07 18:54:23 UTC (rev 1101)
+++ dcplusplus/trunk/smartwin/source/widgets/WidgetWindow.cpp 2008-04-07 18:56:50 UTC (rev 1102)
@@ -1,20 +0,0 @@
-#include "../../include/smartwin/widgets/Window.h"
-
-namespace SmartWin {
-
-Window::Seed::Seed() :
- Widget::Seed(NULL, WS_VISIBLE | WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN),
- background(( HBRUSH )( COLOR_APPWORKSPACE + 1 )),
- menuName(NULL),
- cursor(NULL)
-{
-}
-
-void Window::createWindow( Seed cs )
-{
- windowClass.reset(new WindowClass(WindowClass::getNewClassName(this), &ThisType::wndProc, cs.menuName, cs.background, cs.icon, cs.smallIcon, cs.cursor));
- cs.className = windowClass->getClassName();
- BaseType::create( cs );
-}
-
-}
Copied: dcplusplus/trunk/smartwin/source/widgets/Window.cpp (from rev 1101, dcplusplus/trunk/smartwin/source/widgets/WidgetWindow.cpp)
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/Window.cpp (rev 0)
+++ dcplusplus/trunk/smartwin/source/widgets/Window.cpp 2008-04-07 18:56:50 UTC (rev 1102)
@@ -0,0 +1,13 @@
+#include "../../include/smartwin/widgets/Window.h"
+
+namespace SmartWin {
+
+Window::Seed::Seed() : BaseType::Seed(0) {
+
+}
+
+void Window::create(const Seed& cs) {
+ BaseType::create(cs);
+}
+
+}
Modified: dcplusplus/trunk/win32/MDIChildFrame.h
===================================================================
--- dcplusplus/trunk/win32/MDIChildFrame.h 2008-04-07 18:54:23 UTC (rev 1101)
+++ dcplusplus/trunk/win32/MDIChildFrame.h 2008-04-07 18:56:50 UTC (rev 1102)
@@ -29,13 +29,13 @@
template<typename T>
class MDIChildFrame :
- public WidgetFactory< SmartWin::WidgetChildWindow >,
+ public WidgetFactory< SmartWin::Container >,
public AspectSpeaker<T>,
public AspectStatus<T>
{
public:
typedef MDIChildFrame<T> ThisType;
- typedef WidgetFactory< SmartWin::WidgetChildWindow > BaseType;
+ typedef WidgetFactory< SmartWin::Container > BaseType;
protected:
MDIChildFrame(SmartWin::WidgetTabView* tabView, const tstring& title, unsigned helpId = 0, SmartWin::IconPtr icon = SmartWin::IconPtr(), bool activate = true) :
@@ -55,7 +55,7 @@
cs.background = (HBRUSH)(COLOR_3DFACE + 1);
cs.icon = icon;
cs.location = tabView->getClientSize();
- this->createWindow(cs);
+ this->create(cs);
if(helpId)
setHelpId(helpId);
Modified: dcplusplus/trunk/win32/MainWindow.cpp
===================================================================
--- dcplusplus/trunk/win32/MainWindow.cpp 2008-04-07 18:54:23 UTC (rev 1101)
+++ dcplusplus/trunk/win32/MainWindow.cpp 2008-04-07 18:56:50 UTC (rev 1102)
@@ -170,8 +170,8 @@
cs.caption = _T(APPNAME) _T(" ") _T(VERSIONSTRING);
cs.icon = SmartWin::IconPtr(new SmartWin::Icon(IDR_MAINFRAME));
cs.background = (HBRUSH)(COLOR_3DFACE + 1);
- createWindow(cs);
-
+ create(cs);
+
setHelpId(IDH_STARTPAGE);
paned = createHPaned();
@@ -326,7 +326,7 @@
void MainWindow::initTransfers() {
dcdebug("initTransfers\n");
- transfers = new TransferView(this, getMDIParent());
+ transfers = new TransferView(this, getTabView());
paned->setSecond(transfers);
}
@@ -339,7 +339,7 @@
return true;
}
- SmartWin::WidgetChildWindow* active = getMDIParent()->getActive();
+ SmartWin::Container* active = getTabView()->getActive();
if(active) {
if(::IsDialogMessage( active->handle(), & msg )) {
return true;
@@ -358,7 +358,7 @@
}
void MainWindow::handleForward(WPARAM wParam) {
- SmartWin::WidgetChildWindow* active = getMDIParent()->getActive();
+ SmartWin::Container* active = getTabView()->getActive();
if(active) {
active->sendMessage(WM_COMMAND, wParam, 0);
}
@@ -380,7 +380,7 @@
while ((i = tmp.find(' ')) != string::npos)
tmp.erase(i, 1);
- HubFrame::openWindow(getMDIParent(), Text::fromT(tmp));
+ HubFrame::openWindow(getTabView(), Text::fromT(tmp));
}
}
@@ -411,12 +411,12 @@
switch (s) {
case DOWNLOAD_LISTING: {
boost::scoped_ptr<DirectoryListInfo> i(reinterpret_cast<DirectoryListInfo*>(lParam));
- DirectoryListingFrame::openWindow(getMDIParent(), i->file, i->dir, i->user, i->speed);
+ DirectoryListingFrame::openWindow(getTabView(), i->file, i->dir, i->user, i->speed);
}
break;
case BROWSE_LISTING: {
boost::scoped_ptr<DirectoryBrowseInfo> i(reinterpret_cast<DirectoryBrowseInfo*>(lParam));
- DirectoryListingFrame::openWindow(getMDIParent(), i->user, i->text, 0);
+ DirectoryListingFrame::openWindow(getTabView(), i->user, i->text, 0);
}
break;
case AUTO_CONNECT: {
@@ -429,7 +429,7 @@
break;
case VIEW_FILE_AND_DELETE: {
boost::scoped_ptr<std::string> file(reinterpret_cast<std::string*>(lParam));
- new TextFrame(this->getMDIParent(), *file);
+ new TextFrame(this->getTabView(), *file);
File::deleteFile(*file);
}
break;
@@ -460,7 +460,7 @@
FavoriteHubEntry* entry = *i;
if (entry->getConnect()) {
if (!entry->getNick().empty() || !SETTING(NICK).empty()) {
- HubFrame::openWindow(getMDIParent(), entry->getServer());
+ HubFrame::openWindow(getTabView(), entry->getServer());
}
}
}
@@ -711,7 +711,7 @@
if(WinUtil::browseFileList(createLoadDialog(), file)) {
UserPtr u = DirectoryListing::getUserFromFilename(Text::fromT(file));
if (u) {
- DirectoryListingFrame::openWindow(getMDIParent(), file, Text::toT(Util::emptyString), u, 0);
+ DirectoryListingFrame::openWindow(getTabView(), file, Text::toT(Util::emptyString), u, 0);
} else {
createMessageBox().show(T_("Invalid file list name"), _T(APPNAME) _T(" ") _T(VERSIONSTRING));
}
@@ -720,7 +720,7 @@
void MainWindow::handleOpenOwnList() {
if (!ShareManager::getInstance()->getOwnListFile().empty()) {
- DirectoryListingFrame::openWindow(getMDIParent(), Text::toT(ShareManager::getInstance()->getOwnListFile()), Text::toT(Util::emptyString), ClientManager::getInstance()->getMe(), 0);
+ DirectoryListingFrame::openWindow(getTabView(), Text::toT(ShareManager::getInstance()->getOwnListFile()), Text::toT(Util::emptyString), ClientManager::getInstance()->getMe(), 0);
}
}
@@ -754,7 +754,7 @@
MainWindow* mf = reinterpret_cast<MainWindow*>(p);
HWND wnd, wnd2 = NULL;
- while( (wnd=::GetWindow(mf->getMDIParent()->getTab()->handle(), GW_CHILD)) != NULL) {
+ while( (wnd=::GetWindow(mf->getTabView()->getTab()->handle(), GW_CHILD)) != NULL) {
if(wnd == wnd2) {
::Sleep(100);
} else {
@@ -806,7 +806,7 @@
void MainWindow::handleActivate(bool active) {
// Forward to active tab window
- WidgetChildWindow* w = tabs->getActive();
+ Container* w = tabs->getActive();
if(w) {
w->sendMessage(WM_ACTIVATE, active ? WA_ACTIVE : WA_INACTIVE);
}
Modified: dcplusplus/trunk/win32/MainWindow.h
===================================================================
--- dcplusplus/trunk/win32/MainWindow.h 2008-04-07 18:54:23 UTC (rev 1101)
+++ dcplusplus/trunk/win32/MainWindow.h 2008-04-07 18:56:50 UTC (rev 1102)
@@ -55,8 +55,7 @@
STATUS_LAST
};
- /// @deprecated
- WidgetTabView* getMDIParent() { return tabs; }
+ WidgetTabView* getTabView() { return tabs; }
virtual bool tryFire( const MSG & msg, LRESULT & retVal );
Modified: dcplusplus/trunk/win32/MainWindowFactory.cpp
===================================================================
--- dcplusplus/trunk/win32/MainWindowFactory.cpp 2008-04-07 18:54:23 UTC (rev 1101)
+++ dcplusplus/trunk/win32/MainWindowFactory.cpp 2008-04-07 18:56:50 UTC (rev 1102)
@@ -37,43 +37,43 @@
void MainWindow::handleOpenWindow(unsigned id) {
switch (id) {
case IDC_PUBLIC_HUBS:
- PublicHubsFrame::openWindow(getMDIParent());
+ PublicHubsFrame::openWindow(getTabView());
break;
case IDC_FAVORITE_HUBS:
- FavHubsFrame::openWindow(getMDIParent());
+ FavHubsFrame::openWindow(getTabView());
break;
case IDC_FAVUSERS:
- UsersFrame::openWindow(getMDIParent());
+ UsersFrame::openWindow(getTabView());
break;
case IDC_QUEUE:
- QueueFrame::openWindow(getMDIParent());
+ QueueFrame::openWindow(getTabView());
break;
case IDC_FINISHED_DL:
- FinishedDLFrame::openWindow(getMDIParent());
+ FinishedDLFrame::openWindow(getTabView());
break;
case IDC_WAITING_USERS:
- WaitingUsersFrame::openWindow(getMDIParent());
+ WaitingUsersFrame::openWindow(getTabView());
break;
case IDC_FINISHED_UL:
- FinishedULFrame::openWindow(getMDIParent());
+ FinishedULFrame::openWindow(getTabView());
break;
case IDC_SEARCH:
- SearchFrame::openWindow(getMDIParent());
+ SearchFrame::openWindow(getTabView());
break;
case IDC_ADL_SEARCH:
- ADLSearchFrame::openWindow(getMDIParent());
+ ADLSearchFrame::openWindow(getTabView());
break;
case IDC_SEARCH_SPY:
- SpyFrame::openWindow(getMDIParent());
+ SpyFrame::openWindow(getTabView());
break;
case IDC_NOTEPAD:
- NotepadFrame::openWindow(getMDIParent());
+ NotepadFrame::openWindow(getTabView());
break;
case IDC_SYSTEM_LOG:
- SystemFrame::openWindow(getMDIParent());
+ SystemFrame::openWindow(getTabView());
break;
case IDC_NET_STATS:
- StatsFrame::openWindow(getMDIParent());
+ StatsFrame::openWindow(getTabView());
break;
default:
dcassert(0);
Modified: dcplusplus/trunk/win32/SplashWindow.cpp
===================================================================
--- dcplusplus/trunk/win32/SplashWindow.cpp 2008-04-07 18:54:23 UTC (rev 1101)
+++ dcplusplus/trunk/win32/SplashWindow.cpp 2008-04-07 18:56:50 UTC (rev 1102)
@@ -33,14 +33,14 @@
cs.exStyle = WS_EX_STATICEDGE;
cs.caption = _T(APPNAME);
tmp = new SmartWin::WidgetFactory<SmartWin::Window>(0);
- tmp->createWindow(cs);
+ tmp->create(cs);
}
{
Seed cs;
cs.style = WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN;
cs.exStyle = WS_EX_STATICEDGE;
cs.caption = _T(APPNAME);
- createWindow(cs);
+ create(cs);
}
tstring caption = _T(APPNAME) _T(" ") _T(VERSIONSTRING);
{
Modified: dcplusplus/trunk/win32/TransferView.cpp
===================================================================
--- dcplusplus/trunk/win32/TransferView.cpp 2008-04-07 18:54:23 UTC (rev 1101)
+++ dcplusplus/trunk/win32/TransferView.cpp 2008-04-07 18:56:50 UTC (rev 1102)
@@ -32,14 +32,15 @@
#include <dcpp/Download.h>
#include <dcpp/Upload.h>
-int TransferView::connectionIndexes[] = { CONNECTION_COLUMN_USER, CONNECTION_COLUMN_STATUS, CONNECTION_CO...
[truncated message content] |
|
From: <arn...@us...> - 2008-04-07 18:54:27
|
Revision: 1101
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1101&view=rev
Author: arnetheduck
Date: 2008-04-07 11:54:23 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
Fixed parsing of non-XML hub lists
Modified Paths:
--------------
dcplusplus/trunk/changelog.txt
dcplusplus/trunk/dcpp/FavoriteManager.cpp
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-03-31 16:07:57.911999941 +0200
committer: zouzou123gen
properties:
branch-nick: bzr
+ timestamp: 2008-03-31 17:25:13.130000114 +0200
committer: zouzou123gen
properties:
branch-nick: bzr
bugs: https://launchpad.net/bugs/209684 fixed
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
+ 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
Modified: dcplusplus/trunk/changelog.txt
===================================================================
--- dcplusplus/trunk/changelog.txt 2008-04-07 18:53:15 UTC (rev 1100)
+++ dcplusplus/trunk/changelog.txt 2008-04-07 18:54:23 UTC (rev 1101)
@@ -16,6 +16,7 @@
* [L#208344] Fix about dialog up/down stats
* [L#209099] Fixed non-disappearing controls in search (poy)
* [L#208684] Made the Alt key work again for line history in hub window (poy)
+* [L#209684] Fixed parsing of non-XML hub lists (poy)
-- 0.705 2008-03-14 --
* Several patches for better *nix compatibility of the core (thanks steven sheehy et al)
Modified: dcplusplus/trunk/dcpp/FavoriteManager.cpp
===================================================================
--- dcplusplus/trunk/dcpp/FavoriteManager.cpp 2008-04-07 18:53:15 UTC (rev 1100)
+++ dcplusplus/trunk/dcpp/FavoriteManager.cpp 2008-04-07 18:54:23 UTC (rev 1101)
@@ -295,8 +295,8 @@
continue;
StringList::const_iterator k = tok.getTokens().begin();
+ const string& name = *k++;
const string& server = *k++;
- const string& name = *k++;
const string& desc = *k++;
const string& usersOnline = *k++;
list.push_back(HubEntry(name, server, desc, usersOnline));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2008-04-07 18:53:49
|
Revision: 1100
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1100&view=rev
Author: arnetheduck
Date: 2008-04-07 11:53:15 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
don't add new callbacks everytime a menu opens
Modified Paths:
--------------
dcplusplus/trunk/smartwin/source/widgets/WidgetMenu.cpp
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-03-31 15:51:08.490000010 +0200
committer: zouzou123gen
properties:
branch-nick: bzr
+ timestamp: 2008-03-31 16:07:57.911999941 +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
+ 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
Modified: dcplusplus/trunk/smartwin/source/widgets/WidgetMenu.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/WidgetMenu.cpp 2008-04-07 18:51:57 UTC (rev 1099)
+++ dcplusplus/trunk/smartwin/source/widgets/WidgetMenu.cpp 2008-04-07 18:53:15 UTC (rev 1100)
@@ -66,8 +66,8 @@
}
// set default drawing
- itsParent->addCallback(Message(WM_DRAWITEM), DrawItemDispatcher(std::tr1::bind(&WidgetMenu::handleDrawItem, this, _1, _2)));
- itsParent->addCallback(Message(WM_MEASUREITEM), MeasureItemDispatcher(std::tr1::bind(&WidgetMenu::handleMeasureItem, this, _1)));
+ itsParent->setCallback(Message(WM_DRAWITEM), DrawItemDispatcher(std::tr1::bind(&WidgetMenu::handleDrawItem, this, _1, _2)));
+ itsParent->setCallback(Message(WM_MEASUREITEM), MeasureItemDispatcher(std::tr1::bind(&WidgetMenu::handleMeasureItem, this, _1)));
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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.
|
|
From: <arn...@us...> - 2008-04-07 18:50:40
|
Revision: 1098
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1098&view=rev
Author: arnetheduck
Date: 2008-04-07 11:50:33 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
help in the tab control
Modified Paths:
--------------
dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTabView.h
dcplusplus/trunk/smartwin/source/widgets/WidgetTabView.cpp
dcplusplus/trunk/win32/MainWindow.cpp
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-03-30 15:48:35.204999924 +0200
committer: zouzou123gen
properties:
branch-nick: bzr
+ timestamp: 2008-03-31 14:45:49.411999941 +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
+ 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
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTabView.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTabView.h 2008-04-07 18:49:38 UTC (rev 1097)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTabView.h 2008-04-07 18:50:33 UTC (rev 1098)
@@ -18,6 +18,10 @@
public AspectRaw<WidgetTabView>,
public AspectSizable<WidgetTabView>
{
+ typedef std::tr1::function<void (const SmartUtil::tstring&)> TitleChangedFunction;
+ typedef std::tr1::function<void (HWND, unsigned)> HelpFunction;
+ typedef std::tr1::function<bool (const ScreenCoordinate&)> ContextMenuFunction;
+
public:
/// Class type
typedef WidgetTabView ThisType;
@@ -48,12 +52,16 @@
SmartUtil::tstring getTabText(WidgetChildWindow* w);
- void onTitleChanged(const std::tr1::function<void (const SmartUtil::tstring&)>& f) {
+ void onTitleChanged(const TitleChangedFunction& f) {
titleChangedFunction = f;
}
- void onTabContextMenu(WidgetChildWindow* w, const std::tr1::function<bool (const ScreenCoordinate& pt)>& f);
+ void onHelp(const HelpFunction& f) {
+ helpFunction = f;
+ }
+ void onTabContextMenu(WidgetChildWindow* w, const ContextMenuFunction& f);
+
bool filter(const MSG& msg);
TabSheet::ObjectType getTab();
@@ -75,7 +83,7 @@
struct TabInfo {
TabInfo(WidgetChildWindow* w_) : w(w_) { }
WidgetChildWindow* w;
- std::tr1::function<bool (const ScreenCoordinate& pt)> handleContextMenu;
+ ContextMenuFunction handleContextMenu;
};
static WindowClass windowClass;
@@ -83,7 +91,8 @@
TabSheet::ObjectType tab;
ToolTip::ObjectType tip;
- std::tr1::function<void (const SmartUtil::tstring&)> titleChangedFunction;
+ TitleChangedFunction titleChangedFunction;
+ HelpFunction helpFunction;
bool toggleActive;
@@ -114,6 +123,7 @@
void handleLeftMouseUp(const MouseEventResult& mouseEventResult);
bool handleContextMenu(SmartWin::ScreenCoordinate pt);
void handleMiddleMouseDown(const MouseEventResult& mouseEventResult);
+ void handleHelp(HWND hWnd, unsigned id);
SmartUtil::tstring formatTitle(SmartUtil::tstring title);
void layout();
Modified: dcplusplus/trunk/smartwin/source/widgets/WidgetTabView.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/WidgetTabView.cpp 2008-04-07 18:49:38 UTC (rev 1097)
+++ dcplusplus/trunk/smartwin/source/widgets/WidgetTabView.cpp 2008-04-07 18:50:33 UTC (rev 1098)
@@ -37,6 +37,7 @@
tab->onLeftMouseUp(std::tr1::bind(&WidgetTabView::handleLeftMouseUp, this, _1));
tab->onContextMenu(std::tr1::bind(&WidgetTabView::handleContextMenu, this, _1));
tab->onMiddleMouseDown(std::tr1::bind(&WidgetTabView::handleMiddleMouseDown, this, _1));
+ tab->onHelp(std::tr1::bind(&WidgetTabView::handleHelp, this, _1, _2));
tip = WidgetCreator<ToolTip>::attach(this, tab->getToolTips()); // created and managed by the tab control thanks to the TCS_TOOLTIPS style
if(tip) {
@@ -104,7 +105,7 @@
return SmartUtil::tstring();
}
-void WidgetTabView::onTabContextMenu(WidgetChildWindow* w, const std::tr1::function<bool (const ScreenCoordinate& pt)>& f) {
+void WidgetTabView::onTabContextMenu(WidgetChildWindow* w, const ContextMenuFunction& f) {
TabInfo* ti = getTabInfo(w);
if(ti) {
ti->handleContextMenu = f;
@@ -378,6 +379,18 @@
ti->w->close();
}
+void WidgetTabView::handleHelp(HWND hWnd, unsigned id) {
+ if(helpFunction) {
+ // hWnd and id are those of the whole tab control; not those of the specific tab on which the user wants help for
+ TabInfo* ti = getTabInfo(tab->hitTest(ScreenCoordinate(Point::fromLParam(::GetMessagePos()))));
+ if(ti)
+ id = ti->w->getHelpId();
+
+ // even if no tab was found below the cursor, forward the message to the application so that it can display its default help
+ helpFunction(hWnd, id);
+ }
+}
+
bool WidgetTabView::filter(const MSG& msg) {
if(tip)
tip->relayEvent(msg);
Modified: dcplusplus/trunk/win32/MainWindow.cpp
===================================================================
--- dcplusplus/trunk/win32/MainWindow.cpp 2008-04-07 18:49:38 UTC (rev 1097)
+++ dcplusplus/trunk/win32/MainWindow.cpp 2008-04-07 18:50:33 UTC (rev 1098)
@@ -171,7 +171,9 @@
cs.icon = SmartWin::IconPtr(new SmartWin::Icon(IDR_MAINFRAME));
cs.background = (HBRUSH)(COLOR_3DFACE + 1);
createWindow(cs);
-
+
+ setHelpId(IDH_STARTPAGE);
+
paned = createHPaned();
paned->setRelativePos(0.7);
}
@@ -318,6 +320,7 @@
cs.toggleActive = BOOLSETTING(TOGGLE_ACTIVE_WINDOW);
tabs = createTabView(cs);
tabs->onTitleChanged(std::tr1::bind(&MainWindow::handleTabsTitleChanged, this, _1));
+ tabs->onHelp(std::tr1::bind(&WinUtil::help, _1, _2));
paned->setFirst(tabs);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2008-04-07 18:49:50
|
Revision: 1097
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1097&view=rev
Author: arnetheduck
Date: 2008-04-07 11:49:38 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
use WM_SYSKEYDOWN to catch Alt+key
Modified Paths:
--------------
dcplusplus/trunk/changelog.txt
dcplusplus/trunk/help/settings_advanced.html
dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectKeyboard.h
dcplusplus/trunk/win32/HubFrame.cpp
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-03-30 15:16:07.595999956 +0200
committer: zouzou123gen
properties:
branch-nick: bzr
+ timestamp: 2008-03-30 15:48:35.204999924 +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
+ 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
Modified: dcplusplus/trunk/changelog.txt
===================================================================
--- dcplusplus/trunk/changelog.txt 2008-04-07 18:48:32 UTC (rev 1096)
+++ dcplusplus/trunk/changelog.txt 2008-04-07 18:49:38 UTC (rev 1097)
@@ -15,6 +15,7 @@
* [L#208917] Fixed menu background colors (poy)
* [L#208344] Fix about dialog up/down stats
* [L#209099] Fixed non-disappearing controls in search (poy)
+* [L#208684] Made the Alt key work again for line history in hub window (poy)
-- 0.705 2008-03-14 --
* Several patches for better *nix compatibility of the core (thanks steven sheehy et al)
Modified: dcplusplus/trunk/help/settings_advanced.html
===================================================================
--- dcplusplus/trunk/help/settings_advanced.html 2008-04-07 18:48:32 UTC (rev 1096)
+++ dcplusplus/trunk/help/settings_advanced.html 2008-04-07 18:49:38 UTC (rev 1097)
@@ -112,7 +112,7 @@
will not appear in your file list until the next refresh.</dd>
<dt>Use CTRL for line history</dt>
<dd>Press up arrow while holding down CTRL to scroll through line
-history. If not enabled, up arrow will be enough.</dd>
+history. If not enabled, you can still use ALT.</dd>
<dt>Don't automatically disconnect favorite users who leave the hub</dt>
<dd>With this option enabled, and <a href="window_settings_advanced.html#disconnect">Automatically disconnect users who leave the hub</a>, users who are in your <a href="favorite_users.html">Favorite users</a> page are not disconnected.</dd>
<dt>Show shell menu where possible</dt>
Modified: dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectKeyboard.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectKeyboard.h 2008-04-07 18:48:32 UTC (rev 1096)
+++ dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectKeyboard.h 2008-04-07 18:49:38 UTC (rev 1097)
@@ -154,6 +154,14 @@
onKey(WM_KEYUP, f);
}
+ void onSysKeyDown(const typename Dispatcher::F& f) {
+ onKey(WM_SYSKEYDOWN, f);
+ }
+
+ void onSysKeyUp(const typename Dispatcher::F& f) {
+ onKey(WM_SYSKEYUP, f);
+ }
+
protected:
virtual ~AspectKeyboard()
{}
Modified: dcplusplus/trunk/win32/HubFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/HubFrame.cpp 2008-04-07 18:48:32 UTC (rev 1096)
+++ dcplusplus/trunk/win32/HubFrame.cpp 2008-04-07 18:49:38 UTC (rev 1097)
@@ -99,6 +99,7 @@
addWidget(message, true, false);
message->onRaw(std::tr1::bind(&HubFrame::handleMessageGetDlgCode, this), SmartWin::Message(WM_GETDLGCODE));
message->onKeyDown(std::tr1::bind(&HubFrame::handleMessageKeyDown, this, _1));
+ message->onSysKeyDown(std::tr1::bind(&HubFrame::handleMessageKeyDown, this, _1));
message->onChar(std::tr1::bind(&HubFrame::handleMessageChar, this, _1));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2008-04-07 18:48:38
|
Revision: 1096
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1096&view=rev
Author: arnetheduck
Date: 2008-04-07 11:48:32 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
fix the search window bug, re-open the one about line history
Modified Paths:
--------------
dcplusplus/trunk/changelog.txt
dcplusplus/trunk/win32/HubFrame.cpp
dcplusplus/trunk/win32/SearchFrame.cpp
dcplusplus/trunk/win32/SearchFrame.h
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-03-30 10:12:32.273999929 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
+ timestamp: 2008-03-30 15:16:07.595999956 +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
+ 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
Modified: dcplusplus/trunk/changelog.txt
===================================================================
--- dcplusplus/trunk/changelog.txt 2008-03-30 08:33:27 UTC (rev 1095)
+++ dcplusplus/trunk/changelog.txt 2008-04-07 18:48:32 UTC (rev 1096)
@@ -12,9 +12,9 @@
* Both up&downloads are disconnected if evil users quit (thanks poy)
* Add average share to status bar (thanks mikejj)
* Minor improvements to load / save dialogs
-* [L#208684] Fixed line history when "Use Ctrl ..." is disabled (poy)
* [L#208917] Fixed menu background colors (poy)
* [L#208344] Fix about dialog up/down stats
+* [L#209099] Fixed non-disappearing controls in search (poy)
-- 0.705 2008-03-14 --
* Several patches for better *nix compatibility of the core (thanks steven sheehy et al)
Modified: dcplusplus/trunk/win32/HubFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/HubFrame.cpp 2008-03-30 08:33:27 UTC (rev 1095)
+++ dcplusplus/trunk/win32/HubFrame.cpp 2008-04-07 18:48:32 UTC (rev 1096)
@@ -665,7 +665,7 @@
}
bool HubFrame::historyActive() {
- return isAltPressed() || !BOOLSETTING(USE_CTRL_FOR_LINE_HISTORY) || isControlPressed();
+ return isAltPressed() || (BOOLSETTING(USE_CTRL_FOR_LINE_HISTORY) && isControlPressed());
}
bool HubFrame::handleUsersKeyDown(int c) {
Modified: dcplusplus/trunk/win32/SearchFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/SearchFrame.cpp 2008-03-30 08:33:27 UTC (rev 1095)
+++ dcplusplus/trunk/win32/SearchFrame.cpp 2008-04-07 18:48:32 UTC (rev 1096)
@@ -86,6 +86,7 @@
searchLabel(0),
searchBox(0),
purge(0),
+ doSearch(0),
sizeLabel(0),
mode(0),
size(0),
@@ -97,7 +98,6 @@
onlyFree(BOOLSETTING(SEARCH_ONLY_FREE_SLOTS)),
hubsLabel(0),
hubs(0),
- doSearch(0),
results(0),
showUI(0),
bShowUI(true),
@@ -386,19 +386,6 @@
hubs->setBounds(rect);
} else {
results->setBounds(r);
-
- SmartWin::Rectangle rNULL(0, 0, 0, 0);
- searchBox->setBounds(rNULL);
- mode->setBounds(rNULL);
- purge->setBounds(rNULL);
- size->setBounds(rNULL);
- sizeMode->setBounds(rNULL);
- fileType->setBounds(rNULL);
-
- sizeLabel->setBounds(rNULL);
- typeLabel->setBounds(rNULL);
- optionLabel->setBounds(rNULL);
- hubsLabel->setBounds(rNULL);
}
}
@@ -599,6 +586,22 @@
void SearchFrame::handleShowUIClicked() {
bShowUI = showUI->getChecked();
+
+ searchLabel->setVisible(bShowUI);
+ searchBox->setVisible(bShowUI);
+ purge->setVisible(bShowUI);
+ doSearch->setVisible(bShowUI);
+ sizeLabel->setVisible(bShowUI);
+ mode->setVisible(bShowUI);
+ size->setVisible(bShowUI);
+ sizeMode->setVisible(bShowUI);
+ typeLabel->setVisible(bShowUI);
+ fileType->setVisible(bShowUI);
+ optionLabel->setVisible(bShowUI);
+ slots->setVisible(bShowUI);
+ hubsLabel->setVisible(bShowUI);
+ hubs->setVisible(bShowUI);
+
layout();
}
Modified: dcplusplus/trunk/win32/SearchFrame.h
===================================================================
--- dcplusplus/trunk/win32/SearchFrame.h 2008-03-30 08:33:27 UTC (rev 1095)
+++ dcplusplus/trunk/win32/SearchFrame.h 2008-04-07 18:48:32 UTC (rev 1096)
@@ -157,6 +157,7 @@
LabelPtr searchLabel;
ComboBoxPtr searchBox;
ButtonPtr purge;
+ ButtonPtr doSearch;
LabelPtr sizeLabel;
ComboBoxPtr mode;
@@ -175,8 +176,6 @@
typedef WidgetHubs* WidgetHubsPtr;
WidgetHubsPtr hubs;
- ButtonPtr doSearch;
-
typedef TypedTable<SearchInfo> WidgetResults;
typedef WidgetResults* WidgetResultsPtr;
WidgetResultsPtr results;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2008-03-30 08:33:33
|
Revision: 1095
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1095&view=rev
Author: arnetheduck
Date: 2008-03-30 01:33:27 -0700 (Sun, 30 Mar 2008)
Log Message:
-----------
make frame a control, fix toolbar
Modified Paths:
--------------
dcplusplus/trunk/changelog.txt
dcplusplus/trunk/smartwin/include/smartwin/widgets/Button.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/ComboBox.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/Control.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/DateTime.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/Frame.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/Label.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/ProgressBar.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/Slider.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/Spinner.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/StatusBar.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/TabSheet.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/Table.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/TextBox.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/ToolBar.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/Tree.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTabView.h
dcplusplus/trunk/smartwin/source/widgets/ToolBar.cpp
dcplusplus/trunk/smartwin/source/widgets/WidgetTabView.cpp
dcplusplus/trunk/win32/AboutDlg.cpp
dcplusplus/trunk/win32/DCPlusPlus.rc
dcplusplus/trunk/win32/MainWindow.cpp
dcplusplus/trunk/win32/MainWindow.h
dcplusplus/trunk/win32/resource.h
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-03-30 00:47:06.986000061 +0100
committer: zouzou123gen
properties:
branch-nick: bzr
+ timestamp: 2008-03-30 10:12:32.273999929 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
Name: bzr:ancestry:v3-trunk1
- arn...@gm...-20080329054606-ubefm4h98xjgvif9
+ arn...@gm...-20080329054606-ubefm4h98xjgvif9
arn...@gm...-20080329220538-g3f1nvcfh1ycetw7
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
+ 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
Modified: dcplusplus/trunk/changelog.txt
===================================================================
--- dcplusplus/trunk/changelog.txt 2008-03-30 08:32:18 UTC (rev 1094)
+++ dcplusplus/trunk/changelog.txt 2008-03-30 08:33:27 UTC (rev 1095)
@@ -14,6 +14,7 @@
* Minor improvements to load / save dialogs
* [L#208684] Fixed line history when "Use Ctrl ..." is disabled (poy)
* [L#208917] Fixed menu background colors (poy)
+* [L#208344] Fix about dialog up/down stats
-- 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/widgets/Button.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Button.h 2008-03-30 08:32:18 UTC (rev 1094)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Button.h 2008-03-30 08:33:27 UTC (rev 1095)
@@ -18,7 +18,7 @@
/** Common stuff for all buttons */
class Button :
- public Control,
+ public CommonControl,
public AspectClickable<Button>,
public AspectColor<Button>,
public AspectColorCtlImpl<Button>,
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/ComboBox.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/ComboBox.h 2008-03-30 08:32:18 UTC (rev 1094)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/ComboBox.h 2008-03-30 08:33:27 UTC (rev 1095)
@@ -57,12 +57,12 @@
* value at a time from a list of values.
*/
class ComboBox :
+ public CommonControl,
// Aspects
public AspectClickable< ComboBox >,
public AspectCollection<ComboBox, int>,
public AspectColor< ComboBox >,
public AspectColorCtlImpl<ComboBox>,
- public Control,
public AspectDblClickable< ComboBox >,
public AspectFocus< ComboBox >,
public AspectFont< ComboBox >,
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Control.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Control.h 2008-03-30 08:32:18 UTC (rev 1094)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Control.h 2008-03-30 08:33:27 UTC (rev 1095)
@@ -16,43 +16,36 @@
namespace SmartWin {
-/** Base class is for windows common controls */
-class Control :
- public MessageMap< Policies::Subclassed >,
+/** Base class for all windows */
+template<typename Policy>
+class Control:
+ public MessageMap<Policy>,
- public AspectBorder<Control>,
- public AspectContextMenu<Control>,
- public AspectEnabled<Control>,
- public AspectHelp<Control>,
- public AspectKeyboard<Control>,
- public AspectMouse<Control>,
- public AspectRaw<Control>,
- public AspectSizable<Control>,
- public AspectVisible<Control>
+ public AspectBorder<Control<Policy> >,
+ public AspectContextMenu<Control<Policy> >,
+ public AspectEnabled<Control<Policy> >,
+ public AspectHelp<Control<Policy> >,
+ public AspectKeyboard<Control<Policy> >,
+ public AspectMouse<Control<Policy> >,
+ public AspectRaw<Control<Policy> >,
+ public AspectSizable<Control<Policy> >,
+ public AspectVisible<Control<Policy> >
{
public:
- unsigned int getControlId();
- virtual HWND create(const Seed& cs);
protected:
- typedef Control ControlType;
+ typedef Control<Policy> ControlType;
Control(Widget* parent);
};
-inline Control::Control(Widget* parent) : PolicyType(parent) {
- xAssert( parent, _T( "Common Controls must have a parent" ) );
+template<typename Policy>
+Control<Policy>::Control(Widget* parent) : MessageMap<Policy>(parent) {
+
}
-inline HWND Control::create(const Seed& cs) {
- xAssert((cs.style & WS_CHILD) == WS_CHILD, _T("Common controls must have WS_CHILD style"));
- return PolicyType::create(cs);
-}
+typedef Control<Policies::Subclassed> CommonControl;
-inline unsigned int Control::getControlId() {
- return static_cast<unsigned int>(::GetWindowLongPtr(handle(), GWLP_ID));
}
-}
-
#endif /*CONTROL_H_*/
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/DateTime.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/DateTime.h 2008-03-30 08:32:18 UTC (rev 1094)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/DateTime.h 2008-03-30 08:33:27 UTC (rev 1095)
@@ -54,7 +54,7 @@
* declare a point in time within 1800 - 2100
*/
class DateTime :
- public Control,
+ public CommonControl,
// Aspects
public AspectClickable< DateTime >,
public AspectFocus< DateTime >,
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Frame.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Frame.h 2008-03-30 08:32:18 UTC (rev 1094)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Frame.h 2008-03-30 08:33:27 UTC (rev 1095)
@@ -30,26 +30,16 @@
#include "../Application.h"
#include "../Rectangle.h"
-#include "../Policies.h"
#include "../aspects/AspectActivate.h"
-#include "../aspects/AspectBorder.h"
#include "../aspects/AspectCommand.h"
-#include "../aspects/AspectContextMenu.h"
#include "../aspects/AspectDragDrop.h"
-#include "../aspects/AspectEnabled.h"
#include "../aspects/AspectEraseBackground.h"
#include "../aspects/AspectFocus.h"
#include "../aspects/AspectFont.h"
-#include "../aspects/AspectHelp.h"
-#include "../aspects/AspectKeyboard.h"
#include "../aspects/AspectMinMax.h"
-#include "../aspects/AspectMouse.h"
#include "../aspects/AspectPainting.h"
-#include "../aspects/AspectRaw.h"
-#include "../aspects/AspectSizable.h"
#include "../aspects/AspectText.h"
-#include "../aspects/AspectVisible.h"
-#include "../xCeption.h"
+#include "Control.h"
namespace SmartWin
{
@@ -83,27 +73,18 @@
*/
template< class Policy >
class Frame :
- public MessageMap< Policy >,
+ public Control< Policy >,
// Aspects
public AspectActivate< Frame< Policy > >,
- public AspectBorder< Frame< Policy > >,
public AspectCommand< Frame< Policy > >,
- public AspectContextMenu< Frame< Policy > >,
public AspectDragDrop< Frame< Policy > >,
- public AspectEnabled< Frame< Policy > >,
public AspectEraseBackground< Frame< Policy > >,
public AspectFocus< Frame< Policy > >,
public AspectFont< Frame< Policy > >,
- public AspectHelp< Frame< Policy > >,
- public AspectKeyboard< Frame< Policy > >,
public AspectMinMax<Frame<Policy> >,
- public AspectMouse< Frame< Policy > >,
public AspectPainting< Frame< Policy > >,
- public AspectRaw< Frame< Policy > >,
- public AspectSizable< Frame< Policy > >,
- public AspectText< Frame< Policy > >,
- public AspectVisible< Frame< Policy > >
+ public AspectText< Frame< Policy > >
{
struct CloseDispatcher
{
@@ -359,7 +340,7 @@
template< class Policy >
Frame< Policy >::Frame( Widget * parent )
- : Frame<Policy>::PolicyType( parent )
+ : Control<Policy>( parent )
{
}
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Label.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Label.h 2008-03-30 08:32:18 UTC (rev 1094)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Label.h 2008-03-30 08:33:27 UTC (rev 1095)
@@ -60,7 +60,7 @@
* It can load a bitmap.
*/
class Label :
- public Control,
+ public CommonControl,
// Aspects
public AspectClickable< Label >,
public AspectColor< Label >,
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/ProgressBar.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/ProgressBar.h 2008-03-30 08:32:18 UTC (rev 1094)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/ProgressBar.h 2008-03-30 08:33:27 UTC (rev 1095)
@@ -51,7 +51,7 @@
* jobs, often used when downloading from internet or installing applications etc.
*/
class ProgressBar :
- public Control,
+ public CommonControl,
// Aspects
public AspectPainting< ProgressBar >
{
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Slider.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Slider.h 2008-03-30 08:32:18 UTC (rev 1094)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Slider.h 2008-03-30 08:33:27 UTC (rev 1095)
@@ -56,7 +56,7 @@
* the Spinner control, but have another visual appearance.
*/
class Slider :
- public Control,
+ public CommonControl,
// Aspects
public AspectFocus< Slider >,
public AspectPainting< Slider >,
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Spinner.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Spinner.h 2008-03-30 08:32:18 UTC (rev 1094)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Spinner.h 2008-03-30 08:33:27 UTC (rev 1095)
@@ -54,7 +54,7 @@
* other for softer.
*/
class Spinner :
- public Control,
+ public CommonControl,
// Aspects
public AspectFocus< Spinner >,
public AspectPainting< Spinner >,
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/StatusBar.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/StatusBar.h 2008-03-30 08:32:18 UTC (rev 1094)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/StatusBar.h 2008-03-30 08:33:27 UTC (rev 1095)
@@ -104,7 +104,7 @@
template< class TypeOfStatusBar = NoSection >
class StatusBar :
public TypeOfStatusBar,
- public Control,
+ public CommonControl,
// Aspects
public AspectClickable< StatusBar< TypeOfStatusBar > >,
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/TabSheet.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/TabSheet.h 2008-03-30 08:32:18 UTC (rev 1094)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/TabSheet.h 2008-03-30 08:33:27 UTC (rev 1095)
@@ -63,7 +63,7 @@
* has.
*/
class TabSheet :
- public Control,
+ public CommonControl,
// Aspects
public AspectCollection<TabSheet, int>,
public AspectFocus< TabSheet >,
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Table.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Table.h 2008-03-30 08:32:18 UTC (rev 1094)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Table.h 2008-03-30 08:33:27 UTC (rev 1095)
@@ -68,7 +68,7 @@
* to "map" an LPARAM value to a physical rownumber and vice versa.
*/
class Table :
- public Control,
+ public CommonControl,
// Aspect classes
public AspectClickable< Table >,
public AspectCollection<Table, int>,
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/TextBox.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/TextBox.h 2008-03-30 08:32:18 UTC (rev 1094)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/TextBox.h 2008-03-30 08:33:27 UTC (rev 1095)
@@ -64,7 +64,7 @@
* < ul > < li >RichTextBox< /li > < /ul >
*/
class TextBoxBase :
- public Control,
+ public CommonControl,
// Aspect classes
public AspectColor< TextBoxBase >,
public AspectColorCtlImpl<TextBoxBase>,
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/ToolBar.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/ToolBar.h 2008-03-30 08:32:18 UTC (rev 1094)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/ToolBar.h 2008-03-30 08:33:27 UTC (rev 1095)
@@ -38,6 +38,8 @@
#include "../resources/ImageList.h"
#include "Control.h"
+#include <vector>
+
namespace SmartWin
{
// begin namespace SmartWin
@@ -57,7 +59,7 @@
* to view the log of URL's you have been to etc...
*/
class ToolBar :
- public Control,
+public CommonControl,
// Aspects
public AspectFocus< ToolBar >,
public AspectFont< ToolBar >
@@ -109,7 +111,7 @@
*/
void appendSeparator();
- void appendItem(unsigned int id, int image, const SmartUtil::tstring& toolTip, const Dispatcher::F& f = Dispatcher::F());
+ void appendItem(int image, const SmartUtil::tstring& toolTip, const Dispatcher::F& f = Dispatcher::F());
/// Set the image list with the normal button images.
/** normalImageList is the image list that contains the images
@@ -180,7 +182,7 @@
ImageListPtr itsHotImageList;
ImageListPtr itsDisabledImageList;
- //void addBitmap( HBITMAP hBit, unsigned int noButtonsInBitmap );
+ std::vector<Dispatcher::F> commands;
};
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Tree.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Tree.h 2008-03-30 08:32:18 UTC (rev 1094)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Tree.h 2008-03-30 08:33:27 UTC (rev 1095)
@@ -61,7 +61,7 @@
*/
class Tree :
- public Control,
+ public CommonControl,
// Aspects
public AspectClickable< Tree >,
public AspectCollection<Tree, HTREEITEM>,
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTabView.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTabView.h 2008-03-30 08:32:18 UTC (rev 1094)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTabView.h 2008-03-30 08:33:27 UTC (rev 1095)
@@ -58,8 +58,6 @@
TabSheet::ObjectType getTab();
- virtual bool tryFire(const MSG& msg, LRESULT& retVal);
-
const Rectangle& getClientSize() const { return clientSize; }
void create( const Seed & cs = Seed() );
Modified: dcplusplus/trunk/smartwin/source/widgets/ToolBar.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/ToolBar.cpp 2008-03-30 08:32:18 UTC (rev 1094)
+++ dcplusplus/trunk/smartwin/source/widgets/ToolBar.cpp 2008-03-30 08:33:27 UTC (rev 1095)
@@ -28,8 +28,22 @@
}
}
-void ToolBar::appendItem( unsigned int id, int image, const SmartUtil::tstring& toolTip, const Dispatcher::F& f)
+void ToolBar::appendItem( int image, const SmartUtil::tstring& toolTip, const Dispatcher::F& f)
{
+ int id = -1;
+
+ if(f) {
+ for(id = 0; id < (int)commands.size(); ++id) {
+ if(!commands[id])
+ break;
+ }
+ if(id == (int)commands.size()) {
+ commands.push_back(f);
+ } else {
+ commands[id] = f;
+ }
+ }
+
// Adding button
TBBUTTON tb = { 0 };
tb.iBitmap = image;
@@ -42,24 +56,17 @@
xCeption x( _T( "Error while trying to add a button to toolbar..." ) );
throw x;
}
-
- if(f)
- addCallback(Message(WM_COMMAND, id), Dispatcher(f));
}
-bool ToolBar::tryFire( const MSG & msg, LRESULT & retVal )
-{
- bool handled = PolicyType::tryFire(msg, retVal);
-
- if(!handled && msg.message == WM_COMMAND) {
- Widget* parent = getParent();
- if(parent != NULL) {
- // Maybe parent knows what to do with the WM_COMMAND (in case of shared menu/toolbar id's)
- handled = parent->tryFire(msg, retVal);
+bool ToolBar::tryFire( const MSG & msg, LRESULT & retVal ) {
+ if(msg.message == WM_COMMAND && msg.lParam == reinterpret_cast<LPARAM>(handle())) {
+ size_t id = LOWORD(msg.wParam);
+ if(id < commands.size() && commands[id]) {
+ commands[id]();
+ return true;
}
}
-
- return handled;
+ return PolicyType::tryFire(msg, retVal);
}
}
Modified: dcplusplus/trunk/smartwin/source/widgets/WidgetTabView.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/WidgetTabView.cpp 2008-03-30 08:32:18 UTC (rev 1094)
+++ dcplusplus/trunk/smartwin/source/widgets/WidgetTabView.cpp 2008-03-30 08:33:27 UTC (rev 1095)
@@ -397,15 +397,4 @@
return false;
}
-bool WidgetTabView::tryFire(const MSG& msg, LRESULT& retVal) {
- bool handled = PolicyType::tryFire(msg, retVal);
- if(!handled && msg.message == WM_COMMAND && getTab()) {
- TabInfo* ti = getTabInfo(getTab()->getSelected());
- if(ti) {
- handled = ti->w->tryFire(msg, retVal);
- }
- }
- return handled;
}
-
-}
Modified: dcplusplus/trunk/win32/AboutDlg.cpp
===================================================================
--- dcplusplus/trunk/win32/AboutDlg.cpp 2008-03-30 08:32:18 UTC (rev 1094)
+++ dcplusplus/trunk/win32/AboutDlg.cpp 2008-03-30 08:33:27 UTC (rev 1095)
@@ -58,7 +58,7 @@
setItemText(IDC_VERSION, Text::toT(APPNAME " " VERSIONSTRING) + T_("\n(c) Copyright 2001-2008 Jacek Sieka\nEx-codeveloper: Per Lind\303\251n\nGraphics: Martin Skogevall et al.\nDC++ is licenced under GPL\nhttp://dcplusplus.sourceforge.net/"));
attachTextBox(IDC_TTH)->setText(WinUtil::tth);
attachTextBox(IDC_THANKS)->setText(Text::toT(thanks));
- setItemText(IDC_TOTALS, str(TF_("Upload: %1%, Download: %2%") % Text::toT(Util::formatBytes(SETTING(TOTAL_UPLOAD))) % Text::toT(Util::formatBytes(SETTING(TOTAL_DOWNLOAD)))));
+ setItemText(IDC_UPDOWN, str(TF_("Upload: %1%, Download: %2%") % Text::toT(Util::formatBytes(SETTING(TOTAL_UPLOAD))) % Text::toT(Util::formatBytes(SETTING(TOTAL_DOWNLOAD)))));
setItemText(IDC_GREETZ, T_("Greetz and Contributors"));
setItemText(IDC_TOTALS, T_("Totals"));
setItemText(IDC_LATEST_VERSION, T_("Latest stable version"));
Modified: dcplusplus/trunk/win32/DCPlusPlus.rc
===================================================================
--- dcplusplus/trunk/win32/DCPlusPlus.rc 2008-03-30 08:32:18 UTC (rev 1094)
+++ dcplusplus/trunk/win32/DCPlusPlus.rc 2008-03-30 08:33:27 UTC (rev 1095)
@@ -99,7 +99,7 @@
GROUPBOX "Latest stable version",IDC_LATEST_VERSION,7,239,229,24,BS_CENTER
CTEXT "0.xxx",IDC_LATEST,13,250,218,8
GROUPBOX "Totals",IDC_TOTALS,7,197,229,39,BS_CENTER
- CTEXT "Upload: xx.xx MiB, Download: xx.xx MiB",IDC_TOTALS,13,208,218,8
+ CTEXT "Upload: xx.xx MiB, Download: xx.xx MiB",IDC_UPDOWN,13,208,218,8
CTEXT "Ratio (Up/Down): x.xx",IDC_RATIO,13,221,218,8
EDITTEXT IDC_THANKS,13,122,218,66,ES_MULTILINE | ES_READONLY | WS_VSCROLL
CTEXT "Static",IDC_VERSION,13,37,218,54
Modified: dcplusplus/trunk/win32/MainWindow.cpp
===================================================================
--- dcplusplus/trunk/win32/MainWindow.cpp 2008-03-30 08:32:18 UTC (rev 1094)
+++ dcplusplus/trunk/win32/MainWindow.cpp 2008-03-30 08:33:27 UTC (rev 1095)
@@ -279,29 +279,29 @@
}
int image = 0;
- toolbar->appendItem(IDC_PUBLIC_HUBS, image++, T_("Public Hubs"));
+ toolbar->appendItem(image++, T_("Public Hubs"), std::tr1::bind(&MainWindow::handleOpenWindow, this, IDC_PUBLIC_HUBS));
toolbar->appendSeparator();
- toolbar->appendItem(IDC_RECONNECT, image++, T_("Reconnect"));
- toolbar->appendItem(IDC_FOLLOW, image++, T_("Follow last redirect"));
+ toolbar->appendItem(image++, T_("Reconnect"), std::tr1::bind(&MainWindow::handleForward, this, IDC_PUBLIC_HUBS));
+ toolbar->appendItem(image++, T_("Follow last redirect"), std::tr1::bind(&MainWindow::handleForward, this, IDC_FOLLOW));
toolbar->appendSeparator();
- toolbar->appendItem(IDC_FAVORITE_HUBS, image++, T_("Favorite Hubs"));
- toolbar->appendItem(IDC_FAVUSERS, image++, T_("Favorite Users"));
+ toolbar->appendItem(image++, T_("Favorite Hubs"), std::tr1::bind(&MainWindow::handleOpenWindow, this, IDC_FAVORITE_HUBS));
+ toolbar->appendItem(image++, T_("Favorite Users"), std::tr1::bind(&MainWindow::handleOpenWindow, this, IDC_FAVUSERS));
toolbar->appendSeparator();
- toolbar->appendItem(IDC_QUEUE, image++, T_("Download Queue"));
- toolbar->appendItem(IDC_FINISHED_DL, image++, T_("Finished Downloads"));
- toolbar->appendItem(IDC_WAITING_USERS, image++, T_("Waiting Users"));
- toolbar->appendItem(IDC_FINISHED_UL, image++, T_("Finished Uploads"));
+ toolbar->appendItem(image++, T_("Download Queue"), std::tr1::bind(&MainWindow::handleOpenWindow, this, IDC_QUEUE));
+ toolbar->appendItem(image++, T_("Finished Downloads"), std::tr1::bind(&MainWindow::handleOpenWindow, this, IDC_FINISHED_DL));
+ toolbar->appendItem(image++, T_("Waiting Users"), std::tr1::bind(&MainWindow::handleOpenWindow, this, IDC_WAITING_USERS));
+ toolbar->appendItem(image++, T_("Finished Uploads"), std::tr1::bind(&MainWindow::handleOpenWindow, this, IDC_FINISHED_UL));
toolbar->appendSeparator();
- toolbar->appendItem(IDC_SEARCH, image++, T_("Search"));
- toolbar->appendItem(IDC_ADL_SEARCH, image++, T_("ADL Search"));
- toolbar->appendItem(IDC_SEARCH_SPY, image++, T_("Search Spy"));
+ toolbar->appendItem(image++, T_("Search"), std::tr1::bind(&MainWindow::handleOpenWindow, this, IDC_SEARCH));
+ toolbar->appendItem(image++, T_("ADL Search"), std::tr1::bind(&MainWindow::handleOpenWindow, this, IDC_ADL_SEARCH));
+ toolbar->appendItem(image++, T_("Search Spy"), std::tr1::bind(&MainWindow::handleOpenWindow, this, IDC_SEARCH_SPY));
toolbar->appendSeparator();
- toolbar->appendItem(IDC_OPEN_FILE_LIST, image++, T_("Open file list..."));
+ toolbar->appendItem(image++, T_("Open file list..."), std::tr1::bind(&MainWindow::handleOpenFileList, this));
toolbar->appendSeparator();
- toolbar->appendItem(IDC_SETTINGS, image++, T_("Settings"));
- toolbar->appendItem(IDC_NOTEPAD, image++, T_("Notepad"));
+ toolbar->appendItem(image++, T_("Settings"), std::tr1::bind(&MainWindow::handleSettings, this));
+ toolbar->appendItem(image++, T_("Notepad"), std::tr1::bind(&MainWindow::handleOpenWindow, this, IDC_NOTEPAD));
toolbar->appendSeparator();
- toolbar->appendItem(IDC_WHATS_THIS, image++, T_("\"What's this?\" help"), std::tr1::bind(&MainWindow::handleWhatsThis, this));
+ toolbar->appendItem(image++, T_("\"What's this?\""), std::tr1::bind(&MainWindow::handleWhatsThis, this));
}
void MainWindow::initStatusBar() {
@@ -354,6 +354,13 @@
close(true);
}
+void MainWindow::handleForward(WPARAM wParam) {
+ SmartWin::WidgetChildWindow* active = getMDIParent()->getActive();
+ if(active) {
+ active->sendMessage(WM_COMMAND, wParam, 0);
+ }
+}
+
void MainWindow::handleQuickConnect() {
if (SETTING(NICK).empty()) {
postMessage(WM_COMMAND, IDC_SETTINGS);
Modified: dcplusplus/trunk/win32/MainWindow.h
===================================================================
--- dcplusplus/trunk/win32/MainWindow.h 2008-03-30 08:32:18 UTC (rev 1094)
+++ dcplusplus/trunk/win32/MainWindow.h 2008-03-30 08:33:27 UTC (rev 1095)
@@ -159,6 +159,7 @@
void handleWhatsThis();
void handleSize();
void handleActivate(bool active);
+ void handleForward(WPARAM wParam);
LRESULT handleEndSession();
LRESULT handleTrayIcon(LPARAM lParam);
Modified: dcplusplus/trunk/win32/resource.h
===================================================================
--- dcplusplus/trunk/win32/resource.h 2008-03-30 08:32:18 UTC (rev 1094)
+++ dcplusplus/trunk/win32/resource.h 2008-03-30 08:33:27 UTC (rev 1095)
@@ -442,6 +442,7 @@
#define IDC_SETTINGS_PRIVATE_KEY_FILE 2299
#define IDC_SETTINGS_CERTIFICATE_FILE 2300
#define IDC_SETTINGS_TRUSTED_CERTIFICATES_PATH 2301
+#define IDC_UPDOWN 2302
// Stuff that uses multiple id's
#define IDC_BROWSELIST 3000
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2008-03-30 08:32:24
|
Revision: 1094
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1094&view=rev
Author: arnetheduck
Date: 2008-03-30 01:32:18 -0700 (Sun, 30 Mar 2008)
Log Message:
-----------
don't use COLOR_MENUBAR which is for > XP, and normalize other menu colors
Modified Paths:
--------------
dcplusplus/trunk/changelog.txt
dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetMenu.h
dcplusplus/trunk/smartwin/source/widgets/WidgetMenu.cpp
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-03-29 17:27:03.002000093 +0100
committer: zouzou123gen
properties:
branch-nick: bzr
+ timestamp: 2008-03-30 00:47:06.986000061 +0100
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
+ 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
Modified: dcplusplus/trunk/changelog.txt
===================================================================
--- dcplusplus/trunk/changelog.txt 2008-03-30 08:31:52 UTC (rev 1093)
+++ dcplusplus/trunk/changelog.txt 2008-03-30 08:32:18 UTC (rev 1094)
@@ -13,6 +13,7 @@
* Add average share to status bar (thanks mikejj)
* Minor improvements to load / save dialogs
* [L#208684] Fixed line history when "Use Ctrl ..." is disabled (poy)
+* [L#208917] Fixed menu background colors (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/widgets/WidgetMenu.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetMenu.h 2008-03-30 08:31:52 UTC (rev 1093)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetMenu.h 2008-03-30 08:32:18 UTC (rev 1094)
@@ -85,9 +85,6 @@
/// Strip bar color
COLORREF colorStrip;
- /// Menu bar color
- COLORREF colorMenuBar;
-
/// Highlighted menu item color
COLORREF colorHighlight;
@@ -104,13 +101,11 @@
*/
MenuColorInfo( COLORREF menuColor = ColorUtilities::darkenColor( ::GetSysColor( COLOR_WINDOW ), 0.02 ),
COLORREF stripColor = ColorUtilities::darkenColor( ::GetSysColor( COLOR_3DFACE ), 0.02 ),
- COLORREF menuBarColor = ::GetSysColor( COLOR_MENUBAR ),
COLORREF highlightColor = ::GetSysColor( COLOR_HIGHLIGHT ),
COLORREF titleTextColor = ::GetSysColor( COLOR_MENUTEXT ),
COLORREF imageBackground = RGB( 0, 0, 0 ) ) // black
: colorMenu( menuColor ),
colorStrip( stripColor ),
- colorMenuBar( menuBarColor ),
colorHighlight( highlightColor ),
colorTitleText( titleTextColor ),
colorImageBackground( imageBackground )
Modified: dcplusplus/trunk/smartwin/source/widgets/WidgetMenu.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/WidgetMenu.cpp 2008-03-30 08:31:52 UTC (rev 1093)
+++ dcplusplus/trunk/smartwin/source/widgets/WidgetMenu.cpp 2008-03-30 08:32:18 UTC (rev 1094)
@@ -387,19 +387,9 @@
ItemDataWrapper * wrapper = reinterpret_cast< ItemDataWrapper * >( drawInfo->itemData );
xAssert( wrapper != 0, _T( "Unsupported menu item in drawItem()" ) );
- // setup colors
- MenuColorInfo colorInfo = wrapper->menu->itsColorInfo;
- COLORREF colorMenuBar = colorInfo.colorMenuBar;
- COLORREF colorMenuDraw = colorInfo.colorMenu; // color for drawing menu
- COLORREF colorFillHighlighted = ColorUtilities::lightenColor( colorInfo.colorHighlight, 0.7 );
-
// if processing menu bar
const bool isMenuBar = ::GetMenu( wrapper->menu->getParent()->handle() ) == wrapper->menu->handle();
- // change menu draw color for menubars
- if ( isMenuBar )
- colorMenuDraw = colorMenuBar;
-
// init struct for menu item info
MENUITEMINFO info;
memset( & info, 0, sizeof( MENUITEMINFO ) );
@@ -493,6 +483,8 @@
itemRectangle.size.x -= sidebarWidth;
}
+ const MenuColorInfo& colorInfo = wrapper->menu->itsColorInfo;
+
// draw sidebar with menu title
if ( ( drawInfo->itemAction & ODA_DRAWENTIRE ) && ( wrapper->menu->drawSidebar ) && !wrapper->menu->itsTitle.empty() )
{
@@ -512,7 +504,7 @@
Rectangle textRectangle( 0, 0, sidebarWidth, rect.bottom - rect.top );
// draw background
- Brush brush ( colorInfo.colorMenuBar );
+ Brush brush ( colorInfo.colorStrip );
canvas.fillRectangle( textRectangle, brush );
// draw title
@@ -531,20 +523,10 @@
::DeleteObject( titleFont );
// set item background
- if ( wrapper->isMenuTitleItem ) // for title
{
- Brush brush ( colorMenuBar );
- canvas.fillRectangle( itemRectangle, brush );
-
- // draw raised border
- RECT rc( itemRectangle );
- ::DrawEdge( canvas.handle(), & rc, EDGE_RAISED, BF_RECT );
+ Brush brush((wrapper->isMenuTitleItem || isMenuBar) ? colorInfo.colorStrip : colorInfo.colorMenu);
+ canvas.fillRectangle(itemRectangle, brush);
}
- else // for normal items
- {
- Brush brush ( colorMenuDraw );
- canvas.fillRectangle( itemRectangle, brush );
- }
if ( isMenuBar && isSelected ) // draw selected menu bar item
{
@@ -554,8 +536,6 @@
// and brush for filling item
COLORREF colorBorder = 0;
Canvas::Selector select_pen(canvas, *PenPtr(new Pen(colorBorder)));
- Canvas::Selector select_brush(canvas, *BrushPtr(new Brush(ColorUtilities::lightenColor( colorMenuBar, 0.5 ))));
-
canvas.rectangle( itemRectangle );
} // end if
else if ( ( isSelected || isHighlighted ) && !isDisabled ) // draw selected or highlighted menu item (if not inactive)
@@ -563,7 +543,7 @@
// select pen for drawing broder
// and brush for filling item
Canvas::Selector select_pen(canvas, *PenPtr(new Pen(colorInfo.colorHighlight)));
- Canvas::Selector select_brush(canvas, *BrushPtr(new Brush(colorFillHighlighted)));
+ Canvas::Selector select_brush(canvas, *BrushPtr(new Brush(ColorUtilities::lightenColor( colorInfo.colorHighlight, 0.7 ))));
canvas.rectangle( itemRectangle );
} // end if
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2008-03-30 08:31:54
|
Revision: 1093
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1093&view=rev
Author: arnetheduck
Date: 2008-03-30 01:31:52 -0700 (Sun, 30 Mar 2008)
Log Message:
-----------
Fixed line history when "Use Ctrl ..." is disabled
Modified Paths:
--------------
dcplusplus/trunk/changelog.txt
dcplusplus/trunk/win32/HubFrame.cpp
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-03-29 16:36:53.517999887 +0100
committer: zouzou123gen
properties:
branch-nick: bzr
+ timestamp: 2008-03-29 17:27:03.002000093 +0100
committer: zouzou123gen
properties:
branch-nick: bzr
Name: bzr:file-ids
- help/cshelp.h cshelp.h-20080329145802-nazh0krdetjcj1vf-1
help/cshelp_stub.html cshelp_stub.html-20080329135634-e80e0eh944gd3f7f-1
help/dialog_public_hub_lists.html dialog_public_hub_li-20080328011507-8vngpwi11xglnxcd-1
help/gen_cshelp.py gen_cshelp.py-20080329135626-eku69z9gc8gikpz6-1
help/window_file_list.html 1051@f586c4b0-9d0d-0410-bc51-f1fe239209fc:dcplusplus%2Ftrunk:help%2Fwindow_directory_listing.html
+
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
+ 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
Modified: dcplusplus/trunk/changelog.txt
===================================================================
--- dcplusplus/trunk/changelog.txt 2008-03-30 08:30:17 UTC (rev 1092)
+++ dcplusplus/trunk/changelog.txt 2008-03-30 08:31:52 UTC (rev 1093)
@@ -12,6 +12,7 @@
* Both up&downloads are disconnected if evil users quit (thanks poy)
* Add average share to status bar (thanks mikejj)
* Minor improvements to load / save dialogs
+* [L#208684] Fixed line history when "Use Ctrl ..." is disabled (poy)
-- 0.705 2008-03-14 --
* Several patches for better *nix compatibility of the core (thanks steven sheehy et al)
Modified: dcplusplus/trunk/win32/HubFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/HubFrame.cpp 2008-03-30 08:30:17 UTC (rev 1092)
+++ dcplusplus/trunk/win32/HubFrame.cpp 2008-03-30 08:31:52 UTC (rev 1093)
@@ -665,7 +665,7 @@
}
bool HubFrame::historyActive() {
- return isAltPressed() || (isControlPressed() && BOOLSETTING(USE_CTRL_FOR_LINE_HISTORY));
+ return isAltPressed() || !BOOLSETTING(USE_CTRL_FOR_LINE_HISTORY) || isControlPressed();
}
bool HubFrame::handleUsersKeyDown(int c) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2008-03-30 08:30:19
|
Revision: 1092
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1092&view=rev
Author: arnetheduck
Date: 2008-03-30 01:30:17 -0700 (Sun, 30 Mar 2008)
Log Message:
-----------
script to generate cshelp files; added help for hubs, PMs, file lists
Modified Paths:
--------------
dcplusplus/trunk/.bzrignore
dcplusplus/trunk/changelog.txt
dcplusplus/trunk/help/DCPlusPlus.hhp
dcplusplus/trunk/help/compile.cmd
dcplusplus/trunk/help/credits.html
dcplusplus/trunk/help/dialog_adls_properties.html
dcplusplus/trunk/help/dialog_favorite_hub.html
dcplusplus/trunk/help/dialog_user_command.html
dcplusplus/trunk/help/faq_activemode.html
dcplusplus/trunk/help/index.html
dcplusplus/trunk/help/resource.h
dcplusplus/trunk/help/settings_appearance.html
dcplusplus/trunk/help/settings_certs.html
dcplusplus/trunk/help/settings_colors_and_sounds.html
dcplusplus/trunk/help/settings_connection.html
dcplusplus/trunk/help/settings_downloads.html
dcplusplus/trunk/help/settings_expert.html
dcplusplus/trunk/help/settings_favoritedirs.html
dcplusplus/trunk/help/settings_general.html
dcplusplus/trunk/help/settings_logs.html
dcplusplus/trunk/help/settings_queue.html
dcplusplus/trunk/help/settings_sharing.html
dcplusplus/trunk/help/settings_user_commands.html
dcplusplus/trunk/help/toc.hhc
dcplusplus/trunk/help/window_adlsearch.html
dcplusplus/trunk/help/window_download_queue.html
dcplusplus/trunk/help/window_favorite_hubs.html
dcplusplus/trunk/help/window_hub.html
dcplusplus/trunk/help/window_pm.html
dcplusplus/trunk/help/window_public_hubs.html
dcplusplus/trunk/help/window_search.html
dcplusplus/trunk/help/window_search_spy.html
dcplusplus/trunk/win32/DCPlusPlus.rc
dcplusplus/trunk/win32/DirectoryListingFrame.cpp
dcplusplus/trunk/win32/FavHubsFrame.cpp
dcplusplus/trunk/win32/HubFrame.cpp
dcplusplus/trunk/win32/HubListsDlg.cpp
dcplusplus/trunk/win32/PrivateFrame.cpp
dcplusplus/trunk/win32/resource.h
Added Paths:
-----------
dcplusplus/trunk/help/cshelp.h
dcplusplus/trunk/help/cshelp_stub.html
dcplusplus/trunk/help/dialog_public_hub_lists.html
dcplusplus/trunk/help/gen_cshelp.py
dcplusplus/trunk/help/window_file_list.html
Removed Paths:
-------------
dcplusplus/trunk/help/cshelp.h
dcplusplus/trunk/help/cshelp.txt
dcplusplus/trunk/help/window_directory_listing.html
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-03-29 16:09:01.500000000 +0100
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
+ timestamp: 2008-03-29 16:36:53.517999887 +0100
committer: zouzou123gen
properties:
branch-nick: bzr
Name: bzr:file-ids
-
+ help/cshelp.h cshelp.h-20080329145802-nazh0krdetjcj1vf-1
help/cshelp_stub.html cshelp_stub.html-20080329135634-e80e0eh944gd3f7f-1
help/dialog_public_hub_lists.html dialog_public_hub_li-20080328011507-8vngpwi11xglnxcd-1
help/gen_cshelp.py gen_cshelp.py-20080329135626-eku69z9gc8gikpz6-1
help/window_file_list.html 1051@f586c4b0-9d0d-0410-bc51-f1fe239209fc:dcplusplus%2Ftrunk:help%2Fwindow_directory_listing.html
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
+ 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
Modified: dcplusplus/trunk/.bzrignore
===================================================================
--- dcplusplus/trunk/.bzrignore 2008-03-30 08:28:59 UTC (rev 1091)
+++ dcplusplus/trunk/.bzrignore 2008-03-30 08:30:17 UTC (rev 1092)
@@ -10,4 +10,5 @@
natupnp.h
./help/changelog.html
./help/compile.log
+./help/cshelp.txt
./.pydevproject
Modified: dcplusplus/trunk/changelog.txt
===================================================================
--- dcplusplus/trunk/changelog.txt 2008-03-30 08:28:59 UTC (rev 1091)
+++ dcplusplus/trunk/changelog.txt 2008-03-30 08:30:17 UTC (rev 1092)
@@ -1,6 +1,5 @@
-- 0.706 --
* [L#202563] Fixed some missing translations
-* Fixed help links (thanks poy)
* Use setenv on unix (thanks yakov suraev)
* Fixed out of focus window when restoring from icon (poy)
* [L#203865] Fixed multiple instances (poy)
Modified: dcplusplus/trunk/help/DCPlusPlus.hhp
===================================================================
--- dcplusplus/trunk/help/DCPlusPlus.hhp 2008-03-30 08:28:59 UTC (rev 1091)
+++ dcplusplus/trunk/help/DCPlusPlus.hhp 2008-03-30 08:30:17 UTC (rev 1092)
@@ -40,7 +40,7 @@
credits.html
window_hub.html
window_pm.html
-window_directory_listing.html
+window_file_list.html
window_public_hubs.html
window_favorite_hubs.html
window_favorite_users.html
@@ -58,6 +58,7 @@
dialog_user_command.html
dialog_favorite_hub.html
dialog_adls_properties.html
+dialog_public_hub_lists.html
fdl.html
faq_keyboard_commands.html
faq_upnp.html
@@ -79,7 +80,7 @@
IDH_KEYBOARD=faq_keyboard_commands.html
IDH_HUB=window_hub.html
IDH_PM=window_pm.html
-IDH_DIRECTORY_LISTING=window_directory_listing.html
+IDH_FILE_LIST=window_file_list.html
IDH_PUBLIC_HUBS=window_public_hubs.html
IDH_FAVORITE_HUBS=window_favorite_hubs.html
IDH_FAVUSERS=window_favorite_users.html
@@ -97,6 +98,7 @@
IDH_USER_COMMAND=dialog_user_command.html
IDH_FAVORITE_HUB=dialog_favorite_hub.html
IDH_ADLSP=dialog_adls_properties.html
+IDH_PUBLIC_HUB_LISTS=dialog_public_hub_lists.html
IDH_ADVANCED3PAGE=settings_expert.html
IDH_ADVANCEDPAGE=settings_advanced.html
IDH_APPEARANCE2PAGE=settings_colors_and_sounds.html
Modified: dcplusplus/trunk/help/compile.cmd
===================================================================
--- dcplusplus/trunk/help/compile.cmd 2008-03-30 08:28:59 UTC (rev 1091)
+++ dcplusplus/trunk/help/compile.cmd 2008-03-30 08:30:17 UTC (rev 1092)
@@ -1,7 +1,11 @@
@echo off
+
REM generate changelog.html
gen_changelog.py
+REM generate cshelp.h and cshelp.txt
+gen_cshelp.py
+
copy ..\res\users.bmp .
mkdir ..\build\help
hhc.exe DCPlusPlus.hhp > compile.log
Modified: dcplusplus/trunk/help/credits.html
===================================================================
--- dcplusplus/trunk/help/credits.html 2008-03-30 08:28:59 UTC (rev 1091)
+++ dcplusplus/trunk/help/credits.html 2008-03-30 08:30:17 UTC (rev 1092)
@@ -9,6 +9,7 @@
<h1>Help File Credits and License</h1>
<br>
Copyright (c) 2004-2007 Todd Pederzani, Walter Doekes<br>
+Copyright (c) 2008 Jacek Sieka<br>
<br>
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation
Deleted: dcplusplus/trunk/help/cshelp.h
===================================================================
--- dcplusplus/trunk/help/cshelp.h 2008-03-30 08:28:59 UTC (rev 1091)
+++ dcplusplus/trunk/help/cshelp.h 2008-03-30 08:30:17 UTC (rev 1092)
@@ -1,145 +0,0 @@
-// this file contains help ids for field-level help tooltips
-
-#ifndef DCPLUSPLUS_HELP_CSHELP_H
-#define DCPLUSPLUS_HELP_CSHELP_H
-
-#define IDH_DCPP_OK 11000
-#define IDH_DCPP_CANCEL 11001
-#define IDH_DCPP_HELP 11002
-#define IDH_SETTINGS_TREE 11003
-#define IDH_SETTINGS_GENERAL_PERSONAL_INFORMATION 11004
-#define IDH_SETTINGS_GENERAL_NICK 11005
-#define IDH_SETTINGS_GENERAL_EMAIL 11006
-#define IDH_SETTINGS_GENERAL_DESCRIPTION 11007
-#define IDH_SETTINGS_GENERAL_CONNECTION 11008
-#define IDH_SETTINGS_NETWORK_DIRECT 11009
-#define IDH_SETTINGS_NETWORK_FIREWALL_UPNP 11010
-#define IDH_SETTINGS_NETWORK_FIREWALL_NAT 11011
-#define IDH_SETTINGS_NETWORK_FIREWALL_PASSIVE 11012
-#define IDH_SETTINGS_NETWORK_PORT_TCP 11013
-#define IDH_SETTINGS_NETWORK_PORT_UDP 11014
-#define IDH_SETTINGS_NETWORK_PORT_TLS 11015
-#define IDH_SETTINGS_NETWORK_EXTERNAL_IP 11016
-#define IDH_SETTINGS_NETWORK_OVERRIDE 11017
-#define IDH_SETTINGS_NETWORK_DIRECT_OUT 11018
-#define IDH_SETTINGS_NETWORK_SOCKS5 11019
-#define IDH_SETTINGS_NETWORK_SOCKS_SERVER 11020
-#define IDH_SETTINGS_NETWORK_SOCKS_PORT 11021
-#define IDH_SETTINGS_NETWORK_SOCKS_USER 11022
-#define IDH_SETTINGS_NETWORK_SOCKS_PASSWORD 11023
-#define IDH_SETTINGS_NETWORK_SOCKS_RESOLVE 11024
-#define IDH_SETTINGS_DOWNLOAD_DOWNLOADDIR 11025
-#define IDH_SETTINGS_DOWNLOAD_TEMP_DOWNLOAD_DIRECTORY 11026
-#define IDH_SETTINGS_DOWNLOAD_LIMITS 11027
-#define IDH_SETTINGS_DOWNLOAD_DOWNLOADS 11028
-#define IDH_SETTINGS_DOWNLOAD_MAXSPEED 11029
-#define IDH_SETTINGS_DOWNLOAD_PROXY 11030
-#define IDH_SETTINGS_FAVORITE_DIRS_FAVORITE_DIRECTORIES 11031
-#define IDH_SETTINGS_FAVORITE_DIRS_RENAME 11032
-#define IDH_SETTINGS_FAVORITE_DIRS_REMOVE 11033
-#define IDH_SETTINGS_FAVORITE_DIRS_ADD 11034
-#define IDH_SETTINGS_QUEUE_AUTOPRIO 11035
-#define IDH_SETTINGS_QUEUE_PRIO_HIGHEST 11036
-#define IDH_SETTINGS_QUEUE_PRIO_NORMAL 11037
-#define IDH_SETTINGS_QUEUE_PRIO_HIGH 11038
-#define IDH_SETTINGS_QUEUE_PRIO_LOW 11039
-#define IDH_SETTINGS_QUEUE_AUTODROP 11040
-#define IDH_SETTINGS_QUEUE_AUTODROP_SPEED 11041
-#define IDH_SETTINGS_QUEUE_AUTODROP_ELAPSED 11042
-#define IDH_SETTINGS_QUEUE_AUTODROP_MINSOURCES 11043
-#define IDH_SETTINGS_QUEUE_AUTODROP_INTERVAL 11044
-#define IDH_SETTINGS_QUEUE_AUTODROP_INACTIVITY 11045
-#define IDH_SETTINGS_QUEUE_AUTODROP_FILESIZE 11046
-#define IDH_SETTINGS_UPLOAD_DIRECTORIES 11047
-#define IDH_SETTINGS_UPLOAD_SHAREHIDDEN 11048
-#define IDH_SETTINGS_UPLOAD_RENAME 11049
-#define IDH_SETTINGS_UPLOAD_REMOVE 11050
-#define IDH_SETTINGS_UPLOAD_ADD 11051
-#define IDH_SETTINGS_UPLOAD_MIN_UPLOAD_SPEED 11052
-#define IDH_SETTINGS_UPLOAD_SLOTS 11053
-#define IDH_SETTINGS_APPEARANCE_DEFAULT_AWAY_MESSAGE 11054
-#define IDH_SETTINGS_APPEARANCE_TIME_STAMPS_FORMAT 11055
-#define IDH_SETTINGS_APPEARANCE_LANGUAGE 11056
-#define IDH_SETTINGS_APPEARANCE_REQUIRES_RESTART 11057
-#define IDH_SETTINGS_APPEARANCE2_COLORS 11058
-#define IDH_SETTINGS_APPEARANCE2_SELWINCOLOR 11059
-#define IDH_SETTINGS_APPEARANCE2_SELTEXT 11060
-#define IDH_SETTINGS_APPEARANCE2_UPLOAD_BAR_COLOR 11061
-#define IDH_SETTINGS_APPEARANCE2_DOWNLOAD_BAR_COLOR 11062
-#define IDH_SETTINGS_APPEARANCE2_BEEPFILE 11063
-#define IDH_SETTINGS_LOG_DIRECTORY 11064
-#define IDH_SETTINGS_ADVANCED3_ROLLBACK 11065
-#define IDH_SETTINGS_ADVANCED3_MAX_HASH_SPEED 11066
-#define IDH_SETTINGS_ADVANCED3_PM_HISTORY 11067
-#define IDH_SETTINGS_ADVANCED3_MINISLOT_SIZE 11068
-#define IDH_SETTINGS_ADVANCED3_MAX_FILELIST_SIZE 11069
-#define IDH_SETTINGS_ADVANCED3_PRIVATE_ID 11070
-#define IDH_SETTINGS_ADVANCED3_AUTO_REFRESH_TIME 11071
-#define IDH_SETTINGS_ADVANCED3_BUFFERSIZE 11072
-#define IDH_SETTINGS_ADVANCED3_AUTO_SEARCH_LIMIT 11073
-#define IDH_SETTINGS_ADVANCED3_SEARCH_HISTORY 11074
-#define IDH_SETTINGS_ADVANCED3_BIND_ADDRESS 11075
-#define IDH_SETTINGS_ADVANCED3_SOCKET_IN_BUFFER 11076
-#define IDH_SETTINGS_ADVANCED3_SOCKET_OUT_BUFFER 11077
-#define IDH_SETTINGS_ADVANCED3_MIN_SEGMENT_SIZE 11078
-#define IDH_SETTINGS_UC_LIST 11079
-#define IDH_SETTINGS_UC_ADD 11080
-#define IDH_SETTINGS_UC_CHANGE 11081
-#define IDH_SETTINGS_UC_MOVE_UP 11082
-#define IDH_SETTINGS_UC_MOVE_DOWN 11083
-#define IDH_SETTINGS_UC_REMOVE 11084
-#define IDH_SETTINGS_CERTIFICATES_PRIVATE_KEY_FILE 11085
-#define IDH_SETTINGS_CERTIFICATES_CERTIFICATE_FILE 11086
-#define IDH_SETTINGS_CERTIFICATES_TRUSTED_CERTIFICATES_PATH 11087
-#define IDH_USER_COMMAND_SEPARATOR 11088
-#define IDH_USER_COMMAND_RAW 11089
-#define IDH_USER_COMMAND_CHAT 11090
-#define IDH_USER_COMMAND_PM 11091
-#define IDH_USER_COMMAND_CONTEXT 11092
-#define IDH_USER_COMMAND_HUB_MENU 11093
-#define IDH_USER_COMMAND_USER_MENU 11094
-#define IDH_USER_COMMAND_SEARCH_MENU 11095
-#define IDH_USER_COMMAND_FILELIST_MENU 11096
-#define IDH_USER_COMMAND_NAME 11097
-#define IDH_USER_COMMAND_COMMAND 11098
-#define IDH_USER_COMMAND_HUB 11099
-#define IDH_USER_COMMAND_NICK 11100
-#define IDH_USER_COMMAND_ONCE 11101
-#define IDH_FAVORITE_HUBS_CONNECT 11102
-#define IDH_FAVORITE_HUBS_NEW 11103
-#define IDH_FAVORITE_HUBS_PROPERTIES 11104
-#define IDH_FAVORITE_HUBS_MOVE_UP 11105
-#define IDH_FAVORITE_HUBS_MOVE_DOWN 11106
-#define IDH_FAVORITE_HUBS_REMOVE 11107
-#define IDH_PUBLIC_HUBS_FILTER 11108
-#define IDH_PUBLIC_HUBS_LISTS 11109
-#define IDH_PUBLIC_HUBS_REFRESH 11110
-#define IDH_SEARCH_SEARCH_FOR 11111
-#define IDH_SEARCH_PURGE 11112
-#define IDH_SEARCH_SEARCH 11113
-#define IDH_SEARCH_SIZE 11114
-#define IDH_SEARCH_TYPE 11115
-#define IDH_SEARCH_SLOTS 11116
-#define IDH_SEARCH_HUBS 11117
-#define IDH_ADLS_NEW 11118
-#define IDH_ADLS_PROPERTIES 11119
-#define IDH_ADLS_MOVE_UP 11120
-#define IDH_ADLS_MOVE_DOWN 11121
-#define IDH_ADLS_REMOVE 11122
-#define IDH_ADLSP_SEARCH_STRING 11123
-#define IDH_ADLSP_SOURCE_TYPE 11124
-#define IDH_ADLSP_MIN_FILE_SIZE 11125
-#define IDH_ADLSP_MAX_FILE_SIZE 11126
-#define IDH_ADLSP_SIZE_TYPE 11127
-#define IDH_ADLSP_DEST_DIR 11128
-#define IDH_ADLSP_ENABLED 11129
-#define IDH_ADLSP_AUTOQUEUE 11130
-#define IDH_SPY_IGNORE_TTH 11131
-#define IDH_FAVORITE_HUB_NAME 11132
-#define IDH_FAVORITE_HUB_ADDRESS 11133
-#define IDH_FAVORITE_HUB_DESC 11134
-#define IDH_FAVORITE_HUB_NICK 11135
-#define IDH_FAVORITE_HUB_PASSWORD 11136
-#define IDH_FAVORITE_HUB_USER_DESC 11137
-
-#endif
Added: dcplusplus/trunk/help/cshelp.h
===================================================================
--- dcplusplus/trunk/help/cshelp.h (rev 0)
+++ dcplusplus/trunk/help/cshelp.h 2008-03-30 08:30:17 UTC (rev 1092)
@@ -0,0 +1,319 @@
+// this file contains help ids for field-level help tooltips
+
+#ifndef DCPLUSPLUS_HELP_CSHELP_H
+#define DCPLUSPLUS_HELP_CSHELP_H
+
+#define IDH_DCPP_OK 11000
+
+#define IDH_DCPP_CANCEL 11001
+
+#define IDH_DCPP_HELP 11002
+
+#define IDH_SETTINGS_TREE 11003
+
+#define IDH_ADLSP_SOURCE_TYPE 11004
+
+#define IDH_ADLSP_SEARCH_STRING 11005
+
+#define IDH_ADLSP_MIN_FILE_SIZE 11006
+
+#define IDH_ADLSP_MAX_FILE_SIZE 11007
+
+#define IDH_ADLSP_SIZE_TYPE 11008
+
+#define IDH_ADLSP_DEST_DIR 11009
+
+#define IDH_ADLSP_ENABLED 11010
+
+#define IDH_ADLSP_AUTOQUEUE 11011
+
+#define IDH_FAVORITE_HUB_NAME 11012
+
+#define IDH_FAVORITE_HUB_ADDRESS 11013
+
+#define IDH_FAVORITE_HUB_DESC 11014
+
+#define IDH_FAVORITE_HUB_NICK 11015
+
+#define IDH_FAVORITE_HUB_PASSWORD 11016
+
+#define IDH_FAVORITE_HUB_USER_DESC 11017
+
+#define IDH_PUBLIC_HUB_LISTS_EDIT_BOX 11018
+
+#define IDH_PUBLIC_HUB_LISTS_LIST 11019
+
+#define IDH_PUBLIC_HUB_LISTS_ADD 11020
+
+#define IDH_PUBLIC_HUB_LISTS_MOVE_UP 11021
+
+#define IDH_PUBLIC_HUB_LISTS_MOVE_DOWN 11022
+
+#define IDH_PUBLIC_HUB_LISTS_EDIT 11023
+
+#define IDH_PUBLIC_HUB_LISTS_REMOVE 11024
+
+#define IDH_USER_COMMAND_SEPARATOR 11025
+
+#define IDH_USER_COMMAND_RAW 11026
+
+#define IDH_USER_COMMAND_CHAT 11027
+
+#define IDH_USER_COMMAND_PM 11028
+
+#define IDH_USER_COMMAND_CONTEXT 11029
+
+#define IDH_USER_COMMAND_HUB_MENU 11030
+
+#define IDH_USER_COMMAND_USER_MENU 11031
+
+#define IDH_USER_COMMAND_SEARCH_MENU 11032
+
+#define IDH_USER_COMMAND_FILELIST_MENU 11033
+
+#define IDH_USER_COMMAND_NAME 11034
+
+#define IDH_USER_COMMAND_COMMAND 11035
+
+#define IDH_USER_COMMAND_HUB 11036
+
+#define IDH_USER_COMMAND_NICK 11037
+
+#define IDH_USER_COMMAND_ONCE 11038
+
+#define IDH_SETTINGS_APPEARANCE_REQUIRES_RESTART 11039
+
+#define IDH_SETTINGS_APPEARANCE_DEFAULT_AWAY_MESSAGE 11040
+
+#define IDH_SETTINGS_APPEARANCE_TIME_STAMPS_FORMAT 11041
+
+#define IDH_SETTINGS_APPEARANCE_LANGUAGE 11042
+
+#define IDH_SETTINGS_CERTIFICATES_PRIVATE_KEY_FILE 11043
+
+#define IDH_SETTINGS_CERTIFICATES_CERTIFICATE_FILE 11044
+
+#define IDH_SETTINGS_CERTIFICATES_TRUSTED_CERTIFICATES_PATH 11045
+
+#define IDH_SETTINGS_APPEARANCE2_COLORS 11046
+
+#define IDH_SETTINGS_APPEARANCE2_SELWINCOLOR 11047
+
+#define IDH_SETTINGS_APPEARANCE2_SELTEXT 11048
+
+#define IDH_SETTINGS_APPEARANCE2_UPLOAD_BAR_COLOR 11049
+
+#define IDH_SETTINGS_APPEARANCE2_DOWNLOAD_BAR_COLOR 11050
+
+#define IDH_SETTINGS_APPEARANCE2_BEEPFILE 11051
+
+#define IDH_SETTINGS_NETWORK_DIRECT 11052
+
+#define IDH_SETTINGS_NETWORK_FIREWALL_UPNP 11053
+
+#define IDH_SETTINGS_NETWORK_FIREWALL_NAT 11054
+
+#define IDH_SETTINGS_NETWORK_FIREWALL_PASSIVE 11055
+
+#define IDH_SETTINGS_NETWORK_PORT_TCP 11056
+
+#define IDH_SETTINGS_NETWORK_PORT_UDP 11057
+
+#define IDH_SETTINGS_NETWORK_PORT_TLS 11058
+
+#define IDH_SETTINGS_NETWORK_EXTERNAL_IP 11059
+
+#define IDH_SETTINGS_NETWORK_OVERRIDE 11060
+
+#define IDH_SETTINGS_NETWORK_DIRECT_OUT 11061
+
+#define IDH_SETTINGS_NETWORK_SOCKS5 11062
+
+#define IDH_SETTINGS_NETWORK_SOCKS_SERVER 11063
+
+#define IDH_SETTINGS_NETWORK_SOCKS_PORT 11064
+
+#define IDH_SETTINGS_NETWORK_SOCKS_USER 11065
+
+#define IDH_SETTINGS_NETWORK_SOCKS_PASSWORD 11066
+
+#define IDH_SETTINGS_NETWORK_SOCKS_RESOLVE 11067
+
+#define IDH_SETTINGS_DOWNLOAD_DOWNLOADDIR 11068
+
+#define IDH_SETTINGS_DOWNLOAD_TEMP_DOWNLOAD_DIRECTORY 11069
+
+#define IDH_SETTINGS_DOWNLOAD_LIMITS 11070
+
+#define IDH_SETTINGS_DOWNLOAD_DOWNLOADS 11071
+
+#define IDH_SETTINGS_DOWNLOAD_MAXSPEED 11072
+
+#define IDH_SETTINGS_DOWNLOAD_PROXY 11073
+
+#define IDH_SETTINGS_ADVANCED3_ROLLBACK 11074
+
+#define IDH_SETTINGS_ADVANCED3_MAX_HASH_SPEED 11075
+
+#define IDH_SETTINGS_ADVANCED3_PM_HISTORY 11076
+
+#define IDH_SETTINGS_ADVANCED3_MINISLOT_SIZE 11077
+
+#define IDH_SETTINGS_ADVANCED3_MAX_FILELIST_SIZE 11078
+
+#define IDH_SETTINGS_ADVANCED3_PRIVATE_ID 11079
+
+#define IDH_SETTINGS_ADVANCED3_AUTO_REFRESH_TIME 11080
+
+#define IDH_SETTINGS_ADVANCED3_BUFFERSIZE 11081
+
+#define IDH_SETTINGS_ADVANCED3_AUTO_SEARCH_LIMIT 11082
+
+#define IDH_SETTINGS_ADVANCED3_SEARCH_HISTORY 11083
+
+#define IDH_SETTINGS_ADVANCED3_BIND_ADDRESS 11084
+
+#define IDH_SETTINGS_ADVANCED3_SOCKET_IN_BUFFER 11085
+
+#define IDH_SETTINGS_ADVANCED3_SOCKET_OUT_BUFFER 11086
+
+#define IDH_SETTINGS_ADVANCED3_MIN_SEGMENT_SIZE 11087
+
+#define IDH_SETTINGS_FAVORITE_DIRS_FAVORITE_DIRECTORIES 11088
+
+#define IDH_SETTINGS_FAVORITE_DIRS_RENAME 11089
+
+#define IDH_SETTINGS_FAVORITE_DIRS_REMOVE 11090
+
+#define IDH_SETTINGS_FAVORITE_DIRS_ADD 11091
+
+#define IDH_SETTINGS_GENERAL_PERSONAL_INFORMATION 11092
+
+#define IDH_SETTINGS_GENERAL_NICK 11093
+
+#define IDH_SETTINGS_GENERAL_EMAIL 11094
+
+#define IDH_SETTINGS_GENERAL_DESCRIPTION 11095
+
+#define IDH_SETTINGS_GENERAL_CONNECTION 11096
+
+#define IDH_SETTINGS_LOG_DIRECTORY 11097
+
+#define IDH_SETTINGS_QUEUE_AUTOPRIO 11098
+
+#define IDH_SETTINGS_QUEUE_PRIO_HIGHEST 11099
+
+#define IDH_SETTINGS_QUEUE_PRIO_NORMAL 11100
+
+#define IDH_SETTINGS_QUEUE_PRIO_HIGH 11101
+
+#define IDH_SETTINGS_QUEUE_PRIO_LOW 11102
+
+#define IDH_SETTINGS_QUEUE_AUTODROP 11103
+
+#define IDH_SETTINGS_QUEUE_AUTODROP_SPEED 11104
+
+#define IDH_SETTINGS_QUEUE_AUTODROP_ELAPSED 11105
+
+#define IDH_SETTINGS_QUEUE_AUTODROP_MINSOURCES 11106
+
+#define IDH_SETTINGS_QUEUE_AUTODROP_INTERVAL 11107
+
+#define IDH_SETTINGS_QUEUE_AUTODROP_INACTIVITY 11108
+
+#define IDH_SETTINGS_QUEUE_AUTODROP_FILESIZE 11109
+
+#define IDH_SETTINGS_UPLOAD_DIRECTORIES 11110
+
+#define IDH_SETTINGS_UPLOAD_SHAREHIDDEN 11111
+
+#define IDH_SETTINGS_UPLOAD_RENAME 11112
+
+#define IDH_SETTINGS_UPLOAD_REMOVE 11113
+
+#define IDH_SETTINGS_UPLOAD_ADD 11114
+
+#define IDH_SETTINGS_UPLOAD_MIN_UPLOAD_SPEED 11115
+
+#define IDH_SETTINGS_UPLOAD_SLOTS 11116
+
+#define IDH_SETTINGS_UC_LIST 11117
+
+#define IDH_SETTINGS_UC_ADD 11118
+
+#define IDH_SETTINGS_UC_CHANGE 11119
+
+#define IDH_SETTINGS_UC_MOVE_UP 11120
+
+#define IDH_SETTINGS_UC_MOVE_DOWN 11121
+
+#define IDH_SETTINGS_UC_REMOVE 11122
+
+#define IDH_ADLS_NEW 11123
+
+#define IDH_ADLS_PROPERTIES 11124
+
+#define IDH_ADLS_MOVE_UP 11125
+
+#define IDH_ADLS_MOVE_DOWN 11126
+
+#define IDH_ADLS_REMOVE 11127
+
+#define IDH_FAVORITE_HUBS_CONNECT 11128
+
+#define IDH_FAVORITE_HUBS_NEW 11129
+
+#define IDH_FAVORITE_HUBS_PROPERTIES 11130
+
+#define IDH_FAVORITE_HUBS_MOVE_UP 11131
+
+#define IDH_FAVORITE_HUBS_MOVE_DOWN 11132
+
+#define IDH_FAVORITE_HUBS_REMOVE 11133
+
+#define IDH_FILE_LIST_DIRS 11134
+
+#define IDH_FILE_LIST_FILES 11135
+
+#define IDH_FILE_LIST_SUBSTRACT 11136
+
+#define IDH_FILE_LIST_MATCH_QUEUE 11137
+
+#define IDH_FILE_LIST_FIND 11138
+
+#define IDH_FILE_LIST_NEXT 11139
+
+#define IDH_HUB_CHAT 11140
+
+#define IDH_HUB_MESSAGE 11141
+
+#define IDH_HUB_FILTER 11142
+
+#define IDH_PM_CHAT 11143
+
+#define IDH_PM_MESSAGE 11144
+
+#define IDH_PUBLIC_HUBS_FILTER 11145
+
+#define IDH_PUBLIC_HUBS_LISTS 11146
+
+#define IDH_PUBLIC_HUBS_REFRESH 11147
+
+#define IDH_SEARCH_SEARCH_FOR 11148
+
+#define IDH_SEARCH_PURGE 11149
+
+#define IDH_SEARCH_SEARCH 11150
+
+#define IDH_SEARCH_SIZE 11151
+
+#define IDH_SEARCH_TYPE 11152
+
+#define IDH_SEARCH_SLOTS 11153
+
+#define IDH_SEARCH_HUBS 11154
+
+#define IDH_SPY_IGNORE_TTH 11155
+
+
+#endif
Deleted: dcplusplus/trunk/help/cshelp.txt
===================================================================
--- dcplusplus/trunk/help/cshelp.txt 2008-03-30 08:28:59 UTC (rev 1091)
+++ dcplusplus/trunk/help/cshelp.txt 2008-03-30 08:30:17 UTC (rev 1092)
@@ -1,276 +0,0 @@
-.topic IDH_DCPP_OK
-Press this button to save your changes and close this dialog.
-.topic IDH_DCPP_CANCEL
-Press this button to close this dialog without saving your changes.
-.topic IDH_DCPP_HELP
-Press this button to launch the help file.
-.topic IDH_SETTINGS_TREE
-Choose a settings category here.
-.topic IDH_SETTINGS_GENERAL_PERSONAL_INFORMATION
-This is general information about yourself. The nick is required, though it's suggested that you pick the correct connection type as well.
-.topic IDH_SETTINGS_GENERAL_NICK
-This nickname, or handle, will identify you when you join a hub. It can be overridden on a per-hub basis in the Favorite Hub Properties.
-.topic IDH_SETTINGS_GENERAL_EMAIL
-This field is for sharing your email address, if you wish it.
-.topic IDH_SETTINGS_GENERAL_DESCRIPTION
-This description will show in the user list. It can be overridden on a per-hub basis in the Favorite Hub Properties.
-.topic IDH_SETTINGS_GENERAL_CONNECTION
-This drop-down contains a number of common upload speeds (in MiB/s), please choose the one closest to your own. Do not put in your download speed; this setting is a measure of how fast a source you are likely to be for other users.
-.topic IDH_SETTINGS_NETWORK_DIRECT
-Select this mode if your computer is hooked directly to the internet. Do not select this mode if you have a router (firewall) or a software firewall.
-.topic IDH_SETTINGS_NETWORK_FIREWALL_UPNP
-Select this mode if you are behind a firewall that supports the UPnP standard for program auto-configuration. DC++ will automatically open the ports it needs and obtain your external IP address. This mode is not available on operating systems before Windows XP, as it was the first version to have UPnP support.
-.topic IDH_SETTINGS_NETWORK_FIREWALL_NAT
-Select this mode if you are behind a firewall (router), and will set up the TCP and UDP port forwarding on your own. You will need to specify the external IP address of your router using the setting below if you want downloads to work properly.
-.topic IDH_SETTINGS_NETWORK_FIREWALL_PASSIVE
-Select this mode if none of the previous options apply. In this mode, DC++ will not try to make inbound connections, only outbound ones. This mode carries some limitations: - only 5 results per user will be returned in response to searches; - you will not be able to download from other passive users.
-.topic IDH_SETTINGS_NETWORK_PORT_TCP
-This is the port that DC++ listens on for incoming client connections. If this setting is blank, DC++ will use a random port between 1025 and 32000.
-.topic IDH_SETTINGS_NETWORK_PORT_UDP
-This is the port that DC++ listens on for incoming search results. If this setting is blank, DC++ will use a random port between 1025 and 32000.
-.topic IDH_SETTINGS_NETWORK_PORT_TLS
-This is the port that DC++ listens on for TLS connections. If this setting is blank, DC++ will use a random port between 1025 and 32000.
-.topic IDH_SETTINGS_NETWORK_EXTERNAL_IP
-If you're directly connected to the internet, DC++ will tell remote users to connect to your local IP. Fill in this box only if you need to override the auto-detection. Ordinarily, only users behind a home router (NAT device) will need to fill in this box. If you put a DNS name here, DC++ will try to resolve it into an IP address before use.
-.topic IDH_SETTINGS_NETWORK_OVERRIDE
-Enable this to always use the IP address in "External / WAN IP", and not let either UPnP or connected hubs change it.
-.topic IDH_SETTINGS_NETWORK_DIRECT_OUT
-Select this mode if you can make unrestricted outbound connections. This includes connecting to any IP address on any port.
-.topic IDH_SETTINGS_NETWORK_SOCKS5
-Select this mode if you want to make outbound connections through a SOCKS proxy. The caveats for Firewall (passive) mode also apply here. SOCKS5 proxies are not the same as HTTP proxies. DC++'s SOCKS5 support does not include GSSAPI.
-.topic IDH_SETTINGS_NETWORK_SOCKS_SERVER
-This is the IP, not host name, of your SOCKS5 server.
-.topic IDH_SETTINGS_NETWORK_SOCKS_PORT
-The port that your SOCKS5 server runs on. The default is 1080.
-.topic IDH_SETTINGS_NETWORK_SOCKS_USER
-Login name for the SOCKS5 proxy; may be required.
-.topic IDH_SETTINGS_NETWORK_SOCKS_PASSWORD
-Password for the SOCKS5 proxy; may be required.
-.topic IDH_SETTINGS_NETWORK_SOCKS_RESOLVE
-Enable this to use the SOCKS5 proxy, instead of the local name server, to resolve host names into IP addresses.
-.topic IDH_SETTINGS_DOWNLOAD_DOWNLOADDIR
-After a download is complete, DC++ tries to move your just finished file to this directory. It defaults to the "Downloads\" subdirectory under where the DC++ executable is located.
-.topic IDH_SETTINGS_DOWNLOAD_TEMP_DOWNLOAD_DIRECTORY
-All incomplete downloads will be stored in this directory. If empty, temporary downloads will be stored in the "Incomplete\" subdirectory under where the DC++ executable is located. You can use %[targetdrive] for optional unfinished directory for target drive. If the file has been downloaded with a TTH, the incomplete file will bear the name <filename>.<ext>.<TTH>.dctmp. If the file has no TTH, it will be named<filename>.<ext>.dctmp. If "Use AntiFragmentation Method for Downloads" is enabled the files will have ".antifrag" added to the end of it's name. As in <filename>.<ext>.<TTH>.dctmp.antifrag.
-.topic IDH_SETTINGS_DOWNLOAD_LIMITS
-For both values listed below, certain conditions can result in the limits not being obeyed. Specifically, up to 3 files that are set to the 'highest' priority can be transferred while other downloads are going. File lists and small files (64 kibibytes or smaller) are queued with 'highest' as their priority. When either of the limits are hit, DC++ shows "All download slots taken" next to each source in the Transfer View.
-.topic IDH_SETTINGS_DOWNLOAD_DOWNLOADS
-This limits the number of simultaneous downloads. The default value of this option is 3, and a value of 0 means no limit.
-.topic IDH_SETTINGS_DOWNLOAD_MAXSPEED
-This is another method of limiting simultaneous downloads, designed to prevent new downloads if your existing downloads exceed a specific threshold. It's measured in kibibytes per second, and a value of zero will disable this limit.
-.topic IDH_SETTINGS_DOWNLOAD_PROXY
-This HTTP proxy will only be used to request the Public Hub List specified above. It's not used for uploads, downloads, or connecting to a hub.
-.topic IDH_SETTINGS_FAVORITE_DIRS_FAVORITE_DIRECTORIES
-To add directories to your "Download to" menu (right click on a file in the search frame), you can use the Add and Remove buttons, or drag and drop folders from a Windows Explorer window.
-.topic IDH_SETTINGS_FAVORITE_DIRS_RENAME
-Rename the selected folder(s).
-.topic IDH_SETTINGS_FAVORITE_DIRS_REMOVE
-Remove the selected folder(s).
-.topic IDH_SETTINGS_FAVORITE_DIRS_ADD
-Browse for a new folder to add to your share. After selecting the directory to add, you will be able to pick the Virtual Name name for it that will be shown in the menu.
-.topic IDH_SETTINGS_QUEUE_AUTOPRIO
-Autoprio allows setting the queue item priority automatically when adding it to the download queue. A user can then change the priority of a file manually. Priority conditions are checked from the Highest to the Lowest priority, when assigning a priority to a new queue item. A zero means that the given priority level won't be used - except Normal priority, which is the default priority. Lowest possible value for the Highest priority is 16 KiB.
-.topic IDH_SETTINGS_QUEUE_PRIO_HIGHEST
-Files with the same or under the entered size will be set to Highest as priority. (default: 64 KiB)
-.topic IDH_SETTINGS_QUEUE_PRIO_NORMAL
-Files with the same or under the entered size, but above Highest and High prio max size, will be set to Normal as priority. (default: 0 KiB)
-.topic IDH_SETTINGS_QUEUE_PRIO_HIGH
-Files with the same or under the entered size, but above Highest prio max size, will be set to High as priority. (default: 0 KiB)
-.topic IDH_SETTINGS_QUEUE_PRIO_LOW
-Files with the same or under the entered size, but above Highest, High and Normal prio max size, will be set to Low as priority. (default: 0 KiB)
-.topic IDH_SETTINGS_QUEUE_AUTODROP
-Autodrop allows automatical removal (or disconnecting) of slow download sources. By default, slow sources are removed. All of these autodrop options are necessary to estimate and disconnect/drop sources properly.
-.topic IDH_SETTINGS_QUEUE_AUTODROP_SPEED
-If the download speed of a file is below the entered value, the source will be dropped. (default: 1024 B/s)
-.topic IDH_SETTINGS_QUEUE_AUTODROP_ELAPSED
-Amount of time (in seconds) that has to pass since the download started before a source can be dropped. (default: 15 s)
-.topic IDH_SETTINGS_QUEUE_AUTODROP_MINSOURCES
-Minimum amount of sources before any sources will be dropped. (default: 1)
-.topic IDH_SETTINGS_QUEUE_AUTODROP_INTERVAL
-Check every x second(s) if the source is slow. (default: 10 s)
-.topic IDH_SETTINGS_QUEUE_AUTODROP_INACTIVITY
-This is the maximal time since the last chunk of data for the file was recieved. It is meant to improve speed measurement accuracy and to prevent dropping sources that are going to be disconnected only because of their current inactivity. (default: 10 s)
-.topic IDH_SETTINGS_QUEUE_AUTODROP_FILESIZE
-Minimum filesize before sources will be dropped (in KiB). (default: 0 KiB)
-.topic IDH_SETTINGS_UPLOAD_DIRECTORIES
-To add directories to your share, you can use the Add and Remove buttons, or drag and drop folders from a Windows Explorer window. Beginning with version 0.4032, files will be shared only once they have been hashed. If you enter the Sharing tab and press OK; the client may appear to freeze, this is due to a refresh of the file list.
-.topic IDH_SETTINGS_UPLOAD_SHAREHIDDEN
-Share files with the Hidden attribute set and files inside directory with the Hidden attribute set. With this option off, files starting with a . (full stop) will not be shared. Note: this option requires a refresh of the file list, and may cause the client to appear to freeze.
-.topic IDH_SETTINGS_UPLOAD_RENAME
-Change the virtual name on a shared folder. Note: the client will appear to freeze when you exit settings, this is due to a refresh of the file list.
-.topic IDH_SETTINGS_UPLOAD_REMOVE
-Remove the selected folder(s).
-.topic IDH_SETTINGS_UPLOAD_ADD
-Browse for a new folder to add to your share. If another existing file shares that name, the new name will be made unique by adding another letter to its name. After selecting the directory to add, you will be able to pick the Virtual Name that it will be shown under when other users see your files. If the newly added files have not been hashed, the Hash Progress Dialog will display. You can choose to let it display, or let hashing continue in the background.
-.topic IDH_SETTINGS_UPLOAD_MIN_UPLOAD_SPEED
-If the average upload speed drops below the given number, an additional upload slot will be granted. These slots are granted once every 30 seconds at maximum. If the speed of the original uploads increases, the granted slot will not be closed.
-.topic IDH_SETTINGS_UPLOAD_SLOTS
-Configure the number of slots that other users can occupy to download files from you. A remote user can use only one slot for each hub that they're on with you. DC++ supports uploading file lists and files below 64 KiB to other DC++ users without requiring a slot. There's a max of 3 connections in addition to normal slots, these are called mini slots. Note: If a user leaves the hub, DC++ will close his slots; if the user is back within 10 minutes, DC++ will grant him a slot. (This will only happen if "Automatically Disconnect Users Who Leave the Hub" is enabled.) This can cause your upload slots going over maximum set in settings.
-.topic IDH_SETTINGS_APPEARANCE_DEFAULT_AWAY_MESSAGE
-This is the default away message that will appear when someone PMs you for the first time while you are in the away mode. You can activate away mode by using the /away <message> and /back chat commands or "Auto-away on Minimize" option. All time formatting variables are available. Use Ctrl + Enter to create a new line. (default: "I'm away. State your business and I might answer later if you're lucky.")
-.topic IDH_SETTINGS_APPEARANCE_TIME_STAMPS_FORMAT
-This lets you select the format of the time stamps that can appear in the chat and private message windows. All time formatting variables are available. (default: %H:%M)
-.topic IDH_SETTINGS_APPEARANCE_LANGUAGE
-This drop-down list allows you to choose which language DC++ should use for its user interface and messages. "Default" means "use the same language as my operating system".
-.topic IDH_SETTINGS_APPEARANCE_REQUIRES_RESTART
-Note: Most of these options require that you restart DC++. (Fonts, colors and icons are loaded at startup only. Window settings are loaded when opening a new window.)
-.topic IDH_SETTINGS_APPEARANCE2_COLORS
-You can preview the background color and text style before applying them
-.topic IDH_SETTINGS_APPEARANCE2_SELWINCOLOR
-This setting determines the background color of the windows in DC++.
-.topic IDH_SETTINGS_APPEARANCE2_SELTEXT
-This setting determines the color and font used in many DC++ windows.
-.topic IDH_SETTINGS_APPEARANCE2_UPLOAD_BAR_COLOR
-This will set the coloring for the upload progress bars, if you have them enabled in "Advanced". (default: RGB(205, 60, 55))
-.topic IDH_SETTINGS_APPEARANCE2_DOWNLOAD_BAR_COLOR
-This will set the coloring for the download progress bars, if you have them enabled in "Advanced". (default: RGB(55, 170, 85))
-.topic IDH_SETTINGS_APPEARANCE2_BEEPFILE
-Instead of the system's computer beep, you can select a different beep or tune for above options.
-.topic IDH_SETTINGS_LOG_DIRECTORY
-All logs generated by DC++ will be put in this subdirectory. Default: The "Logs" subdirectory under where you've installed the application.
-.topic IDH_SETTINGS_ADVANCED3_ROLLBACK
-This option is not used currently.
-.topic IDH_SETTINGS_ADVANCED3_MAX_HASH_SPEED
-This is the speed at which DC++ will hash your files, in MiB/s. It is limited by the speed of your disk subsystem, but it can be used to make hashing slower and less noticable. A "normal" hash speed may be anywhere from 20 to 30 MiB/s. (no default)
-.topic IDH_SETTINGS_ADVANCED3_PM_HISTORY
-The number of lines that will be read from the private message log and displayed when a new PM is received. (no default)
-.topic IDH_SETTINGS_ADVANCED3_MINISLOT_SIZE
-This defines the size of the mini slot. The minimum value for this setting is 64 KiB. (default: 64 KiB)
-.topic IDH_SETTINGS_ADVANCED3_MAX_FILELIST_SIZE
-This setting controls the size of the maximum file list that DC++ will open, in mebibytes. This setting helps protect against malformed file lists that require large amounts of memory to decode. You may need to reduce or increase the value of this setting based on personal experience. (default: 512 MiB)
-.topic IDH_SETTINGS_ADVANCED3_PRIVATE_ID
-This is your unique private ID (PID). This will later with an algorithm be used to identify you on ADC hubs. Do not share this with other users.
-.topic IDH_SETTINGS_ADVANCED3_AUTO_REFRESH_TIME
-This controls the interval at which your shared directories are rescanned for new and changed content. This is measured in minutes. (default: 60 minutes)
-.topic IDH_SETTINGS_ADVANCED3_BUFFERSIZE
-This controls the size of the chunks that DC++ writes to disk for downloads. Measured in kibibytes. (default: 16 KiB)
-.topic IDH_SETTINGS_ADVANCED3_AUTO_SEARCH_LIMIT
-This will limit the amount of sources a file can have before it will no longer be auto searched for. For example, if this option is set to 2, if a file has more than or exactly 2 sources, the file will be excluded from the auto-search list.
-.topic IDH_SETTINGS_ADVANCED3_SEARCH_HISTORY
-Number of old search lines that will be shown in the Search Window. (default: 10)
-.topic IDH_SETTINGS_ADVANCED3_BIND_ADDRESS
-This setting allows you to bind DC++ to a particular IP address on your machine. Most users do not need to change the default value, 0.0.0.0. However, if you have more than one network interface connected to the internet, you can force DC++ to use a particular connection by entering its IP here. If binding fails, it will do so silently and INADDR_ANY will be used instead. If you experience connection problems make sure that this is set to default. (default: 0.0.0.0) This feature requires a restart to be fully effective.
-.topic IDH_SETTINGS_ADVANCED3_SOCKET_IN_BUFFER
-The size of the buffer DC++ use to read sockets. Measured in bytes. (default: 8192 bytes)
-.topic IDH_SETTINGS_ADVANCED3_SOCKET_OUT_BUFFER
-The size of the buffer DC++ use to write to sockets. Measured in bytes. (default: 8192 bytes)
-.topic IDH_SETTINGS_ADVANCED3_MIN_SEGMENT_SIZE
-DC++ now uses segment downloading. i.e. it downloads each file in many little parts. This setting lets you specifiy the mimium size of these parts. (default: 1MiB)
-.topic IDH_SETTINGS_UC_LIST
-List of your current user commands.
-.topic IDH_SETTINGS_UC_ADD
-Open the User Command dialog to create a new user command and add it to the list.
-.topic IDH_SETTINGS_UC_CHANGE
-Open the currently selected user command in the User Command dialog in order to change it.
-.topic IDH_SETTINGS_UC_MOVE_UP
-Move the currently selected user command upwards in the list.
-.topic IDH_SETTINGS_UC_MOVE_DOWN
-Move the currently selected user command downwards in the list.
-.topic IDH_SETTINGS_UC_REMOVE
-Remove the currently selected user command.
-.topic IDH_SETTINGS_CERTIFICATES_PRIVATE_KEY_FILE
-This file is your personal and private certificate file. Do not share this with other users or hubs. If you do, you risk allowing others to use your certificate and in essence pose as you.
-.topic IDH_SETTINGS_CERTIFICATES_CERTIFICATE_FILE
-This file is the certificate file you should give to other users and hubs that you want to consider "trusted".
-.topic IDH_SETTINGS_CERTIFICATES_TRUSTED_CERTIFICATES_PATH
-Where trusted certificates from users or hubs will be stored. (default: the "Certificates\" subdirectory of where you've installed the application.)
-.topic IDH_USER_COMMAND_SEPARATOR
-Adds a separator to the menu
-.topic IDH_USER_COMMAND_RAW
-Sends raw command to the hub (experts only, end it with '|' in NMDC hubs and '\n' in ADC hubs!)
-.topic IDH_USER_COMMAND_CHAT
-Sends command as if you were typing it in the chat
-.topic IDH_USER_COMMAND_PM
-Sends command as if you sent it by PM
-.topic IDH_USER_COMMAND_CONTEXT
-Contexts determine where the command is shown.
-.topic IDH_USER_COMMAND_HUB_MENU
-Hub tab (at the bottom of the screen) right-click menu
-.topic IDH_USER_COMMAND_USER_MENU
-User right-click menu in chat and PM tab menu
-.topic IDH_USER_COMMAND_SEARCH_MENU
-Search right-click menu
-.topic IDH_USER_COMMAND_FILELIST_MENU
-File list right-click menu
-.topic IDH_USER_COMMAND_NAME
-Name (use '\' to create submenus)
-.topic IDH_USER_COMMAND_COMMAND
-Command text (may contain any of the variables listed below). Use Ctrl + Enter to create a new line.
-.topic IDH_USER_COMMAND_HUB
-Hub ip as typed when connecting (empty = all NMDC hubs, "op" = NMDC hubs where you're an operator, "adc://" = all ADC hubs, "adc://op" = ADC hubs where you're an operator, "adcs://" = all TLS enabled hubs)
-.topic IDH_USER_COMMAND_NICK
-Private Message recipient
-.topic IDH_USER_COMMAND_ONCE
-Send only once per user from search frame, regardless of how many files you've selected from that user
-.topic IDH_FAVORITE_HUBS_CONNECT
-Connect to selected hubs.
-.topic IDH_FAVORITE_HUBS_NEW
-Create a new favorite hub.
-.topic IDH_FAVORITE_HUBS_PROPERTIES
-Change pre-existing hub properties for the selected hub.
-.topic IDH_FAVORITE_HUBS_MOVE_UP
-Move up selected hubs in the list. If several hubs have auto connect enabled, the highest hub will be connected to first.
-.topic IDH_FAVORITE_HUBS_MOVE_DOWN
-Move down selected hubs in the list. If several hubs have auto connect enabled, the lowest hub will be connected to last.
-.topic IDH_FAVORITE_HUBS_REMOVE
-Removes selected hubs from the favorite hubs list.
-.topic IDH_PUBLIC_HUBS_FILTER
-Here, you can filter the hublist so you will only see specific hubs in the hublist. Eg, selecting 'address' in the drop down, and writing "foo" in the filter, will only display hubs that have "foo" in their address.
-.topic IDH_PUBLIC_HUBS_LISTS
-In the dropdown, you may select different hublists you want to see. If you click on 'Configure', you will be able to change, add and remove hublists. The order in 'Configured Public Hub lists' determines the order hublists are displayed in the dropdown mentioned above.
-.topic IDH_PUBLIC_HUBS_REFRESH
-Download a fresh version of the hublist.
-.topic IDH_SEARCH_SEARCH_FOR
-This is the set of search strings to search for. Words beginning with "-" will be filtered away.
-.topic IDH_SEARCH_PURGE
-Clear the contents of the search history.
-.topic IDH_SEARCH_SEARCH
-Start searching for the set of search strings defined above. Note; you may not start too many searches in a small amount of time.
-.topic IDH_SEARCH_SIZE
-Filter away files depending on their file size.
-.topic IDH_SEARCH_TYPE
-Filter away files depending on their file type (extension).
-.topic IDH_SEARCH_SLOTS
-Filter away files depending on the user's free slots.
-.topic IDH_SEARCH_HUBS
-Search only selected hubs.
-.topic IDH_ADLS_NEW
-Create a new ADLSearch entry.
-.topic IDH_ADLS_PROPERTIES
-Change pre-existing ADLSearch properties for the selected entries.
-.topic IDH_ADLS_MOVE_UP
-Move up selected ADLSearch entries in the list.
-.topic IDH_ADLS_MOVE_DOWN
-Move down selected ADLSearch entries in the list.
-.topic IDH_ADLS_REMOVE
-Removes selected ADLSearch entries from the list.
-.topic IDH_ADLSP_SEARCH_STRING
-This is the set of search strings to search for.
-.topic IDH_ADLSP_SOURCE_TYPE
-"Filename": Matches search against filename; "Directory": Matches against current subdirectory and places the whole structure in the special folder; "Full Path": Matches against whole directory + filename.
-.topic IDH_ADLSP_MIN_FILE_SIZE
-Sets the lower limits for file size. This is unused for Directory searches.
-.topic IDH_ADLSP_MAX_FILE_SIZE
-Sets the upper limits for file size. This is unused for Directory searches.
-.topic IDH_ADLSP_SIZE_TYPE
-Sets the units for the search sizes.
-.topic IDH_ADLSP_DEST_DIR
-Sets the output folder for a search. Multiple folders with different names can exist simultaneously. Each folder name gets wrapped in <<< and >>>.
-.topic IDH_ADLSP_ENABLED
-Marks the search as active or inactive.
-.topic IDH_ADLSP_AUTOQUEUE
-When checked, matches to this search will be put into your Download Queue.
-.topic IDH_SPY_IGNORE_TTH
-Check this checkbox to filter out TTH searches. Note that DC++ will still respond to them; you will just not see them in this window.
-.topic IDH_FAVORITE_HUB_NAME
-Specifies what name the hub has.
-.topic IDH_FAVORITE_HUB_ADDRESS
-The address for the hub.
-.topic IDH_FAVORITE_HUB_DESC
-Description of the hub.
-.topic IDH_FAVORITE_HUB_NICK
-If you would like to use a special nick for a specific hub. Leave this blank for default.
-.topic IDH_FAVORITE_HUB_PASSWORD
-If you have a password attached together with your nick. Used for operators or other registered people.
-.topic IDH_FAVORITE_HUB_USER_DESC
-If you would like to use a special user description (shown in the user list) for a specific hub. Leave this blank for default.
Added: dcplusplus/trunk/help/cshelp_stub.html
===================================================================
--- dcplusplus/trunk/help/cshelp_stub.html (rev 0)
+++ dcplusplus/trunk/help/cshelp_stub.html 2008-03-30 08:30:17 UTC (rev 1092)
@@ -0,0 +1,25 @@
+not included in the help project; used only by gen_cshelp.py.
+
+this file is a placeholder for strings that are used by the DC++ context-sensitive help system, but:
+* either are not defined in any HTML help file;
+* or are defined in a too complex way (eg, a list) for the script to being able to convert them to plain text.
+
+<span cshelp=IDH_DCPP_OK>
+Press this button to save your changes and close this dialog.
+</span>
+
+<span cshelp=IDH_DCPP_CANCEL>
+Press this button to close this dialog without saving your changes.
+</span>
+
+<span cshelp=IDH_DCPP_HELP>
+Press this button to launch the help file.
+</span>
+
+<span cshelp=IDH_SETTINGS_TREE>
+Choose a settings category here.
+</span>
+
+<span cshelp=IDH_ADLSP_SOURCE_TYPE>
+"Filename": Matches search against filename; "Directory": Matches against current subdirectory and places the whole structure in the special folder; "Full Path": Matches against whole directory + filename.
+</span>
Modified: dcplusplus/trunk/help/dialog_adls_properties.html
===================================================================
--- dcplusplus/trunk/help/dialog_adls_properties.html 2008-03-30 08:28:59 UTC (rev 1091)
+++ dcplusplus/trunk/help/dialog_adls_properties.html 2008-03-30 08:30:17 UTC (rev 1092)
@@ -9,7 +9,7 @@
<h1>ADLSearch Properties</h1>
<dl style="margin-left: 40px;">
<dt>Search String</dt>
- <dd>This is the set of search strings to search for.</dd>
+ <dd cshelp=IDH_ADLSP_SEARCH_STRING>This is the set of search strings to search for.</dd>
<dt>Source Type</dt>
<dd><p>One of following values:</p>
<dl style="margin-left: 40px;">
@@ -23,19 +23,19 @@
</dl>
</dd>
<dt>Min FileSize</dt>
- <dd>Sets the lower limits for file size. This is unused for <a href="#directory">Directory</a> searches.</dd>
+ <dd cshelp=IDH_ADLSP_MIN_FILE_SIZE>Sets the lower limits for file size. This is unused for <a href="#directory">Directory</a> searches.</dd>
<dt>Max FileSize</dt>
- <dd>Sets the upper limits for file size. This is unused for <a href="#directory">Directory</a> searches.</dd>
+ <dd cshelp=IDH_ADLSP_MAX_FILE_SIZE>Sets the upper limits for file size. This is unused for <a href="#directory">Directory</a> searches.</dd>
<dt>Size Type</dt>
- <dd>Sets the units for the search sizes.</dd>
+ <dd cshelp=IDH_ADLSP_SIZE_TYPE>Sets the units for the search sizes.</dd>
<dt>Destination Directory</dt>
- <dd>Sets the output folder for a search. Multiple folders with
+ <dd cshelp=IDH_ADLSP_DEST_DIR>Sets the output folder for a search. Multiple folders with
different names can exist simultaneously. Each folder name gets wrapped
in <<< and >>>.</dd>
<dt>Enabled</dt>
- <dd>Marks the search as active or inactive.</dd>
+ <dd cshelp=IDH_ADLSP_ENABLED>Marks the search as active or inactive.</dd>
<dt>Download Matches</dt>
- <dd>When checked, matches to this search will be put into your
+ <dd cshelp=IDH_ADLSP_AUTOQUEUE>When checked, matches to this search will be put into your
<a href="window_download_queue.html">Download Queue</a>.</dd>
</dl>
</body>
Modified: dcplusplus/trunk/help/dialog_favorite_hub.html
===================================================================
--- dcplusplus/trunk/help/dialog_favorite_hub.html 2008-03-30 08:28:59 UTC (rev 1091)
+++ dcplusplus/trunk/help/dialog_favorite_hub.html 2008-03-30 08:30:17 UTC (rev 1092)
@@ -10,20 +10,20 @@
<h2>Hub</h2>
<dl style="margin-left: 40px;">
<dt>Name</dt>
- <dd>Specifies what name the hub has.</dd>
+ <dd cshelp=IDH_FAVORITE_HUB_NAME>Specifies what name the hub has.</dd>
<dt>Address</dt>
- <dd>The address for the hub.</dd>
+ <dd cshelp=IDH_FAVORITE_HUB_ADDRESS>The address for the hub.</dd>
<dt>Description</dt>
- <dd>Description of the hub.</dd>
+ <dd cshelp=IDH_FAVORITE_HUB_DESC>Description of the hub.</dd>
</dl>
<h2>Identification (leave blank for defaults)</h2>
<dl style="margin-left: 40px;">
<dt>Nick</dt>
- <dd>If you would like to use a special nick for a specific hub. Leave this blank for default.</dd>
+ <dd cshelp=IDH_FAVORITE_HUB_NICK>If you would like to use a special nick for a specific hub. Leave this blank for default.</dd>
<dt>Password</dt>
- <dd>If you have a password attached together with your nick. Used for operators or other registered people.</dd>
+ <dd cshelp=IDH_FAVORITE_HUB_PASSWORD>If you have a password attached together with your nick. Used for operators or other registered people.</dd>
<dt>Description</dt>
- <dd>If you would like to use a special user description (shown in the user list) for a specific hub. Leave this blank for default.</dd>
+ <dd cshelp=IDH_FAVORITE_HUB_USER_DESC>If you would like to use a special user description (shown in the user list) for a specific hub. Leave this blank for default.</dd>
</dl>
</body>
</html>
Added: dcplusplus/trunk/help/dialog_public_hub_lists.html
===================================================================
--- dcplusplus/trunk/help/dialog_public_hub_lists.html (rev 0)
+++ dcplusplus/trunk/help/dialog_public_hub_lists.html 2008-03-30 08:30:17 UTC (rev 1092)
@@ -0,0 +1,32 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+ <meta content="text/html; charset=us-ascii" http-equiv="content-type">
+ <link type="text/css" rel="stylesheet" href="office11.css">
+ <title>Configured Public Hub Lists</title>
+</head>
+<body>
+<h1>Configured Public Hub Lists</h1>
+<h2>Field to add a new hub list (top)</h2>
+<span cshelp=IDH_PUBLIC_HUB_LISTS_EDIT_BOX>
+Write here the address to the hub list you want to add. You can add muliple hub lists at once by separating them with a semi-colon (';').
+</span>
+<h2>List of current hub lists</h2>
+<span cshelp=IDH_PUBLIC_HUB_LISTS_LIST>
+Lists your current hub lists. The hub list on top will be tried first.
+</span>
+<h2>Buttons (right)</h2>
+<dl style="margin-left: 40px;">
+ <dt>Add</dt>
+ <dd cshelp=IDH_PUBLIC_HUB_LISTS_ADD>Add the hub list(s) specified in the field on the top left to your list of public hub lists.</dd>
+ <dt>Move Up</dt>
+ <dd cshelp=IDH_PUBLIC_HUB_LISTS_MOVE_UP>Move selected hub lists upwards in the list. The hub list on top will be tried first.</dd>
+ <dt>Move Down</dt>
+ <dd cshelp=IDH_PUBLIC_HUB_LISTS_MOVE_DOWN>Move selected hub lists downwards in the list. The hub list on top will be tried first.</dd>
+ <dt>Edit</dt>
+ <dd cshelp=IDH_PUBLIC_HUB_LISTS_EDIT>Open a dialog to edit addresses to selected hub lists.</dd>
+ <dt>Remove</dt>
+ <dd cshelp=IDH_PUBLIC_HUB_LISTS_REMOVE>Remove selected hub lists from your list of public hub lists.</dd>
+</dl>
+</body>
+</html>
Modified: dcplusplus/trunk/help/dialog_user_command.html
===================================================================
--- dcplusplus/trunk/help/dialog_user_command.html 2008-03-30 08:28:59 UTC (rev 1091)
+++ dcplusplus/trunk/help/dialog_user_command.html 2008-03-30 08:30:17 UTC (rev 1092)
@@ -10,40 +10,42 @@
<h2>Command Types:</h2>
<dl style="margin-left: 40px;">
<dt>Separator</dt>
- <dd>Adds a separator to the menu</dd>
+ <dd cshelp=IDH_USER_COMMAND_SEPARATOR>Adds a separator to the menu</dd>
<dt>Raw</dt>
- <dd>Sends raw command to the hub (experts only, end it with '|' in NMDC hubs and '\n' in ADC hubs!)</dd>
+ <dd cshelp=IDH_USER_COMMAND_RAW>Sends raw command to the hub (experts only, end it with '|' in NMDC hubs and '\n' in ADC hubs!)</dd>
<dt>Chat</dt>
- <dd>Sends command as if you were typing it in the chat</dd>
+ <dd cshelp=IDH_USER_COMMAND_CHAT>Sends command as if you were typing it in the chat</dd>
<dt>PM</dt>
- <dd>Sends command as if you sent it by PM</dd>
+ <dd cshelp=IDH_USER_COMMAND_PM>Sends command as if you sent it by PM</dd>
</dl>
<h2>Context</h2>
+<span cshelp=IDH_USER_COMMAND_CONTEXT>
Contexts determine where the command is shown.<br>
+</span>
<dl style="margin-left: 40px;">
<dt>Hub Menu</dt>
- <dd>Hub tab (at the bottom of the screen) right-click menu</dd>
+ <dd cshelp=IDH_USER_COMMAND_HUB_MENU>Hub tab (at the bottom of the screen) right-click menu</dd>
<dt>Chat Menu </dt>
- <dd>User right-click menu in chat and PM tab menu</dd>
+ <dd cshelp=IDH_USER_COMMAND_USER_MENU>User right-click menu in chat and PM tab menu</dd>
<dt>Search Menu</dt>
- <dd>Search right-click menu </dd>
+ <dd cshelp=IDH_USER_COMMAND_SEARCH_MENU>Search right-click menu </dd>
<dt>File list Menu</dt>
- <dd>File list right-click menu</dd>
+ <dd cshelp=IDH_USER_COMMAND_FILELIST_MENU>File list right-click menu</dd>
</dl>
<h2>Parameters</h2>
<dl style="margin-left: 40px;">
<dt>Name</dt>
- <dd>Name (use '\' to create submenus)</dd>
+ <dd cshelp=IDH_USER_COMMAND_NAME>Name (use '\' to create submenus)</dd>
<dt>Command</dt>
- <dd>Command text (may contain any of the variables listed below). Use Ctrl + Enter to create a new line.</dd>
+ <dd cshelp=IDH_USER_COMMAND_COMMAND>Command text (may contain any of the variables listed below). Use Ctrl + Enter to create a new line.</dd>
<dt>Hub </dt>
- <dd>Hub ip as typed when connecting (empty = all NMDC hubs, "op" = NMDC hubs
+ <dd cshelp=IDH_USER_COMMAND_HUB>Hub ip as typed when connecting (empty = all NMDC hubs, "op" = NMDC hubs
where you're an operator, "adc://" = all ADC hubs, "adc://op" = ADC hubs where you're an operator,
"adcs://" = all <a href="settings_certs.html">TLS</a> enabled hubs)</dd>
<dt>To</dt>
- <dd>Private Message recipient</dd>
+ <dd cshelp=IDH_USER_COMMAND_NICK>Private Message recipient</dd>
<dt>Send Once Per Nick</dt>
- <dd>Send only once per user from search frame, regardless of how many
+ <dd cshelp=IDH_USER_COMMAND_ONCE>Send only once per user from search frame, regardless of how many
files you've selected from that user</dd>
</dl>
<h2>Variables</h2>
Modified: dcplusplus/trunk/help/faq_activemode.html
===================================================================
--- dcplusplus/trunk/help/faq_activemode.html 2008-03-30 08:28:59 UTC (rev 1091)
+++ dcplusplus/trunk/help/faq_activemode.html 2008-03-30 08:30:17 UTC (rev 1092)
@@ -40,7 +40,7 @@
IP page</a> <img title="External Link" src="external.png" border="0"
height="10" width="10" alt="External Link">. </li>
<li>It should now be working. If it is working for a while, but the
-next time you use DC++, you only get "Connection Timeout’s or no
+next time you use DC++, you only get "Connection Timeout"s or no
results when searching, your IP (either <span
style="font-weight: bold;">external</span> or <span
style="font-weight: bold;">internal</span>) is likely to have changed.
Added: dcplusplus/trunk/help/gen_cshelp.py
===================================================================
--- dcplusplus/trunk/help/gen_cshelp.py (rev 0)
+++ dcplusplus/trunk/help/gen_cshelp.py 2008-03-30 08:30:17 UTC (rev 1092)
@@ -0,0 +1,80 @@
+#this script browses through every HTML files in the current directory, looking for tags that have the "cshelp" argument; cshelp.h and cshelp.txt files are then generated and used by the DC++ context-sensitive help system
+
+import glob
+from HTMLParser import HTMLParser
+from htmlentitydefs import entitydefs
+
+#will hold [id, text] pairs
+output = []
+
+#define our HTML parsing class derived from HTMLParser
+class Parser(HTMLParser):
+ text = ""
+ current_tag = ""
+ count = 0 #to handle sub-tags with the same name as the current tag; eg <x cshelp="y">bla <x>bla</x> bla</x>
+
+ def handle_starttag(self, tag, attrs):
+ if self.count ...
[truncated message content] |
|
From: <arn...@us...> - 2008-03-30 08:29:01
|
Revision: 1091
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1091&view=rev
Author: arnetheduck
Date: 2008-03-30 01:28:59 -0700 (Sun, 30 Mar 2008)
Log Message:
-----------
Don't use control id's
Modified Paths:
--------------
dcplusplus/trunk/smartwin/include/smartwin/Widget.h
dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectClickable.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/Button.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/ComboBox.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/Control.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/DateTime.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/Label.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/StatusBar.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/TextBox.h
dcplusplus/trunk/smartwin/source/Message.cpp
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-03-29 13:49:26.227999926 +0100
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
+ timestamp: 2008-03-29 16:09:01.500000000 +0100
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
Name: bzr:file-ids
- x2po.py x2po.py-20080329124851-4mzy5m3ojyowxxbv-1
+
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
+ 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
Modified: dcplusplus/trunk/smartwin/include/smartwin/Widget.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/Widget.h 2008-03-30 08:28:27 UTC (rev 1090)
+++ dcplusplus/trunk/smartwin/include/smartwin/Widget.h 2008-03-30 08:28:59 UTC (rev 1091)
@@ -34,7 +34,6 @@
#include "../../SmartUtil/tstring.h"
#include <boost/noncopyable.hpp>
-#include <memory>
#include <list>
#include <functional>
#include <tr1/unordered_map>
Modified: dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectClickable.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectClickable.h 2008-03-30 08:28:27 UTC (rev 1090)
+++ dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectClickable.h 2008-03-30 08:28:59 UTC (rev 1091)
@@ -55,7 +55,7 @@
* something else. No parameters are passed.
*/
void onClicked(const typename Dispatcher::F& f) {
- W().addCallback(W().getClickMessage(), Dispatcher(f));
+ W().addCallback(WidgetType::getClickMessage(), Dispatcher(f));
}
protected:
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Button.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Button.h 2008-03-30 08:28:27 UTC (rev 1090)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Button.h 2008-03-30 08:28:59 UTC (rev 1091)
@@ -28,6 +28,8 @@
public AspectPainting< Button >,
public AspectText< Button >
{
+ friend class AspectClickable<Button>;
+ friend class AspectDblClickable<Button>;
friend class WidgetCreator<Button>;
public:
/// Class type
@@ -49,12 +51,6 @@
Seed(const SmartUtil::tstring& caption_ = SmartUtil::tstring());
};
- // Contract needed by AspectClickable Aspect class
- Message getClickMessage();
-
- // Contract needed by AspectDblClickable Aspect class
- Message getDblClickMessage();
-
template<typename SeedType>
void create(const SeedType& cs);
@@ -62,14 +58,22 @@
typedef Button ButtonType;
Button(Widget* parent);
+
+private:
+ // Contract needed by AspectClickable Aspect class
+ static Message getClickMessage();
+
+ // Contract needed by AspectDblClickable Aspect class
+ static Message getDblClickMessage();
+
};
inline Message Button::getClickMessage() {
- return Message( WM_COMMAND, MAKEWPARAM(getControlId(), BN_CLICKED) );
+ return Message( WM_COMMAND, MAKEWPARAM(0, BN_CLICKED) );
}
inline Message Button::getDblClickMessage() {
- return Message( WM_COMMAND, MAKEWPARAM(getControlId(), BN_DBLCLK) );
+ return Message( WM_COMMAND, MAKEWPARAM(0, BN_DBLCLK) );
}
inline Button::Button(Widget* parent) : ControlType(parent) {
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/ComboBox.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/ComboBox.h 2008-03-30 08:28:27 UTC (rev 1090)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/ComboBox.h 2008-03-30 08:28:59 UTC (rev 1091)
@@ -74,6 +74,8 @@
friend class AspectCollection<ComboBox, int>;
friend class AspectColor<ComboBox>;
friend class AspectSelection<ComboBox, int>;
+ friend class AspectClickable<ComboBox>;
+ friend class AspectDblClickable<ComboBox>;
public:
/// Class type
typedef ComboBox ThisType;
@@ -99,15 +101,6 @@
Seed();
};
- // Aspect expectation implementation
- Message getSelectionChangedMessage();
-
- // Aspect expectation implementation
- Message getClickMessage();
-
- // Aspect expectation implementation
- Message getDblClickMessage();
-
/// Return the selected value of the ComboBox
/** If no item is actually selected the return value is "".
*/
@@ -157,25 +150,31 @@
void clearImpl();
size_t sizeImpl() const;
+ // Aspect expectation implementation
+ static Message getSelectionChangedMessage();
+
+ // Aspect expectation implementation
+ static Message getClickMessage();
+
+ // Aspect expectation implementation
+ static Message getDblClickMessage();
+
};
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Implementation of class
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-inline Message ComboBox::getSelectionChangedMessage()
-{
- return Message( WM_COMMAND, MAKEWPARAM(this->getControlId(), CBN_SELENDOK) );
+inline Message ComboBox::getSelectionChangedMessage() {
+ return Message( WM_COMMAND, MAKEWPARAM(0, CBN_SELENDOK) );
}
-inline Message ComboBox::getClickMessage()
-{
- return Message( WM_COMMAND, MAKEWPARAM(this->getControlId(), CBN_DROPDOWN) );
+inline Message ComboBox::getClickMessage() {
+ return Message( WM_COMMAND, MAKEWPARAM(0, CBN_DROPDOWN) );
}
-inline Message ComboBox::getDblClickMessage()
-{
- return Message( WM_COMMAND, MAKEWPARAM(this->getControlId(), CBN_DBLCLK) );
+inline Message ComboBox::getDblClickMessage() {
+ return Message( WM_COMMAND, MAKEWPARAM(0, CBN_DBLCLK) );
}
inline int ComboBox::getSelectedImpl() const {
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Control.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Control.h 2008-03-30 08:28:27 UTC (rev 1090)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Control.h 2008-03-30 08:28:59 UTC (rev 1091)
@@ -17,7 +17,6 @@
namespace SmartWin {
/** Base class is for windows common controls */
-
class Control :
public MessageMap< Policies::Subclassed >,
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/DateTime.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/DateTime.h 2008-03-30 08:28:27 UTC (rev 1090)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/DateTime.h 2008-03-30 08:28:59 UTC (rev 1091)
@@ -61,6 +61,9 @@
public AspectFont< DateTime >,
public AspectPainting< DateTime >
{
+ friend class WidgetCreator< DateTime >;
+ friend class AspectClickable<DateTime>;
+
struct Dispatcher
{
typedef std::tr1::function<void (const SYSTEMTIME &)> F;
@@ -82,8 +85,6 @@
/// Object type
typedef ThisType* ObjectType;
- friend class WidgetCreator< DateTime >;
-
/// 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
@@ -108,9 +109,6 @@
Seed();
};
- // Aspect expectation implementation
- static Message & getClickMessage();
-
/// Member function Setting the event handler for the "date changed" event
/** The event handler must have the signature "void foo( DateTimePtr
* date, const SYSTEMTIME & st )" <br>
@@ -209,16 +207,18 @@
// WidgetFactory class which is friend
virtual ~DateTime()
{}
+
+private:
+ // Aspect expectation implementation
+ static Message getClickMessage();
};
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Implementation of class
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-inline Message & DateTime::getClickMessage()
-{
- static Message retVal = Message( WM_NOTIFY, DTN_DROPDOWN );
- return retVal;
+inline Message DateTime::getClickMessage() {
+ return Message( WM_NOTIFY, DTN_DROPDOWN );
}
inline SYSTEMTIME DateTime::getDateTime()
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Label.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Label.h 2008-03-30 08:28:27 UTC (rev 1090)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Label.h 2008-03-30 08:28:59 UTC (rev 1091)
@@ -72,6 +72,8 @@
public AspectText< Label >
{
friend class WidgetCreator< Label >;
+ friend class AspectClickable<Label>;
+ friend class AspectDblClickable<Label>;
public:
/// Class type
typedef Label ThisType;
@@ -94,12 +96,6 @@
Seed(const SmartUtil::tstring& caption_ = SmartUtil::tstring());
};
- // Contract needed by AspectClickable Aspect class
- Message getClickMessage();
-
- // Contract needed by AspectDblClickable Aspect class
- Message getDblClickMessage();
-
/// Actually creates the Static Control
/** You should call WidgetFactory::createStatic if you instantiate class
* directly. <br>
@@ -126,16 +122,20 @@
BitmapPtr itsBitmap;
void setBitmap( HBITMAP bitmap );
+
+ // Contract needed by AspectClickable Aspect class
+ static Message getClickMessage();
+
+ // Contract needed by AspectDblClickable Aspect class
+ static Message getDblClickMessage();
};
-inline Message Label::getClickMessage()
-{
- return Message( WM_COMMAND, MAKEWPARAM(this->getControlId(), STN_CLICKED) );
+inline Message Label::getClickMessage() {
+ return Message( WM_COMMAND, MAKEWPARAM(0, STN_CLICKED) );
}
-inline Message Label::getDblClickMessage()
-{
- return Message( WM_COMMAND, MAKEWPARAM(this->getControlId(), STN_DBLCLK) );
+inline Message Label::getDblClickMessage() {
+ return Message( WM_COMMAND, MAKEWPARAM(0, STN_DBLCLK) );
}
inline Label::Label( Widget * parent )
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/StatusBar.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/StatusBar.h 2008-03-30 08:28:27 UTC (rev 1090)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/StatusBar.h 2008-03-30 08:28:59 UTC (rev 1091)
@@ -113,6 +113,8 @@
public AspectPainting< StatusBar< TypeOfStatusBar > >
{
friend class WidgetCreator< StatusBar >;
+ friend class AspectClickable< StatusBar< TypeOfStatusBar > >;
+ friend class AspectDblClickable< StatusBar< TypeOfStatusBar > >;
public:
/// Class type
typedef StatusBar<TypeOfStatusBar> ThisType;
@@ -145,12 +147,6 @@
*/
void refresh();
- // Contract needed by AspectClickable Aspect class
- static const Message& getClickMessage();
-
- // Contract needed by AspectDblClickable Aspect class
- static const Message& getDblClickMessage();
-
/// Actually creates the StatusBar
/** You should call WidgetFactory::createStatusBar if you instantiate class
* directly. <br>
@@ -166,6 +162,12 @@
// WidgetFactory class which is friend
virtual ~StatusBar()
{}
+
+ // Contract needed by AspectClickable Aspect class
+ static Message getClickMessage();
+
+ // Contract needed by AspectDblClickable Aspect class
+ static Message getDblClickMessage();
};
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -220,17 +222,15 @@
}
template< class TypeOfStatusBar >
-const Message & StatusBar< TypeOfStatusBar >::getClickMessage()
+Message StatusBar< TypeOfStatusBar >::getClickMessage()
{
- static Message retVal = Message( WM_NOTIFY, NM_CLICK );
- return retVal;
+ return Message( WM_NOTIFY, NM_CLICK );
}
template< class TypeOfStatusBar >
-const Message & StatusBar< TypeOfStatusBar >::getDblClickMessage()
+Message StatusBar< TypeOfStatusBar >::getDblClickMessage()
{
- static Message retVal = Message( WM_NOTIFY, NM_DBLCLK );
- return retVal;
+ return Message( WM_NOTIFY, NM_DBLCLK );
}
template< class TypeOfStatusBar >
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/TextBox.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/TextBox.h 2008-03-30 08:28:27 UTC (rev 1090)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/TextBox.h 2008-03-30 08:28:59 UTC (rev 1091)
@@ -75,13 +75,11 @@
public AspectUpdate< TextBoxBase >
{
friend class WidgetCreator< TextBoxBase >;
-
+ friend class AspectUpdate<TextBoxBase>;
+
typedef Dispatchers::VoidVoid<> Dispatcher;
public:
- // Contract needed by AspectUpdate Aspect class
- Message getUpdateMessage();
-
/// Sets the current selection of the Edit Control
/** Start means the offset of where the current selection shall start, if it is
* omitted it defaults to 0. <br>
@@ -187,6 +185,12 @@
// is supposed to do so when parent is killed...
virtual ~TextBoxBase()
{}
+
+private:
+ // Contract needed by AspectUpdate Aspect class
+ static Message getUpdateMessage();
+
+
};
class TextBox :
@@ -280,9 +284,8 @@
// Implementation of class
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-inline Message TextBoxBase::getUpdateMessage()
-{
- return Message( WM_COMMAND, MAKEWPARAM(this->getControlId(), EN_UPDATE) );
+inline Message TextBoxBase::getUpdateMessage() {
+ return Message( WM_COMMAND, MAKEWPARAM(0, EN_UPDATE) );
}
inline void TextBoxBase::setSelection( long start, long end )
@@ -356,7 +359,7 @@
inline void TextBoxBase::onTextChanged( const Dispatcher::F& f ) {
this->addCallback(
- Message( WM_COMMAND, MAKEWPARAM(this->getControlId(), EN_CHANGE) ), Dispatcher(f)
+ Message( WM_COMMAND, MAKEWPARAM(0, EN_CHANGE) ), Dispatcher(f)
);
}
Modified: dcplusplus/trunk/smartwin/source/Message.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/Message.cpp 2008-03-30 08:28:27 UTC (rev 1090)
+++ dcplusplus/trunk/smartwin/source/Message.cpp 2008-03-30 08:28:59 UTC (rev 1091)
@@ -71,9 +71,9 @@
} break;
case WM_COMMAND: {
if(msg_.lParam == 0) {
- param = LOWORD( msg_.wParam );
+ param = LOWORD(msg_.wParam);
} else {
- param = msg_.wParam;
+ param = HIWORD(msg_.wParam);
}
} break;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2008-03-30 08:28:28
|
Revision: 1090
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1090&view=rev
Author: arnetheduck
Date: 2008-03-30 01:28:27 -0700 (Sun, 30 Mar 2008)
Log Message:
-----------
Add xml->po conversion tool, only pipe when not saving temps
Modified Paths:
--------------
dcplusplus/trunk/SConstruct
Added Paths:
-----------
dcplusplus/trunk/x2po.py
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-03-29 13:40:42.691999912 +0100
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
+ timestamp: 2008-03-29 13:49:26.227999926 +0100
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
Name: bzr:file-ids
- smartwin/include/smartwin/widgets/Frame.h 712@f586c4b0-9d0d-0410-bc51-f1fe239209fc:dcplusplus%2Ftrunk:smartwin%2Finclude%2Fsmartwin%2Fwidgets%2FWidgetWindowBase.h
smartwin/include/smartwin/widgets/ModalDialog.h 712@f586c4b0-9d0d-0410-bc51-f1fe239209fc:dcplusplus%2Ftrunk:smartwin%2Finclude%2Fsmartwin%2Fwidgets%2FWidgetModalDialog.h
smartwin/include/smartwin/widgets/ModelessDialog.h 712@f586c4b0-9d0d-0410-bc51-f1fe239209fc:dcplusplus%2Ftrunk:smartwin%2Finclude%2Fsmartwin%2Fwidgets%2FWidgetDialog.h
smartwin/include/smartwin/widgets/Window.h 712@f586c4b0-9d0d-0410-bc51-f1fe239209fc:dcplusplus%2Ftrunk:smartwin%2Finclude%2Fsmartwin%2Fwidgets%2FWidgetWindow.h
+ x2po.py x2po.py-20080329124851-4mzy5m3ojyowxxbv-1
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
+ 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
Modified: dcplusplus/trunk/SConstruct
===================================================================
--- dcplusplus/trunk/SConstruct 2008-03-30 08:17:30 UTC (rev 1089)
+++ dcplusplus/trunk/SConstruct 2008-03-30 08:28:27 UTC (rev 1090)
@@ -17,7 +17,7 @@
)
gcc_flags = {
- 'common': ['-g', '-Wall', '-Wextra', '-pipe', '-Wno-unused-parameter', '-Wno-missing-field-initializers', '-fexceptions', '-mthreads'],
+ 'common': ['-g', '-Wall', '-Wextra', '-Wno-unused-parameter', '-Wno-missing-field-initializers', '-fexceptions', '-mthreads'],
'debug': [],
'release' : ['-O2', '-mwindows']
}
@@ -105,10 +105,13 @@
env.Append(LIBS = ['stlport.5.1'])
elif 'gcc' in env['TOOLS']:
env.Append(CPPDEFINES = ['BOOST_HAS_GCC_TR1'])
-
-if env['savetemps'] and 'gcc' in env['TOOLS']:
- env.Append(CCFLAGS = ['-save-temps', '-fverbose-asm'])
+if 'gcc' in env['TOOLS']:
+ if env['savetemps']:
+ env.Append(CCFLAGS = ['-save-temps', '-fverbose-asm'])
+ else:
+ env.Append(CCFLAGS = ['-pipe'])
+
if env['unicode']:
env.Append(CPPDEFINES = ['UNICODE', '_UNICODE'])
Added: dcplusplus/trunk/x2po.py
===================================================================
--- dcplusplus/trunk/x2po.py (rev 0)
+++ dcplusplus/trunk/x2po.py 2008-03-30 08:28:27 UTC (rev 1090)
@@ -0,0 +1,365 @@
+# -*- coding: utf-8 -*-
+
+import sys, re, codecs
+
+if len(sys.argv) < 5:
+ print "x2po pot source locale translator project"
+ sys.exit(0)
+
+pot = sys.argv[1]
+source = sys.argv[2]
+locale = sys.argv[3]
+translator = sys.argv[4]
+project = sys.argv[5]
+
+langs = {
+ "aa": "Afar",
+ "ab": "Abkhazian",
+ "ace": "Achinese",
+ "ad": "Adangme",
+ "ae": "Avestan",
+ "af": "Afrikaans",
+ "ak": "Akan",
+ "am": "Amharic",
+ "an": "Aragonese",
+ "ang": "Old English",
+ "ar": "Arabic",
+ "as": "Assamese",
+ "av": "Avaric",
+ "awa": "Awadhi",
+ "ay": "Aymara",
+ "az": "Azerbaijani",
+ "ba": "Bashkir",
+ "bad": "Banda",
+ "bal": "Baluchi",
+ "ban": "Balinese",
+ "be": "Belarusian",
+ "bem": "Bemba",
+ "bg": "Bulgarian",
+ "bh": "Bihari",
+ "bho": "Bhojpuri",
+ "bi": "Bislama",
+ "bik": "Bikol",
+ "bin": "Bini",
+ "bm": "Bambara",
+ "bn": "Bengali",
+ "bo": "Tibetan",
+ "br": "Breton",
+ "bs": "Bosnian",
+ "btk": "Batak",
+ "bug": "Buginese",
+ "ca": "Catalan",
+ "ce": "Chechen",
+ "ceb": "Cebuano",
+ "ch": "Chamorro",
+ "co": "Corsican",
+ "cr": "Cree",
+ "cs": "Czech",
+ "csb": "Kashubian",
+ "cu": "Church Slavic",
+ "cv": "Chuvash",
+ "cy": "Welsh",
+ "da": "Danish",
+ "de": "German",
+ "din": "Dinka",
+ "doi": "Dogri",
+ "dv": "Divehi",
+ "dz": "Dzongkha",
+ "ee": "Ewe",
+ "el": "Greek",
+ "en": "English",
+ "eo": "Esperanto",
+ "es": "Spanish",
+ "et": "Estonian",
+ "eu": "Basque",
+ "fa": "Persian",
+ "ff": "Fulah",
+ "fi": "Finnish",
+ "fil": "Filipino",
+ "fj": "Fijian",
+ "fo": "Faroese",
+ "fon": "Fon",
+ "fr": "French",
+ "fy": "Western Frisian",
+ "ga": "Irish",
+ "gd": "Scots",
+ "gl": "Galician",
+ "gn": "Guarani",
+ "gon": "Gondi",
+ "gsw": "Swiss German",
+ "gu": "Gujarati",
+ "gv": "Manx",
+ "ha": "Hausa",
+ "he": "Hebrew",
+ "hi": "Hindi",
+ "hil": "Hiligaynon",
+ "hmn": "Hmong",
+ "ho": "Hiri Motu",
+ "hr": "Croatian",
+ "ht": "Haitian",
+ "hu": "Hungarian",
+ "hy": "Armenian",
+ "hz": "Herero",
+ "ia": "Interlingua",
+ "id": "Indonesian",
+ "ie": "Interlingue",
+ "ig": "Igbo",
+ "ii": "Sichuan Yi",
+ "ik": "Inupiak",
+ "ilo": "Iloko",
+ "is": "Icelandic",
+ "it": "Italian",
+ "iu": "Inuktitut",
+ "ja": "Japanese",
+ "jab": "Hyam",
+ "jv": "Javanese",
+ "ka": "Georgian",
+ "kab": "Kabyle",
+ "kaj": "Jju",
+ "kam": "Kamba",
+ "kbd": "Kabardian",
+ "kcg": "Tyap",
+ "kdm": "Kagoma",
+ "kg": "Kongo",
+ "ki": "Kikuyu",
+ "kj": "Kuanyama",
+ "kk": "Kazakh",
+ "kl": "Kalaallisut",
+ "km": "Khmer",
+ "kmb": "Kimbundu",
+ "kn": "Kannada",
+ "ko": "Korean",
+ "kr": "Kanuri",
+ "kru": "Kurukh",
+ "ks": "Kashmiri",
+ "ku": "Kurdish",
+ "kv": "Komi",
+ "kw": "Cornish",
+ "ky": "Kirghiz",
+ "kok": "Konkani",
+ "la": "Latin",
+ "lb": "Letzeburgesch",
+ "lg": "Ganda",
+ "li": "Limburgish",
+ "ln": "Lingala",
+ "lo": "Laotian",
+ "lt": "Lithuanian",
+ "lu": "Luba-Katanga",
+ "lua": "Luba-Lulua",
+ "luo": "Luo",
+ "lv": "Latvian",
+ "mad": "Madurese",
+ "mag": "Magahi",
+ "mai": "Maithili",
+ "mak": "Makasar",
+ "man": "Mandingo",
+ "men": "Mende",
+ "mg": "Malagasy",
+ "mh": "Marshallese",
+ "mi": "Maori",
+ "min": "Minangkabau",
+ "mk": "Macedonian",
+ "ml": "Malayalam",
+ "mn": "Mongolian",
+ "mni": "Manipuri",
+ "mo": "Moldavian",
+ "mos": "Mossi",
+ "mr": "Marathi",
+ "ms": "Malay",
+ "mt": "Maltese",
+ "mwr": "Marwari",
+ "my": "Burmese",
+ "myn": "Mayan",
+ "na": "Nauru",
+ "nap": "Neapolitan",
+ "nah": "Nahuatl",
+ "nb": "Norwegian Bokmal",
+ "nd": "North Ndebele",
+ "nds": "Low Saxon",
+ "ne": "Nepali",
+ "ng": "Ndonga",
+ "nl": "Dutch",
+ "nn": "Norwegian Nynorsk",
+ "no": "Norwegian",
+ "nr": "South Ndebele",
+ "nso": "Northern Sotho",
+ "nv": "Navajo",
+ "ny": "Nyanja",
+ "nym": "Nyamwezi",
+ "nyn": "Nyankole",
+ "oc": "Occitan",
+ "oj": "Ojibwa",
+ "om": "(Afan) Oromo",
+ "or": "Oriya",
+ "os": "Ossetian",
+ "pa": "Punjabi",
+ "pag": "Pangasinan",
+ "pam": "Pampanga",
+ "pbb": "Páez",
+ "pi": "Pali",
+ "pl": "Polish",
+ "ps": "Pashto",
+ "pt": "Portuguese",
+ "qu": "Quechua",
+ "raj": "Rajasthani",
+ "rm": "Rhaeto-Roman",
+ "rn": "Kirundi",
+ "ro": "Romanian",
+ "ru": "Russian",
+ "rw": "Kinyarwanda",
+ "sa": "Sanskrit",
+ "sas": "Sasak",
+ "sat": "Santali",
+ "sc": "Sardinian",
+ "scn": "Sicilian",
+ "sd": "Sindhi",
+ "se": "Northern Sami",
+ "sg": "Sango",
+ "shn": "Shan",
+ "si": "Sinhala",
+ "sid": "Sidamo",
+ "sk": "Slovak",
+ "sl": "Slovenian",
+ "sm": "Samoan",
+ "sn": "Shona",
+ "so": "Somali",
+ "sq": "Albanian",
+ "sr": "Serbian",
+ "srr": "Serer",
+ "ss": "Siswati",
+ "st": "Sesotho",
+ "su": "Sundanese",
+ "suk": "Sukuma",
+ "sus": "Susu",
+ "sv": "Swedish",
+ "sw": "Swahili",
+ "ta": "Tamil",
+ "te": "Telugu",
+ "tem": "Timne",
+ "tet": "Tetum",
+ "tg": "Tajik",
+ "th": "Thai",
+ "ti": "Tigrinya",
+ "tiv": "Tiv",
+ "tk": "Turkmen",
+ "tl": "Tagalog",
+ "tn": "Setswana",
+ "to": "Tonga",
+ "tr": "Turkish",
+ "ts": "Tsonga",
+ "tt": "Tatar",
+ "tum": "Tumbuka",
+ "tw": "Twi",
+ "ty": "Tahitian",
+ "ug": "Uighur",
+ "uk": "Ukrainian",
+ "umb": "Umbundu",
+ "ur": "Urdu",
+ "uz": "Uzbek",
+ "ve": "Venda",
+ "vi": "Vietnamese",
+ "vo": "Volapuk",
+ "wal": "Walamo",
+ "war": "Waray",
+ "wen": "Sorbian",
+ "wo": "Wolof",
+ "xh": "Xhosa",
+ "yao": "Yao",
+ "yi": "Yiddish",
+ "yo": "Yoruba",
+ "za": "Zhuang",
+ "zh": "Chinese",
+ "zu": "Zulu",
+ "zap": "Zapotec"
+}
+plurals = {
+ "ja": "nplurals=1; plural=0;" ,
+ "ko": "nplurals=1; plural=0;" ,
+ "vi": "nplurals=1; plural=0;" ,
+ "tr": "nplurals=1; plural=0;" ,
+ "da": "nplurals=2; plural=(n != 1);" ,
+ "nl": "nplurals=2; plural=(n != 1);" ,
+ "en": "nplurals=2; plural=(n != 1);" ,
+ "fo": "nplurals=2; plural=(n != 1);" ,
+ "de": "nplurals=2; plural=(n != 1);" ,
+ "nb": "nplurals=2; plural=(n != 1);" ,
+ "no": "nplurals=2; plural=(n != 1);" ,
+ "nn": "nplurals=2; plural=(n != 1);" ,
+ "sv": "nplurals=2; plural=(n != 1);" ,
+ "et": "nplurals=2; plural=(n != 1);" ,
+ "fi": "nplurals=2; plural=(n != 1);" ,
+ "el": "nplurals=2; plural=(n != 1);" ,
+ "he": "nplurals=2; plural=(n != 1);" ,
+ "it": "nplurals=2; plural=(n != 1);" ,
+ "pt": "nplurals=2; plural=(n != 1);" ,
+ "es": "nplurals=2; plural=(n != 1);" ,
+ "eo": "nplurals=2; plural=(n != 1);" ,
+ "hu": "nplurals=2; plural=(n != 1);" ,
+ "fr": "nplurals=2; plural=(n > 1);" ,
+ "pt_BR": "nplurals=2; plural=(n > 1);" ,
+ "lv": "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);" ,
+ "ga": "nplurals=3; plural=n==1 ? 0 : n==2 ? 1 : 2;" ,
+ "ro": "nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2;" ,
+ "lt": "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);" ,
+ "hr": "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" ,
+ "sr": "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" ,
+ "ru": "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" ,
+ "uk": "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" ,
+ "sk": "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;" ,
+ "cs": "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;" ,
+ "pl": "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" ,
+ "sl": "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"
+
+}
+
+ids = []
+for line in codecs.open(pot, "r", "utf-8"):
+ m = re.search(ur'^msgid "([^"]+)', line)
+ if m:
+ ids += [m.group(1)]
+
+oldmap = { }
+sre = re.compile(ur'<String Name="([^"]+)">([^<]+)<')
+
+for line in codecs.open(u"Example.xml", "r", "utf-8"):
+ m = sre.search(line)
+ if m:
+ oldmap[m.group(1)] = m.group(2)
+
+newmap = { }
+for line in codecs.open(source, "r", "utf-8"):
+ m = sre.search(line)
+ if m:
+ s = oldmap.get(m.group(1))
+ if s and s in ids:
+ newmap[s] = m.group(2).replace('"', '\\"')
+
+out = codecs.open(project + "/po/template-" + locale + ".po", "w", "utf-8")
+plural = plurals.get(locale, "plurals=2; plural=(n != 1);")
+language = langs.get(locale, "XXX");
+
+out.write(r"""
+# LANGUAGE translations for the DC++ package.
+# Copyright (C) 2008 The translators
+# This file is distributed under the same license as the DC++ package.
+# <TRANSLATOR>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PROJECT\n"
+"Report-Msgid-Bugs-To: dcp...@li...\n"
+"Last-Translator: <TRANSLATOR>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: PLURAL\n"
+
+""".replace("TRANSLATOR", translator).replace("PROJECT", project).replace("PLURAL", plural).replace("LANGUAGE", language)
+)
+
+for k, v in newmap.iteritems():
+ out.write(u'msgid "' + k + u'"\n')
+ out.write(u'msgstr "' + v + u'"\n')
+ out.write(u'\n')
+
+out.close()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2008-03-30 08:17:36
|
Revision: 1089
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1089&view=rev
Author: arnetheduck
Date: 2008-03-30 01:17:30 -0700 (Sun, 30 Mar 2008)
Log Message:
-----------
rename windows&dialogs
Modified Paths:
--------------
dcplusplus/trunk/smartwin/include/smartwin/Anchors.h
dcplusplus/trunk/smartwin/include/smartwin/Application.h
dcplusplus/trunk/smartwin/include/smartwin/Policies.h
dcplusplus/trunk/smartwin/include/smartwin/SmartWin.h
dcplusplus/trunk/smartwin/include/smartwin/Widget.h
dcplusplus/trunk/smartwin/include/smartwin/WidgetFactory.h
dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectColor.h
dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectDragDrop.h
dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectEraseBackground.h
dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectMinMax.h
dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectMouse.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/Control.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/CoolBar.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/MDIChild.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/MDIFrame.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/MDIParent.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/StatusBar.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/ToolTip.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/Tree.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetMenu.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTabView.h
dcplusplus/trunk/smartwin/source/widgets/WidgetDialog.cpp
dcplusplus/trunk/smartwin/source/widgets/WidgetModalDialog.cpp
dcplusplus/trunk/smartwin/source/widgets/WidgetWindow.cpp
dcplusplus/trunk/win32/ADLSProperties.cpp
dcplusplus/trunk/win32/ADLSProperties.h
dcplusplus/trunk/win32/AboutDlg.cpp
dcplusplus/trunk/win32/AboutDlg.h
dcplusplus/trunk/win32/CommandDlg.cpp
dcplusplus/trunk/win32/CommandDlg.h
dcplusplus/trunk/win32/FavHubProperties.cpp
dcplusplus/trunk/win32/FavHubProperties.h
dcplusplus/trunk/win32/HashProgressDlg.cpp
dcplusplus/trunk/win32/HashProgressDlg.h
dcplusplus/trunk/win32/HubListsDlg.cpp
dcplusplus/trunk/win32/HubListsDlg.h
dcplusplus/trunk/win32/LineDlg.cpp
dcplusplus/trunk/win32/LineDlg.h
dcplusplus/trunk/win32/MagnetDlg.cpp
dcplusplus/trunk/win32/MagnetDlg.h
dcplusplus/trunk/win32/MainWindow.cpp
dcplusplus/trunk/win32/MainWindow.h
dcplusplus/trunk/win32/PropPage.cpp
dcplusplus/trunk/win32/PropPage.h
dcplusplus/trunk/win32/SettingsDialog.cpp
dcplusplus/trunk/win32/SettingsDialog.h
dcplusplus/trunk/win32/SplashWindow.cpp
dcplusplus/trunk/win32/SplashWindow.h
dcplusplus/trunk/win32/WidgetPaned.h
Added Paths:
-----------
dcplusplus/trunk/smartwin/include/smartwin/widgets/Frame.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/ModalDialog.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/ModelessDialog.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/Window.h
Removed Paths:
-------------
dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetDialog.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetModalDialog.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetWindow.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetWindowBase.h
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-03-29 11:32:16.434999943 +0100
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
+ timestamp: 2008-03-29 13:40:42.691999912 +0100
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
Name: bzr:file-ids
- smartwin/source/widgets/LoadDialog.cpp loaddialog.cpp-20080329103151-2zvxbm5b87on29pc-1
smartwin/source/widgets/SaveDialog.cpp savedialog.cpp-20080329103151-2zvxbm5b87on29pc-2
+ smartwin/include/smartwin/widgets/Frame.h 712@f586c4b0-9d0d-0410-bc51-f1fe239209fc:dcplusplus%2Ftrunk:smartwin%2Finclude%2Fsmartwin%2Fwidgets%2FWidgetWindowBase.h
smartwin/include/smartwin/widgets/ModalDialog.h 712@f586c4b0-9d0d-0410-bc51-f1fe239209fc:dcplusplus%2Ftrunk:smartwin%2Finclude%2Fsmartwin%2Fwidgets%2FWidgetModalDialog.h
smartwin/include/smartwin/widgets/ModelessDialog.h 712@f586c4b0-9d0d-0410-bc51-f1fe239209fc:dcplusplus%2Ftrunk:smartwin%2Finclude%2Fsmartwin%2Fwidgets%2FWidgetDialog.h
smartwin/include/smartwin/widgets/Window.h 712@f586c4b0-9d0d-0410-bc51-f1fe239209fc:dcplusplus%2Ftrunk:smartwin%2Finclude%2Fsmartwin%2Fwidgets%2FWidgetWindow.h
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
+ 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
Modified: dcplusplus/trunk/smartwin/include/smartwin/Anchors.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/Anchors.h 2008-03-30 08:15:26 UTC (rev 1088)
+++ dcplusplus/trunk/smartwin/include/smartwin/Anchors.h 2008-03-30 08:17:30 UTC (rev 1089)
@@ -42,7 +42,7 @@
* the files in the current directory, grows or shrinks according to the size of the dialog.
*
* That's what Anchors does. After the widgets were created, you add them to a special list,
-* and in the event handler of OnSize (of your WidgetWindow), you call a special method that
+* and in the event handler of OnSize (of your Window), you call a special method that
* resizes all the widgets you've added before.
*
* Supposed to be simple.
Modified: dcplusplus/trunk/smartwin/include/smartwin/Application.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/Application.h 2008-03-30 08:15:26 UTC (rev 1088)
+++ dcplusplus/trunk/smartwin/include/smartwin/Application.h 2008-03-30 08:17:30 UTC (rev 1089)
@@ -59,7 +59,7 @@
class Widget;
namespace Policies {
-class ModalDialog;
+class ModelessDialog;
}
/// Class declaration for the application class
@@ -94,7 +94,7 @@
#endif
friend class Widget;
- friend class Policies::ModalDialog;
+ friend class Policies::ModelessDialog;
public:
/// Returns the Application object
/** Use this static function to access the Application object.
Modified: dcplusplus/trunk/smartwin/include/smartwin/Policies.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/Policies.h 2008-03-30 08:15:26 UTC (rev 1088)
+++ dcplusplus/trunk/smartwin/include/smartwin/Policies.h 2008-03-30 08:17:30 UTC (rev 1089)
@@ -35,11 +35,11 @@
// begin namespace SmartWin
template<typename Policy>
-class MessageMapPolicy : public Policy {
+class MessageMap : public Policy {
public:
- typedef MessageMapPolicy<Policy> PolicyType;
+ typedef MessageMap<Policy> PolicyType;
- MessageMapPolicy(Widget* parent) : Policy(parent) { }
+ MessageMap(Widget* parent) : Policy(parent) { }
static LRESULT CALLBACK wndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) {
// Check if this is an init type message - a message that will set the window pointer correctly
@@ -119,15 +119,12 @@
};
namespace Policies {
-/// Aspect classes for a MessageMapPolicyDialogWidget
-/** Used as the third template argument to WidgetFactory if you're creating a
- * MessageMapPolicyDialogWidget
- */
-class Dialog
+/// Policy for modeless dialogs
+class ModelessDialog
: public Widget
{
public:
- Dialog(Widget* parent) : Widget(parent) { }
+ ModelessDialog(Widget* parent) : Widget(parent) { }
static LRESULT returnDestroyed(HWND hWnd, UINT msg, WPARAM wPar, LPARAM lPar) {
return FALSE;
@@ -162,21 +159,18 @@
if ( uMsg == WM_INITDIALOG )
{
// extracting the this pointer and stuffing it into the Window with SetProp
- Dialog* This = reinterpret_cast<Dialog*>(lParam);
+ ModelessDialog* This = reinterpret_cast<ModelessDialog*>(lParam);
This->attach( hwnd );
}
}
};
-/// Aspect classes for a MessageMapPolicyModalDialogWidget
-/** Used as the third template argument to WidgetFactory if you're creating a
- * MessageMapPolicyModalDialogWidget
- */
+/// Policy for modal dialogs - these are treated the same as modeless dialogs but are not automagically deleted
class ModalDialog
- : public Dialog
+ : public ModelessDialog
{
public:
- ModalDialog(Widget* parent) : Dialog(parent) { }
+ ModalDialog(Widget* parent) : ModelessDialog(parent) { }
virtual void kill() {
// Modal dialogs are stack allocated, so no delete
@@ -242,7 +236,7 @@
virtual void attach(HWND hWnd) {
Normal::attach(hWnd);
- oldProc = reinterpret_cast< WNDPROC >( ::SetWindowLongPtr( hWnd, GWL_WNDPROC, ( LONG_PTR ) &MessageMapPolicy<Subclassed>::wndProc ) );
+ oldProc = reinterpret_cast< WNDPROC >( ::SetWindowLongPtr( hWnd, GWL_WNDPROC, ( LONG_PTR ) &MessageMap<Subclassed>::wndProc ) );
}
using Widget::attach;
private:
Modified: dcplusplus/trunk/smartwin/include/smartwin/SmartWin.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/SmartWin.h 2008-03-30 08:15:26 UTC (rev 1088)
+++ dcplusplus/trunk/smartwin/include/smartwin/SmartWin.h 2008-03-30 08:17:30 UTC (rev 1089)
@@ -63,7 +63,8 @@
#include "resources/Icon.h"
#include "resources/ImageList.h"
#include "resources/Pen.h"
-#include "widgets/WidgetModalDialog.h"
+#include "widgets/ModalDialog.h"
+#include "widgets/ModelessDialog.h"
namespace sw = SmartWin;
Modified: dcplusplus/trunk/smartwin/include/smartwin/Widget.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/Widget.h 2008-03-30 08:15:26 UTC (rev 1088)
+++ dcplusplus/trunk/smartwin/include/smartwin/Widget.h 2008-03-30 08:17:30 UTC (rev 1089)
@@ -200,7 +200,7 @@
Widget * itsParent;
HWND itsHandle;
- /// The atom with which the pointer to the MessageMapBase is registered on the HWND
+ /// The atom with which the pointer to the Widget is registered on the HWND
static GlobalAtom propAtom;
};
Modified: dcplusplus/trunk/smartwin/include/smartwin/WidgetFactory.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/WidgetFactory.h 2008-03-30 08:15:26 UTC (rev 1088)
+++ dcplusplus/trunk/smartwin/include/smartwin/WidgetFactory.h 2008-03-30 08:17:30 UTC (rev 1089)
@@ -37,7 +37,6 @@
#include "widgets/ComboBox.h"
#include "widgets/Table.h"
#include "widgets/DateTime.h"
-#include "widgets/WidgetDialog.h"
#include "widgets/GroupBox.h"
#include "widgets/LoadDialog.h"
#include "widgets/MDIChild.h"
@@ -55,8 +54,8 @@
#include "widgets/TextBox.h"
#include "widgets/Tree.h"
#include "widgets/ToolTip.h"
-#include "widgets/WidgetWindow.h"
-#include "widgets/WidgetWindowBase.h"
+#include "widgets/Window.h"
+#include "widgets/Frame.h"
#include "WidgetFactoryPlatformImplementation.h"
#include "WidgetCreator.h"
@@ -66,15 +65,15 @@
/// Factory class for creating Widgets from a derived custom class
/** This is the class you would normally derive from in your own application. <br>
- * < p >Derive directly from WidgetFactory and then supply WidgetWindow as the first
+ * < p >Derive directly from WidgetFactory and then supply Window as the first
* template parameter. The second parameter would then be YOUR CLASS ( this is
* needed for the SmartWin type system to function ) Example : < b >class
- * MyMainWindow : public SmartWin::WidgetFactory< SmartWin::WidgetWindow,
+ * MyMainWindow : public SmartWin::WidgetFactory< SmartWin::Window,
* MyMainWindow > { ... };< /b > The third template argument is for declaring what
* type of Widget you're declaring, for a "normal Widget" this defaults to
- * MessageMapPolicyNormalWidget, if this is a Widget constructed from a dialog
- * resource, you must state so by adding SmartWin::MessageMapPolicyDialogWidget and
- * if it is a MDI Child you must add SmartWin::MessageMapPolicyMDIChildWidget as the
+ * MessageMapNormalWidget, if this is a Widget constructed from a dialog
+ * resource, you must state so by adding SmartWin::MessageMapDialogWidget and
+ * if it is a MDI Child you must add SmartWin::MessageMapMDIChildWidget as the
* third argument Then when you need e.g. a Button you would create that
* button by calling createButton. Class contains type defs for your
* convenience for all Widget types that exists in the SmartWin library.< /p > Note!
@@ -217,16 +216,16 @@
/// WidgetChildWindow object type.
typedef typename WidgetChildWindow::ObjectType WidgetChildWindowPtr;
- /// WidgetWindow class type.
- typedef SmartWin::WidgetWindow WidgetWindow;
+ /// Window class type.
+ typedef SmartWin::Window Window;
- /// WidgetWindow object type.
- typedef typename WidgetWindow::ObjectType WidgetWindowPtr;
+ /// Window object type.
+ typedef typename Window::ObjectType WindowPtr;
/// MDIFrame class type.
typedef SmartWin::MDIFrame MDIFrame;
- /// WidgetWindow object type.
+ /// Window object type.
typedef typename MDIFrame::ObjectType MDIFramePtr;
/// ProgressBar class type.
Modified: dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectColor.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectColor.h 2008-03-30 08:15:26 UTC (rev 1088)
+++ dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectColor.h 2008-03-30 08:17:30 UTC (rev 1089)
@@ -38,7 +38,7 @@
/// Aspect class used by Widgets that have the possibility of handling the
/// erase background property
/** \ingroup AspectClasses
- * E.g. the WidgetWindow has a background Aspect to it, therefore Table
+ * E.g. the Window has a background Aspect to it, therefore Table
* realizes the AspectEnabled through inheritance.
*/
template<class WidgetType>
Modified: dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectDragDrop.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectDragDrop.h 2008-03-30 08:15:26 UTC (rev 1088)
+++ dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectDragDrop.h 2008-03-30 08:17:30 UTC (rev 1089)
@@ -38,7 +38,7 @@
// begin namespace SmartWin
/// Aspect class used by dialog Widgets that have the possibility of trapping "drop files events".
/** \ingroup AspectClasses
- * E.g. the WidgetModalDialog can trap "drop files events" therefore they realize the AspectDragDrop through inheritance.
+ * E.g. the ModalDialog can trap "drop files events" therefore they realize the AspectDragDrop through inheritance.
*/
template< class WidgetType >
class AspectDragDrop
Modified: dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectEraseBackground.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectEraseBackground.h 2008-03-30 08:15:26 UTC (rev 1088)
+++ dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectEraseBackground.h 2008-03-30 08:17:30 UTC (rev 1089)
@@ -37,7 +37,7 @@
/// Aspect class used by Widgets that have the possibility of handling the erase
/// background property
/** \ingroup AspectClasses
- * E.g. the WidgetWindow have a AspectEraseBackground Aspect to it therefore
+ * E.g. the Window have a AspectEraseBackground Aspect to it therefore
* Table realize the AspectEraseBackground through inheritance. When the
* Widget needs to erase its background this event will be called with a Canvas
* object which can be used for manipulating the colors etc the system uses to
Modified: dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectMinMax.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectMinMax.h 2008-03-30 08:15:26 UTC (rev 1088)
+++ dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectMinMax.h 2008-03-30 08:17:30 UTC (rev 1089)
@@ -69,21 +69,21 @@
/** This will make the window fill the whole area that the window has available.
* <br>
* This function cannot be called for any Widget types other than those derived
- * from WidgetWindowBase.
+ * from Frame.
*/
void maximize();
/// Minimize your window
/** This will make the window become minimized. <br>
* This function cannot be called for any Widget types other than those derived
- * from WidgetWindowBase.
+ * from Frame.
*/
void minimize();
/// Restores your window
/** This will make the window become restored. <br>
* This function cannot be called for any Widget types other than those derived
- * from WidgetWindowBase.
+ * from Frame.
*/
void restore();
Modified: dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectMouse.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectMouse.h 2008-03-30 08:15:26 UTC (rev 1088)
+++ dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectMouse.h 2008-03-30 08:17:30 UTC (rev 1089)
@@ -78,7 +78,7 @@
/// Aspect class used by Widgets that have the possibility of trapping "mouse
/// clicked" events.
/** \ingroup AspectClasses
- * E.g. the WidgetWindow can trap "mouse clicked events" therefore it realize the
+ * E.g. the Window can trap "mouse clicked events" therefore it realize the
* AspectMouse through inheritance.
*/
template< class WidgetType >
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Control.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Control.h 2008-03-30 08:15:26 UTC (rev 1088)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Control.h 2008-03-30 08:17:30 UTC (rev 1089)
@@ -19,7 +19,7 @@
/** Base class is for windows common controls */
class Control :
- public MessageMapPolicy< Policies::Subclassed >,
+ public MessageMap< Policies::Subclassed >,
public AspectBorder<Control>,
public AspectContextMenu<Control>,
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/CoolBar.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/CoolBar.h 2008-03-30 08:15:26 UTC (rev 1088)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/CoolBar.h 2008-03-30 08:17:30 UTC (rev 1089)
@@ -69,7 +69,7 @@
* complex Widgets lke for instance a ComboBox, a TextBox and so on...
*/
class CoolBar :
- public MessageMapPolicy< Policies::Subclassed >,
+ public MessageMap< Policies::Subclassed >,
// Aspects
public AspectEnabled< CoolBar >,
@@ -101,8 +101,6 @@
/// Object type
typedef ThisType * ObjectType;
- typedef MessageMapPolicy<Policies::Subclassed> PolicyType;
-
/// 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
Copied: dcplusplus/trunk/smartwin/include/smartwin/widgets/Frame.h (from rev 1088, dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetWindowBase.h)
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Frame.h (rev 0)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Frame.h 2008-03-30 08:17:30 UTC (rev 1089)
@@ -0,0 +1,369 @@
+/*
+ Copyright (c) 2005, Thomas Hansen
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ * Neither the name of the SmartWin++ nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef Frame_h
+#define Frame_h
+
+#include "../Application.h"
+#include "../Rectangle.h"
+#include "../Policies.h"
+#include "../aspects/AspectActivate.h"
+#include "../aspects/AspectBorder.h"
+#include "../aspects/AspectCommand.h"
+#include "../aspects/AspectContextMenu.h"
+#include "../aspects/AspectDragDrop.h"
+#include "../aspects/AspectEnabled.h"
+#include "../aspects/AspectEraseBackground.h"
+#include "../aspects/AspectFocus.h"
+#include "../aspects/AspectFont.h"
+#include "../aspects/AspectHelp.h"
+#include "../aspects/AspectKeyboard.h"
+#include "../aspects/AspectMinMax.h"
+#include "../aspects/AspectMouse.h"
+#include "../aspects/AspectPainting.h"
+#include "../aspects/AspectRaw.h"
+#include "../aspects/AspectSizable.h"
+#include "../aspects/AspectText.h"
+#include "../aspects/AspectVisible.h"
+#include "../xCeption.h"
+
+namespace SmartWin
+{
+// begin namespace SmartWin
+
+/// Main Window class
+/** \ingroup WidgetControls
+ * \WidgetUsageInfo
+ * \image html widgetwindow.png
+ * This class defines a "normal" window or the most commonly used "container
+ * Widget", normally you would define your own class which (indirectly) derives from
+ * this one. <br>
+ * You would normally derive directly from WidgetFactory and then supply this class
+ * as the first template parameter. <br>
+ * The second parameter would then be YOUR CLASS. <br>
+ * Example <br>
+ * <b>class MyMainWindow : public SmartWin::WidgetFactory<SmartWin::Window,
+ * MyMainWindow> { ... };</b> <br>
+ * Note especially that the second template argument to the WidgetFactory template
+ * class would almost ALWAYS be the name of your class derived from WidgetFactory.
+ * <br>
+ * You can also derive directly from Window and skip around the WidgetFactory
+ * factory class, the inheritance string would then become: <br>
+ * <b>class MyMainWindow : public SmartWin::Window<MyMainWindow></b> <br>
+ * But then you wouldn't have access to all the "createxxx" functions from class
+ * WidgetFactory which automatically gurantees that your Widgets get the right parent
+ * etc. <br>
+ * Look at (almost) any of the example projects distributed with the main download of
+ * the library residing in the SmartWinUnitTests directory for an example of how to
+ * use this class with the factory class WidgetFactory.
+ */
+template< class Policy >
+class Frame :
+ public MessageMap< Policy >,
+
+ // Aspects
+ public AspectActivate< Frame< Policy > >,
+ public AspectBorder< Frame< Policy > >,
+ public AspectCommand< Frame< Policy > >,
+ public AspectContextMenu< Frame< Policy > >,
+ public AspectDragDrop< Frame< Policy > >,
+ public AspectEnabled< Frame< Policy > >,
+ public AspectEraseBackground< Frame< Policy > >,
+ public AspectFocus< Frame< Policy > >,
+ public AspectFont< Frame< Policy > >,
+ public AspectHelp< Frame< Policy > >,
+ public AspectKeyboard< Frame< Policy > >,
+ public AspectMinMax<Frame<Policy> >,
+ public AspectMouse< Frame< Policy > >,
+ public AspectPainting< Frame< Policy > >,
+ public AspectRaw< Frame< Policy > >,
+ public AspectSizable< Frame< Policy > >,
+ public AspectText< Frame< Policy > >,
+ public AspectVisible< Frame< Policy > >
+{
+ struct CloseDispatcher
+ {
+ typedef std::tr1::function<bool ()> F;
+
+ CloseDispatcher(const F& f_, Widget* widget_) : f(f_), widget(widget_) { }
+
+ bool operator()(const MSG& msg, LRESULT& ret) {
+ bool destroy = f();
+
+ if ( destroy ) {
+ return false;
+ }
+
+ return true;
+ }
+
+ F f;
+ Widget* widget;
+ };
+
+ struct TimerDispatcher
+ {
+ typedef std::tr1::function<bool ()> F;
+
+ TimerDispatcher(const F& f_) : f(f_) { }
+
+ bool operator()(const MSG& msg, LRESULT& ret) {
+ bool keep = f();
+
+ if(!keep) {
+ ::KillTimer(msg.hwnd, msg.wParam);
+ // TODO remove from message map as well...
+ }
+ return FALSE;
+ }
+
+ F f;
+ };
+
+public:
+ /// Class type
+ typedef Frame< Policy > ThisType;
+
+ /// Object type
+ typedef ThisType * ObjectType;
+
+ // TODO: Outfactor into WidgetClosable
+ /// Event Handler setter for the Closing Event
+ /** If supplied event handler is called before the window is closed. <br>
+ * Signature of event handler must be "bool foo()" <br>
+ * If you return true from your event handler the window is closed, otherwise
+ * the window is NOT allowed to actually close!!
+ */
+ void onClosing(const typename CloseDispatcher::F& f) {
+ this->addCallback(
+ Message( WM_CLOSE ), CloseDispatcher(f, this)
+ );
+ }
+
+ // TODO: Outfactor into "time Aspect" class
+ /// Creates a timer object.
+ /** The supplied function must have the signature bool foo() <br>
+ * The event function will be called when at least milliSeconds seconds have elapsed.
+ * If your event handler returns true, it will keep getting called periodically, otherwise
+ * it will be removed.
+ */
+ void createTimer(const typename TimerDispatcher::F& f, unsigned int milliSeconds, unsigned int id = 0);
+
+ /// Closes the window
+ /** Call this function to raise the "Closing" event. <br>
+ * This will normally try to close the window. <br>
+ * Note! <br>
+ * If this event is trapped and we in that event handler state that we DON'T
+ * want to close the window (by returning false) the window will not be close.
+ * <br>
+ * Note! <br>
+ * If the asyncron argument is true the message will be posted to the message
+ * que meaning that the close event will be done asyncronously and therefore the
+ * function will return immediately and the close event will be handled when the
+ * close event pops up in the event handler que.
+ */
+ void close( bool asyncron = false );
+
+ // TODO: Outfactor to system implementation type, see e.g. WidgetFactory
+#ifndef WINCE
+ /// Animates a window
+ /** Slides the window into view from either right or left depending on the
+ * parameter "left". If "left" is true, then from the left, otherwise from the
+ * right. <br>
+ * Show defines if the window shall come INTO view or go OUT of view. <br>
+ * The "time" parameter is the total duration of the function in milliseconds.
+ */
+ void animateSlide( bool show, bool left, unsigned int msTime );
+
+ /// Animates a window
+ /** Blends the window INTO view or OUT of view. <br>
+ * Show defines if the window shall come INTO view or go OUT of view. <br>
+ * The "time" parameter is the total duration of the function in milliseconds.
+ */
+ void animateBlend( bool show, int msTime );
+
+ /// Animates a window
+ /** Collapses the window INTO view or OUT of view. The collapse can be thought of
+ * as either an "explosion" or an "implosion". <br>
+ * Show defines if the window shall come INTO view or go OUT of view. <br>
+ * The "time" parameter is the total duration of the function in milliseconds.
+ */
+ void animateCollapse( bool show, int msTime );
+#endif
+
+ /// Adds or removes the minimize box from the Widget
+ void setMinimizeBox( bool value = true );
+
+ /// Adds or removes the maximize box from the Widget
+ void setMaximizeBox( bool value = true );
+
+ /// Sets the small icon for the Widget (the small icon appears typically in the top left corner of the Widget)
+ void setIconSmall( int resourceId );
+
+ /// Sets the small icon for the Widget (the small icon appears typically in the top left corner of the Widget)
+ void setIconSmall( const SmartUtil::tstring & filePathName );
+
+ /// Sets the large icon for the Widget (the large icon appears e.g. when you press ALT+Tab)
+ void setIconLarge( int resourceId );
+
+ /// Sets the large icon for the Widget (the large icon appears e.g. when you press ALT+Tab)
+ void setIconLarge( const SmartUtil::tstring & filePathName );
+
+ /// Sets the cursor for the Widget
+ void setCursor( int resourceId );
+
+ /// Sets the cursor for the Widget
+ void setCursor( const SmartUtil::tstring & filePathName );
+
+protected:
+ // Protected since this Widget we HAVE to inherit from
+ explicit Frame( Widget * parent = 0 );
+
+ // Protected to avoid direct instantiation, you can inherit but NOT instantiate
+ // directly
+ virtual ~Frame()
+ {}
+
+
+};
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Implementation of class
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+template< class Policy >
+void Frame< Policy >::createTimer( const typename TimerDispatcher::F& f,
+ unsigned int milliSecond, unsigned int id)
+{
+
+ ::SetTimer( this->handle(), id, static_cast< UINT >( milliSecond ), NULL);
+ addCallback(
+ Message( WM_TIMER, id ), TimerDispatcher(f)
+ );
+}
+
+template< class Policy >
+void Frame< Policy >::close( bool asyncron )
+{
+ if ( asyncron )
+ this->postMessage(WM_CLOSE); // Return now
+ else
+ this->sendMessage(WM_CLOSE); // Return after close is done.
+}
+
+#ifndef WINCE
+template< class Policy >
+void Frame< Policy >::animateSlide( bool show, bool left, unsigned int time )
+{
+ ::AnimateWindow( this->handle(), static_cast< DWORD >( time ),
+ show ?
+ left ? AW_SLIDE | AW_HOR_NEGATIVE :
+ AW_SLIDE | AW_HOR_POSITIVE
+ :
+ left ? AW_HIDE | AW_SLIDE | AW_HOR_NEGATIVE :
+ AW_HIDE | AW_SLIDE | AW_HOR_POSITIVE
+ );
+}
+
+//HC: This function gives problems with some non-Microsoft visual styles
+template< class Policy >
+void Frame< Policy >::animateBlend( bool show, int msTime )
+{
+ ::AnimateWindow( this->handle(), static_cast< DWORD >( msTime ), show ? AW_BLEND : AW_HIDE | AW_BLEND );
+}
+
+template< class Policy >
+void Frame< Policy >::animateCollapse( bool show, int msTime )
+{
+ ::AnimateWindow( this->handle(), static_cast< DWORD >( msTime ), show ? AW_CENTER : AW_HIDE | AW_CENTER );
+}
+#endif
+
+template< class Policy >
+void Frame< Policy >::setMinimizeBox( bool value )
+{
+ Widget::addRemoveStyle( WS_MINIMIZEBOX, value );
+}
+
+template< class Policy >
+void Frame< Policy >::setMaximizeBox( bool value )
+{
+ Widget::addRemoveStyle( WS_MAXIMIZEBOX, value );
+}
+
+template< class Policy >
+void Frame< Policy >::setIconSmall( int resourceId )
+{
+ HICON hIcon = ( HICON )::LoadImage( Application::instance().getAppHandle(), MAKEINTRESOURCE( resourceId ), IMAGE_ICON, ::GetSystemMetrics(SM_CXSMICON), ::GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR );
+ ::SendMessage( this->handle(), WM_SETICON, ICON_SMALL, reinterpret_cast< LPARAM >( hIcon ) );
+}
+
+template< class Policy >
+void Frame< Policy >::setIconLarge( int resourceId )
+{
+ HICON hIcon = ( HICON )::LoadImage( Application::instance().getAppHandle(), MAKEINTRESOURCE( resourceId ), IMAGE_ICON, 0, 0, LR_DEFAULTSIZE );
+ ::SendMessage( this->handle(), WM_SETICON, ICON_BIG, reinterpret_cast< LPARAM >( hIcon ) );
+}
+
+template< class Policy >
+void Frame< Policy >::setIconSmall( const SmartUtil::tstring & filePathName )
+{
+ HICON hIcon = ( HICON )::LoadImage( 0, filePathName.c_str(), IMAGE_ICON, ::GetSystemMetrics(SM_CXSMICON), ::GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR | LR_LOADFROMFILE );
+ ::SendMessage( this->handle(), WM_SETICON, ICON_SMALL, reinterpret_cast< LPARAM >( hIcon ) );
+}
+
+template< class Policy >
+void Frame< Policy >::setIconLarge( const SmartUtil::tstring & filePathName )
+{
+ HICON hIcon = ( HICON )::LoadImage( 0, filePathName.c_str(), IMAGE_ICON, 0, 0, LR_DEFAULTSIZE | LR_LOADFROMFILE );
+ ::SendMessage( this->handle(), WM_SETICON, ICON_BIG, reinterpret_cast< LPARAM >( hIcon ) );
+}
+
+template< class Policy >
+void Frame< Policy >::setCursor( int resourceId )
+{
+ HCURSOR hCur = ::LoadCursor( Application::instance().getAppHandle(), MAKEINTRESOURCE( resourceId ) );
+ ::SetClassLongPtr( this->handle(), GCLP_HCURSOR, reinterpret_cast< LONG >( hCur ) );
+}
+
+template< class Policy >
+void Frame< Policy >::setCursor( const SmartUtil::tstring & filePathName )
+{
+ HICON hCur = ( HICON )::LoadImage( 0, filePathName.c_str(), IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE | LR_LOADFROMFILE );
+ ::SetClassLongPtr( this->handle(), GCLP_HCURSOR, reinterpret_cast< LONG >( hCur ) );
+}
+
+template< class Policy >
+Frame< Policy >::Frame( Widget * parent )
+ : Frame<Policy>::PolicyType( parent )
+{
+}
+
+// end namespace SmartWin
+}
+
+#endif
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/MDIChild.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/MDIChild.h 2008-03-30 08:15:26 UTC (rev 1088)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/MDIChild.h 2008-03-30 08:17:30 UTC (rev 1089)
@@ -36,7 +36,7 @@
#include "../Policies.h"
#include "../WindowClass.h"
#include "MDIParent.h"
-#include "WidgetWindowBase.h"
+#include "Frame.h"
#include <sstream>
#include <boost/scoped_ptr.hpp>
@@ -51,7 +51,7 @@
* \WidgetUsageInfo
* \image html mdi.PNG
* Class for creating a MDI Child Widget. <br>
- * An MDI Child is a Widget which is kind of like a special case of WidgetWindow, it
+ * An MDI Child is a Widget which is kind of like a special case of Window, it
* exists only for two purposes which is 1. Contained in the MDIParent class
* and 2. To serve as a container widget for your control widgets. <br>
* Use either the MDIParent::createMDIChild or inherit from this class and roll
@@ -60,10 +60,10 @@
* MDIParent
*/
class MDIChild
- : public WidgetWindowBase< Policies::MDIChild >
+ : public Frame< Policies::MDIChild >
{
public:
- typedef WidgetWindowBase<Policies::MDIChild> BaseType;
+ typedef Frame<Policies::MDIChild> BaseType;
/// Class type
typedef MDIChild ThisType;
@@ -93,7 +93,7 @@
};
/// Creates a MDIChild Window
- /** This version creates a MessageMapPolicyMDIChildWidget to plug into MDIParent
+ /** This version creates a MessageMapMDIChildWidget to plug into MDIParent
* container window.
*/
void createMDIChild( Seed cs = Seed() );
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/MDIFrame.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/MDIFrame.h 2008-03-30 08:15:26 UTC (rev 1088)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/MDIFrame.h 2008-03-30 08:17:30 UTC (rev 1089)
@@ -31,7 +31,7 @@
#include "../WindowsHeaders.h"
#include "../Rectangle.h"
#include "../WindowClass.h"
-#include "WidgetWindowBase.h"
+#include "Frame.h"
#include <boost/scoped_ptr.hpp>
namespace SmartWin
@@ -53,9 +53,9 @@
* features of MDIFrameBase.
*/
class MDIFrame
- : public WidgetWindowBase< Policies::MDIFrame<MDIFrame > >
+ : public Frame< Policies::MDIFrame<MDIFrame > >
{
- typedef WidgetWindowBase< Policies::MDIFrame<MDIFrame > > BaseType;
+ typedef Frame< Policies::MDIFrame<MDIFrame > > BaseType;
public:
/// Class type
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/MDIParent.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/MDIParent.h 2008-03-30 08:15:26 UTC (rev 1088)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/MDIParent.h 2008-03-30 08:17:30 UTC (rev 1089)
@@ -64,7 +64,7 @@
* MDIChild
*/
class MDIParent :
- public MessageMapPolicy< Policies::Subclassed >,
+ public MessageMap< Policies::Subclassed >,
// Aspects
public AspectSizable< MDIParent >,
@@ -81,7 +81,6 @@
/// Object type
typedef ThisType * ObjectType;
- typedef MessageMapPolicy<Policies::Subclassed> PolicyType;
/// 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
Copied: dcplusplus/trunk/smartwin/include/smartwin/widgets/ModalDialog.h (from rev 1088, dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetModalDialog.h)
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/ModalDialog.h (rev 0)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/ModalDialog.h 2008-03-30 08:17:30 UTC (rev 1089)
@@ -0,0 +1,215 @@
+/*
+ Copyright ( c ) 2005, Thomas Hansen
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met :
+
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ * Neither the name of the SmartWin++ nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ ( INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION ) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT ( INCLUDING NEGLIGENCE OR OTHERWISE ) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef ModalDialog_h
+#define ModalDialog_h
+
+#include "../aspects/AspectDialog.h"
+#include "Frame.h"
+
+namespace SmartWin
+{
+// begin namespace SmartWin
+
+/// Modal Dialog class
+/** \ingroup WidgetControls
+ * \image html dialog.PNG
+ * Class for creating a Modal Dialog based optionally on an embedded resource. <br>
+ * Use createDialog( unsigned resourceId ) if you define the dialog in a .rc file,
+ * and use createDialog() if you define the dialog completly in C++ source. <br>
+ * Use the createDialog function to actually create a dialog. <br>
+ * Class is a public superclass of Frame and therefore can use all
+ * features of Frame. <br>
+ * Note! <br>
+ * Usually you create a ModalDialog on the stack. <br>
+ * This Widget does NOT have selfdestructive semantics and should normally be
+ * constructed on the stack! <br>
+ * The createDialog function does NOT return before the Widget is destroyed! <br>
+ * Thus, you must declare the "onInitDialog" event handler before calling the
+ * "createDialog()", either in the contructor, or in some intialization routine
+ * called before createDialog();
+ */
+
+class ModalDialog :
+ public Frame< Policies::ModalDialog >,
+ public AspectDialog<ModalDialog >
+{
+ struct Dispatcher
+ {
+ typedef std::tr1::function<bool ()> F;
+
+ Dispatcher(const F& f_) : f(f_) { }
+
+ bool operator()(const MSG& msg, LRESULT& ret) {
+ ret = f() ? TRUE : FALSE;
+ return true;
+ }
+
+ F f;
+ };
+
+public:
+ typedef Frame< Policies::ModalDialog > BaseType;
+
+ /// Class type
+ typedef ModalDialog ThisType;
+
+ /// Object type
+ /** Note, not a pointer!!!!
+ */
+ typedef ThisType ObjectType;
+
+ /// Creates a Modal Dialog Window from a resource id.
+ /** This version creates a window from a Dialog Resource ID. <br>
+ * To be called by the invoker of the dialog. <br>
+ * The return comes from the parameter to endDialog() <br>
+ * You must call onInitDialog( &MyDialogWidget::initDialog ); or similar either
+ * in the constructor of your dialog or right before calling this function. <br>
+ * And in your initDialog, you must call attachXxxx for all of the controls
+ * 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>
+ * prompt->onClicked( &X::myClickMethod ); <br>
+ * ...etc...
+ */
+ virtual int createDialog( unsigned resourceId );
+
+ /// Creates a Modal Dialog Window defined in C++ alone.
+ /** This version creates a dialog window without using a Dialog Resource ID. <br>
+ * To be called by the invoker of the dialog. <br>
+ * The return comes from the parameter to endDialog() <br>
+ * You must call onInitDialog( &MyModalDialogWidget::initDialog ); in the
+ * constructor of your dialog, <br>
+ * and in your initDialog you create the dialog's Widgets yourself. <br>
+ * Example : <br>
+ * LabelPtr prompt = createStatic(); <br>
+ * prompt->setBounds( 10, 100, 100, 50 ); <br>
+ * prompt->setText( _T("testing") );
+ */
+ int createDialog();
+
+ /// Ends the Modal Dialog Window started with createDialog().
+ /** Pass a return value for createDialog() and close the dialog. <br>
+ * To be called by the dialog class when it should close. <br>
+ * Note that the member variables of the ModalDialog class still exist,
+ * but not any subwindows or Control Widgets.
+ */
+ void endDialog( int returnValue );
+
+ /// Dialog Init Event Handler setter
+ /** This would normally be the event handler where you attach your Widget
+ * controls and do all the initializing etc... <br>
+ * It's important that you declare this event handler BEFORE calling the
+ * createDialog function since that function doesn't actually return before the
+ * dialog is destroyed! <br>
+ * Method signature must be bool foo(); <br>
+ * If you return true from your Event Handler the system will NOT mess up the
+ * initial focus you have chosen, if you return false the system will decide
+ * which control to initially have focus according to the tab order of the
+ * controls!
+ */
+ void onInitDialog(const Dispatcher::F& f) {
+ addCallback(
+ Message( WM_INITDIALOG ), Dispatcher(f)
+ );
+ }
+
+protected:
+ // Protected since this Widget we HAVE to inherit from
+ explicit ModalDialog( Widget * parent = 0 );
+
+ virtual ~ModalDialog()
+ {}
+
+ /// Specify how a resourceless dialog's window appears.
+ /** The derived pure dialog class can control the DLGTEMPLATE parameters used in
+ * createDialog() with this protected call. <br>
+ * The calling layer is prevented from doing so. <br>
+ * See DLGTEMPLATE as used in ::DialogBoxIndirectParam for details.
+ */
+ void setDlgTemplate( DLGTEMPLATE inTemplate );
+
+ /// Called by default when WM_CLOSE is posted to the dialog
+ bool defaultClosing() {
+ endDialog(IDCANCEL);
+ return true;
+ }
+
+private:
+ DLGTEMPLATE itsDefaultDlgTemplate; // For pure modal dialogs without resource files
+};
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Implementation of class
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+inline ModalDialog::ModalDialog( Widget * parent )
+ : BaseType( parent )
+{
+ // Default parameters for pure modal dialogs
+#ifdef WINCE
+ itsDefaultDlgTemplate.style = DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTER;
+#else
+ itsDefaultDlgTemplate.style = DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTER;
+#endif
+ itsDefaultDlgTemplate.dwExtendedStyle = 0;
+ itsDefaultDlgTemplate.cdit = 0; // No dialog items in the dialog
+ itsDefaultDlgTemplate.cx = 280; // 4 horizontal units are the width of one character
+ itsDefaultDlgTemplate.cy = 160; // 8 vertical units are the height of one character
+ itsDefaultDlgTemplate.x = 0;
+ itsDefaultDlgTemplate.y = 0;
+
+ onClosing(std::tr1::bind(&ThisType::defaultClosing, this));
+}
+
+// The derived pure dialog class can control the DLGTEMPLATE parameters used in
+// createDialog() with this protected call. The calling layer is prevented from
+// doing so.
+//
+
+inline void ModalDialog::setDlgTemplate( DLGTEMPLATE inTemplate )
+{
+ itsDefaultDlgTemplate = inTemplate;
+}
+
+// A Pure dialog created at runtime, without any help from a resource editer. The
+// derived dialog class can control the DLGTEMPLATE parameters. instead of the
+// calling layer.
+//
+
+inline void ModalDialog::endDialog( int retv )
+{
+ // Causes createDialog() to return with retv.
+ //
+ ::EndDialog( this->handle(), static_cast< INT_PTR >( retv ) );
+}
+
+// end namespace SmartWin
+}
+
+#endif
Copied: dcplusplus/trunk/smartwin/include/smartwin/widgets/ModelessDialog.h (from rev 1088, dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetDialog.h)
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/ModelessDialog.h (rev 0)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/ModelessDialog.h 2008-03-30 08:17:30 UTC (rev 1089)
@@ -0,0 +1,82 @@
+/*
+ Copyright ( c ) 2005, Thomas Hansen
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met :
+
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ * Neither the name of the SmartWin++ nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ ( INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION ) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT ( INCLUDING NEGLIGENCE OR OTHERWISE ) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef ModelessDialog_h
+#define ModelessDialog_h
+
+#include "../aspects/AspectDialog.h"
+#include "Frame.h"
+
+namespace SmartWin
+{
+// begin namespace SmartWin
+
+/// Dialog class
+/** \ingroup WidgetControls
+ * \WidgetUsageInfo
+ * \image html dialog.PNG
+ * Class for creating a Modeless Dialog based upon an embedded resource. <br>
+ * Use the createDialog function to actually create a dialog. <br>
+ * Class is a public superclass of Frame and therefor can use all features
+ * of Frame.
+ */
+class ModelessDialog :
+ public Frame< Policies::ModelessDialog >,
+ public AspectDialog<ModelessDialog >
+{
+public:
+ typedef Frame< Policies::ModelessDialog > BaseType;
+ /// Class type
+ typedef ModelessDialog ThisType;
+
+ /// Object type
+ typedef ThisType * ObjectType;
+
+ /// Creates a Dialog Window
+ /** This version creates a window from the given Dialog Resource Id.
+ */
+ void createDialog( unsigned resourceId );
+
+protected:
+ // Protected since this Widget we HAVE to inherit from
+ explicit ModelessDialog( Widget * parent = 0 );
+
+ virtual ~ModelessDialog()
+ {}
+};
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Implementation of class
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+inline ModelessDialog::ModelessDialog( Widget * parent )
+ : BaseType( parent )
+{}
+
+// end namespace SmartWin
+}
+
+#endif
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/StatusBar.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/StatusBar.h 2008-03-30 08:15:26 UTC (rev 1088)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/StatusBar.h 2008-03-30 08:17:30 UTC (rev 1089)
@@ -87,9 +87,9 @@
* \image html status.PNG
* Class for creating a Status Bar Control. <br>
* A status bar is a status info line normally residing in the bottom of a
- * WidgetWindow or other container type of Widget. <br>
+ * Window or other container type of Widget. <br>
* You can then send text to that window to show e.g. "status info" regarding the
- * WidgetWindow which owns the Status Bar Control. A good example of an application
+ * Window which owns the Status Bar Control. A good example of an application
* with a status bar is for instance Internet Explorer which ( unless you have made
* it invisible ) has a strip of status information at the bottom showing for
* instance the security settings of the current page and how far in the download
@@ -140,8 +140,8 @@
* status bar, typical example is when you have resized the container Widget.
* <br>
* Normally you would call this function after _EVERY_ single resize the main
- * WidgetWindow which owns the status bar gets. <br>
- * Call this one in the onSized event handler for your WidgetWindow.
+ * Window which owns the status bar gets. <br>
+ * Call this one in the onSized event handler for your Window.
*/
void refresh();
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/ToolTip.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/ToolTip.h 2008-03-30 08:15:26 UTC (rev 1088)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/ToolTip.h 2008-03-30 08:17:30 UTC (rev 1089)
@@ -14,7 +14,7 @@
class WidgetCreator;
class ToolTip :
- public MessageMapPolicy< Policies::Subclassed >,
+ public MessageMap< Policies::Subclassed >,
// Aspects
public AspectEnabled< ToolTip >,
@@ -46,8 +46,6 @@
/// Object type
typedef ThisType * ObjectType;
- typedef MessageMapPolicy<Policies::Subclassed> PolicyType;
-
class Seed
: public Widget::Seed
{
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Tree.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Tree.h 2008-03-30 08:15:26 UTC (rev 1088)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Tree.h 2008-03-30 08:17:30 UTC (rev 1089)
@@ -234,7 +234,7 @@
/// Sets the event handler for what function to be called when a label is edited.
/** Event handler signature is must be "bool foo( Tree *,
* SmartUtil::tstring & )" and it must be contained as a member of the class
- * that is defined as the EventHandlerClass, normally either the WidgetWindow
+ * that is defined as the EventHandlerClass, normally either the Window
* derived class or the class derived from Tree. <br>
* Return true from your event handler if you wish the label to actually become
* updated or false if you want to disallow the item to actually become updated!
Deleted: dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetDialog.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetDialog.h 2008-03-30 08:15:26 UTC (rev 1088)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetDialog.h 2008-03-30 08:17:30 UTC (rev 1089)
@@ -1,82 +0,0 @@
-/*
- Copyright ( c ) 2005, Thomas Hansen
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met :
-
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- * Neither the name of the SmartWin++ nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- ( INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION ) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT ( INCLUDING NEGLIGENCE OR OTHERWISE ) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef WidgetDialog_h
-#define WidgetDialog_h
-
-#include "../aspects/AspectDialog.h"
-#include "WidgetWindowBase.h"
-
-namespace SmartWin
-{
-// begin namespace SmartWin
-
-/// Dialog class
-/** \ingroup WidgetControls
- * \WidgetUsageInfo
- * \image html dialog.PNG
- * Class for creating a Modeless Dialog based upon an embedded resource. <br>
- * Use the createDialog function to actually create a dialog. <br>
- * Class is a public superclass of WidgetWindowBase and therefor can use all features
- * of WidgetWindowBase.
- */
-class WidgetDialog :
- public WidgetWindowBase< Policies::Dialog >,
- public AspectDialog<WidgetDialog >
-{
-public:
- typedef WidgetWindowBase< Policies::Dialog > BaseType;
- /// Class type
- typedef WidgetDialog ThisType;
-
- /// Object type
- typedef ThisType * ObjectType;
-
- /// Creates a Dialog Window
- /** This version creates a window from the given Dialog Resource Id.
- */
- void createDialog( unsigned resourceId );
-
-protected:
- // Protected since this Widget we HAVE to inherit from
- explicit WidgetDialog( Widget * parent = 0 );
-
- virtual ~WidgetDialog()
- {}
-};
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// Implementation of class
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-inline WidgetDialog::WidgetDialog( Widget * parent )
- : BaseType( parent )
-{}
-
-// end namespace SmartWin
-}
-
-#endif
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetMenu.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetMenu.h 2008-03-30 08:15:26 UTC (rev 1088)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetMenu.h 2008-03-30 08:17:30 UTC (rev 1089)
@@ -122,7 +122,7 @@
* \WidgetUsageInfo
* \image ht...
[truncated message content] |
