summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorbshe@chromium.org <bshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-08 19:18:39 +0000
committerbshe@chromium.org <bshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-08 19:18:39 +0000
commit9b0900645e20c512d1e3087af51aac25f0a44572 (patch)
treea93d8b9f925b275829738f53e836c4a6e5caf110 /chrome/app
parent776d957756c60a1cbfcf283448a48db5553a306e (diff)
downloadchromium_src-9b0900645e20c512d1e3087af51aac25f0a44572.zip
chromium_src-9b0900645e20c512d1e3087af51aac25f0a44572.tar.gz
chromium_src-9b0900645e20c512d1e3087af51aac25f0a44572.tar.bz2
Intergrate progress bar into butter bar.
This CL implements the following features: 1. Showing an animated progress bar when pasting files/folders. Currently, the progress bar only shows when the copied files are larger than 100MB or there are more than 25 files to copy. 2. Removing texts for cut and copy operations in butter bar. Use a blinking effect (decrease opacity to 0.8 in 100ms and restore it) to give user visual feedback for these operations. 3. Using a x button to replace "cancel" button in butter bar 4. Changing the error butter bar to more Kennedy style. 5. Removing "pasting" text when pasting large files and replace it with an animated progress bar. BUG=chromium-os:24704 TEST=Copy and paste files and/or folders in file manager. Verify the following: 1. Copy and paste a large file(>100MB), verify if a 100% progress bar with no cancel button appears in butter bar. 2. Copy and paste a few files (more than 25), verify if a progress bar appears. 3. Copy and paste small files, when the total size is less than 100MB and the total number is less than 25, there shouldn't be a progress bar. 4. Copy and paste same file more than 10 times. The 10th time should have show an error-bar. Verify the style of it. 5. When copy or cut, verify if the selected items blink. Review URL: http://codereview.chromium.org/9307022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121013 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/generated_resources.grd24
1 files changed, 6 insertions, 18 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 1a9170b..004ebf6 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -10041,32 +10041,20 @@ Some features may be unavailable. Please check that the profile exists and you
Cut
</message>
- <message name="IDS_FILE_BROWSER_SELECTION_COPIED" desc="File picker status message.">
- Selection copied to clipboard.
- </message>
- <message name="IDS_FILE_BROWSER_SELECTION_CUT" desc="File picker status message.">
- Selection cut to clipboard.
- </message>
- <message name="IDS_FILE_BROWSER_PASTE_STARTED" desc="File picker status message.">
- Pasting...
- </message>
- <message name="IDS_FILE_BROWSER_PASTE_SOME_PROGRESS" desc="File picker status message. 'Item' is used here as a generic term for file or directory.">
- Pasting $1 of $2 items...
- </message>
- <message name="IDS_FILE_BROWSER_PASTE_COMPLETE" desc="File picker status message.">
- Paste complete.
+ <message name="IDS_FILE_BROWSER_PASTE_ITEMS_REMAINING" desc="File picker status message. 'Item' is used here as a generic term for file or directory.">
+ Pasting $1 items
</message>
<message name="IDS_FILE_BROWSER_PASTE_CANCELLED" desc="File picker status message.">
- Paste cancelled.
+ Paste cancelled.
</message>
<message name="IDS_FILE_BROWSER_PASTE_TARGET_EXISTS_ERROR" desc="File picker status message. 'Item' is used here as a generic term for file or directory.">
- Paste failed, item exists: $1
+ Paste failed, item exists: $1
</message>
<message name="IDS_FILE_BROWSER_PASTE_FILESYSTEM_ERROR" desc="File picker status message.">
- Paste failed, file system error: $1'
+ Paste failed, file system error: $1'
</message>
<message name="IDS_FILE_BROWSER_PASTE_UNEXPECTED_ERROR" desc="File picker status message.">
- Paste failed, unexpected error: $1
+ Paste failed, unexpected error: $1
</message>
<message name="IDS_FILE_BROWSER_DEVICE_TYPE_FLASH" desc="Indication of mounted device type.">