diff options
Diffstat (limited to 'chrome')
27 files changed, 44 insertions, 9 deletions
diff --git a/chrome/app/resources/locale_settings.grd b/chrome/app/resources/locale_settings.grd index 57b7b17..eab7f03 100644 --- a/chrome/app/resources/locale_settings.grd +++ b/chrome/app/resources/locale_settings.grd @@ -267,6 +267,12 @@ 24 </message> + <!-- The width of the list box in the Content Settings dialog box, in characters (character width = --> + <!-- average character width for default dialog box font) --> + <message name="IDS_CONTENT_SETTINGS_DIALOG_LISTBOX_WIDTH_CHARS" use_name_for_id="true"> + 18 + </message> + <!-- The width and height of the URL picker dialog box in characters and lines --> <!-- (See above). --> <message name="IDS_URLPICKER_DIALOG_WIDTH_CHARS" use_name_for_id="true"> diff --git a/chrome/app/resources/locale_settings_ar.xtb b/chrome/app/resources/locale_settings_ar.xtb index 56d567f..1d94958 100644 --- a/chrome/app/resources/locale_settings_ar.xtb +++ b/chrome/app/resources/locale_settings_ar.xtb @@ -63,5 +63,6 @@ <translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation> <translation id="IDS_CONTENT_SETTINGS_DIALOG_WIDTH_CHARS">83</translation> <translation id="IDS_CONTENT_SETTINGS_DIALOG_HEIGHT_LINES">25</translation> +<translation id="IDS_CONTENT_SETTINGS_DIALOG_LISTBOX_WIDTH_CHARS">22</translation> <translation id="IDS_CONTENT_EXCEPTION_DIALOG_WIDTH_CHARS">96</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_bg.xtb b/chrome/app/resources/locale_settings_bg.xtb index d66d8c9..805cfed 100644 --- a/chrome/app/resources/locale_settings_bg.xtb +++ b/chrome/app/resources/locale_settings_bg.xtb @@ -63,5 +63,6 @@ <translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation> <translation id="IDS_CONTENT_SETTINGS_DIALOG_WIDTH_CHARS">90</translation> <translation id="IDS_CONTENT_SETTINGS_DIALOG_HEIGHT_LINES">26</translation> +<translation id="IDS_CONTENT_SETTINGS_DIALOG_LISTBOX_WIDTH_CHARS">23</translation> <translation id="IDS_CONTENT_EXCEPTION_DIALOG_WIDTH_CHARS">110</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_bn.xtb b/chrome/app/resources/locale_settings_bn.xtb index ae611a3..ee5e458 100644 --- a/chrome/app/resources/locale_settings_bn.xtb +++ b/chrome/app/resources/locale_settings_bn.xtb @@ -61,4 +61,5 @@ <translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_DOWNLOAD_IN_PROGRESS_WIDTH_CHARS">67</translation> <translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation> +<translation id="IDS_CONTENT_SETTINGS_DIALOG_LISTBOX_WIDTH_CHARS">20</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_ca.xtb b/chrome/app/resources/locale_settings_ca.xtb index 4f839e6..4eadf66 100644 --- a/chrome/app/resources/locale_settings_ca.xtb +++ b/chrome/app/resources/locale_settings_ca.xtb @@ -63,4 +63,5 @@ <translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation> <translation id="IDS_CONTENT_SETTINGS_DIALOG_WIDTH_CHARS">83</translation> <translation id="IDS_CONTENT_SETTINGS_DIALOG_HEIGHT_LINES">24</translation> +<translation id="IDS_CONTENT_SETTINGS_DIALOG_LISTBOX_WIDTH_CHARS">21</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_de.xtb b/chrome/app/resources/locale_settings_de.xtb index 68ad69e..f9a6be8 100644 --- a/chrome/app/resources/locale_settings_de.xtb +++ b/chrome/app/resources/locale_settings_de.xtb @@ -64,5 +64,6 @@ <translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation> <translation id="IDS_CONTENT_SETTINGS_DIALOG_WIDTH_CHARS">83</translation> <translation id="IDS_CONTENT_SETTINGS_DIALOG_HEIGHT_LINES">25</translation> +<translation id="IDS_CONTENT_SETTINGS_DIALOG_LISTBOX_WIDTH_CHARS">23</translation> <translation id="IDS_CONTENT_EXCEPTION_DIALOG_WIDTH_CHARS">94</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_el.xtb b/chrome/app/resources/locale_settings_el.xtb index ce3214f..1f007db 100644 --- a/chrome/app/resources/locale_settings_el.xtb +++ b/chrome/app/resources/locale_settings_el.xtb @@ -64,4 +64,5 @@ <translation id="IDS_CONTENT_SETTINGS_DIALOG_WIDTH_CHARS">83</translation> <translation id="IDS_CONTENT_SETTINGS_DIALOG_HEIGHT_LINES">26</translation> <translation id="IDS_CONTENT_EXCEPTION_DIALOG_WIDTH_CHARS">98</translation> +<translation id="IDS_CONTENT_SETTINGS_DIALOG_LISTBOX_WIDTH_CHARS">24</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_es-419.xtb b/chrome/app/resources/locale_settings_es-419.xtb index deeb693..a33bc38 100644 --- a/chrome/app/resources/locale_settings_es-419.xtb +++ b/chrome/app/resources/locale_settings_es-419.xtb @@ -63,4 +63,5 @@ <translation id="IDS_DOWNLOAD_IN_PROGRESS_WIDTH_CHARS">67</translation> <translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation> <translation id="IDS_CONTENT_SETTINGS_DIALOG_WIDTH_CHARS">83</translation> +<translation id="IDS_CONTENT_SETTINGS_DIALOG_LISTBOX_WIDTH_CHARS">22</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_es.xtb b/chrome/app/resources/locale_settings_es.xtb index bcb3afa..ebe47b3 100644 --- a/chrome/app/resources/locale_settings_es.xtb +++ b/chrome/app/resources/locale_settings_es.xtb @@ -62,4 +62,5 @@ <translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_DOWNLOAD_IN_PROGRESS_WIDTH_CHARS">67</translation> <translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation> +<translation id="IDS_CONTENT_SETTINGS_DIALOG_WIDTH_CHARS">84</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_et.xtb b/chrome/app/resources/locale_settings_et.xtb index 1a2bed8..cc85e24 100644 --- a/chrome/app/resources/locale_settings_et.xtb +++ b/chrome/app/resources/locale_settings_et.xtb @@ -61,4 +61,5 @@ <translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_DOWNLOAD_IN_PROGRESS_WIDTH_CHARS">67</translation> <translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation> +<translation id="IDS_CONTENT_SETTINGS_DIALOG_HEIGHT_LINES">25</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_fi.xtb b/chrome/app/resources/locale_settings_fi.xtb index 96b5866..aac2b45 100644 --- a/chrome/app/resources/locale_settings_fi.xtb +++ b/chrome/app/resources/locale_settings_fi.xtb @@ -61,4 +61,5 @@ <translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_DOWNLOAD_IN_PROGRESS_WIDTH_CHARS">67</translation> <translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation> +<translation id="IDS_CONTENTS_SETTINGS_DIALOG_LISTBOX_WIDTH_CHARS">24</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_hr.xtb b/chrome/app/resources/locale_settings_hr.xtb index e4c9aa2..e0303c8 100644 --- a/chrome/app/resources/locale_settings_hr.xtb +++ b/chrome/app/resources/locale_settings_hr.xtb @@ -61,4 +61,5 @@ <translation id="IDS_DOWNLOAD_IN_PROGRESS_WIDTH_CHARS">67</translation> <translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation> <translation id="IDS_CONTENT_SETTINGS_DIALOG_HEIGHT_LINES">25</translation> +<translation id="IDS_CONTENT_SETTINGS_DIALOG_WIDTH_CHARS">84</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_hu.xtb b/chrome/app/resources/locale_settings_hu.xtb index 2cf74f8..4937f9c 100644 --- a/chrome/app/resources/locale_settings_hu.xtb +++ b/chrome/app/resources/locale_settings_hu.xtb @@ -61,5 +61,6 @@ <translation id="IDS_DOWNLOAD_IN_PROGRESS_WIDTH_CHARS">67</translation> <translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation> <translation id="IDS_CONTENT_SETTINGS_DIALOG_HEIGHT_LINES">25</translation> +<translation id="IDS_CONTENT_SETTINGS_DIALOG_LISTBOX_WIDTH_CHARS">19</translation> <translation id="IDS_CONTENT_EXCEPTION_DIALOG_WIDTH_CHARS">100</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_ja.xtb b/chrome/app/resources/locale_settings_ja.xtb index 8adf02e..76771ea 100644 --- a/chrome/app/resources/locale_settings_ja.xtb +++ b/chrome/app/resources/locale_settings_ja.xtb @@ -61,4 +61,5 @@ <translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_DOWNLOAD_IN_PROGRESS_WIDTH_CHARS">67</translation> <translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation> +<translation id="IDS_CONTENT_SETTINGS_DIALOG_WIDTH_CHARS">82</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_lt.xtb b/chrome/app/resources/locale_settings_lt.xtb index b9b3890..2c654c3d 100644 --- a/chrome/app/resources/locale_settings_lt.xtb +++ b/chrome/app/resources/locale_settings_lt.xtb @@ -60,4 +60,7 @@ <translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_DOWNLOAD_IN_PROGRESS_WIDTH_CHARS">67</translation> <translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation> +<translation id="IDS_CONTENT_SETTINGS_DIALOG_WIDTH_CHARS">82</translation> +<translation id="IDS_CONTENT_SETTINGS_DIALOG_HEIGHT_LINES">25</translation> +<translation id="IDS_CONTENT_SETTINGS_DIALOG_LISTBOX_WIDTH_CHARS">19</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_nb.xtb b/chrome/app/resources/locale_settings_nb.xtb index 2d3fe94..fd52ec2 100644 --- a/chrome/app/resources/locale_settings_nb.xtb +++ b/chrome/app/resources/locale_settings_nb.xtb @@ -62,4 +62,5 @@ <translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation> <translation id="IDS_CONTENT_SETTINGS_DIALOG_WIDTH_CHARS">84</translation> <translation id="IDS_CONTENT_SETTINGS_DIALOG_HEIGHT_LINES">25</translation> +<translation id="IDS_CONTENT_SETTINGS_DIALOG_LISTBOX_WIDTH_CHARS">21</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_nl.xtb b/chrome/app/resources/locale_settings_nl.xtb index 9cd360f..055d7a2 100644 --- a/chrome/app/resources/locale_settings_nl.xtb +++ b/chrome/app/resources/locale_settings_nl.xtb @@ -63,4 +63,6 @@ <translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation> <translation id="IDS_CONTENT_SETTINGS_DIALOG_HEIGHT_LINES">25</translation> <translation id="IDS_CONTENT_EXCEPTION_DIALOG_WIDTH_CHARS">97</translation> +<translation id="IDS_CONTENT_SETTINGS_DIALOG_WIDTH_CHARS">84</translation> +<translation id="IDS_CONTENT_SETTINGS_DIALOG_LISTBOX_WIDTH_CHARS">21</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_pl.xtb b/chrome/app/resources/locale_settings_pl.xtb index d130b01..0c2e219 100644 --- a/chrome/app/resources/locale_settings_pl.xtb +++ b/chrome/app/resources/locale_settings_pl.xtb @@ -62,4 +62,5 @@ <translation id="IDS_DOWNLOAD_IN_PROGRESS_WIDTH_CHARS">67</translation> <translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation> <translation id="IDS_CONTENT_SETTINGS_DIALOG_HEIGHT_LINES">25</translation> +<translation id="IDS_CONTENT_SETTINGS_DIALOG_LISTBOX_WIDTH_CHARS">22</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_pt-BR.xtb b/chrome/app/resources/locale_settings_pt-BR.xtb index fa74574..3a807b3 100644 --- a/chrome/app/resources/locale_settings_pt-BR.xtb +++ b/chrome/app/resources/locale_settings_pt-BR.xtb @@ -61,5 +61,5 @@ <translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_DOWNLOAD_IN_PROGRESS_WIDTH_CHARS">67</translation> <translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation> -<translation id="IDS_CONTENT_SETTINGS_DIALOG_HEIGHT_LINES">25</translation> +<translation id="IDS_CONTENT_SETTINGS_DIALOG_WIDTH_CHARS">84</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_pt-PT.xtb b/chrome/app/resources/locale_settings_pt-PT.xtb index 0f275cb..f43d6dc 100644 --- a/chrome/app/resources/locale_settings_pt-PT.xtb +++ b/chrome/app/resources/locale_settings_pt-PT.xtb @@ -61,4 +61,5 @@ <translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_DOWNLOAD_IN_PROGRESS_WIDTH_CHARS">67</translation> <translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation> +<translation id="IDS_CONTENT_SETTINGS_DIALOG_WIDTH_CHARS">82</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_ro.xtb b/chrome/app/resources/locale_settings_ro.xtb index 1ce3d43..aa7a61d 100644 --- a/chrome/app/resources/locale_settings_ro.xtb +++ b/chrome/app/resources/locale_settings_ro.xtb @@ -61,4 +61,6 @@ <translation id="IDS_DOWNLOAD_IN_PROGRESS_WIDTH_CHARS">67</translation> <translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation> <translation id="IDS_CONTENT_SETTINGS_DIALOG_HEIGHT_LINES">26</translation> +<translation id="IDS_CONTENT_SETTINGS_DIALOG_WIDTH_CHARS">80</translation> +<translation id="IDS_CONTENT_SETTINGS_DIALOG_LISTBOX_WIDTH_CHARS">23</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_ru.xtb b/chrome/app/resources/locale_settings_ru.xtb index 78c8730..bdda8d1 100644 --- a/chrome/app/resources/locale_settings_ru.xtb +++ b/chrome/app/resources/locale_settings_ru.xtb @@ -63,5 +63,6 @@ <translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation> <translation id="IDS_CONTENT_SETTINGS_DIALOG_WIDTH_CHARS">97</translation> <translation id="IDS_CONTENT_SETTINGS_DIALOG_HEIGHT_LINES">25</translation> +<translation id="IDS_CONTENT_SETTINGS_DIALOG_LISTBOX_WIDTH_CHARS">27</translation> <translation id="IDS_CONTENT_EXCEPTION_DIALOG_WIDTH_CHARS">94</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_sk.xtb b/chrome/app/resources/locale_settings_sk.xtb index 211ef79..00f6375 100644 --- a/chrome/app/resources/locale_settings_sk.xtb +++ b/chrome/app/resources/locale_settings_sk.xtb @@ -60,6 +60,6 @@ <translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_DOWNLOAD_IN_PROGRESS_WIDTH_CHARS">67</translation> <translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation> -<translation id="IDS_CONTENT_SETTINGS_DIALOG_HEIGHT_LINES">25</translation> -<translation id="IDS_CONTENT_EXCEPTION_DIALOG_WIDTH_CHARS">80</translation> +<translation id="IDS_CONTENT_SETTINGS_DIALOG_WIDTH_CHARS">88</translation> +<translation id="IDS_CONTENT_SETTINGS_DIALOG_LISTBOX_WIDTH_CHARS">20</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_sl.xtb b/chrome/app/resources/locale_settings_sl.xtb index ec7d084..5833d01 100644 --- a/chrome/app/resources/locale_settings_sl.xtb +++ b/chrome/app/resources/locale_settings_sl.xtb @@ -60,4 +60,6 @@ <translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_DOWNLOAD_IN_PROGRESS_WIDTH_CHARS">67</translation> <translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation> +<translation id="IDS_CONTENT_SETTINGS_DIALOG_WIDTH_CHARS">82</translation> +<translation id="IDS_CONTENT_SETTINGS_DIALOG_LISTBOX_WIDTH_CHARS">20</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_sr.xtb b/chrome/app/resources/locale_settings_sr.xtb index 3be27ea..ad9d9ab 100644 --- a/chrome/app/resources/locale_settings_sr.xtb +++ b/chrome/app/resources/locale_settings_sr.xtb @@ -61,4 +61,6 @@ <translation id="IDS_DOWNLOAD_IN_PROGRESS_WIDTH_CHARS">67</translation> <translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation> <translation id="IDS_CONTENT_SETTINGS_DIALOG_HEIGHT_LINES">25</translation> +<translation id="IDS_CONTENT_SETTINGS_DIALOG_WIDTH_CHARS">84</translation> +<translation id="IDS_CONTENT_SETTINGS_DIALOG_LISTBOX_WIDTH_CHARS">20</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_uk.xtb b/chrome/app/resources/locale_settings_uk.xtb index 7cb7a1d..f03ab44 100644 --- a/chrome/app/resources/locale_settings_uk.xtb +++ b/chrome/app/resources/locale_settings_uk.xtb @@ -61,5 +61,6 @@ <translation id="IDS_DOWNLOAD_IN_PROGRESS_WIDTH_CHARS">67</translation> <translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation> <translation id="IDS_CONTENT_SETTINGS_DIALOG_HEIGHT_LINES">25</translation> +<translation id="IDS_CONTENT_SETTINGS_DIALOG_WIDTH_CHARS">84</translation> <translation id="IDS_CONTENT_EXCEPTION_DIALOG_WIDTH_CHARS">94</translation> </translationbundle> diff --git a/chrome/browser/views/options/content_settings_window_view.cc b/chrome/browser/views/options/content_settings_window_view.cc index 48feb31..c956457 100644 --- a/chrome/browser/views/options/content_settings_window_view.cc +++ b/chrome/browser/views/options/content_settings_window_view.cc @@ -28,8 +28,6 @@ static ContentSettingsWindowView* instance_ = NULL; // Content setting dialog bounds padding. const int kDialogPadding = 7; -// Width of the page selector lisbox. -const int kListboxWidth = 100; namespace browser { @@ -120,21 +118,23 @@ void ContentSettingsWindowView::ListboxSelectionChanged( // ContentSettingsWindowView, views::View overrides: void ContentSettingsWindowView::Layout() { + int list_box_width = views::Window::GetLocalizedContentsWidth( + IDS_CONTENT_SETTINGS_DIALOG_LISTBOX_WIDTH_CHARS); label_->SetBounds(kDialogPadding, kDialogPadding, - kListboxWidth, + list_box_width, label_->GetPreferredSize().height()); listbox_->SetBounds(kDialogPadding, 2 * kDialogPadding + label_->height(), - kListboxWidth, + list_box_width, height() - (3 * kDialogPadding) - label_->height()); if (pages_[current_page_]->GetParent()) { pages_[current_page_]->SetBounds( - 2 * kDialogPadding + kListboxWidth, + 2 * kDialogPadding + list_box_width, 2 * kDialogPadding + label_->height(), - width() - (3 * kDialogPadding) - kListboxWidth, + width() - (3 * kDialogPadding) - list_box_width, height() - (2 * kDialogPadding)); } } |