X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=tests%2Ftestassistant.c;h=8360400387f58aa5504315da36d861c61e6b0903;hb=HEAD;hp=a6b4ef5e67eb87bb66dd4cb5285451b5d6c7ef9c;hpb=260ccdfebef9e17842dcc162aefba46fe5459c7c;p=~andy%2Fgtk
diff --git a/tests/testassistant.c b/tests/testassistant.c
index a6b4ef5e6..836040038 100644
--- a/tests/testassistant.c
+++ b/tests/testassistant.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 .
*/
#include
@@ -193,6 +191,48 @@ create_simple_assistant (GtkWidget *widget)
}
}
+static void
+create_anonymous_assistant (GtkWidget *widget)
+{
+ static GtkWidget *assistant = NULL;
+
+ if (!assistant)
+ {
+ GtkWidget *page;
+
+ assistant = gtk_assistant_new ();
+ gtk_window_set_default_size (GTK_WINDOW (assistant), 400, 300);
+
+ g_signal_connect (G_OBJECT (assistant), "cancel",
+ G_CALLBACK (cancel_callback), NULL);
+ g_signal_connect (G_OBJECT (assistant), "close",
+ G_CALLBACK (close_callback), NULL);
+ g_signal_connect (G_OBJECT (assistant), "apply",
+ G_CALLBACK (apply_callback), NULL);
+ g_signal_connect (G_OBJECT (assistant), "prepare",
+ G_CALLBACK (prepare_callback), NULL);
+
+ page = get_test_page ("Page 1");
+ gtk_widget_show (page);
+ gtk_assistant_append_page (GTK_ASSISTANT (assistant), page);
+ gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), page, TRUE);
+
+ page = get_test_page ("Page 2");
+ gtk_widget_show (page);
+ gtk_assistant_append_page (GTK_ASSISTANT (assistant), page);
+ gtk_assistant_set_page_type (GTK_ASSISTANT (assistant), page, GTK_ASSISTANT_PAGE_CONFIRM);
+ gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), page, TRUE);
+ }
+
+ if (!gtk_widget_get_visible (assistant))
+ gtk_widget_show (assistant);
+ else
+ {
+ gtk_widget_destroy (assistant);
+ assistant = NULL;
+ }
+}
+
static void
visible_cb (GtkWidget *check,
gpointer data)
@@ -357,13 +397,13 @@ create_nonlinear_assistant (GtkWidget *widget)
page = get_test_page ("Page 2A");
gtk_widget_show (page);
gtk_assistant_append_page (GTK_ASSISTANT (assistant), page);
- gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), page, "Page 2A");
+ gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), page, "Page 2");
gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), page, TRUE);
page = get_test_page ("Page 2B");
gtk_widget_show (page);
gtk_assistant_append_page (GTK_ASSISTANT (assistant), page);
- gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), page, "Page 2B");
+ gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), page, "Page 2");
gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), page, TRUE);
page = get_test_page ("Confirmation");
@@ -480,6 +520,16 @@ create_looping_assistant (GtkWidget *widget)
}
}
+static void
+toggle_invisible (GtkButton *button, GtkAssistant *assistant)
+{
+ GtkWidget *page;
+
+ page = gtk_assistant_get_nth_page (assistant, 1);
+
+ gtk_widget_set_visible (page, !gtk_widget_get_visible (page));
+}
+
static void
create_full_featured_assistant (GtkWidget *widget)
{
@@ -488,14 +538,15 @@ create_full_featured_assistant (GtkWidget *widget)
if (!assistant)
{
GtkWidget *page, *button;
- GdkPixbuf *pixbuf;
assistant = gtk_assistant_new ();
gtk_window_set_default_size (GTK_WINDOW (assistant), 400, 300);
- button = gtk_button_new_from_stock (GTK_STOCK_STOP);
- gtk_widget_show (button);
- gtk_assistant_add_action_widget (GTK_ASSISTANT (assistant), button);
+ button = gtk_button_new_from_stock (GTK_STOCK_STOP);
+ gtk_widget_show (button);
+ gtk_assistant_add_action_widget (GTK_ASSISTANT (assistant), button);
+ g_signal_connect (button, "clicked",
+ G_CALLBACK (toggle_invisible), assistant);
g_signal_connect (G_OBJECT (assistant), "cancel",
G_CALLBACK (cancel_callback), NULL);
@@ -512,16 +563,10 @@ create_full_featured_assistant (GtkWidget *widget)
gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), page, "Page 1");
gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), page, TRUE);
- /* set a side image */
- pixbuf = gtk_widget_render_icon (page, GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_DIALOG, NULL);
- gtk_assistant_set_page_side_image (GTK_ASSISTANT (assistant), page, pixbuf);
-
- /* set a header image */
- pixbuf = gtk_widget_render_icon (page, GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG, NULL);
- gtk_assistant_set_page_header_image (GTK_ASSISTANT (assistant), page, pixbuf);
-
page = get_test_page ("Invisible page");
gtk_assistant_append_page (GTK_ASSISTANT (assistant), page);
+ gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), page, "Page 2");
+ gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), page, TRUE);
page = get_test_page ("Page 3");
gtk_widget_show (page);
@@ -529,10 +574,6 @@ create_full_featured_assistant (GtkWidget *widget)
gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), page, "Page 3");
gtk_assistant_set_page_type (GTK_ASSISTANT (assistant), page, GTK_ASSISTANT_PAGE_CONFIRM);
gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), page, TRUE);
-
- /* set a header image */
- pixbuf = gtk_widget_render_icon (page, GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG, NULL);
- gtk_assistant_set_page_header_image (GTK_ASSISTANT (assistant), page, pixbuf);
}
if (!gtk_widget_get_visible (assistant))
@@ -550,6 +591,7 @@ struct {
} buttons[] =
{
{ "simple assistant", create_simple_assistant },
+ { "anonymous assistant", create_anonymous_assistant },
{ "generous assistant", create_generous_assistant },
{ "nonlinear assistant", create_nonlinear_assistant },
{ "looping assistant", create_looping_assistant },