diff options
Diffstat (limited to 'chrome/browser/gtk/options')
| -rw-r--r-- | chrome/browser/gtk/options/passwords_exceptions_window_gtk.cc | 21 | ||||
| -rw-r--r-- | chrome/browser/gtk/options/url_picker_dialog_gtk.cc | 27 |
2 files changed, 27 insertions, 21 deletions
diff --git a/chrome/browser/gtk/options/passwords_exceptions_window_gtk.cc b/chrome/browser/gtk/options/passwords_exceptions_window_gtk.cc index d163a4f..811ceaa 100644 --- a/chrome/browser/gtk/options/passwords_exceptions_window_gtk.cc +++ b/chrome/browser/gtk/options/passwords_exceptions_window_gtk.cc @@ -16,14 +16,7 @@ #include "chrome/common/gtk_util.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" - -namespace { - -// Initial width of the passwords and exceptions window. -const int kPasswordsExceptionsWindowInitialWidth = 565; -const int kPasswordsExceptionsWindowInitialHeight = 400; - -} // anonymous namespace +#include "grit/locale_settings.h" /////////////////////////////////////////////////////////////////////////////// // PasswordsExceptionsWindowGtk @@ -78,9 +71,6 @@ PasswordsExceptionsWindowGtk::PasswordsExceptionsWindowGtk(Profile* profile) GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); - gtk_window_set_default_size(GTK_WINDOW(dialog_), - kPasswordsExceptionsWindowInitialWidth, - kPasswordsExceptionsWindowInitialHeight); gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog_)->vbox), gtk_util::kContentAreaSpacing); @@ -100,6 +90,15 @@ PasswordsExceptionsWindowGtk::PasswordsExceptionsWindowGtk(Profile* profile) gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog_)->vbox), notebook_); + gtk_widget_realize(dialog_); + int width = 1, height = 1; + gtk_util::GetWidgetSizeFromResources( + dialog_, + IDS_PASSWORDS_DIALOG_WIDTH_CHARS, + IDS_PASSWORDS_DIALOG_HEIGHT_LINES, + &width, &height); + gtk_window_set_default_size(GTK_WINDOW(dialog_), width, height); + // We only have one button and don't do any special handling, so just hook it // directly to gtk_widget_destroy. g_signal_connect(dialog_, "response", G_CALLBACK(gtk_widget_destroy), NULL); diff --git a/chrome/browser/gtk/options/url_picker_dialog_gtk.cc b/chrome/browser/gtk/options/url_picker_dialog_gtk.cc index 9122bc7..4743bc5 100644 --- a/chrome/browser/gtk/options/url_picker_dialog_gtk.cc +++ b/chrome/browser/gtk/options/url_picker_dialog_gtk.cc @@ -17,17 +17,11 @@ #include "googleurl/src/gurl.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" +#include "grit/locale_settings.h" #include "net/base/net_util.h" namespace { -// Initial size for dialog. -const int kDialogDefaultWidth = 450; -const int kDialogDefaultHeight = 450; - -// Initial width of the first column. -const int kTitleColumnInitialSize = 200; - // Style for recent history label. const char kHistoryLabelMarkup[] = "<span weight='bold'>%s</span>"; @@ -57,8 +51,6 @@ UrlPickerDialogGtk::UrlPickerDialogGtk(UrlPickerCallback* callback, add_button_ = gtk_dialog_add_button(GTK_DIALOG(dialog_), GTK_STOCK_ADD, GTK_RESPONSE_OK); gtk_dialog_set_default_response(GTK_DIALOG(dialog_), GTK_RESPONSE_OK); - gtk_window_set_default_size(GTK_WINDOW(dialog_), kDialogDefaultWidth, - kDialogDefaultHeight); gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog_)->vbox), gtk_util::kContentAreaSpacing); @@ -139,7 +131,6 @@ UrlPickerDialogGtk::UrlPickerDialogGtk(UrlPickerCallback* callback, column, l10n_util::GetStringUTF8(IDS_ASI_PAGE_COLUMN).c_str()); gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); gtk_tree_view_column_set_resizable(column, TRUE); - gtk_tree_view_column_set_fixed_width(column, kTitleColumnInitialSize); gtk_tree_view_column_set_sort_column_id(column, COL_TITLE); GtkTreeViewColumn* url_column = gtk_tree_view_column_new_with_attributes( @@ -158,6 +149,22 @@ UrlPickerDialogGtk::UrlPickerDialogGtk(UrlPickerCallback* callback, EnableControls(); + // Set the size of the dialog. + gtk_widget_realize(dialog_); + int width = 1, height = 1; + gtk_util::GetWidgetSizeFromResources( + dialog_, + IDS_URLPICKER_DIALOG_WIDTH_CHARS, + IDS_URLPICKER_DIALOG_HEIGHT_LINES, + &width, &height); + gtk_window_set_default_size(GTK_WINDOW(dialog_), width, height); + // Set the width of the first column as well. + gtk_util::GetWidgetSizeFromResources( + dialog_, + IDS_URLPICKER_DIALOG_LEFT_COLUMN_WIDTH_CHARS, 0, + &width, NULL); + gtk_tree_view_column_set_fixed_width(column, width); + gtk_widget_show_all(dialog_); g_signal_connect(dialog_, "response", G_CALLBACK(OnResponse), this); |