Menu
▾
▴
[Dcplusplus-commit] SF.net SVN: dcplusplus: [1075] dcplusplus/trunk
|
From: <arn...@us...> - 2008-03-29 07:12:37
|
Revision: 1075
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1075&view=rev
Author: arnetheduck
Date: 2008-03-29 00:12:33 -0700 (Sat, 29 Mar 2008)
Log Message:
-----------
Average share added
Modified Paths:
--------------
dcplusplus/trunk/changelog.txt
dcplusplus/trunk/win32/HubFrame.cpp
dcplusplus/trunk/win32/HubFrame.h
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-03-26 22:43:13.706000090 +0100
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
+ timestamp: 2008-03-26 22:52:56.621000051 +0100
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
+ 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
Modified: dcplusplus/trunk/changelog.txt
===================================================================
--- dcplusplus/trunk/changelog.txt 2008-03-29 06:26:29 UTC (rev 1074)
+++ dcplusplus/trunk/changelog.txt 2008-03-29 07:12:33 UTC (rev 1075)
@@ -11,6 +11,7 @@
* Fixed background color of drop-down controls
* Fixed selection glitches
* Both up&downloads are disconnected if evil users quit (thanks poy)
+* Add average share to status bar (thanks mikejj)
-- 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-29 06:26:29 UTC (rev 1074)
+++ dcplusplus/trunk/win32/HubFrame.cpp 2008-03-29 07:12:33 UTC (rev 1075)
@@ -243,6 +243,7 @@
void HubFrame::updateStatus() {
setStatus(STATUS_USERS, getStatusUsers());
setStatus(STATUS_SHARED, getStatusShared());
+ setStatus(STATUS_AVERAGE_SHARED, getStatusAverageShared());
}
void HubFrame::initSecond() {
@@ -926,7 +927,24 @@
return textForUsers + str(TFN_("%1% user", "%1% users", userCount) % userCount);
}
+tstring HubFrame::getStatusAverageShared() const {
+ int64_t available;
+ size_t userCount = 0;
+ if (users->getSelectedCount() > 1) {
+ available = users->forEachSelectedT(CountAvailable()).available;
+ userCount = users->getSelectedCount();
+ } else {
+ available = std::for_each(userMap.begin(), userMap.end(), CountAvailable()).available;
+ for(UserMap::const_iterator i = userMap.begin(); i != userMap.end(); ++i){
+ UserInfo* ui = i->second;
+ if(!ui->isHidden())
+ userCount++;
+ }
+ }
+ return str(TF_("Average: %1%") % Text::toT(Util::formatBytes(userCount > 0 ? available / userCount : 0)));
+}
+
void HubFrame::on(FavoriteManagerListener::UserAdded, const FavoriteUser& /*aUser*/) throw() {
resortForFavsFirst();
}
Modified: dcplusplus/trunk/win32/HubFrame.h
===================================================================
--- dcplusplus/trunk/win32/HubFrame.h 2008-03-29 06:26:29 UTC (rev 1074)
+++ dcplusplus/trunk/win32/HubFrame.h 2008-03-29 07:12:33 UTC (rev 1075)
@@ -47,6 +47,7 @@
STATUS_STATUS,
STATUS_USERS,
STATUS_SHARED,
+ STATUS_AVERAGE_SHARED,
STATUS_SHOW_USERS,
STATUS_LAST
};
@@ -208,6 +209,7 @@
tstring getStatusUsers() const;
tstring getStatusShared() const;
+ tstring getStatusAverageShared() const;
void updateStatus();
void initSecond();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
