summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/app/theme/download_progress_background32.pngbin1550 -> 2014 bytes
-rw-r--r--chrome/app/theme/download_progress_foreground32.pngbin2728 -> 3181 bytes
-rw-r--r--chrome/browser/dom_ui/downloads_ui.cc49
-rw-r--r--chrome/browser/resources/downloads.html122
4 files changed, 159 insertions, 12 deletions
diff --git a/chrome/app/theme/download_progress_background32.png b/chrome/app/theme/download_progress_background32.png
index b644be4..7c8507c 100644
--- a/chrome/app/theme/download_progress_background32.png
+++ b/chrome/app/theme/download_progress_background32.png
Binary files differ
diff --git a/chrome/app/theme/download_progress_foreground32.png b/chrome/app/theme/download_progress_foreground32.png
index 138beec..b64271a 100644
--- a/chrome/app/theme/download_progress_foreground32.png
+++ b/chrome/app/theme/download_progress_foreground32.png
Binary files differ
diff --git a/chrome/browser/dom_ui/downloads_ui.cc b/chrome/browser/dom_ui/downloads_ui.cc
index 5ee67bd..50c588f 100644
--- a/chrome/browser/dom_ui/downloads_ui.cc
+++ b/chrome/browser/dom_ui/downloads_ui.cc
@@ -178,6 +178,9 @@ class DownloadsDOMHandler : public DOMMessageHandler,
// Return the download that is referred to in a given value.
DownloadItem* GetDownloadByValue(const Value* value);
+ // Get the localized status text for an in-progress download.
+ std::wstring GetProgressStatusText(DownloadItem* download);
+
// Current search text.
std::wstring search_text_;
@@ -389,8 +392,10 @@ DictionaryValue* DownloadsDOMHandler::CreateDownloadItemValue(
} else {
file_value->SetString(L"state", L"IN_PROGRESS");
}
- file_value->SetInteger(L"speed",
- static_cast<int>(download->CurrentSpeed()));
+
+ file_value->SetString(L"progress_status_text",
+ GetProgressStatusText(download));
+
file_value->SetInteger(L"percent",
static_cast<int>(download->PercentComplete()));
file_value->SetInteger(L"received",
@@ -439,6 +444,46 @@ DownloadItem* DownloadsDOMHandler::GetDownloadByValue(const Value* value) {
return NULL;
}
+std::wstring DownloadsDOMHandler::GetProgressStatusText(
+ DownloadItem* download) {
+ int64 total = download->total_bytes();
+ int64 size = download->received_bytes();
+ DataUnits amount_units = GetByteDisplayUnits(size);
+ std::wstring received_size = FormatBytes(size, amount_units, true);
+ std::wstring amount = received_size;
+
+ // Adjust both strings for the locale direction since we don't yet know which
+ // string we'll end up using for constructing the final progress string.
+ std::wstring amount_localized;
+ if (l10n_util::AdjustStringForLocaleDirection(amount, &amount_localized)) {
+ amount.assign(amount_localized);
+ received_size.assign(amount_localized);
+ }
+
+ amount_units = GetByteDisplayUnits(total);
+ std::wstring total_text = FormatBytes(total, amount_units, true);
+ std::wstring total_text_localized;
+ if (l10n_util::AdjustStringForLocaleDirection(total_text,
+ &total_text_localized))
+ total_text.assign(total_text_localized);
+
+ amount = l10n_util::GetStringF(IDS_DOWNLOAD_TAB_PROGRESS_SIZE,
+ received_size,
+ total_text);
+
+ amount_units = GetByteDisplayUnits(download->CurrentSpeed());
+ std::wstring speed_text = FormatSpeed(download->CurrentSpeed(),
+ amount_units, true);
+ std::wstring speed_text_localized;
+ if (l10n_util::AdjustStringForLocaleDirection(speed_text,
+ &speed_text_localized))
+ speed_text.assign(speed_text_localized);
+
+ return l10n_util::GetStringF(IDS_DOWNLOAD_TAB_PROGRESS_SPEED,
+ speed_text,
+ amount);
+}
+
} // namespace
///////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/resources/downloads.html b/chrome/browser/resources/downloads.html
index 8808524..8eac7b7 100644
--- a/chrome/browser/resources/downloads.html
+++ b/chrome/browser/resources/downloads.html
@@ -43,22 +43,51 @@ html[dir='rtl'] .form {
}
.download {
position:relative;
- padding-left:45px;
+ padding-left:56px;
margin-bottom:16px;
}
+html[dir='rtl'] .download {
+ padding-left:0px;
+ padding-right:56px;
+}
.download .icon {
position:absolute;
- top:2px;
- left:2px;
+ top:7px;
+ left:9px;
width:32px;
height:32px;
}
+html[dir='rtl'] .icon {
+ left:auto;
+ right:9px;
+}
+.progress {
+ position:absolute;
+ top:2px;
+ left:0px;
+ width:48px;
+ height:48px;
+}
+html[dir='rtl'] .progress {
+ left:auto;
+ right:0px;
+}
+.progress.background {
+ background:url('../../app/theme/download_progress_background32.png');
+}
+.progress.foreground {
+ background:url('../../app/theme/download_progress_foreground32.png');
+}
.name {
display:none;
padding-right:16px;
max-width:450px;
text-overflow:ellipsis;
}
+html[dir='rtl'] .name {
+ padding-right:0px;
+ padding-left:16px;
+}
.download .status {
display:inline;
color:#999;
@@ -288,6 +317,23 @@ function Download(download) {
this.safe_.ondragstart = bind(this.drag_, this);
this.node.appendChild(this.safe_);
+ if (download.state != Download.States.COMPLETE) {
+ this.nodeProgressBackground_ =
+ createElementWithClassName('div', 'progress background');
+ this.safe_.appendChild(this.nodeProgressBackground_);
+
+ this.canvasProgress_ =
+ document.getCSSCanvasContext('2d', 'canvas_' + download.id,
+ Download.Progress.width,
+ Download.Progress.height);
+
+ this.nodeProgressForeground_ =
+ createElementWithClassName('div', 'progress foreground');
+ this.nodeProgressForeground_.style.webkitMask =
+ '-webkit-canvas(canvas_'+download.id+')';
+ this.safe_.appendChild(this.nodeProgressForeground_);
+ }
+
this.nodeImg_ = createElementWithClassName('img', 'icon');
this.safe_.appendChild(this.nodeImg_);
@@ -363,6 +409,19 @@ Download.States = {
}
/**
+ * Constants for the progress meter.
+ */
+Download.Progress = {
+ width : 48,
+ height : 48,
+ radius : 24,
+ centerX : 24,
+ centerY : 24,
+ base : -0.5 * Math.PI,
+ dir : false,
+}
+
+/**
* Updates the download to reflect new data.
* @param {Object} download A backend download object (see downloads_ui.cc)
*/
@@ -372,8 +431,10 @@ Download.prototype.update = function(download) {
this.fileName_ = download.file_name;
this.url_ = download.url;
this.state_ = download.state;
- this.percent_ = download.percent;
- this.speed_ = download.speed;
+
+ // See DownloadItem::PercentComplete
+ this.percent_ = Math.max(download.percent, 0);
+ this.progressStatusText_ = download.progress_status_text;
this.received_ = download.received;
if (this.state_ == Download.States.DANGEROUS) {
@@ -394,10 +455,41 @@ Download.prototype.update = function(download) {
showInline(this.nodeFileLink_, this.state_ == Download.States.COMPLETE);
showInline(this.nodeFileName_, this.state_ != Download.States.COMPLETE);
+ if (this.state_ == Download.States.IN_PROGRESS) {
+ this.nodeProgressForeground_.style.display = 'block';
+ this.nodeProgressBackground_.style.display = 'block';
+
+ // Draw a pie-slice for the progress.
+ this.canvasProgress_.clearRect(0, 0,
+ Download.Progress.width,
+ Download.Progress.height);
+ this.canvasProgress_.beginPath();
+ this.canvasProgress_.moveTo(Download.Progress.centerX,
+ Download.Progress.centerY);
+
+ this.canvasProgress_.arc(Download.Progress.centerX,
+ Download.Progress.centerY,
+ Download.Progress.radius,
+ Download.Progress.base,
+ Download.Progress.base + Math.PI * 0.02 *
+ Number(this.percent_) *
+ (Download.Progress.dir ? -1 : 1),
+ Download.Progress.dir);
+
+ this.canvasProgress_.lineTo(Download.Progress.centerX,
+ Download.Progress.centerY);
+ this.canvasProgress_.fill();
+ this.canvasProgress_.closePath();
+ } else if (this.nodeProgressBackground_) {
+ this.nodeProgressForeground_.style.display = 'none';
+ this.nodeProgressBackground_.style.display = 'none';
+ }
+
showInline(this.controlShow_, this.state_ == Download.States.COMPLETE);
showInline(this.controlPause_, this.state_ == Download.States.IN_PROGRESS);
showInline(this.controlResume_, this.state_ == Download.States.PAUSED);
- showInline(this.controlCancel_, this.state_ == Download.States.IN_PROGRESS);
+ showInline(this.controlCancel_, this.state_ == Download.States.IN_PROGRESS ||
+ this.state_ == Download.States.PAUSED);
this.nodeURL_.innerHTML = this.url_;
this.nodeStatus_.innerHTML = this.getStatusText_();
@@ -428,8 +520,7 @@ Download.prototype.clear = function() {
Download.prototype.getStatusText_ = function() {
switch (this.state_) {
case Download.States.IN_PROGRESS:
- // TODO(glen): Make pretty, localize, etc.
- return this.percent_ + '% at ' + this.speed_;
+ return this.progressStatusText_;
case Download.States.CANCELLED:
return localStrings.getString('status_cancelled');
case Download.States.PAUSED:
@@ -506,6 +597,8 @@ var downloads, localStrings, resultsTimeout;
function load() {
localStrings = new LocalStrings($('l10n'));
+ Download.Progress.dir =
+ !!(document.getElementsByTagName('html')[0].dir == 'rtl');
downloads = new Downloads();
$('term').focus();
setSearch("");
@@ -526,6 +619,8 @@ function setSearch(searchText) {
function downloadsList(results) {
if (resultsTimeout)
clearTimeout(resultsTimeout);
+ window.console.log('results');
+ downloads.clear();
downloadUpdated(results);
}
@@ -533,12 +628,19 @@ function downloadsList(results) {
* When a download is updated (progress, state change), this is called.
*/
function downloadUpdated(results) {
+ // Sometimes this can get called too early.
+ if (!downloads)
+ return;
+
if (results.length) {
downloads.updated(results[0]);
- if (results.length > 1)
+
+ if (results.length > 1) {
+ clearTimeout(resultsTimeout);
resultsTimeout = setTimeout(downloadUpdated, 5, results.slice(1));
- else
+ } else {
downloads.updateSummary();
+ }
}
}
</script>
generated by cgit v1.1 at 2025-01-19 03:03:24 +0000