Menu
▾
▴
[Dcplusplus-commit] SF.net SVN: dcplusplus: [1072] dcplusplus/trunk
|
From: <arn...@us...> - 2008-03-29 06:24:26
|
Revision: 1072
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1072&view=rev
Author: arnetheduck
Date: 2008-03-28 23:24:22 -0700 (Fri, 28 Mar 2008)
Log Message:
-----------
cshelp in search, make static controls send click messages
Modified Paths:
--------------
dcplusplus/trunk/help/cshelp.h
dcplusplus/trunk/help/cshelp.txt
dcplusplus/trunk/help/window_search.html
dcplusplus/trunk/smartwin/source/widgets/WidgetStatic.cpp
dcplusplus/trunk/win32/PublicHubsFrame.cpp
dcplusplus/trunk/win32/SearchFrame.cpp
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-03-26 18:04:38.267999887 +0100
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
+ timestamp: 2008-03-26 18:28:21.986000061 +0100
committer: zouzou123gen
properties:
branch-nick: bzr
Name: bzr:file-ids
- smartwin/include/smartwin/widgets/Control.h 844@f586c4b0-9d0d-0410-bc51-f1fe239209fc:dcplusplus%2Ftrunk:smartwin%2Finclude%2Fsmartwin%2Faspects%2FAspectControl.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
+ 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
Modified: dcplusplus/trunk/help/cshelp.h
===================================================================
--- dcplusplus/trunk/help/cshelp.h 2008-03-29 06:11:15 UTC (rev 1071)
+++ dcplusplus/trunk/help/cshelp.h 2008-03-29 06:24:22 UTC (rev 1072)
@@ -114,5 +114,12 @@
#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
#endif
Modified: dcplusplus/trunk/help/cshelp.txt
===================================================================
--- dcplusplus/trunk/help/cshelp.txt 2008-03-29 06:11:15 UTC (rev 1071)
+++ dcplusplus/trunk/help/cshelp.txt 2008-03-29 06:24:22 UTC (rev 1072)
@@ -220,3 +220,17 @@
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.
Modified: dcplusplus/trunk/help/window_search.html
===================================================================
--- dcplusplus/trunk/help/window_search.html 2008-03-29 06:11:15 UTC (rev 1071)
+++ dcplusplus/trunk/help/window_search.html 2008-03-29 06:24:22 UTC (rev 1072)
@@ -12,13 +12,15 @@
<dt>Search for</dt>
<dd>This is the set of search strings to search for. Words beginning with "-" will be filtered away.</dd>
<dt>Purge</dt>
- <dd>Will remove <a href="settings_experts_only#searchhistory">search history</a>.</dd>
+ <dd>Clear the contents of the <a href="settings_expert.html#searchhistory">search history</a>.</dd>
+ <dt>Search</dt>
+ <dd>Start searching for the set of search strings defined above. Note; you may not start too many searches in a small amount of time.</dd>
<dt>Size</dt>
<dd>Filter away files depending on their file size.</dd>
<dt>File type</dt>
<dd>Filter away files depending on their file type (extension).</dd>
<dt>Only users with free slots</dt>
- <dd>Filter away files depending on the users free slots</dd>
+ <dd>Filter away files depending on the user's free slots.</dd>
<dt>Hubs</dt>
<dd>Search only selected hubs.</dd>
</dl>
Modified: dcplusplus/trunk/smartwin/source/widgets/WidgetStatic.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/WidgetStatic.cpp 2008-03-29 06:11:15 UTC (rev 1071)
+++ dcplusplus/trunk/smartwin/source/widgets/WidgetStatic.cpp 2008-03-29 06:24:22 UTC (rev 1072)
@@ -3,7 +3,7 @@
namespace SmartWin {
WidgetStatic::Seed::Seed(const SmartUtil::tstring& caption) :
- Widget::Seed(_T("Static"), WS_CHILD | WS_VISIBLE, 0, caption),
+ Widget::Seed(WC_STATIC, WS_CHILD | WS_VISIBLE | SS_NOTIFY, 0, caption),
font(new Font(DefaultGuiFont))
{
Modified: dcplusplus/trunk/win32/PublicHubsFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/PublicHubsFrame.cpp 2008-03-29 06:11:15 UTC (rev 1071)
+++ dcplusplus/trunk/win32/PublicHubsFrame.cpp 2008-03-29 06:24:22 UTC (rev 1072)
@@ -159,9 +159,9 @@
cs.caption = T_("&Refresh");
refresh = createButton(cs);
refresh->setHelpId(IDH_PUBLIC_HUBS_REFRESH);
- refresh->onClicked(std::tr1::bind(&PublicHubsFrame::handleRefresh, this));
refresh->setFont(WinUtil::font);
addWidget(refresh);
+ refresh->onClicked(std::tr1::bind(&PublicHubsFrame::handleRefresh, this));
cs.style = WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON | BS_GROUPBOX;
cs.exStyle = WS_EX_TRANSPARENT;
Modified: dcplusplus/trunk/win32/SearchFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/SearchFrame.cpp 2008-03-29 06:11:15 UTC (rev 1071)
+++ dcplusplus/trunk/win32/SearchFrame.cpp 2008-03-29 06:24:22 UTC (rev 1072)
@@ -111,26 +111,30 @@
{
WidgetStatic::Seed cs;
cs.exStyle = WS_EX_TRANSPARENT;
-
+
+ cs.caption = T_("Search for");
searchLabel = createStatic(cs);
- searchLabel->setText(T_("Search for"));
+ searchLabel->setHelpId(IDH_SEARCH_SEARCH_FOR);
+ cs.caption = T_("Size");
sizeLabel = createStatic(cs);
- sizeLabel->setText(T_("Size"));
-
+ sizeLabel->setHelpId(IDH_SEARCH_SIZE);
+
+ cs.caption = T_("File type");
typeLabel = createStatic(cs);
- typeLabel->setText(T_("File type"));
+ typeLabel->setHelpId(IDH_SEARCH_TYPE);
- optionLabel = createStatic();
- optionLabel->setText(T_("Search options"));
+ cs.caption = T_("Search options");
+ optionLabel = createStatic(cs);
- hubsLabel = createStatic();
- hubsLabel->setText(T_("Hubs"));
-
+ cs.caption = T_("Hubs");
+ hubsLabel = createStatic(cs);
+ hubsLabel->setHelpId(IDH_SEARCH_HUBS);
}
{
searchBox = createComboBox(WinUtil::Seeds::comboBoxEdit);
+ searchBox->setHelpId(IDH_SEARCH_SEARCH_FOR);
addWidget(searchBox);
for(TStringIter i = lastSearches.begin(); i != lastSearches.end(); ++i) {
@@ -141,15 +145,21 @@
{
WidgetButton::Seed cs = WinUtil::Seeds::button;
+ cs.caption = T_("Purge");
+ purge = createButton(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->setHelpId(IDH_SEARCH_SEARCH);
doSearch->onClicked(std::tr1::bind(&SearchFrame::runSearch, this));
}
{
mode = createComboBox(WinUtil::Seeds::comboBoxStatic);
+ mode->setHelpId(IDH_SEARCH_SIZE);
addWidget(mode);
mode->addValue(T_("Normal"));
@@ -159,13 +169,15 @@
{
WidgetTextBox::Seed cs = WinUtil::Seeds::textBox;
- cs.style = WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_NUMBER;
+ cs.style |= ES_AUTOHSCROLL | ES_NUMBER;
size = createTextBox(cs);
+ size->setHelpId(IDH_SEARCH_SIZE);
addWidget(size);
}
{
sizeMode = createComboBox(WinUtil::Seeds::comboBoxStatic);
+ sizeMode->setHelpId(IDH_SEARCH_SIZE);
addWidget(sizeMode);
sizeMode->addValue(T_("B"));
@@ -177,6 +189,7 @@
{
fileType = createComboBox(WinUtil::Seeds::comboBoxStatic);
+ fileType->setHelpId(IDH_SEARCH_TYPE);
addWidget(fileType);
fileType->addValue(T_("Any"));
@@ -193,6 +206,7 @@
{
WidgetCheckBox::Seed cs(T_("Only users with free slots"));
slots = createCheckBox(cs);
+ slots->setHelpId(IDH_SEARCH_SLOTS);
slots->setChecked(onlyFree);
slots->onClicked(std::tr1::bind(&SearchFrame::handleSlotsClicked, this)) ;
@@ -203,6 +217,7 @@
cs.style |= LVS_NOCOLUMNHEADER;
cs.lvStyle |= LVS_EX_CHECKBOXES;
hubs = SmartWin::WidgetCreator<WidgetHubs>::create(this, cs);
+ hubs->setHelpId(IDH_SEARCH_HUBS);
addWidget(hubs);
TStringList dummy;
@@ -231,15 +246,6 @@
}
{
- WidgetButton::Seed cs = WinUtil::Seeds::button;
- cs.caption = T_("Purge");
- purge = createButton(cs);
-
- purge->onClicked(std::tr1::bind(&SearchFrame::handlePurgeClicked, this));
- }
-
-
- {
WidgetCheckBox::Seed cs(_T("+/-"));
showUI = createCheckBox(cs);
showUI->setChecked(bShowUI);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
