[glade/modern-ui: 33/33] GladeIntro: WIP add interactive introduction to new GUI
- From: Juan Pablo Ugarte <jpu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glade/modern-ui: 33/33] GladeIntro: WIP add interactive introduction to new GUI
- Date: Mon, 14 Aug 2017 20:16:01 +0000 (UTC)
commit 0aaa91a7c34c78d593925a42194bbcfb951c05a5
Author: Juan Pablo Ugarte <juanpablougarte gmail com>
Date: Sun Jul 2 12:12:25 2017 -0300
GladeIntro: WIP add interactive introduction to new GUI
gladeui/glade-adaptor-chooser.ui | 4 +
src/Makefile.am | 2 +
src/glade-intro.c | 433 ++++++++++++++++++++++++++++++++++++++
src/glade-intro.h | 69 ++++++
src/glade-window.c | 117 ++++++++++-
src/glade-window.css | 26 +++-
src/glade.glade | 43 ++++
7 files changed, 692 insertions(+), 2 deletions(-)
---
diff --git a/gladeui/glade-adaptor-chooser.ui b/gladeui/glade-adaptor-chooser.ui
index 496a995..b216c5d 100644
--- a/gladeui/glade-adaptor-chooser.ui
+++ b/gladeui/glade-adaptor-chooser.ui
@@ -8,6 +8,7 @@
<property name="spacing">4</property>
<child>
<object class="GtkMenuButton" id="all_button">
+ <property name="name">adaptor-search-button</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -53,6 +54,7 @@
</child>
<child>
<object class="GtkMenuButton" id="others_button">
+ <property name="name">adaptor-others-button</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -74,11 +76,13 @@
</child>
<child>
<object class="GtkButtonBox" id="gtk_button_box">
+ <property name="name">adaptor-gtk-buttonbox</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">expand</property>
<child>
<object class="GtkMenuButton" id="extra_button">
+ <property name="name">adaptor-extra-button</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Extra gtk objects</property>
diff --git a/src/Makefile.am b/src/Makefile.am
index 67d1b3b..428ae4e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,6 +24,7 @@ BUILT_SOURCES = glade-resources.c glade-resources.h
glade_SOURCES = \
glade-window.c \
+ glade-intro.c \
glade-resources.c \
glade-preferences.c \
glade-http.c \
@@ -32,6 +33,7 @@ glade_SOURCES = \
noinst_HEADERS = \
glade-window.h \
+ glade-intro.h \
glade-resources.h \
glade-preferences.h \
glade-logo.h \
diff --git a/src/glade-intro.c b/src/glade-intro.c
new file mode 100644
index 0000000..5e5604c
--- /dev/null
+++ b/src/glade-intro.c
@@ -0,0 +1,433 @@
+/*
+ * glade-intro.c
+ *
+ * Copyright (C) 2017 Juan Pablo Ugarte
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Authors:
+ * Juan Pablo Ugarte <juanpablougarte gmail com>
+ */
+
+#include "glade-intro.h"
+
+typedef struct
+{
+ GtkWidget *widget;
+ const gchar *name;
+ const gchar *text;
+ GladeIntroPosition position;
+ gint delay;
+} ScriptNode;
+
+typedef struct
+{
+ GtkWidget *toplevel;
+
+ GList *script; /* List of (ScriptNode *) */
+ GHashTable *widgets; /* Table with all named widget in toplevel */
+
+ GtkPopover *popover; /* Popover to show the script text */
+
+ guint timeout_id; /* Timeout id for running the script */
+ GList *current; /* Current script node */
+} GladeIntroPrivate;
+
+struct _GladeIntro
+{
+ GObject parent_instance;
+};
+
+enum
+{
+ PROP_0,
+ PROP_TOPLEVEL,
+ PROP_STATE,
+
+ N_PROPERTIES
+};
+
+enum
+{
+ SHOW_NODE,
+ HIDE_NODE,
+
+ LAST_SIGNAL
+};
+
+static guint intro_signals[LAST_SIGNAL] = { 0 };
+
+static GParamSpec *properties[N_PROPERTIES];
+
+G_DEFINE_TYPE_WITH_PRIVATE (GladeIntro, glade_intro, G_TYPE_OBJECT);
+
+#define GET_PRIVATE(d) ((GladeIntroPrivate *) glade_intro_get_instance_private((GladeIntro*)d))
+
+static void
+glade_intro_init (GladeIntro *intro)
+{
+}
+
+static void
+glade_intro_finalize (GObject *object)
+{
+ GladeIntroPrivate *priv = GET_PRIVATE (object);
+
+ if (priv->timeout_id)
+ {
+ g_source_remove (priv->timeout_id);
+ priv->timeout_id = 0;
+ }
+
+ gtk_popover_set_relative_to (priv->popover, NULL);
+ g_clear_object (&priv->popover);
+
+ G_OBJECT_CLASS (glade_intro_parent_class)->finalize (object);
+}
+
+static void
+glade_intro_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ g_return_if_fail (GLADE_IS_INTRO (object));
+
+ switch (prop_id)
+ {
+ case PROP_TOPLEVEL:
+ glade_intro_set_toplevel (GLADE_INTRO (object), g_value_get_object (value));
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
+}
+
+static void
+glade_intro_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ GladeIntroPrivate *priv;
+
+ g_return_if_fail (GLADE_IS_INTRO (object));
+ priv = GET_PRIVATE (object);
+
+ switch (prop_id)
+ {
+ case PROP_TOPLEVEL:
+ g_value_set_object (value, priv->toplevel);
+ break;
+ case PROP_STATE:
+ if (priv->timeout_id)
+ g_value_set_enum (value, GLADE_INTRO_STATE_PLAYING);
+ else if (priv->current)
+ g_value_set_enum (value, GLADE_INTRO_STATE_PAUSED);
+ else
+ g_value_set_enum (value, GLADE_INTRO_STATE_NULL);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
+}
+
+static GType
+glade_intro_state_get_type (void)
+{
+ static GType etype = 0;
+ if (G_UNLIKELY(etype == 0)) {
+ static const GEnumValue values[] = {
+ { GLADE_INTRO_STATE_NULL, "GLADE_INTRO_STATE_NULL", "null" },
+ { GLADE_INTRO_STATE_PLAYING, "GLADE_INTRO_STATE_PLAYING", "playing" },
+ { GLADE_INTRO_STATE_PAUSED, "GLADE_INTRO_STATE_PAUSED", "paused" },
+ { 0, NULL, NULL }
+ };
+ etype = g_enum_register_static (g_intern_static_string ("GladeIntroStatus"), values);
+ }
+ return etype;
+}
+
+static void
+glade_intro_class_init (GladeIntroClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+ object_class->finalize = glade_intro_finalize;
+ object_class->set_property = glade_intro_set_property;
+ object_class->get_property = glade_intro_get_property;
+
+ /* Properties */
+ properties[PROP_TOPLEVEL] =
+ g_param_spec_object ("toplevel", "Toplevel",
+ "The main toplevel from where to get the widgets",
+ GTK_TYPE_WINDOW,
+ G_PARAM_READWRITE);
+ properties[PROP_STATE] =
+ g_param_spec_enum ("state", "State",
+ "Playback state",
+ glade_intro_state_get_type (),
+ GLADE_INTRO_STATE_NULL,
+ G_PARAM_READABLE);
+
+ intro_signals[SHOW_NODE] =
+ g_signal_new ("show-node", G_OBJECT_CLASS_TYPE (klass), 0, 0,
+ NULL, NULL, NULL,
+ G_TYPE_NONE, 2,
+ G_TYPE_STRING,
+ GTK_TYPE_WIDGET);
+ intro_signals[HIDE_NODE] =
+ g_signal_new ("hide-node", G_OBJECT_CLASS_TYPE (klass), 0, 0,
+ NULL, NULL, NULL,
+ G_TYPE_NONE, 2,
+ G_TYPE_STRING,
+ GTK_TYPE_WIDGET);
+
+ g_object_class_install_properties (object_class, N_PROPERTIES, properties);
+}
+
+/* Public API */
+
+GladeIntro *
+glade_intro_new (GtkWindow *toplevel)
+{
+ return (GladeIntro*) g_object_new (GLADE_TYPE_INTRO, "toplevel", toplevel, NULL);
+}
+
+static void
+get_toplevel_widgets (GtkWidget *widget, gpointer data)
+{
+ const gchar *name;
+
+ if ((name = gtk_widget_get_name (widget)) &&
+ g_strcmp0 (name, G_OBJECT_TYPE_NAME (widget)))
+ g_hash_table_insert (GET_PRIVATE (data)->widgets, (gpointer)name, widget);
+
+ if (GTK_IS_CONTAINER (widget))
+ gtk_container_forall (GTK_CONTAINER (widget), get_toplevel_widgets, data);
+}
+
+void
+glade_intro_set_toplevel (GladeIntro *intro, GtkWindow *toplevel)
+{
+ GladeIntroPrivate *priv;
+
+ g_return_if_fail (GLADE_IS_INTRO (intro));
+ priv = GET_PRIVATE (intro);
+
+ g_clear_object (&priv->toplevel);
+ g_clear_pointer (&priv->widgets, g_hash_table_unref);
+
+ if (toplevel)
+ {
+ priv->toplevel = g_object_ref (toplevel);
+ priv->widgets = g_hash_table_new (g_str_hash, g_str_equal);
+ gtk_container_forall (GTK_CONTAINER (toplevel), get_toplevel_widgets, intro);
+ }
+}
+
+void
+glade_intro_script_add (GladeIntro *intro,
+ const gchar *name,
+ const gchar *text,
+ GladeIntroPosition position,
+ gdouble delay)
+{
+ GladeIntroPrivate *priv;
+ ScriptNode *node;
+
+ g_return_if_fail (GLADE_IS_INTRO (intro));
+ priv = GET_PRIVATE (intro);
+
+ node = g_new0 (ScriptNode, 1);
+ node->name = name;
+ node->text = text;
+ node->position = position;
+ node->delay = delay * 1000;
+
+ priv->script = g_list_append (priv->script, node);
+}
+
+static gboolean script_play (gpointer data);
+
+static void
+hide_current_node (GladeIntro *intro)
+{
+ GladeIntroPrivate *priv = GET_PRIVATE (intro);
+ ScriptNode *node;
+
+ if (priv->current && (node = priv->current->data))
+ {
+ if (node->widget)
+ gtk_style_context_remove_class (gtk_widget_get_style_context (node->widget),
+ "glade-intro-highlight");
+ g_signal_emit (intro, intro_signals[HIDE_NODE], 0, node->name, node->widget);
+ }
+
+ if (priv->popover)
+ gtk_popover_popdown (priv->popover);
+}
+
+static gboolean
+script_transition (gpointer data)
+{
+ GladeIntroPrivate *priv = GET_PRIVATE (data);
+
+ hide_current_node (data);
+ priv->timeout_id = g_timeout_add (250, script_play, data);
+
+ return G_SOURCE_REMOVE;
+}
+
+static void
+on_popover_closed (GtkPopover *popover, GladeIntro *intro)
+{
+ glade_intro_pause (intro);
+}
+
+static GtkWidget *
+glade_intro_popover_new (GladeIntro *intro, const gchar *text)
+{
+ GtkWidget *popover, *box, *image, *label;
+
+ popover = gtk_popover_new (NULL);
+ label = gtk_label_new (text);
+ box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+ image = gtk_image_new_from_icon_name ("dialog-information-symbolic", GTK_ICON_SIZE_DIALOG);
+
+ gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+ gtk_label_set_max_width_chars (GTK_LABEL (label), 28);
+
+ gtk_box_pack_start (GTK_BOX (box), image, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
+ gtk_container_add (GTK_CONTAINER (popover), box);
+
+ gtk_style_context_add_class (gtk_widget_get_style_context (popover), "glade-intro");
+ g_signal_connect (popover, "closed", G_CALLBACK (on_popover_closed), intro);
+
+ gtk_widget_show_all (box);
+
+ return popover;
+}
+
+static gboolean
+script_play (gpointer data)
+{
+ GladeIntroPrivate *priv = GET_PRIVATE (data);
+ GtkStyleContext *context;
+ ScriptNode *node;
+
+ priv->timeout_id = 0;
+
+ if (priv->script == NULL)
+ return G_SOURCE_REMOVE;
+
+ /* Set current node to prenset */
+ priv->current = (priv->current) ? g_list_next (priv->current) : priv->script;
+
+ if (!priv->current || !(node = priv->current->data))
+ return G_SOURCE_REMOVE;
+
+ g_clear_object (&priv->popover);
+
+ if ((node->widget = g_hash_table_lookup (priv->widgets, node->name)) && node->text)
+ {
+ /* Ensure the widget is visible */
+ if (!gtk_widget_is_visible (node->widget))
+ {
+ GtkWidget *parent;
+ /* if the widget is inside a popover pop it up */
+ if ((parent = gtk_widget_get_ancestor (node->widget, GTK_TYPE_POPOVER)))
+ gtk_popover_popup (GTK_POPOVER (parent));
+ }
+
+ context = gtk_widget_get_style_context (node->widget);
+ gtk_style_context_add_class (context, "glade-intro-highlight");
+
+ /* Create popover */
+ priv->popover = g_object_ref_sink (glade_intro_popover_new (data, node->text));
+ gtk_popover_set_relative_to (priv->popover, node->widget);
+
+ if (node->position == GLADE_INTRO_BOTTOM)
+ gtk_popover_set_position (priv->popover, GTK_POS_BOTTOM);
+ else if (node->position == GLADE_INTRO_LEFT)
+ gtk_popover_set_position (priv->popover, GTK_POS_LEFT);
+ else if (node->position == GLADE_INTRO_RIGHT)
+ gtk_popover_set_position (priv->popover, GTK_POS_RIGHT);
+ else if (node->position == GLADE_INTRO_CENTER)
+ {
+ GdkRectangle rect = {
+ gtk_widget_get_allocated_width (node->widget)/2,
+ gtk_widget_get_allocated_height (node->widget)/2,
+ 4, 4
+ };
+
+ gtk_popover_set_pointing_to (priv->popover, &rect);
+ gtk_popover_set_position (priv->popover, GTK_POS_TOP);
+ }
+ }
+
+ g_signal_emit (data, intro_signals[SHOW_NODE], 0, node->name, node->widget);
+
+ if (priv->popover)
+ gtk_popover_popup (priv->popover);
+
+ priv->timeout_id = g_timeout_add (node->delay, script_transition, data);
+
+ return G_SOURCE_REMOVE;
+}
+
+void
+glade_intro_play (GladeIntro *intro)
+{
+ g_return_if_fail (GLADE_IS_INTRO (intro));
+
+ script_play (intro);
+
+ g_object_notify_by_pspec (G_OBJECT (intro), properties[PROP_STATE]);
+}
+
+void
+glade_intro_pause (GladeIntro *intro)
+{
+ GladeIntroPrivate *priv;
+
+ g_return_if_fail (GLADE_IS_INTRO (intro));
+ priv = GET_PRIVATE (intro);
+
+ if (priv->timeout_id)
+ g_source_remove (priv->timeout_id);
+
+ priv->timeout_id = 0;
+ hide_current_node (intro);
+
+ g_object_notify_by_pspec (G_OBJECT (intro), properties[PROP_STATE]);
+}
+
+void
+glade_intro_stop (GladeIntro *intro)
+{
+ GladeIntroPrivate *priv;
+
+ g_return_if_fail (GLADE_IS_INTRO (intro));
+ priv = GET_PRIVATE (intro);
+
+ glade_intro_pause (intro);
+ priv->current = NULL;
+
+ g_object_notify_by_pspec (G_OBJECT (intro), properties[PROP_STATE]);
+}
diff --git a/src/glade-intro.h b/src/glade-intro.h
new file mode 100644
index 0000000..1a759e1
--- /dev/null
+++ b/src/glade-intro.h
@@ -0,0 +1,69 @@
+/*
+ * glade-intro.h
+ *
+ * Copyright (C) 2017 Juan Pablo Ugarte
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Authors:
+ * Juan Pablo Ugarte <juanpablougarte gmail com>
+ */
+
+#ifndef _GLADE_INTRO_H_
+#define _GLADE_INTRO_H_
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+#define GLADE_TYPE_INTRO (glade_intro_get_type ())
+G_DECLARE_FINAL_TYPE (GladeIntro, glade_intro, GLADE, INTRO, GObject)
+
+typedef enum
+{
+ GLADE_INTRO_STATE_NULL = 0,
+ GLADE_INTRO_STATE_PLAYING,
+ GLADE_INTRO_STATE_PAUSED
+} GladeIntroState;
+
+typedef enum
+{
+ GLADE_INTRO_NONE = 0,
+ GLADE_INTRO_TOP,
+ GLADE_INTRO_BOTTOM,
+ GLADE_INTRO_RIGHT,
+ GLADE_INTRO_LEFT,
+ GLADE_INTRO_CENTER
+} GladeIntroPosition;
+
+GladeIntro *glade_intro_new (GtkWindow *toplevel);
+
+void glade_intro_set_toplevel (GladeIntro *intro,
+ GtkWindow *toplevel);
+
+void glade_intro_script_add (GladeIntro *intro,
+ const gchar *name,
+ const gchar *text,
+ GladeIntroPosition position,
+ gdouble delay);
+
+void glade_intro_play (GladeIntro *intro);
+void glade_intro_pause (GladeIntro *intro);
+void glade_intro_stop (GladeIntro *intro);
+
+
+G_END_DECLS
+
+#endif /* _GLADE_INTRO_H_ */
diff --git a/src/glade-window.c b/src/glade-window.c
index 8334f28..94c92f6 100644
--- a/src/glade-window.c
+++ b/src/glade-window.c
@@ -30,6 +30,7 @@
#include "glade-resources.h"
#include "glade-preferences.h"
#include "glade-registration.h"
+#include "glade-intro.h"
#include <gladeui/glade.h>
#include <gladeui/glade-popup.h>
@@ -100,7 +101,7 @@ struct _GladeWindowPrivate
GtkAccelGroup *accelgroup;
- GtkAction *save_action, *quit_action;
+ GtkAction *new_action, *save_action, *quit_action;
GtkAction *undo_action, *redo_action, *cut_action, *copy_action, *paste_action, *delete_action;
GtkAction *selector_radioaction;
@@ -129,6 +130,8 @@ struct _GladeWindowPrivate
GtkWidget *registration; /* Registration and user survey dialog */
+ GladeIntro *intro;
+
GdkRectangle position;
};
@@ -2223,6 +2226,12 @@ on_quit_action_activate (GtkAction *action, GladeWindow *window)
}
static void
+on_intro_button_clicked (GtkWidget *button, GladeWindow *window)
+{
+ glade_intro_play (window->priv->intro);
+}
+
+static void
glade_window_init (GladeWindow *window)
{
GladeWindowPrivate *priv;
@@ -2253,6 +2262,107 @@ glade_window_init (GladeWindow *window)
}
static void
+on_intro_show_node (GladeIntro *intro,
+ const gchar *node,
+ GtkWidget *widget,
+ GladeWindow *window)
+{
+ if (!g_strcmp0 (node, "action-new"))
+ {
+ GladeProject *project;
+ GladeWidget *win, *box, *button;
+
+ gtk_action_activate (window->priv->new_action);
+ project = get_active_project (window);
+ win = glade_command_create (glade_widget_adaptor_get_by_type (GTK_TYPE_WINDOW),
+ NULL, NULL, project);
+
+ gtk_action_activate (window->priv->new_action);
+ project = get_active_project (window);
+ win = glade_command_create (glade_widget_adaptor_get_by_type (GTK_TYPE_WINDOW),
+ NULL, NULL, project);
+ box = glade_command_create (glade_widget_adaptor_get_by_type (GTK_TYPE_BOX),
+ win, NULL, project);
+ button = glade_command_create (glade_widget_adaptor_get_by_type (GTK_TYPE_BUTTON),
+ box, NULL, project);
+ glade_project_selection_add (project, glade_widget_get_object (button), TRUE);
+ }
+ else if (!g_strcmp0 (node, "adaptor-search-button") ||
+ !g_strcmp0 (node, "adaptor-others-button"))
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
+ else if (!g_strcmp0 (node, "adaptor-gtk-buttonbox"))
+ {
+ GList *children;
+
+ if ((children = gtk_container_get_children (GTK_CONTAINER (widget))))
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (children->data), TRUE);
+
+ g_list_free (children);
+ }
+}
+
+static void
+on_intro_hide_node (GladeIntro *intro,
+ const gchar *node,
+ GtkWidget *widget,
+ GladeWindow *window)
+{
+ if (!g_strcmp0 (node, "adaptor-search-button") ||
+ !g_strcmp0 (node, "adaptor-others-button"))
+ {
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE);
+ }
+ else if (!g_strcmp0 (node, "adaptor-gtk-buttonbox"))
+ {
+ GList *children;
+
+ if ((children = gtk_container_get_children (GTK_CONTAINER (widget))))
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (children->data), FALSE);
+
+ g_list_free (children);
+ }
+}
+
+#define ADD_NODE(n,P,d,t) glade_intro_script_add (window->priv->intro, n, t, GLADE_INTRO_##P, d)
+
+static void
+glade_window_populate_intro (GladeWindow *window)
+{
+ ADD_NODE ("headerbar", BOTTOM, 4, _("Hello, this is Glade's new UI walktrought"));
+
+ ADD_NODE ("open-button", BOTTOM, 3, _("Start by opening a project"));
+ ADD_NODE ("recent-button", BOTTOM, 2, _("a recently used one"));
+ ADD_NODE ("new-button", BOTTOM, 2, _("or create a new one"));
+ ADD_NODE ("action-new", NONE, .75, NULL);
+
+ ADD_NODE ("undo-button", BOTTOM, 1, _("Undo..."));
+ ADD_NODE ("redo-button", BOTTOM, 1, _("Redo..."));
+ ADD_NODE ("save-button", BOTTOM, 5, _("and Save button are directly accesible in the headerbar"));
+ ADD_NODE ("save-as-button", BOTTOM, 2, _("just like Save As..."));
+ ADD_NODE ("properties-button", BOTTOM, 2, _("project properties"));
+ ADD_NODE ("menu-button", BOTTOM, 4, _("and the rest of less commonly used actions"));
+
+ ADD_NODE ("project-switcher", BOTTOM, 4, _("You can also switch between projects"));
+
+ ADD_NODE ("inspector", CENTER, 3, _("The object inspector took the palette place"));
+ ADD_NODE ("editor", CENTER, 4, _("To free up space for the property editor"));
+
+ ADD_NODE ("adaptor-chooser", BOTTOM, 6, _("This is the new object class chooser"));
+ ADD_NODE ("adaptor-gtk-buttonbox", BOTTOM, 4, _("You can investigate Gtk widget groups"));
+ ADD_NODE ("adaptor-others-button", RIGHT, 5, _("find classes from other libraries"));
+ ADD_NODE ("adaptor-search-button", RIGHT, 5, _("or simply search all class supported by Glade"));
+
+ ADD_NODE ("headerbar", BOTTOM, 2, _("Enjoy!"));
+
+ g_signal_connect (window->priv->intro, "show-node",
+ G_CALLBACK (on_intro_show_node),
+ window);
+ g_signal_connect (window->priv->intro, "hide-node",
+ G_CALLBACK (on_intro_hide_node),
+ window);
+}
+
+static void
glade_window_constructed (GObject *object)
{
GladeWindow *window = GLADE_WINDOW (object);
@@ -2335,6 +2445,9 @@ glade_window_constructed (GObject *object)
}
#endif
+ priv->intro = glade_intro_new (GTK_WINDOW (window));
+ glade_window_populate_intro (window);
+
refresh_title (window);
}
@@ -2390,6 +2503,7 @@ glade_window_class_init (GladeWindowClass *klass)
gtk_widget_class_bind_template_child_private (widget_class, GladeWindow, about_menuitem);
/* Actions */
+ gtk_widget_class_bind_template_child_private (widget_class, GladeWindow, new_action);
gtk_widget_class_bind_template_child_private (widget_class, GladeWindow, save_action);
gtk_widget_class_bind_template_child_private (widget_class, GladeWindow, quit_action);
gtk_widget_class_bind_template_child_private (widget_class, GladeWindow, undo_action);
@@ -2429,6 +2543,7 @@ glade_window_class_init (GladeWindowClass *klass)
gtk_widget_class_bind_template_callback (widget_class, on_stack_visible_child_notify);
gtk_widget_class_bind_template_callback (widget_class, on_recent_menu_insert);
gtk_widget_class_bind_template_callback (widget_class, on_recent_menu_remove);
+ gtk_widget_class_bind_template_callback (widget_class, on_intro_button_clicked);
}
diff --git a/src/glade-window.css b/src/glade-window.css
index feae384..5430a07 100644
--- a/src/glade-window.css
+++ b/src/glade-window.css
@@ -67,7 +67,6 @@ GladeDesignView * {
}
#glade-brand-image {
- padding-top: 40px;
animation: brand-highlight 2s infinite alternate;
}
@@ -88,3 +87,28 @@ GladeDesignView * {
padding-bottom: 120px;
}
+/* GladeIntro */
+
+popover.glade-intro {
+ padding: 1em;
+}
+
+popover.glade-intro label {
+ font-size: 18px;
+ font-weight: bold;
+}
+
+@keyframes widget-highlight {
+ from { box-shadow: 0px 0px 10px @theme_selected_bg_color, inset 0px 0px 4px @theme_selected_bg_color; }
+ to { box-shadow: 0px 0px 4px @theme_selected_bg_color, inset 0px 0px 10px @theme_selected_bg_color; }
+}
+
+button.glade-intro-highlight,
+buttonbox.glade-intro-highlight > button,
+stackswitcher.glade-intro-highlight > button,
+#adaptor-chooser.glade-intro-highlight button,
+#inspector.glade-intro-highlight > box > scrolledwindow > treeview,
+#editor.glade-intro-highlight > notebook > stack > scrolledwindow {
+ animation: widget-highlight 1s infinite alternate;
+}
+
diff --git a/src/glade.glade b/src/glade.glade
index 75b78fd..3990d3d 100644
--- a/src/glade.glade
+++ b/src/glade.glade
@@ -450,6 +450,7 @@ Andreas Nilsson <andreas andreasn se></property>
<property name="name">glade-brand-image</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="margin_top">64</property>
<property name="pixel_size">250</property>
<property name="icon_name">glade-brand-symbolic</property>
</object>
@@ -512,6 +513,7 @@ Andreas Nilsson <andreas andreasn se></property>
<property name="orientation">vertical</property>
<child>
<object class="GtkStack" id="inspectors_stack">
+ <property name="name">inspector</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">3</property>
@@ -614,6 +616,7 @@ Andreas Nilsson <andreas andreasn se></property>
<property name="orientation">vertical</property>
<child>
<object class="GladeAdaptorChooser" id="adaptor_chooser">
+ <property name="name">adaptor-chooser</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">2</property>
@@ -638,6 +641,7 @@ Andreas Nilsson <andreas andreasn se></property>
</child>
<child>
<object class="GtkStack" id="view_stack">
+ <property name="name">workspace</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="transition_duration">128</property>
@@ -684,6 +688,7 @@ Andreas Nilsson <andreas andreasn se></property>
</child>
<child>
<object class="GladeEditor" id="editor">
+ <property name="name">editor</property>
<property name="width_request">256</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -709,6 +714,7 @@ Andreas Nilsson <andreas andreasn se></property>
</child>
<child type="titlebar">
<object class="GtkHeaderBar" id="headerbar">
+ <property name="name">headerbar</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="show_close_button">True</property>
@@ -722,6 +728,7 @@ Andreas Nilsson <andreas andreasn se></property>
<property name="label" translatable="yes">Open</property>
<property name="use_action_appearance">True</property>
<property name="related_action">open_action</property>
+ <property name="name">open-button</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -737,6 +744,7 @@ Andreas Nilsson <andreas andreasn se></property>
</child>
<child>
<object class="GtkMenuButton" id="recent_menu_button">
+ <property name="name">recent-button</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -766,6 +774,7 @@ Andreas Nilsson <andreas andreasn se></property>
<object class="GtkButton">
<property name="use_action_appearance">False</property>
<property name="related_action">new_action</property>
+ <property name="name">new-button</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -800,6 +809,7 @@ Andreas Nilsson <andreas andreasn se></property>
<object class="GtkButton" id="undo_button">
<property name="use_action_appearance">False</property>
<property name="related_action">undo_action</property>
+ <property name="name">undo-button</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -822,6 +832,7 @@ Andreas Nilsson <andreas andreasn se></property>
<object class="GtkButton" id="redo_button">
<property name="use_action_appearance">False</property>
<property name="related_action">redo_action</property>
+ <property name="name">redo-button</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -848,6 +859,7 @@ Andreas Nilsson <andreas andreasn se></property>
</child>
<child type="title">
<object class="GtkStackSwitcher" id="project_switcher">
+ <property name="name">project-switcher</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stack">view_stack</property>
@@ -855,6 +867,7 @@ Andreas Nilsson <andreas andreasn se></property>
</child>
<child>
<object class="GtkMenuButton">
+ <property name="name">menu-button</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -876,6 +889,7 @@ Andreas Nilsson <andreas andreasn se></property>
<object class="GtkButton">
<property name="use_action_appearance">False</property>
<property name="related_action">properties_action</property>
+ <property name="name">properties-button</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -904,6 +918,7 @@ Andreas Nilsson <andreas andreasn se></property>
<property name="label" translatable="yes">Save</property>
<property name="use_action_appearance">True</property>
<property name="related_action">save_action</property>
+ <property name="name">save-button</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -920,6 +935,7 @@ Andreas Nilsson <andreas andreasn se></property>
<object class="GtkButton">
<property name="use_action_appearance">False</property>
<property name="related_action">save_as_action</property>
+ <property name="name">save-as-button</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -945,6 +961,33 @@ Andreas Nilsson <andreas andreasn se></property>
<property name="position">3</property>
</packing>
</child>
+ <child>
+ <object class="GtkButton" id="intro_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip_text" translatable="yes">Start/resume interactive UI
introduction</property>
+ <property name="relief">none</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="on_intro_button_clicked" swapped="no"/>
+ <child>
+ <object class="GtkImage">
+ <property name="name">glade-brand-image</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">glade-brand-symbolic</property>
+ <property name="icon_size">3</property>
+ <style>
+ <class name="glade-tight-fit"/>
+ </style>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="pack_type">end</property>
+ <property name="position">7</property>
+ </packing>
+ </child>
</object>
</child>
</template>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
