[Dcplusplus-commit] SF.net SVN: dcplusplus: [985] dcplusplus/trunk

[<arn...@us...>]

Revision: 985
          http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=985&view=rev
Author:   arnetheduck
Date:     2008-02-02 15:28:26 -0800 (Sat, 02 Feb 2008)

Log Message:
-----------
fix waiting users, don't build i18n by default in debug builds

Modified Paths:
--------------
    dcplusplus/trunk/SConstruct
    dcplusplus/trunk/build_util.py
    dcplusplus/trunk/changelog.txt
    dcplusplus/trunk/dcpp/UploadManager.cpp

Modified: dcplusplus/trunk/SConstruct
===================================================================
--- dcplusplus/trunk/SConstruct	2008-02-02 22:09:23 UTC (rev 984)
+++ dcplusplus/trunk/SConstruct	2008-02-02 23:28:26 UTC (rev 985)
@@ -12,6 +12,7 @@
 	BoolOption('verbose', 'Show verbose command lines', 'no'),
 	BoolOption('savetemps', 'Save intermediate compilation files (assembly output)', 'no'),
 	BoolOption('unicode', 'Build a Unicode version which fully supports international characters', 'yes'),
+	BoolOption('i18n', 'Rebuild i18n files in debug build', 'no'),
 	('prefix', 'Prefix to use when cross compiling', 'i386-mingw32-')
 )
 
@@ -172,3 +173,4 @@
 dev.client = dev.build('dcpp/')
 dev.smartwin = dev.build('smartwin/')
 dev.win32 = dev.build('win32/')
+

Modified: dcplusplus/trunk/build_util.py
===================================================================
--- dcplusplus/trunk/build_util.py	2008-02-02 22:09:23 UTC (rev 984)
+++ dcplusplus/trunk/build_util.py	2008-02-02 23:28:26 UTC (rev 985)
@@ -75,6 +75,9 @@
 		return local_env.SConscript(source_path + 'SConscript', exports={'dev' : self, 'source_path' : full_path })
 
 	def i18n (self, source_path, buildenv, sources, name):
+		if self.env['mode'] != 'release' and not self.env['i18n']:
+			return
+
 		p_oze = glob.glob('po/*.po')
 		languages = [ os.path.basename(po).replace ('.po', '') for po in p_oze ]
 		potfile = 'po/' + name + '.pot'

Modified: dcplusplus/trunk/changelog.txt
===================================================================
--- dcplusplus/trunk/changelog.txt	2008-02-02 22:09:23 UTC (rev 984)
+++ dcplusplus/trunk/changelog.txt	2008-02-02 23:28:26 UTC (rev 985)
@@ -18,6 +18,7 @@
 * Allow spaces in the description field (poy)
 * [ADC] Handle third person formatting (thanks poy)
 * Fix right-click issue when chat history is long (thanks poy)
+* In waiting users, show requested chunk (since we can't know % done)
  
 -- 0.704 2007-12-14 --
 * Hub lists added to utilize Coral's distributed network (ullner)

Modified: dcplusplus/trunk/dcpp/UploadManager.cpp
===================================================================
--- dcplusplus/trunk/dcpp/UploadManager.cpp	2008-02-02 22:09:23 UTC (rev 984)
+++ dcplusplus/trunk/dcpp/UploadManager.cpp	2008-02-02 23:28:26 UTC (rev 985)
@@ -174,7 +174,7 @@
 					tFile = ShareManager::getInstance()->toVirtual(TTHValue(aFile.substr(4)));
 
 				addFailedUpload(aSource, tFile +
-					" (" + Util::toString((aStartPos*1000/(size+10))/10.0)+"% of " + Util::formatBytes(size) + " done)");
+					" (" +  Util::formatBytes(aStartPos) + " - " + Util::formatBytes(aStartPos + aBytes) + ")");
 				aSource.disconnect();
 				return false;
 			}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.