diff options
| author | rginda@chromium.org <rginda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-26 01:54:02 +0000 |
|---|---|---|
| committer | rginda@chromium.org <rginda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-26 01:54:02 +0000 |
| commit | 3e74c0652df00f546932a7f1894d45c84b2466e6 (patch) | |
| tree | a16c230a3da479b3ff4930bb68aff5ef0ccf6020 /chrome/app | |
| parent | 41b8a3594e276503c3233974cd7d4071c620e97f (diff) | |
| download | chromium_src-3e74c0652df00f546932a7f1894d45c84b2466e6.zip chromium_src-3e74c0652df00f546932a7f1894d45c84b2466e6.tar.gz chromium_src-3e74c0652df00f546932a7f1894d45c84b2466e6.tar.bz2 | |
File Manager: Create in-page modal dialogs
File manager is useing window.alert/confirm/prompt which are app modal, and a little janky for our purposes. Additionally, they began freezing the browser recently :/
This change adds js modal dialog replacements. They live in file_manager/ for now, but once stabalized they are intended to live in cr/ so that they can be used by other webui or component extensions.
BUG=chromium-os:17642
TEST=manually trigger all dialogs
Review URL: http://codereview.chromium.org/7495030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94020 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/generated_resources.grd | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 6bbd201..68b726d 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -8862,11 +8862,8 @@ Keep your key file in a safe place. You will need it to create new versions of y <message name="IDS_FILE_BROWSER_ERROR_CREATING_FOLDER" desc="Message displayed when we can't create a folder."> Unable to create folder "$1": $2 </message> - <message name="IDS_FILE_BROWSER_ERROR_INVALID_FOLDER_CHARACTER" desc="Error message displayed when the user enters an invalid character in a folder name."> - Invalid character in folder name: $1 - </message> - <message name="IDS_FILE_BROWSER_ERROR_INVALID_FILE_CHARACTER" desc="Error message displayed when the user enters an invalid character in a file name."> - Invalid character in file name: $1 + <message name="IDS_FILE_BROWSER_ERROR_INVALID_CHARACTER" desc="Error message displayed when the user enters an invalid character in a file or directory name."> + Invalid character: $1 </message> <message name="IDS_FILE_BROWSER_ERROR_RESERVED_NAME" desc="Error message displayed when the user enters a file name which is reserved."> This name may not be used as a file of folder name @@ -8890,6 +8887,13 @@ Keep your key file in a safe place. You will need it to create new versions of y File name </message> + <message name="IDS_FILE_BROWSER_DIMENSIONS_LABEL" desc="Image dimensions label."> + Dimensions + </message> + <message name="IDS_FILE_BROWSER_DIMENSIONS_FORMAT" desc="Image dimensions format (width x height)."> + $1 x $2 + </message> + <message name="IDS_FILE_BROWSER_EJECT_BUTTON" desc="Button label."> Eject </message> @@ -9010,6 +9014,16 @@ Keep your key file in a safe place. You will need it to create new versions of y <message name="IDS_FILE_BROWSER_SAVE_LABEL" desc="Save label."> Save </message> + <message name="IDS_FILE_BROWSER_OK_LABEL" desc="Ok label."> + Ok + </message> + + <message name="IDS_FILE_BROWSER_CONFIRM_DELETE_ONE" desc="Asks the user if they are sure they want to delete a single file."> + Are you sure you want to delete "$1"? + </message> + <message name="IDS_FILE_BROWSER_CONFIRM_DELETE_SOME" desc="Asks the user if they are sure they want to delete multiple files/directories."> + Are you sure you want to delete $1 items? + </message> <message name="IDS_FILE_BROWSER_SELECT_FOLDER_TITLE" desc="Select folder title."> Select a folder to open |