Menu
▾
▴
[Dcplusplus-commit] SF.net SVN: dcplusplus: [1096] dcplusplus/trunk
|
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.
|
