From: Soeren Sandmann Date: Tue, 10 Dec 2002 12:02:43 +0000 (+0000) Subject: new default color scheme based on the GNOME stock icon palette. (#80691, X-Git-Url: http://pileus.org/git/?p=~andy%2Fgtk;a=commitdiff_plain;h=439d61b96fab7635c5487c7eb5bc89fe90bf78bd new default color scheme based on the GNOME stock icon palette. (#80691, Tue Dec 10 12:40:30 2002 Soeren Sandmann * gtk/gtkmenuitem.c, gtk/gtkstyle.c, gtk/gtkrc.c: new default color scheme based on the GNOME stock icon palette. (#80691, Tuomas Kuosmanen, Garrett LeSage, Owen Taylor) * gtk/gtknotebook.c (gtk_notebook_real_remove): take a new parameter, "destroying", and don't emit the switch-page signals when it is true (fix #64832, reported by Jarred Keuch) * gtk/gtklabel.c (gtk_label_set_property): remove unused variable. --- diff --git a/ChangeLog b/ChangeLog index 6e228770d..f430e6232 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +Tue Dec 10 12:40:30 2002 Soeren Sandmann + + * gtk/gtkmenuitem.c, gtk/gtkstyle.c, gtk/gtkrc.c: new default + color scheme based on the GNOME stock icon palette. (#80691, + Tuomas Kuosmanen, Garrett LeSage, Owen Taylor) + + * gtk/gtknotebook.c (gtk_notebook_real_remove): take a new + parameter, "destroying", and don't emit the switch-page signals + when it is true (fix #64832, reported by Jarred Keuch) + + * gtk/gtklabel.c (gtk_label_set_property): remove unused + variable. + Tue Dec 10 02:14:12 2002 Kristian Rietveld * gtk/gtktreeview.c (gtk_tree_view_get_path_at_pos): x can be in diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 6e228770d..f430e6232 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,16 @@ +Tue Dec 10 12:40:30 2002 Soeren Sandmann + + * gtk/gtkmenuitem.c, gtk/gtkstyle.c, gtk/gtkrc.c: new default + color scheme based on the GNOME stock icon palette. (#80691, + Tuomas Kuosmanen, Garrett LeSage, Owen Taylor) + + * gtk/gtknotebook.c (gtk_notebook_real_remove): take a new + parameter, "destroying", and don't emit the switch-page signals + when it is true (fix #64832, reported by Jarred Keuch) + + * gtk/gtklabel.c (gtk_label_set_property): remove unused + variable. + Tue Dec 10 02:14:12 2002 Kristian Rietveld * gtk/gtktreeview.c (gtk_tree_view_get_path_at_pos): x can be in diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 6e228770d..f430e6232 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,16 @@ +Tue Dec 10 12:40:30 2002 Soeren Sandmann + + * gtk/gtkmenuitem.c, gtk/gtkstyle.c, gtk/gtkrc.c: new default + color scheme based on the GNOME stock icon palette. (#80691, + Tuomas Kuosmanen, Garrett LeSage, Owen Taylor) + + * gtk/gtknotebook.c (gtk_notebook_real_remove): take a new + parameter, "destroying", and don't emit the switch-page signals + when it is true (fix #64832, reported by Jarred Keuch) + + * gtk/gtklabel.c (gtk_label_set_property): remove unused + variable. + Tue Dec 10 02:14:12 2002 Kristian Rietveld * gtk/gtktreeview.c (gtk_tree_view_get_path_at_pos): x can be in diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 6e228770d..f430e6232 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,16 @@ +Tue Dec 10 12:40:30 2002 Soeren Sandmann + + * gtk/gtkmenuitem.c, gtk/gtkstyle.c, gtk/gtkrc.c: new default + color scheme based on the GNOME stock icon palette. (#80691, + Tuomas Kuosmanen, Garrett LeSage, Owen Taylor) + + * gtk/gtknotebook.c (gtk_notebook_real_remove): take a new + parameter, "destroying", and don't emit the switch-page signals + when it is true (fix #64832, reported by Jarred Keuch) + + * gtk/gtklabel.c (gtk_label_set_property): remove unused + variable. + Tue Dec 10 02:14:12 2002 Kristian Rietveld * gtk/gtktreeview.c (gtk_tree_view_get_path_at_pos): x can be in diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 6e228770d..f430e6232 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,16 @@ +Tue Dec 10 12:40:30 2002 Soeren Sandmann + + * gtk/gtkmenuitem.c, gtk/gtkstyle.c, gtk/gtkrc.c: new default + color scheme based on the GNOME stock icon palette. (#80691, + Tuomas Kuosmanen, Garrett LeSage, Owen Taylor) + + * gtk/gtknotebook.c (gtk_notebook_real_remove): take a new + parameter, "destroying", and don't emit the switch-page signals + when it is true (fix #64832, reported by Jarred Keuch) + + * gtk/gtklabel.c (gtk_label_set_property): remove unused + variable. + Tue Dec 10 02:14:12 2002 Kristian Rietveld * gtk/gtktreeview.c (gtk_tree_view_get_path_at_pos): x can be in diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 6e228770d..f430e6232 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,16 @@ +Tue Dec 10 12:40:30 2002 Soeren Sandmann + + * gtk/gtkmenuitem.c, gtk/gtkstyle.c, gtk/gtkrc.c: new default + color scheme based on the GNOME stock icon palette. (#80691, + Tuomas Kuosmanen, Garrett LeSage, Owen Taylor) + + * gtk/gtknotebook.c (gtk_notebook_real_remove): take a new + parameter, "destroying", and don't emit the switch-page signals + when it is true (fix #64832, reported by Jarred Keuch) + + * gtk/gtklabel.c (gtk_label_set_property): remove unused + variable. + Tue Dec 10 02:14:12 2002 Kristian Rietveld * gtk/gtktreeview.c (gtk_tree_view_get_path_at_pos): x can be in diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index 2129b50e6..c294c4afc 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -467,10 +467,8 @@ gtk_label_set_property (GObject *object, GParamSpec *pspec) { GtkLabel *label; - guint last_keyval; label = GTK_LABEL (object); - last_keyval = label->mnemonic_keyval; switch (prop_id) { diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c index 1d559c6d6..9e774940b 100644 --- a/gtk/gtkmenuitem.c +++ b/gtk/gtkmenuitem.c @@ -208,7 +208,7 @@ gtk_menu_item_class_init (GtkMenuItemClass *klass) "Selected Shadow Type", "Shadow type when item is selected", GTK_TYPE_SHADOW_TYPE, - GTK_SHADOW_OUT, + GTK_SHADOW_NONE, G_PARAM_READABLE), gtk_rc_property_parse_enum); } diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index ab2b2ab98..736ad6558 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -189,7 +189,8 @@ static void gtk_notebook_forall (GtkContainer *container, static void gtk_notebook_redraw_tabs (GtkNotebook *notebook); static void gtk_notebook_redraw_arrows (GtkNotebook *notebook); static void gtk_notebook_real_remove (GtkNotebook *notebook, - GList *list); + GList *list, + gboolean destroying); static void gtk_notebook_update_labels (GtkNotebook *notebook); static gint gtk_notebook_timer (GtkNotebook *notebook); static gint gtk_notebook_page_compare (gconstpointer a, @@ -747,11 +748,21 @@ gtk_notebook_new (void) static void gtk_notebook_destroy (GtkObject *object) { + GList *children; GtkNotebook *notebook = GTK_NOTEBOOK (object); if (notebook->menu) gtk_notebook_popup_disable (notebook); + children = notebook->children; + while (children) + { + GList *child = children; + children = child->next; + + gtk_notebook_real_remove (notebook, child, TRUE); + } + GTK_OBJECT_CLASS (parent_class)->destroy (object); } @@ -1953,7 +1964,7 @@ gtk_notebook_remove (GtkContainer *container, page = children->data; if (page->child == widget) { - gtk_notebook_real_remove (notebook, children); + gtk_notebook_real_remove (notebook, children, FALSE); break; } page_num++; @@ -2350,7 +2361,8 @@ gtk_notebook_remove_tab_label (GtkNotebook *notebook, static void gtk_notebook_real_remove (GtkNotebook *notebook, - GList *list) + GList *list, + gboolean destroying) { GtkNotebookPage *page; GList * next_list; @@ -2363,13 +2375,13 @@ gtk_notebook_real_remove (GtkNotebook *notebook, if (notebook->cur_page == list->data) { notebook->cur_page = NULL; - if (next_list) + if (next_list && !destroying) gtk_notebook_switch_page (notebook, GTK_NOTEBOOK_PAGE (next_list), -1); } if (list == notebook->first_tab) notebook->first_tab = next_list; - if (list == notebook->focus_tab) + if (list == notebook->focus_tab && !destroying) gtk_notebook_switch_focus_tab (notebook, next_list); page = list->data; @@ -4120,13 +4132,13 @@ gtk_notebook_remove_page (GtkNotebook *notebook, { list = g_list_nth (notebook->children, page_num); if (list) - gtk_notebook_real_remove (notebook, list); + gtk_notebook_real_remove (notebook, list, FALSE); } else { list = g_list_last (notebook->children); if (list) - gtk_notebook_real_remove (notebook, list); + gtk_notebook_real_remove (notebook, list, FALSE); } } diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c index c28fc4806..82700ebf4 100644 --- a/gtk/gtkrc.c +++ b/gtk/gtkrc.c @@ -661,11 +661,33 @@ _gtk_rc_init (void) /* Default RC string */ gtk_rc_parse_string ("style \"gtk-default-tooltips-style\" {\n" - " bg[NORMAL] = \"#ffffc0\"\n" + " bg[NORMAL] = \"#eee1b3\"\n" " fg[NORMAL] = \"#000000\"\n" "}\n" "\n" - "widget \"gtk-tooltips*\" style : gtk \"gtk-default-tooltips-style\"\n"); + "style \"gtk-default-progress-bar-style\" {\n" + " bg[PRELIGHT] = \"#4b6983\"\n" + " fg[PRELIGHT] = \"#ffffff\"\n" + " bg[NORMAL] = \"#bab5ab\"\n" + "}\n" + "\n" + "style \"gtk-default-menu-item-style\" {\n" + " bg[PRELIGHT] = \"#4b6983\"\n" + " fg[PRELIGHT] = \"#ffffff\"\n" + " base[PRELIGHT] = \"#4b6983\"\n" + " text[PRELIGHT] = \"#ffffff\"\n" + "}\n" + "\n" + "class \"GtkProgressBar\" style : gtk \"gtk-default-progress-bar-style\"\n" + "widget \"gtk-tooltips*\" style : gtk \"gtk-default-tooltips-style\"\n" + "class \"GtkMenuItem\" style : gtk \"gtk-default-menu-item-style\"\n" + "widget_class \"*.GtkMenuItem.*\" style : gtk \"gtk-default-menu-item-style\"\n" + "widget_class \"*.GtkAccelMenuItem.*\" style : gtk \"gtk-default-menu-item-style\"\n" + "widget_class \"*.GtkRadioMenuItem.*\" style : gtk \"gtk-default-menu-item-style\"\n" + "widget_class \"*.GtkCheckMenuItem.*\" style : gtk \"gtk-default-menu-item-style\"\n" + "widget_class \"*.GtkImageMenuItem.*\" style : gtk \"gtk-default-menu-item-style\"\n" + "widget_class \"*.GtkSeparatorMenuItem.*\" style : gtk \"gtk-default-menu-item-style\"\n" + ); } static void diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c index 6d5f0751d..89d8dcefa 100644 --- a/gtk/gtkstyle.c +++ b/gtk/gtkstyle.c @@ -452,13 +452,13 @@ static GdkColor gtk_default_prelight_fg = { 0, 0, 0, 0 }; static GdkColor gtk_default_selected_fg = { 0, 0xffff, 0xffff, 0xffff }; static GdkColor gtk_default_insensitive_fg = { 0, 0x7530, 0x7530, 0x7530 }; -static GdkColor gtk_default_normal_bg = { 0, 0xd6d6, 0xd6d6, 0xd6d6 }; -static GdkColor gtk_default_active_bg = { 0, 0xc350, 0xc350, 0xc350 }; -static GdkColor gtk_default_prelight_bg = { 0, 0xea60, 0xea60, 0xea60 }; -static GdkColor gtk_default_selected_bg = { 0, 0, 0, 0x9c40 }; -static GdkColor gtk_default_insensitive_bg = { 0, 0xd6d6, 0xd6d6, 0xd6d6 }; -static GdkColor gtk_default_selected_base = { 0, 0xa4a4, 0xdfdf, 0xffff }; -static GdkColor gtk_default_active_base = { 0, 0xbcbc, 0xd2d2, 0xeeee }; +static GdkColor gtk_default_normal_bg = { 0, 0xdcdc, 0xdada, 0xd5d5 }; +static GdkColor gtk_default_active_bg = { 0, 0xbaba, 0xb5b5, 0xabab }; +static GdkColor gtk_default_prelight_bg = { 0, 0xeeee, 0xebeb, 0xe7e7 }; +static GdkColor gtk_default_selected_bg = { 0, 0x4b4b, 0x6969, 0x8383 }; +static GdkColor gtk_default_insensitive_bg = { 0, 0xdcdc, 0xdada, 0xd5d5 }; +static GdkColor gtk_default_selected_base = { 0, 0x4b4b, 0x6969, 0x8383 }; +static GdkColor gtk_default_active_base = { 0, 0x8080, 0x7d7d, 0x7474 }; static gpointer parent_class = NULL; @@ -573,9 +573,9 @@ gtk_style_init (GtkStyle *style) } style->base[GTK_STATE_SELECTED] = gtk_default_selected_base; - style->text[GTK_STATE_SELECTED] = style->black; + style->text[GTK_STATE_SELECTED] = style->white; style->base[GTK_STATE_ACTIVE] = gtk_default_active_base; - style->text[GTK_STATE_ACTIVE] = style->black; + style->text[GTK_STATE_ACTIVE] = style->white; style->base[GTK_STATE_INSENSITIVE] = gtk_default_prelight_bg; style->text[GTK_STATE_INSENSITIVE] = gtk_default_insensitive_fg;