Author: ai0867
Date: Mon Nov 3 04:02:36 2008
New Revision: 30558
URL: http://svn.gna.org/viewcvs/wesnoth?rev=30558&view=rev
Log:
* State filesizes in proper SI-notation.
Modified:
trunk/attic/wesnoth-pngcrush
trunk/data/tools/addon_manager/html.py
trunk/src/hotkeys.cpp
trunk/src/network.cpp
trunk/utils/weblist.pl
trunk/utils/wesnoth-optipng
Modified: trunk/attic/wesnoth-pngcrush
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/attic/wesnoth-pngcrush?rev=30558&r1=30557&r2=30558&view=diff
==============================================================================
--- trunk/attic/wesnoth-pngcrush (original)
+++ trunk/attic/wesnoth-pngcrush Mon Nov 3 04:02:36 2008
@@ -56,10 +56,10 @@
totalSavedBytes = totalSavedBytes + savedBytes
totalSavedFiles = totalSavedFiles.succ
output = `mv "#{file}.new.png" -v "#{file}"`
- puts ",\nsaved: #{savedBytes} bytes, total saved:
#{totalSavedBytes/1024} KB"
+ puts ",\nsaved: #{savedBytes} bytes, total saved:
#{totalSavedBytes/1024} KiB"
else
File.unlink("#{file}.new.png");
end
}
-puts "\ntotal saved: #{totalSavedBytes/1024} KB, #{totalSavedFiles} files\n";
+puts "\ntotal saved: #{totalSavedBytes/1024} KiB, #{totalSavedFiles} files\n";
Modified: trunk/data/tools/addon_manager/html.py
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/tools/addon_manager/html.py?rev=30558&r1=30557&r2=30558&view=diff
==============================================================================
--- trunk/data/tools/addon_manager/html.py (original)
+++ trunk/data/tools/addon_manager/html.py Mon Nov 3 04:02:36 2008
@@ -90,8 +90,8 @@
w("<td><b>%s</b><br/>" % name)
w("Version: %s<br/>" % v("version", "unknown"))
w("Author: %s</td>" % v("author", "unknown"))
- MB = 1024 * 1024
- w("<td>%.2fMB" % (float(v("size", "unknown")) / MB))
+ MiB = 1024 * 1024
+ w("<td>%.2fMiB" % (float(v("size", "unknown")) / MiB))
if url:
link = url.rstrip("/") + "/" + v("name") + ".tar.bz2"
w("<br/><a href=\"%s\">download</a></td>" % link)
Modified: trunk/src/hotkeys.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/hotkeys.cpp?rev=30558&r1=30557&r2=30558&view=diff
==============================================================================
--- trunk/src/hotkeys.cpp (original)
+++ trunk/src/hotkeys.cpp Mon Nov 3 04:02:36 2008
@@ -898,7 +898,7 @@
int size = disp.screenshot(filename, map_screenshot);
if (size > 0) {
std::stringstream res;
- res << filename << " ( " << size/1000000 <<"
"<< (size/1000)%1000 << " KB )";
+ res << filename << " ( " << size/1000000 <<"
"<< (size/1000)%1000 << " kB )";
gui::dialog(disp,_("Screenshot
done"),res.str(),gui::MESSAGE).show();
} else
gui::dialog(disp,_("Screenshot
failed"),"",gui::MESSAGE).show();
Modified: trunk/src/network.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/network.cpp?rev=30558&r1=30557&r2=30558&view=diff
==============================================================================
--- trunk/src/network.cpp (original)
+++ trunk/src/network.cpp Mon Nov 3 04:02:36 2008
@@ -974,7 +974,7 @@
ss << "Hour stat starting from " << hour << "\n " << std::left <<
std::setw(bandwidth_stats::type_width) << "Type of packet" << "| "
<< std::setw(bandwidth_stats::packet_width)<< "out #" << "| "
- << std::setw(bandwidth_stats::bytes_width) << "out kb" << "| "
+ << std::setw(bandwidth_stats::bytes_width) << "out kb" << "| "
/* Are these bytes or bits? base10 or base2? */
<< std::setw(bandwidth_stats::packet_width)<< "in #" << "| "
<< std::setw(bandwidth_stats::bytes_width) << "in kb" << "\n";
Modified: trunk/utils/weblist.pl
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/utils/weblist.pl?rev=30558&r1=30557&r2=30558&view=diff
==============================================================================
--- trunk/utils/weblist.pl (original)
+++ trunk/utils/weblist.pl Mon Nov 3 04:02:36 2008
@@ -250,7 +250,7 @@
$size += 512;
$size -= $size % 1024;
$size /= 1024;
- push @row, escapeHTML("$size KB");
+ push @row, escapeHTML("$size KiB");
push @row, escapeHTML($campaign->{'attr'}->{'downloads'});
push @rows, td([EMAIL PROTECTED]);
}
Modified: trunk/utils/wesnoth-optipng
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/utils/wesnoth-optipng?rev=30558&r1=30557&r2=30558&view=diff
==============================================================================
--- trunk/utils/wesnoth-optipng (original)
+++ trunk/utils/wesnoth-optipng Mon Nov 3 04:02:36 2008
@@ -89,7 +89,7 @@
total_savings_size=$((${total_savings_size}+${png_savings_size}))
total_savings_filecount=$((1+${total_savings_filecount}))
mv -f ${1}.new ${1}
- echo " saved: ${png_savings_size} bytes, total saved:
$((${total_savings_size}/1024)) KB"
+ echo " saved: ${png_savings_size} bytes, total saved:
$((${total_savings_size}/1024)) KiB"
else
rm -f ${1}.new
echo " already optimized"
@@ -106,9 +106,9 @@
# Print overall statistics
if [ "$total_savings_filecount" -gt 0 ]; then
echo "Overall statistics (only for files with a smaller
recompressed size):"
- echo " Original size: $((${total_original_size}/1024)) KB on
${total_savings_filecount} files"
- echo " Optimized size:
$(((${total_original_size}-${total_savings_size})/1024)) KB"
- echo " Total saving: $((${total_savings_size}/1024)) KB =
$((${total_savings_size}*100/${total_original_size}))% decrease"
+ echo " Original size: $((${total_original_size}/1024)) KiB on
${total_savings_filecount} files"
+ echo " Optimized size:
$(((${total_original_size}-${total_savings_size})/1024)) KiB"
+ echo " Total saving: $((${total_savings_size}/1024)) KiB =
$((${total_savings_size}*100/${total_original_size}))% decrease"
else
echo "No files were recompressed."
fi
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
