X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkassistant.c;h=3ba9f227be5abc7934d793a7877a92be13638a2d;hb=e4c2ef108cc66210af015b679ce3542ca6decfec;hp=0f289d567163d4dd82a6beccc1ecb5cba32928f9;hpb=4d17ff973e8c289bf3186c70f68977356fd6b89e;p=~andy%2Fgtk diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c index 0f289d567..3ba9f227b 100644 --- a/gtk/gtkassistant.c +++ b/gtk/gtkassistant.c @@ -18,9 +18,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ /** @@ -62,13 +60,13 @@ #include "gtkassistant.h" -#include "gtkaccessibleprivate.h" #include "gtkbutton.h" #include "gtkbox.h" #include "gtkframe.h" #include "gtknotebook.h" #include "gtkimage.h" #include "gtklabel.h" +#include "gtksettings.h" #include "gtksizegroup.h" #include "gtksizerequest.h" #include "gtkstock.h" @@ -168,6 +166,12 @@ static void gtk_assistant_buildable_custom_finished (GtkBuildable *bui static GList* find_page (GtkAssistant *assistant, GtkWidget *page); +static void gtk_assistant_do_set_page_header_image (GtkAssistant *assistant, + GtkWidget *page, + GdkPixbuf *pixbuf); +static void gtk_assistant_do_set_page_side_image (GtkAssistant *assistant, + GtkWidget *page, + GdkPixbuf *pixbuf); GType _gtk_assistant_accessible_get_type (void); @@ -715,6 +719,10 @@ set_current_page (GtkAssistant *assistant, priv->current_page = (GtkAssistantPage *)g_list_nth_data (priv->pages, page_num); g_signal_emit (assistant, signals [PREPARE], 0, priv->current_page->page); + /* do not continue if the prepare signal handler has already changed the + * current page */ + if (priv->current_page != (GtkAssistantPage *)g_list_nth_data (priv->pages, page_num)) + return; update_title_state (assistant); @@ -1001,11 +1009,11 @@ gtk_assistant_init (GtkAssistant *assistant) gtk_button_set_image (GTK_BUTTON (priv->forward), gtk_image_new_from_stock (GTK_STOCK_GO_FORWARD, GTK_ICON_SIZE_BUTTON)); priv->back = gtk_button_new_with_mnemonic (_("Go _Back")); - gtk_button_set_image (GTK_BUTTON (priv->forward), + gtk_button_set_image (GTK_BUTTON (priv->back), gtk_image_new_from_stock (GTK_STOCK_GO_BACK, GTK_ICON_SIZE_BUTTON)); priv->cancel = gtk_button_new_from_stock (GTK_STOCK_CANCEL); priv->last = gtk_button_new_with_mnemonic (_("_Finish")); - gtk_button_set_image (GTK_BUTTON (priv->forward), + gtk_button_set_image (GTK_BUTTON (priv->last), gtk_image_new_from_stock (GTK_STOCK_GOTO_LAST, GTK_ICON_SIZE_BUTTON)); gtk_widget_set_can_default (priv->close, TRUE); gtk_widget_set_can_default (priv->apply, TRUE); @@ -1019,6 +1027,13 @@ gtk_assistant_init (GtkAssistant *assistant) gtk_size_group_add_widget (priv->button_size_group, priv->cancel); gtk_size_group_add_widget (priv->button_size_group, priv->last); + gtk_widget_set_no_show_all (priv->close, TRUE); + gtk_widget_set_no_show_all (priv->apply, TRUE); + gtk_widget_set_no_show_all (priv->forward, TRUE); + gtk_widget_set_no_show_all (priv->back, TRUE); + gtk_widget_set_no_show_all (priv->cancel, TRUE); + gtk_widget_set_no_show_all (priv->last, TRUE); + if (!alternative_button_order (assistant)) { gtk_box_pack_end (GTK_BOX (priv->action_area), priv->apply, FALSE, FALSE, 0); @@ -1087,12 +1102,12 @@ gtk_assistant_set_child_property (GtkContainer *container, g_value_get_string (value)); break; case CHILD_PROP_PAGE_HEADER_IMAGE: - gtk_assistant_set_page_header_image (GTK_ASSISTANT (container), child, - g_value_get_object (value)); + gtk_assistant_do_set_page_header_image (GTK_ASSISTANT (container), child, + g_value_get_object (value)); break; case CHILD_PROP_PAGE_SIDEBAR_IMAGE: - gtk_assistant_set_page_side_image (GTK_ASSISTANT (container), child, - g_value_get_object (value)); + gtk_assistant_do_set_page_side_image (GTK_ASSISTANT (container), child, + g_value_get_object (value)); break; case CHILD_PROP_PAGE_COMPLETE: gtk_assistant_set_page_complete (GTK_ASSISTANT (container), child, @@ -1111,27 +1126,29 @@ gtk_assistant_get_child_property (GtkContainer *container, GValue *value, GParamSpec *pspec) { + GtkAssistant *assistant = GTK_ASSISTANT (container); + switch (property_id) { case CHILD_PROP_PAGE_TYPE: g_value_set_enum (value, - gtk_assistant_get_page_type (GTK_ASSISTANT (container), child)); + gtk_assistant_get_page_type (assistant, child)); break; case CHILD_PROP_PAGE_TITLE: g_value_set_string (value, - gtk_assistant_get_page_title (GTK_ASSISTANT (container), child)); + gtk_assistant_get_page_title (assistant, child)); break; case CHILD_PROP_PAGE_HEADER_IMAGE: g_value_set_object (value, - gtk_assistant_get_page_header_image (GTK_ASSISTANT (container), child)); + ((GtkAssistantPage*) find_page (assistant, child))->header_image); break; case CHILD_PROP_PAGE_SIDEBAR_IMAGE: g_value_set_object (value, - gtk_assistant_get_page_side_image (GTK_ASSISTANT (container), child)); + ((GtkAssistantPage*) find_page (assistant, child))->sidebar_image); break; case CHILD_PROP_PAGE_COMPLETE: g_value_set_boolean (value, - gtk_assistant_get_page_complete (GTK_ASSISTANT (container), child)); + gtk_assistant_get_page_complete (assistant, child)); break; default: GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec); @@ -1301,9 +1318,12 @@ gtk_assistant_remove (GtkContainer *container, { GtkAssistant *assistant = (GtkAssistant*) container; - /* Forward this removal to the content notebook. */ - container = (GtkContainer *) assistant->priv->content; - gtk_container_remove (container, page); + /* Forward this removal to the content notebook */ + if (gtk_widget_get_parent (page) == assistant->priv->content) + { + container = (GtkContainer *) assistant->priv->content; + gtk_container_remove (container, page); + } } /** @@ -1606,14 +1626,19 @@ gtk_assistant_insert_page (GtkAssistant *assistant, page_info = g_slice_new0 (GtkAssistantPage); page_info->page = page; page_info->regular_title = gtk_label_new (NULL); + gtk_widget_set_no_show_all (page_info->regular_title, TRUE); page_info->current_title = gtk_label_new (NULL); + gtk_widget_set_no_show_all (page_info->current_title, TRUE); - gtk_widget_set_halign (page_info->regular_title, GTK_ALIGN_START); - gtk_widget_set_valign (page_info->regular_title, GTK_ALIGN_CENTER); + /* Note: we need to use misc alignment here as long as GtkLabel + * pays attention to it. GtkWiget::halign is ineffective, since + * all the labels are getting the same size anyway, due to the + * size group. + */ + gtk_misc_set_alignment (GTK_MISC (page_info->regular_title), 0, 0.5); gtk_widget_show (page_info->regular_title); - gtk_widget_set_halign (page_info->current_title, GTK_ALIGN_START); - gtk_widget_set_valign (page_info->current_title, GTK_ALIGN_CENTER); + gtk_misc_set_alignment (GTK_MISC (page_info->current_title), 0, 0.5); gtk_widget_hide (page_info->current_title); context = gtk_widget_get_style_context (page_info->current_title); @@ -1648,6 +1673,30 @@ gtk_assistant_insert_page (GtkAssistant *assistant, return position; } +/** + * gtk_assistant_remove_page: + * @assistant: a #GtkAssistant + * @page_num: the index of a page in the @assistant, + * or -1 to remove the last page + * + * Removes the @page_num's page from @assistant. + * + * Since: 3.2 + */ +void +gtk_assistant_remove_page (GtkAssistant *assistant, + gint page_num) +{ + GtkWidget *page; + + g_return_if_fail (GTK_IS_ASSISTANT (assistant)); + + page = gtk_assistant_get_nth_page (assistant, page_num); + + if (page) + gtk_container_remove (GTK_CONTAINER (assistant), page); +} + /** * gtk_assistant_set_forward_page_func: * @assistant: a #GtkAssistant @@ -1931,13 +1980,21 @@ gtk_assistant_set_page_header_image (GtkAssistant *assistant, GtkWidget *page, GdkPixbuf *pixbuf) { - GtkAssistantPage *page_info; - GList *child; - g_return_if_fail (GTK_IS_ASSISTANT (assistant)); g_return_if_fail (GTK_IS_WIDGET (page)); g_return_if_fail (pixbuf == NULL || GDK_IS_PIXBUF (pixbuf)); + gtk_assistant_do_set_page_header_image (assistant, page, pixbuf); +} + +static void +gtk_assistant_do_set_page_header_image (GtkAssistant *assistant, + GtkWidget *page, + GdkPixbuf *pixbuf) +{ + GtkAssistantPage *page_info; + GList *child; + child = find_page (assistant, page); g_return_if_fail (child != NULL); @@ -2014,13 +2071,21 @@ gtk_assistant_set_page_side_image (GtkAssistant *assistant, GtkWidget *page, GdkPixbuf *pixbuf) { - GtkAssistantPage *page_info; - GList *child; - g_return_if_fail (GTK_IS_ASSISTANT (assistant)); g_return_if_fail (GTK_IS_WIDGET (page)); g_return_if_fail (pixbuf == NULL || GDK_IS_PIXBUF (pixbuf)); + gtk_assistant_do_set_page_side_image (assistant, page, pixbuf); +} + +static void +gtk_assistant_do_set_page_side_image (GtkAssistant *assistant, + GtkWidget *page, + GdkPixbuf *pixbuf) +{ + GtkAssistantPage *page_info; + GList *child; + child = find_page (assistant, page); g_return_if_fail (child != NULL);