AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'nbpage' into 'master'

Browse Source 
Notebook child metas

See merge request GNOME/gtk!594
This commit is contained in:
Matthias Clasen 2019-02-21 05:50:05 +00:00
commit f95ed63b88
26 changed files with 2247 additions and 1964 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

480
demos/widget-factory/widget-factory.ui
View File

@ -1224,48 +1224,47 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
<object class="GtkNotebook" id="notebook1"> <object class="GtkNotebook" id="notebook1">
<property name="can-focus">1</property> <property name="can-focus">1</property>
<child> <child>
<object class="GtkBox" id="box6"> <object class="GtkNotebookPage">
<property name="orientation">vertical</property> <property name="child">
<object class="GtkBox" id="box6">
<property name="orientation">vertical</property>
</object>
</property>
<property name="tab">
<object class="GtkLabel" id="label5">
<property name="label" translatable="yes">page 1</property>
</object>
</property>
</object> </object>
</child> </child>
<child type="tab">
<object class="GtkLabel" id="label5">
<property name="label" translatable="yes">page 1</property>
</object>
<packing>
<property name="tab-fill">0</property>
</packing>
</child>
<child> <child>
<object class="GtkBox" id="box7"> <object class="GtkNotebookPage">
<property name="orientation">vertical</property> <property name="child">
<object class="GtkBox" id="box7">
<property name="orientation">vertical</property>
</object>
</property>
<property name="tab">
<object class="GtkLabel" id="label6">
<property name="label" translatable="yes">page 2</property>
</object>
</property>
</object> </object>
</child> </child>
<child type="tab">
<object class="GtkLabel" id="label6">
<property name="label" translatable="yes">page 2</property>
</object>
<packing>
<property name="position">1</property>
<property name="tab-fill">0</property>
</packing>
</child>
<child> <child>
<object class="GtkBox" id="box8"> <object class="GtkNotebookPage">
<property name="orientation">vertical</property>
</object>
<packing>
<property name="position">2</property> <property name="position">2</property>
</packing> <property name="child">
</child> <object class="GtkBox" id="box8">
<child type="tab"> <property name="orientation">vertical</property>
<object class="GtkLabel" id="label7"> </object>
<property name="label" translatable="yes">page 3</property> </property>
<property name="tab">
<object class="GtkLabel" id="label7">
<property name="label" translatable="yes">page 3</property>
</object>
</property>
</object> </object>
<packing>
<property name="position">2</property>
<property name="tab-fill">0</property>
</packing>
</child> </child>
</object> </object>
</child> </child>
@ -1274,51 +1273,48 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
<property name="can-focus">1</property> <property name="can-focus">1</property>
<property name="tab-pos">right</property> <property name="tab-pos">right</property>
<child> <child>
<object class="GtkBox" id="box9"> <object class="GtkNotebookPage">
<property name="orientation">vertical</property> <property name="child">
<object class="GtkBox" id="box9">
<property name="orientation">vertical</property>
</object>
</property>
<property name="tab">
<object class="GtkLabel" id="label8">
<property name="label" translatable="yes">page 1</property>
</object>
</property>
</object> </object>
</child> </child>
<child type="tab">
<object class="GtkLabel" id="label8">
<property name="label" translatable="yes">page 1</property>
</object>
<packing>
<property name="tab-fill">0</property>
</packing>
</child>
<child> <child>
<object class="GtkBox" id="box10"> <object class="GtkNotebookPage">
<property name="orientation">vertical</property>
</object>
<packing>
<property name="position">1</property> <property name="position">1</property>
</packing> <property name="child">
</child> <object class="GtkBox" id="box10">
<child type="tab"> <property name="orientation">vertical</property>
<object class="GtkLabel" id="label9"> </object>
<property name="label" translatable="yes">page 2</property> </property>
<property name="tab">
<object class="GtkLabel" id="label9">
<property name="label" translatable="yes">page 2</property>
</object>
</property>
</object> </object>
<packing>
<property name="position">1</property>
<property name="tab-fill">0</property>
</packing>
</child> </child>
<child> <child>
<object class="GtkBox" id="box11"> <object class="GtkNotebookPage">
<property name="orientation">vertical</property>
</object>
<packing>
<property name="position">2</property> <property name="position">2</property>
</packing> <property name="child">
</child> <object class="GtkBox" id="box11">
<child type="tab"> <property name="orientation">vertical</property>
<object class="GtkLabel" id="label10"> </object>
<property name="label" translatable="yes">page 3</property> </property>
<property name="tab">
<object class="GtkLabel" id="label10">
<property name="label" translatable="yes">page 3</property>
</object>
</property>
</object> </object>
<packing>
<property name="position">2</property>
<property name="tab-fill">0</property>
</packing>
</child> </child>
</object> </object>
</child> </child>
@ -1327,51 +1323,48 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
<property name="can-focus">1</property> <property name="can-focus">1</property>
<property name="tab-pos">bottom</property> <property name="tab-pos">bottom</property>
<child> <child>
<object class="GtkBox" id="box12"> <object class="GtkNotebookPage">
<property name="orientation">vertical</property> <property name="child">
<object class="GtkBox" id="box12">
<property name="orientation">vertical</property>
</object>
</property>
<property name="tab">
<object class="GtkLabel" id="label11">
<property name="label" translatable="yes">page 1</property>
</object>
</property>
</object> </object>
</child> </child>
<child type="tab">
<object class="GtkLabel" id="label11">
<property name="label" translatable="yes">page 1</property>
</object>
<packing>
<property name="tab-fill">0</property>
</packing>
</child>
<child> <child>
<object class="GtkBox" id="box13"> <object class="GtkNotebookPage">
<property name="orientation">vertical</property>
</object>
<packing>
<property name="position">1</property> <property name="position">1</property>
</packing> <property name="child">
</child> <object class="GtkBox" id="box13">
<child type="tab"> <property name="orientation">vertical</property>
<object class="GtkLabel" id="label12"> </object>
<property name="label" translatable="yes">page 2</property> </property>
<property name="tab">
<object class="GtkLabel" id="label12">
<property name="label" translatable="yes">page 2</property>
</object>
</property>
</object> </object>
<packing>
<property name="position">1</property>
<property name="tab-fill">0</property>
</packing>
</child> </child>
<child> <child>
<object class="GtkBox" id="box14"> <object class="GtkNotebookPage">
<property name="orientation">vertical</property>
</object>
<packing>
<property name="position">2</property> <property name="position">2</property>
</packing> <property name="child">
</child> <object class="GtkBox" id="box14">
<child type="tab"> <property name="orientation">vertical</property>
<object class="GtkLabel" id="label13"> </object>
<property name="label" translatable="yes">page 3</property> </property>
<property name="tab">
<object class="GtkLabel" id="label13">
<property name="label" translatable="yes">page 3</property>
</object>
</property>
</object> </object>
<packing>
<property name="position">2</property>
<property name="tab-fill">0</property>
</packing>
</child> </child>
</object> </object>
</child> </child>
@ -1380,51 +1373,48 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
<property name="can-focus">1</property> <property name="can-focus">1</property>
<property name="tab-pos">left</property> <property name="tab-pos">left</property>
<child> <child>
<object class="GtkBox" id="box15"> <object class="GtkNotebookPage">
<property name="orientation">vertical</property> <property name="child">
<object class="GtkBox" id="box15">
<property name="orientation">vertical</property>
</object>
</property>
<property name="tab">
<object class="GtkLabel" id="label14">
<property name="label" translatable="yes">page 1</property>
</object>
</property>
</object> </object>
</child> </child>
<child type="tab">
<object class="GtkLabel" id="label14">
<property name="label" translatable="yes">page 1</property>
</object>
<packing>
<property name="tab-fill">0</property>
</packing>
</child>
<child> <child>
<object class="GtkBox" id="box16"> <object class="GtkNotebookPage">
<property name="orientation">vertical</property>
</object>
<packing>
<property name="position">1</property> <property name="position">1</property>
</packing> <property name="child">
</child> <object class="GtkBox" id="box16">
<child type="tab"> <property name="orientation">vertical</property>
<object class="GtkLabel" id="label15"> </object>
<property name="label" translatable="yes">page 2</property> </property>
<property name="tab">
<object class="GtkLabel" id="label15">
<property name="label" translatable="yes">page 2</property>
</object>
</property>
</object> </object>
<packing>
<property name="position">1</property>
<property name="tab-fill">0</property>
</packing>
</child> </child>
<child> <child>
<object class="GtkBox" id="box17"> <object class="GtkNotebookPage">
<property name="orientation">vertical</property>
</object>
<packing>
<property name="position">2</property> <property name="position">2</property>
</packing> <property name="child">
</child> <object class="GtkBox" id="box17">
<child type="tab"> <property name="orientation">vertical</property>
<object class="GtkLabel" id="label16"> </object>
<property name="label" translatable="yes">page 3</property> </property>
<property name="tab">
<object class="GtkLabel" id="label16">
<property name="label" translatable="yes">page 3</property>
</object>
</property>
</object> </object>
<packing>
<property name="position">2</property>
<property name="tab-fill">0</property>
</packing>
</child> </child>
</object> </object>
</child> </child>
@ -2892,63 +2882,67 @@ microphone-sensitivity-medium-symbolic</property>
<object class="GtkNotebook"> <object class="GtkNotebook">
<property name="show-border">0</property> <property name="show-border">0</property>
<child> <child>
<object class="GtkBox" id="closable_page_1"> <object class="GtkNotebookPage">
<property name="height-request">120</property>
</object>
<packing>
<property name="tab-expand">1</property> <property name="tab-expand">1</property>
</packing> <property name="child">
</child> <object class="GtkBox" id="closable_page_1">
<child type="tab"> <property name="height-request">120</property>
<object class="GtkBox">
<child>
<object class="GtkLabel">
<property name="label" translatable="yes">Page 1</property>
<property name="halign">center</property>
<property name="hexpand">1</property>
</object> </object>
</child> </property>
<child> <property name="tab">
<object class="GtkButton"> <object class="GtkBox">
<property name="relief">none</property> <child>
<property name="focus-on-click">0</property> <object class="GtkLabel">
<property name="icon-name">window-close-symbolic</property> <property name="label" translatable="yes">Page 1</property>
<signal name="clicked" handler="tab_close_cb" object="closable_page_1"/> <property name="halign">center</property>
<style> <property name="hexpand">1</property>
<class name="small-button"/> </object>
</style> </child>
<child>
<object class="GtkButton">
<property name="relief">none</property>
<property name="focus-on-click">0</property>
<property name="icon-name">window-close-symbolic</property>
<signal name="clicked" handler="tab_close_cb" object="closable_page_1"/>
<style>
<class name="small-button"/>
</style>
</object>
</child>
</object> </object>
</child> </property>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkBox" id="closable_page_2"> <object class="GtkNotebookPage">
<property name="vexpand">1</property>
</object>
<packing>
<property name="tab-expand">1</property> <property name="tab-expand">1</property>
</packing> <property name="child">
</child> <object class="GtkBox" id="closable_page_2">
<child type="tab"> <property name="vexpand">1</property>
<object class="GtkBox">
<child>
<object class="GtkLabel">
<property name="label" translatable="yes">Page 2</property>
<property name="halign">center</property>
<property name="hexpand">1</property>
</object> </object>
</child> </property>
<child> <property name="tab">
<object class="GtkButton"> <object class="GtkBox">
<property name="relief">none</property> <child>
<property name="focus-on-click">0</property> <object class="GtkLabel">
<property name="icon-name">window-close-symbolic</property> <property name="label" translatable="yes">Page 2</property>
<signal name="clicked" handler="tab_close_cb" object="closable_page_2"/> <property name="halign">center</property>
<style> <property name="hexpand">1</property>
<class name="small-button"/> </object>
</style> </child>
<child>
<object class="GtkButton">
<property name="relief">none</property>
<property name="focus-on-click">0</property>
<property name="icon-name">window-close-symbolic</property>
<signal name="clicked" handler="tab_close_cb" object="closable_page_2"/>
<style>
<class name="small-button"/>
</style>
</object>
</child>
</object> </object>
</child> </property>
</object> </object>
</child> </child>
</object> </object>
@ -2957,13 +2951,17 @@ microphone-sensitivity-medium-symbolic</property>
<object class="GtkNotebook"> <object class="GtkNotebook">
<property name="show-border">0</property> <property name="show-border">0</property>
<child> <child>
<object class="GtkBox"> <object class="GtkNotebookPage">
<property name="vexpand">1</property> <property name="child">
</object> <object class="GtkBox">
</child> <property name="vexpand">1</property>
<child type="tab"> </object>
<object class="GtkLabel"> </property>
<property name="label" translatable="yes">Page 3</property> <property name="tab">
<object class="GtkLabel">
<property name="label" translatable="yes">Page 3</property>
</object>
</property>
</object> </object>
</child> </child>
</object> </object>
@ -3028,62 +3026,72 @@ microphone-sensitivity-medium-symbolic</property>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkBox"> <object class="GtkNotebookPage">
<property name="height-request">120</property>
</object>
<packing>
<property name="tab-expand">1</property> <property name="tab-expand">1</property>
</packing> <property name="child">
</child> <object class="GtkBox">
<child type="tab"> <property name="height-request">120</property>
<object class="GtkLabel"> </object>
<property name="label" translatable="yes">Page 1</property> </property>
<property name="tab">
<object class="GtkLabel">
<property name="label" translatable="yes">Page 1</property>
</object>
</property>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkBox"> <object class="GtkNotebookPage">
<property name="height-request">40</property>
</object>
<packing>
<property name="tab-expand">1</property> <property name="tab-expand">1</property>
</packing> <property name="child">
</child> <object class="GtkBox">
<child type="tab"> <property name="height-request">40</property>
<object class="GtkLabel"> </object>
<property name="label" translatable="yes">Page 2</property> </property>
<property name="tab">
<object class="GtkLabel">
<property name="label" translatable="yes">Page 2</property>
</object>
</property>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkBox"/> <object class="GtkNotebookPage">
<packing>
<property name="tab-expand">1</property> <property name="tab-expand">1</property>
</packing> <property name="child">
</child> <object class="GtkBox"/>
<child type="tab"> </property>
<object class="GtkLabel"> <property name="tab">
<property name="label" translatable="yes">Page 3</property> <object class="GtkLabel">
<property name="label" translatable="yes">Page 3</property>
</object>
</property>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkBox"/> <object class="GtkNotebookPage">
<packing>
<property name="tab-expand">1</property> <property name="tab-expand">1</property>
</packing> <property name="child">
</child> <object class="GtkBox"/>
<child type="tab"> </property>
<object class="GtkLabel"> <property name="tab">
<property name="label" translatable="yes">Page 4</property> <object class="GtkLabel">
<property name="label" translatable="yes">Page 4</property>
</object>
</property>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkBox"/> <object class="GtkNotebookPage">
<packing>
<property name="tab-expand">1</property> <property name="tab-expand">1</property>
</packing> <property name="child">
</child> <object class="GtkBox"/>
<child type="tab"> </property>
<object class="GtkLabel"> <property name="tab">
<property name="label" translatable="yes">Page 5</property> <object class="GtkLabel">
<property name="label" translatable="yes">Page 5</property>
</object>
</property>
</object> </object>
</child> </child>
</object> </object>

13
gtk/gtkassistant.c
View File

@ -470,6 +470,18 @@ escape_cb (GtkAssistant *assistant)
g_signal_stop_emission (assistant, signals[ESCAPE], 0); g_signal_stop_emission (assistant, signals[ESCAPE], 0);
} }
static void
gtk_assistant_finalize (GObject *object)
{
GtkAssistant *assistant = GTK_ASSISTANT (object);
GtkAssistantPrivate *priv = assistant->priv;
if (priv->model)
g_object_remove_weak_pointer (G_OBJECT (priv->model), (gpointer *)&priv->model);
G_OBJECT_CLASS (gtk_assistant_parent_class)->finalize (object);
}
static void static void
gtk_assistant_class_init (GtkAssistantClass *class) gtk_assistant_class_init (GtkAssistantClass *class)
{ {
@ -484,6 +496,7 @@ gtk_assistant_class_init (GtkAssistantClass *class)
container_class = (GtkContainerClass *) class; container_class = (GtkContainerClass *) class;
window_class = (GtkWindowClass *) class; window_class = (GtkWindowClass *) class;
gobject_class->finalize = gtk_assistant_finalize;
gobject_class->constructed = gtk_assistant_constructed; gobject_class->constructed = gtk_assistant_constructed;
gobject_class->set_property = gtk_assistant_set_property; gobject_class->set_property = gtk_assistant_set_property;
gobject_class->get_property = gtk_assistant_get_property; gobject_class->get_property = gtk_assistant_get_property;

896
gtk/gtknotebook.c
View File

File diff suppressed because it is too large Load Diff

21
gtk/gtknotebook.h
View File

@ -43,6 +43,16 @@ G_BEGIN_DECLS
#define GTK_IS_NOTEBOOK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_NOTEBOOK)) #define GTK_IS_NOTEBOOK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_NOTEBOOK))
#define GTK_NOTEBOOK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_NOTEBOOK, GtkNotebookClass)) #define GTK_NOTEBOOK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_NOTEBOOK, GtkNotebookClass))
#define GTK_TYPE_NOTEBOOK_PAGE (gtk_notebook_page_get_type ())
#define GTK_NOTEBOOK_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_NOTEBOOK_PAGE, GtkNotebookPage))
#define GTK_NOTEBOOK_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_NOTEBOOK_PAGE, GtkNotebookPageClass))
#define GTK_IS_NOTEBOOK_PAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_NOTEBOOK_PAGE))
#define GTK_IS_NOTEBOOK_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_NOTEBOOK_PAGE))
#define GTK_NOTEBOOK_PAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_NOTEBOOK_PAGE, GtkNotebookPageClass))
typedef struct _GtkNotebookPage GtkNotebookPage;
typedef struct _GtkNotebookPageClass GtkNotebookPageClass;
typedef enum typedef enum
{ {
@ -289,6 +299,17 @@ void gtk_notebook_set_action_widget (GtkNotebook *notebook,
GtkWidget *widget, GtkWidget *widget,
GtkPackType pack_type); GtkPackType pack_type);
GDK_AVAILABLE_IN_ALL
GType gtk_notebook_page_get_type (void) G_GNUC_CONST;
GDK_AVAILABLE_IN_ALL
GtkNotebookPage *gtk_notebook_get_page (GtkNotebook *notebook,
GtkWidget *child);
GDK_AVAILABLE_IN_ALL
GtkWidget *gtk_notebook_page_get_child (GtkNotebookPage *page);
GDK_AVAILABLE_IN_ALL
GListModel *gtk_notebook_get_pages (GtkNotebook *notebook);
G_END_DECLS G_END_DECLS
#endif /* __GTK_NOTEBOOK_H__ */ #endif /* __GTK_NOTEBOOK_H__ */

2
gtk/gtksearchentry.c
View File

@ -707,5 +707,5 @@ gtk_search_entry_get_text_widget (GtkSearchEntry *entry)
{ {
GtkSearchEntryPrivate *priv = gtk_search_entry_get_instance_private (entry); GtkSearchEntryPrivate *priv = gtk_search_entry_get_instance_private (entry);
return priv->entry; return GTK_TEXT (priv->entry);
} }

8
gtk/gtktext.c
View File

@ -253,7 +253,6 @@ enum {
PROP_0, PROP_0,
PROP_BUFFER, PROP_BUFFER,
PROP_MAX_LENGTH, PROP_MAX_LENGTH,
PROP_HAS_FRAME,
PROP_VISIBILITY, PROP_VISIBILITY,
PROP_INVISIBLE_CHAR, PROP_INVISIBLE_CHAR,
PROP_INVISIBLE_CHAR_SET, PROP_INVISIBLE_CHAR_SET,
@ -721,13 +720,6 @@ gtk_text_class_init (GtkTextClass *class)
0, 0,
GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY); GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
text_props[PROP_HAS_FRAME] =
g_param_spec_boolean ("has-frame",
P_("Has Frame"),
P_("FALSE removes outside bevel from self"),
FALSE,
GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
text_props[PROP_INVISIBLE_CHAR] = text_props[PROP_INVISIBLE_CHAR] =
g_param_spec_unichar ("invisible-char", g_param_spec_unichar ("invisible-char",
P_("Invisible character"), P_("Invisible character"),

78
gtk/gtktext.h
View File

@ -42,13 +42,9 @@ G_BEGIN_DECLS
#define GTK_TYPE_TEXT (gtk_text_get_type ()) #define GTK_TYPE_TEXT (gtk_text_get_type ())
#define GTK_TEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TEXT, GtkText)) #define GTK_TEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TEXT, GtkText))
#define GTK_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT, GtkTextClass))
#define GTK_IS_TEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TEXT)) #define GTK_IS_TEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TEXT))
#define GTK_IS_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TEXT))
#define GTK_TEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TEXT, GtkTextClass))
typedef struct _GtkText GtkText; typedef struct _GtkText GtkText;
typedef struct _GtkTextClass GtkTextClass;
struct _GtkText struct _GtkText
{ {
@ -56,80 +52,6 @@ struct _GtkText
GtkWidget parent_instance; GtkWidget parent_instance;
}; };
/**
* GtkTextClass:
* @parent_class: The parent class.
* @populate_popup: Class handler for the #GtkText::populate-popup signal. If
* non-%NULL, this will be called to add additional entries to the context
* menu when it is displayed.
* @activate: Class handler for the #GtkText::activate signal. The default
* implementation calls gtk_window_activate_default() on the entry’s top-level
* window.
* @move_cursor: Class handler for the #GtkText::move-cursor signal. The
* default implementation specifies the standard #GtkText cursor movement
* behavior.
* @insert_at_cursor: Class handler for the #GtkText::insert-at-cursor signal.
* The default implementation inserts text at the cursor.
* @delete_from_cursor: Class handler for the #GtkText::delete-from-cursor
* signal. The default implementation deletes the selection or the specified
* number of characters or words.
* @backspace: Class handler for the #GtkText::backspace signal. The default
* implementation deletes the selection or a single character or word.
* @cut_clipboard: Class handler for the #GtkText::cut-clipboard signal. The
* default implementation cuts the selection, if one exists.
* @copy_clipboard: Class handler for the #GtkText::copy-clipboard signal. The
* default implementation copies the selection, if one exists.
* @paste_clipboard: Class handler for the #GtkText::paste-clipboard signal.
* The default implementation pastes at the current cursor position or over
* the current selection if one exists.
* @toggle_overwrite: Class handler for the #GtkText::toggle-overwrite signal.
* The default implementation toggles overwrite mode and blinks the cursor.
* @insert_emoji: Class handler for the #GtkText::insert-emoji signal.
*
* Class structure for #GtkText. All virtual functions have a default
* implementation. Derived classes may set the virtual function pointers for the
* signal handlers to %NULL, but must keep @get_text_area_size and
* @get_frame_size non-%NULL; either use the default implementation, or provide
* a custom one.
*/
struct _GtkTextClass
{
GtkWidgetClass parent_class;
/* Hook to customize right-click popup */
void (* populate_popup) (GtkText *self,
GtkWidget *popup);
/* Action signals
*/
void (* activate) (GtkText *self);
void (* move_cursor) (GtkText *self,
GtkMovementStep step,
gint count,
gboolean extend);
void (* insert_at_cursor) (GtkText *self,
const gchar *str);
void (* delete_from_cursor) (GtkText *self,
GtkDeleteType type,
gint count);
void (* backspace) (GtkText *self);
void (* cut_clipboard) (GtkText *self);
void (* copy_clipboard) (GtkText *self);
void (* paste_clipboard) (GtkText *self);
void (* toggle_overwrite) (GtkText *self);
void (* insert_emoji) (GtkText *self);
/*< private >*/
/* Padding for future expansion */
void (*_gtk_reserved1) (void);
void (*_gtk_reserved2) (void);
void (*_gtk_reserved3) (void);
void (*_gtk_reserved4) (void);
void (*_gtk_reserved5) (void);
void (*_gtk_reserved6) (void);
};
GDK_AVAILABLE_IN_ALL GDK_AVAILABLE_IN_ALL
GType gtk_text_get_type (void) G_GNUC_CONST; GType gtk_text_get_type (void) G_GNUC_CONST;

70
gtk/gtktextprivate.h
View File

@ -25,6 +25,76 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT, GtkTextClass))
#define GTK_IS_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TEXT))
#define GTK_TEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TEXT, GtkTextClass))
typedef struct _GtkTextClass GtkTextClass;
/*<private>
* GtkTextClass:
* @parent_class: The parent class.
* @populate_popup: Class handler for the #GtkText::populate-popup signal. If
* non-%NULL, this will be called to add additional entries to the context
* menu when it is displayed.
* @activate: Class handler for the #GtkText::activate signal. The default
* implementation calls gtk_window_activate_default() on the entry’s top-level
* window.
* @move_cursor: Class handler for the #GtkText::move-cursor signal. The
* default implementation specifies the standard #GtkText cursor movement
* behavior.
* @insert_at_cursor: Class handler for the #GtkText::insert-at-cursor signal.
* The default implementation inserts text at the cursor.
* @delete_from_cursor: Class handler for the #GtkText::delete-from-cursor
* signal. The default implementation deletes the selection or the specified
* number of characters or words.
* @backspace: Class handler for the #GtkText::backspace signal. The default
* implementation deletes the selection or a single character or word.
* @cut_clipboard: Class handler for the #GtkText::cut-clipboard signal. The
* default implementation cuts the selection, if one exists.
* @copy_clipboard: Class handler for the #GtkText::copy-clipboard signal. The
* default implementation copies the selection, if one exists.
* @paste_clipboard: Class handler for the #GtkText::paste-clipboard signal.
* The default implementation pastes at the current cursor position or over
* the current selection if one exists.
* @toggle_overwrite: Class handler for the #GtkText::toggle-overwrite signal.
* The default implementation toggles overwrite mode and blinks the cursor.
* @insert_emoji: Class handler for the #GtkText::insert-emoji signal.
*
* Class structure for #GtkText. All virtual functions have a default
* implementation. Derived classes may set the virtual function pointers for the
* signal handlers to %NULL, but must keep @get_text_area_size and
* @get_frame_size non-%NULL; either use the default implementation, or provide
* a custom one.
*/
struct _GtkTextClass
{
GtkWidgetClass parent_class;
/* Hook to customize right-click popup */
void (* populate_popup) (GtkText *self,
GtkWidget *popup);
/* Action signals
*/
void (* activate) (GtkText *self);
void (* move_cursor) (GtkText *self,
GtkMovementStep step,
gint count,
gboolean extend);
void (* insert_at_cursor) (GtkText *self,
const gchar *str);
void (* delete_from_cursor) (GtkText *self,
GtkDeleteType type,
gint count);
void (* backspace) (GtkText *self);
void (* cut_clipboard) (GtkText *self);
void (* copy_clipboard) (GtkText *self);
void (* paste_clipboard) (GtkText *self);
void (* toggle_overwrite) (GtkText *self);
void (* insert_emoji) (GtkText *self);
};
char * gtk_text_get_display_text (GtkText *entry, char * gtk_text_get_display_text (GtkText *entry,
int start_pos, int start_pos,
int end_pos); int end_pos);

125
gtk/tools/gtk-builder-tool-simplify.c
View File

@ -635,6 +635,127 @@ rewrite_assistant (Element *element,
element->children = new_children; element->children = new_children;
} }
static gboolean
has_attribute (Element *elt,
const char *name,
const char *value)
{
int i;
for (i = 0; elt->attribute_names[i]; i++)
{
if (strcmp (elt->attribute_names[i], name) == 0 &&
strcmp (elt->attribute_values[i], value) == 0)
return TRUE;
}
return FALSE;
}
static Element *
rewrite_notebook_page (Element *child, Element *tab, MyParserData *data)
{
Element *object = NULL;
Element *tab_obj = NULL;
Element *packing = NULL;
Element *new_object;
Element *prop;
GList *l;
if (!g_str_equal (child->element_name, "child"))
return child;
if (has_attribute (child, "type", "tab") ||
has_attribute (child, "type", "action-start") ||
has_attribute (child, "type", "action-end"))
return child;
for (l = child->children; l; l = l->next)
{
Element *elt = l->data;
if (g_str_equal (elt->element_name, "object"))
object = elt;
else if (g_str_equal (elt->element_name, "packing"))
packing = elt;
}
if (!packing && !tab)
return child;
if (tab)
{
for (l = tab->children; l; l = l->next)
{
Element *elt = l->data;
if (g_str_equal (elt->element_name, "object"))
tab_obj = elt;
}
}
new_object = g_new0 (Element, 1);
new_object->element_name = g_strdup ("object");
new_object->attribute_names = g_new0 (char *, 2);
new_object->attribute_names[0] = g_strdup ("class");
new_object->attribute_values = g_new0 (char *, 2);
new_object->attribute_values[0] = g_strdup ("GtkNotebookPage");
if (packing)
{
new_object->children = packing->children;
packing->children = NULL;
}
prop = g_new0 (Element, 1);
prop->element_name = g_strdup ("property");
prop->attribute_names = g_new0 (char *, 2);
prop->attribute_names[0] = g_strdup ("name");
prop->attribute_values = g_new0 (char *, 2);
prop->attribute_values[0] = g_strdup ("child");
prop->children = g_list_append (prop->children, object);
new_object->children = g_list_append (new_object->children, prop);
if (tab_obj)
{
prop = g_new0 (Element, 1);
prop->element_name = g_strdup ("property");
prop->attribute_names = g_new0 (char *, 2);
prop->attribute_names[0] = g_strdup ("name");
prop->attribute_values = g_new0 (char *, 2);
prop->attribute_values[0] = g_strdup ("tab");
prop->children = g_list_append (prop->children, tab_obj);
new_object->children = g_list_append (new_object->children, prop);
}
g_list_free (child->children);
child->children = g_list_append (NULL, new_object);
return child;
}
static void
rewrite_notebook (Element *element,
MyParserData *data)
{
GList *l, *new_children;
new_children = NULL;
for (l = element->children; l; l = l->next)
{
Element *child = l->data;
Element *tab = l->next ? l->next->data : NULL;
if (tab && has_attribute (tab, "type", "tab"))
{
new_children = g_list_append (new_children, rewrite_notebook_page (child, tab, data));
l = l->next; /* skip the tab */
}
else
new_children = g_list_append (new_children, rewrite_notebook_page (child, NULL, data));
}
g_list_free (element->children);
element->children = new_children;
}
static gboolean static gboolean
simplify_element (Element *element, simplify_element (Element *element,
MyParserData *data) MyParserData *data)
@ -681,6 +802,10 @@ simplify_element (Element *element,
g_str_equal (get_class_name (element), "GtkAssistant")) g_str_equal (get_class_name (element), "GtkAssistant"))
rewrite_assistant (element, data); rewrite_assistant (element, data);
if (g_str_equal (element->element_name, "object") &&
g_str_equal (get_class_name (element), "GtkNotebook"))
rewrite_notebook (element, data);
if (g_str_equal (element->element_name, "property") && if (g_str_equal (element->element_name, "property") &&
property_has_been_removed (element, data)) property_has_been_removed (element, data))
return TRUE; return TRUE;

1877
gtk/ui/gtkprintunixdialog.ui
View File

File diff suppressed because it is too large Load Diff

44
testsuite/a11y/notebook.ui
View File

@ -1,34 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface> <interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkWindow" id="window1"> <object class="GtkWindow" id="window1">
<property name="can_focus">False</property>
<property name="type">popup</property> <property name="type">popup</property>
<child> <child>
<object class="GtkNotebook" id="notebook1"> <object class="GtkNotebook" id="notebook1">
<property name="visible">True</property>
<child> <child>
<object class="GtkButton" id="page1"> <object class="GtkNotebookPage">
<property name="label" translatable="yes">Yes</property> <property name="child">
<property name="visible">True</property> <object class="GtkButton" id="page1">
</object> <property name="label" translatable="yes">Yes</property>
</child> </object>
<child type="tab"> </property>
<object class="GtkLabel" id="tab1"> <property name="tab">
<property name="label" translatable="yes">Tab 1</property> <object class="GtkLabel" id="tab1">
<property name="visible">True</property> <property name="label" translatable="yes">Tab 1</property>
</object>
</property>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkButton" id="page2"> <object class="GtkNotebookPage">
<property name="label" translatable="yes">No</property> <property name="child">
<property name="visible">True</property> <object class="GtkButton" id="page2">
</object> <property name="label" translatable="yes">No</property>
</child> </object>
<child type="tab"> </property>
<object class="GtkLabel" id="tab2"> <property name="tab">
<property name="label" translatable="yes">Tab 2</property> <object class="GtkLabel" id="tab2">
<property name="visible">True</property> <property name="label" translatable="yes">Tab 2</property>
</object>
</property>
</object> </object>
</child> </child>
</object> </object>

2
testsuite/css/nodes/combobox.nodes
View File

@ -21,7 +21,7 @@
combobox:dir(ltr) combobox:dir(ltr)
box.linked.horizontal:dir(ltr) box.linked.horizontal:dir(ltr)
entry.combo:dir(ltr) entry.combo:dir(ltr)
text.flat:dir(ltr) text:dir(ltr)
undershoot.left:dir(ltr) undershoot.left:dir(ltr)
undershoot.right:dir(ltr) undershoot.right:dir(ltr)
button.combo:dir(ltr) button.combo:dir(ltr)

8
testsuite/css/nodes/entries.nodes
View File

@ -5,25 +5,25 @@
label:dir(ltr) label:dir(ltr)
label:dir(ltr) label:dir(ltr)
entry:dir(ltr) entry:dir(ltr)
text.flat:dir(ltr) text:dir(ltr)
undershoot.left:dir(ltr) undershoot.left:dir(ltr)
undershoot.right:dir(ltr) undershoot.right:dir(ltr)
progress.horizontal:dir(ltr) progress.horizontal:dir(ltr)
trough:dir(ltr) trough:dir(ltr)
progress.left:dir(ltr) progress.left:dir(ltr)
entry:dir(ltr) entry:dir(ltr)
text.flat:dir(ltr) text:dir(ltr)
undershoot.left:dir(ltr) undershoot.left:dir(ltr)
undershoot.right:dir(ltr) undershoot.right:dir(ltr)
entry:dir(ltr) entry:dir(ltr)
image.left:dir(ltr) image.left:dir(ltr)
text.flat:dir(ltr) text:dir(ltr)
undershoot.left:dir(ltr) undershoot.left:dir(ltr)
undershoot.right:dir(ltr) undershoot.right:dir(ltr)
image.right:dir(ltr) image.right:dir(ltr)
spinbutton.horizontal:dir(ltr) spinbutton.horizontal:dir(ltr)
box.horizontal:dir(ltr) box.horizontal:dir(ltr)
text.flat:dir(ltr) text:dir(ltr)
undershoot.left:dir(ltr) undershoot.left:dir(ltr)
undershoot.right:dir(ltr) undershoot.right:dir(ltr)
button.image-button.down:dir(ltr) button.image-button.down:dir(ltr)

54
testsuite/css/nodes/notebook-arrows.ui
View File

@ -1,39 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface> <interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkWindow" id="window1"> <object class="GtkWindow" id="window1">
<property name="can_focus">False</property>
<property name="type">popup</property> <property name="type">popup</property>
<child> <child>
<object class="GtkNotebook"> <object class="GtkNotebook">
<property name="visible">True</property> <property name="scrollable">1</property>
<property name="scrollable">True</property>
<child> <child>
<object class="GtkButton"> <object class="GtkNotebookPage">
<property name="name">page1</property> <property name="child">
<property name="label" translatable="yes">Yes</property> <object class="GtkButton">
<property name="visible">True</property> <property name="name">page1</property>
</object> <property name="label" translatable="yes">Yes</property>
</child> </object>
<child type="tab"> </property>
<object class="GtkLabel"> <property name="tab">
<property name="name">tab1</property> <object class="GtkLabel">
<property name="label" translatable="yes">Tab 1</property> <property name="name">tab1</property>
<property name="visible">True</property> <property name="label" translatable="yes">Tab 1</property>
</object>
</property>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkButton"> <object class="GtkNotebookPage">
<property name="name">page2</property> <property name="child">
<property name="label" translatable="yes">No</property> <object class="GtkButton">
<property name="visible">True</property> <property name="name">page2</property>
</object> <property name="label" translatable="yes">No</property>
</child> </object>
<child type="tab"> </property>
<object class="GtkLabel" id="tab2"> <property name="tab">
<property name="name">tab2</property> <object class="GtkLabel" id="tab2">
<property name="label" translatable="yes">Tab 2</property> <property name="name">tab2</property>
<property name="visible">True</property> <property name="label" translatable="yes">Tab 2</property>
</object>
</property>
</object> </object>
</child> </child>
</object> </object>

56
testsuite/css/nodes/notebook-arrows2.ui
View File

@ -1,42 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface> <interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkWindow" id="window1"> <object class="GtkWindow" id="window1">
<property name="can_focus">False</property>
<!-- <property name="type">popup</property> -->
<child> <child>
<object class="GtkNotebook"> <object class="GtkNotebook">
<property name="visible">True</property> <property name="scrollable">1</property>
<property name="scrollable">True</property>
<child> <child>
<object class="GtkButton"> <object class="GtkNotebookPage">
<property name="name">page1</property> <property name="child">
<property name="label" translatable="yes">Yes</property> <object class="GtkButton">
<property name="visible">True</property> <property name="name">page1</property>
</object> <property name="label" translatable="yes">Yes</property>
</child> </object>
<child type="tab"> </property>
<object class="GtkLabel"> <property name="tab">
<property name="name">tab1</property> <object class="GtkLabel">
<property name="label" translatable="yes">Tab 1</property> <property name="name">tab1</property>
<property name="visible">True</property> <property name="label" translatable="yes">Tab 1</property>
</object>
</property>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkButton"> <object class="GtkNotebookPage">
<property name="name">page2</property> <property name="child">
<property name="label" translatable="yes">No</property> <object class="GtkButton">
<property name="visible">True</property> <property name="name">page2</property>
<property name="label" translatable="yes">No</property>
</object>
</property>
<property name="tab">
<object class="GtkLabel" id="tab2">
<property name="name">tab2</property>
<property name="label" translatable="yes">Tab 2</property>
</object>
</property>
</object> </object>
</child> </child>
<child type="tab">
<object class="GtkLabel" id="tab2">
<property name="name">tab2</property>
<property name="label" translatable="yes">Tab 2</property>
<property name="visible">True</property>
</object>
</child>
<property name="page">-1</property>
</object> </object>
</child> </child>
</object> </object>

54
testsuite/css/nodes/notebook.bottom.ltr.ui
View File

@ -1,53 +1,51 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface> <interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkWindow" id="window1"> <object class="GtkWindow" id="window1">
<property name="can_focus">False</property>
<property name="type">popup</property> <property name="type">popup</property>
<child> <child>
<object class="GtkNotebook"> <object class="GtkNotebook">
<property name="visible">True</property>
<property name="tab-pos">bottom</property> <property name="tab-pos">bottom</property>
<child> <child>
<object class="GtkButton"> <object class="GtkNotebookPage">
<property name="name">page1</property> <property name="child">
<property name="label" translatable="yes">Yes</property> <object class="GtkButton">
<property name="visible">True</property> <property name="name">page1</property>
</object> <property name="label" translatable="yes">Yes</property>
</child> </object>
<child type="tab"> </property>
<object class="GtkLabel"> <property name="tab">
<property name="name">tab1</property> <object class="GtkLabel">
<property name="label" translatable="yes">Tab 1</property> <property name="name">tab1</property>
<property name="visible">True</property> <property name="label" translatable="yes">Tab 1</property>
</object>
</property>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkButton"> <object class="GtkNotebookPage">
<property name="name">page2</property> <property name="child">
<property name="label" translatable="yes">No</property> <object class="GtkButton">
<property name="visible">True</property> <property name="name">page2</property>
</object> <property name="label" translatable="yes">No</property>
</child> </object>
<child type="tab"> </property>
<object class="GtkLabel" id="tab2"> <property name="tab">
<property name="name">tab2</property> <object class="GtkLabel" id="tab2">
<property name="label" translatable="yes">Tab 2</property> <property name="name">tab2</property>
<property name="visible">True</property> <property name="label" translatable="yes">Tab 2</property>
</object>
</property>
</object> </object>
</child> </child>
<child type="action-start"> <child type="action-start">
<object class="GtkButton"> <object class="GtkButton">
<property name="name">start</property> <property name="name">start</property>
<property name="label" translatable="yes">Action</property> <property name="label" translatable="yes">Action</property>
<property name="visible">True</property>
</object> </object>
</child> </child>
<child type="action-end"> <child type="action-end">
<object class="GtkButton"> <object class="GtkButton">
<property name="name">end</property> <property name="name">end</property>
<property name="label" translatable="yes">Action</property> <property name="label" translatable="yes">Action</property>
<property name="visible">True</property>
</object> </object>
</child> </child>
</object> </object>

54
testsuite/css/nodes/notebook.bottom.rtl.ui
View File

@ -1,53 +1,51 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface> <interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkWindow" id="window1"> <object class="GtkWindow" id="window1">
<property name="can_focus">False</property>
<property name="type">popup</property> <property name="type">popup</property>
<child> <child>
<object class="GtkNotebook"> <object class="GtkNotebook">
<property name="visible">True</property>
<property name="tab-pos">bottom</property> <property name="tab-pos">bottom</property>
<child> <child>
<object class="GtkButton"> <object class="GtkNotebookPage">
<property name="name">page1</property> <property name="child">
<property name="label" translatable="yes">Yes</property> <object class="GtkButton">
<property name="visible">True</property> <property name="name">page1</property>
</object> <property name="label" translatable="yes">Yes</property>
</child> </object>
<child type="tab"> </property>
<object class="GtkLabel"> <property name="tab">
<property name="name">tab1</property> <object class="GtkLabel">
<property name="label" translatable="yes">Tab 1</property> <property name="name">tab1</property>
<property name="visible">True</property> <property name="label" translatable="yes">Tab 1</property>
</object>
</property>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkButton"> <object class="GtkNotebookPage">
<property name="name">page2</property> <property name="child">
<property name="label" translatable="yes">No</property> <object class="GtkButton">
<property name="visible">True</property> <property name="name">page2</property>
</object> <property name="label" translatable="yes">No</property>
</child> </object>
<child type="tab"> </property>
<object class="GtkLabel" id="tab2"> <property name="tab">
<property name="name">tab2</property> <object class="GtkLabel" id="tab2">
<property name="label" translatable="yes">Tab 2</property> <property name="name">tab2</property>
<property name="visible">True</property> <property name="label" translatable="yes">Tab 2</property>
</object>
</property>
</object> </object>
</child> </child>
<child type="action-start"> <child type="action-start">
<object class="GtkButton"> <object class="GtkButton">
<property name="name">start</property> <property name="name">start</property>
<property name="label" translatable="yes">Action</property> <property name="label" translatable="yes">Action</property>
<property name="visible">True</property>
</object> </object>
</child> </child>
<child type="action-end"> <child type="action-end">
<object class="GtkButton"> <object class="GtkButton">
<property name="name">end</property> <property name="name">end</property>
<property name="label" translatable="yes">Action</property> <property name="label" translatable="yes">Action</property>
<property name="visible">True</property>
</object> </object>
</child> </child>
</object> </object>

54
testsuite/css/nodes/notebook.left.ltr.ui
View File

@ -1,53 +1,51 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface> <interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkWindow" id="window1"> <object class="GtkWindow" id="window1">
<property name="can_focus">False</property>
<property name="type">popup</property> <property name="type">popup</property>
<child> <child>
<object class="GtkNotebook"> <object class="GtkNotebook">
<property name="visible">True</property>
<property name="tab-pos">left</property> <property name="tab-pos">left</property>
<child> <child>
<object class="GtkButton"> <object class="GtkNotebookPage">
<property name="name">page1</property> <property name="child">
<property name="label" translatable="yes">Yes</property> <object class="GtkButton">
<property name="visible">True</property> <property name="name">page1</property>
</object> <property name="label" translatable="yes">Yes</property>
</child> </object>
<child type="tab"> </property>
<object class="GtkLabel"> <property name="tab">
<property name="name">tab1</property> <object class="GtkLabel">
<property name="label" translatable="yes">Tab 1</property> <property name="name">tab1</property>
<property name="visible">True</property> <property name="label" translatable="yes">Tab 1</property>
</object>
</property>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkButton"> <object class="GtkNotebookPage">
<property name="name">page2</property> <property name="child">
<property name="label" translatable="yes">No</property> <object class="GtkButton">
<property name="visible">True</property> <property name="name">page2</property>
</object> <property name="label" translatable="yes">No</property>
</child> </object>
<child type="tab"> </property>
<object class="GtkLabel" id="tab2"> <property name="tab">
<property name="name">tab2</property> <object class="GtkLabel" id="tab2">
<property name="label" translatable="yes">Tab 2</property> <property name="name">tab2</property>
<property name="visible">True</property> <property name="label" translatable="yes">Tab 2</property>
</object>
</property>
</object> </object>
</child> </child>
<child type="action-start"> <child type="action-start">
<object class="GtkButton"> <object class="GtkButton">
<property name="name">start</property> <property name="name">start</property>
<property name="label" translatable="yes">Action</property> <property name="label" translatable="yes">Action</property>
<property name="visible">True</property>
</object> </object>
</child> </child>
<child type="action-end"> <child type="action-end">
<object class="GtkButton"> <object class="GtkButton">
<property name="name">end</property> <property name="name">end</property>
<property name="label" translatable="yes">Action</property> <property name="label" translatable="yes">Action</property>
<property name="visible">True</property>
</object> </object>
</child> </child>
</object> </object>

54
testsuite/css/nodes/notebook.left.rtl.ui
View File

@ -1,53 +1,51 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface> <interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkWindow" id="window1"> <object class="GtkWindow" id="window1">
<property name="can_focus">False</property>
<property name="type">popup</property> <property name="type">popup</property>
<child> <child>
<object class="GtkNotebook"> <object class="GtkNotebook">
<property name="visible">True</property>
<property name="tab-pos">left</property> <property name="tab-pos">left</property>
<child> <child>
<object class="GtkButton"> <object class="GtkNotebookPage">
<property name="name">page1</property> <property name="child">
<property name="label" translatable="yes">Yes</property> <object class="GtkButton">
<property name="visible">True</property> <property name="name">page1</property>
</object> <property name="label" translatable="yes">Yes</property>
</child> </object>
<child type="tab"> </property>
<object class="GtkLabel"> <property name="tab">
<property name="name">tab1</property> <object class="GtkLabel">
<property name="label" translatable="yes">Tab 1</property> <property name="name">tab1</property>
<property name="visible">True</property> <property name="label" translatable="yes">Tab 1</property>
</object>
</property>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkButton"> <object class="GtkNotebookPage">
<property name="name">page2</property> <property name="child">
<property name="label" translatable="yes">No</property> <object class="GtkButton">
<property name="visible">True</property> <property name="name">page2</property>
</object> <property name="label" translatable="yes">No</property>
</child> </object>
<child type="tab"> </property>
<object class="GtkLabel" id="tab2"> <property name="tab">
<property name="name">tab2</property> <object class="GtkLabel" id="tab2">
<property name="label" translatable="yes">Tab 2</property> <property name="name">tab2</property>
<property name="visible">True</property> <property name="label" translatable="yes">Tab 2</property>
</object>
</property>
</object> </object>
</child> </child>
<child type="action-start"> <child type="action-start">
<object class="GtkButton"> <object class="GtkButton">
<property name="name">start</property> <property name="name">start</property>
<property name="label" translatable="yes">Action</property> <property name="label" translatable="yes">Action</property>
<property name="visible">True</property>
</object> </object>
</child> </child>
<child type="action-end"> <child type="action-end">
<object class="GtkButton"> <object class="GtkButton">
<property name="name">end</property> <property name="name">end</property>
<property name="label" translatable="yes">Action</property> <property name="label" translatable="yes">Action</property>
<property name="visible">True</property>
</object> </object>
</child> </child>
</object> </object>

54
testsuite/css/nodes/notebook.right.ltr.ui
View File

@ -1,53 +1,51 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface> <interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkWindow" id="window1"> <object class="GtkWindow" id="window1">
<property name="can_focus">False</property>
<property name="type">popup</property> <property name="type">popup</property>
<child> <child>
<object class="GtkNotebook"> <object class="GtkNotebook">
<property name="visible">True</property>
<property name="tab-pos">right</property> <property name="tab-pos">right</property>
<child> <child>
<object class="GtkButton"> <object class="GtkNotebookPage">
<property name="name">page1</property> <property name="child">
<property name="label" translatable="yes">Yes</property> <object class="GtkButton">
<property name="visible">True</property> <property name="name">page1</property>
</object> <property name="label" translatable="yes">Yes</property>
</child> </object>
<child type="tab"> </property>
<object class="GtkLabel"> <property name="tab">
<property name="name">tab1</property> <object class="GtkLabel">
<property name="label" translatable="yes">Tab 1</property> <property name="name">tab1</property>
<property name="visible">True</property> <property name="label" translatable="yes">Tab 1</property>
</object>
</property>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkButton"> <object class="GtkNotebookPage">
<property name="name">page2</property> <property name="child">
<property name="label" translatable="yes">No</property> <object class="GtkButton">
<property name="visible">True</property> <property name="name">page2</property>
</object> <property name="label" translatable="yes">No</property>
</child> </object>
<child type="tab"> </property>
<object class="GtkLabel" id="tab2"> <property name="tab">
<property name="name">tab2</property> <object class="GtkLabel" id="tab2">
<property name="label" translatable="yes">Tab 2</property> <property name="name">tab2</property>
<property name="visible">True</property> <property name="label" translatable="yes">Tab 2</property>
</object>
</property>
</object> </object>
</child> </child>
<child type="action-start"> <child type="action-start">
<object class="GtkButton"> <object class="GtkButton">
<property name="name">start</property> <property name="name">start</property>
<property name="label" translatable="yes">Action</property> <property name="label" translatable="yes">Action</property>
<property name="visible">True</property>
</object> </object>
</child> </child>
<child type="action-end"> <child type="action-end">
<object class="GtkButton"> <object class="GtkButton">
<property name="name">end</property> <property name="name">end</property>
<property name="label" translatable="yes">Action</property> <property name="label" translatable="yes">Action</property>
<property name="visible">True</property>
</object> </object>
</child> </child>
</object> </object>

54
testsuite/css/nodes/notebook.right.rtl.ui
View File

@ -1,53 +1,51 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface> <interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkWindow" id="window1"> <object class="GtkWindow" id="window1">
<property name="can_focus">False</property>
<property name="type">popup</property> <property name="type">popup</property>
<child> <child>
<object class="GtkNotebook"> <object class="GtkNotebook">
<property name="visible">True</property>
<property name="tab-pos">right</property> <property name="tab-pos">right</property>
<child> <child>
<object class="GtkButton"> <object class="GtkNotebookPage">
<property name="name">page1</property> <property name="child">
<property name="label" translatable="yes">Yes</property> <object class="GtkButton">
<property name="visible">True</property> <property name="name">page1</property>
</object> <property name="label" translatable="yes">Yes</property>
</child> </object>
<child type="tab"> </property>
<object class="GtkLabel"> <property name="tab">
<property name="name">tab1</property> <object class="GtkLabel">
<property name="label" translatable="yes">Tab 1</property> <property name="name">tab1</property>
<property name="visible">True</property> <property name="label" translatable="yes">Tab 1</property>
</object>
</property>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkButton"> <object class="GtkNotebookPage">
<property name="name">page2</property> <property name="child">
<property name="label" translatable="yes">No</property> <object class="GtkButton">
<property name="visible">True</property> <property name="name">page2</property>
</object> <property name="label" translatable="yes">No</property>
</child> </object>
<child type="tab"> </property>
<object class="GtkLabel" id="tab2"> <property name="tab">
<property name="name">tab2</property> <object class="GtkLabel" id="tab2">
<property name="label" translatable="yes">Tab 2</property> <property name="name">tab2</property>
<property name="visible">True</property> <property name="label" translatable="yes">Tab 2</property>
</object>
</property>
</object> </object>
</child> </child>
<child type="action-start"> <child type="action-start">
<object class="GtkButton"> <object class="GtkButton">
<property name="name">start</property> <property name="name">start</property>
<property name="label" translatable="yes">Action</property> <property name="label" translatable="yes">Action</property>
<property name="visible">True</property>
</object> </object>
</child> </child>
<child type="action-end"> <child type="action-end">
<object class="GtkButton"> <object class="GtkButton">
<property name="name">end</property> <property name="name">end</property>
<property name="label" translatable="yes">Action</property> <property name="label" translatable="yes">Action</property>
<property name="visible">True</property>
</object> </object>
</child> </child>
</object> </object>

54
testsuite/css/nodes/notebook.top.ltr.ui
View File

@ -1,52 +1,50 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface> <interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkWindow" id="window1"> <object class="GtkWindow" id="window1">
<property name="can_focus">False</property>
<property name="type">popup</property> <property name="type">popup</property>
<child> <child>
<object class="GtkNotebook"> <object class="GtkNotebook">
<property name="visible">True</property>
<child> <child>
<object class="GtkButton"> <object class="GtkNotebookPage">
<property name="name">page1</property> <property name="child">
<property name="label" translatable="yes">Yes</property> <object class="GtkButton">
<property name="visible">True</property> <property name="name">page1</property>
</object> <property name="label" translatable="yes">Yes</property>
</child> </object>
<child type="tab"> </property>
<object class="GtkLabel"> <property name="tab">
<property name="name">tab1</property> <object class="GtkLabel">
<property name="label" translatable="yes">Tab 1</property> <property name="name">tab1</property>
<property name="visible">True</property> <property name="label" translatable="yes">Tab 1</property>
</object>
</property>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkButton"> <object class="GtkNotebookPage">
<property name="name">page2</property> <property name="child">
<property name="label" translatable="yes">No</property> <object class="GtkButton">
<property name="visible">True</property> <property name="name">page2</property>
</object> <property name="label" translatable="yes">No</property>
</child> </object>
<child type="tab"> </property>
<object class="GtkLabel" id="tab2"> <property name="tab">
<property name="name">tab2</property> <object class="GtkLabel" id="tab2">
<property name="label" translatable="yes">Tab 2</property> <property name="name">tab2</property>
<property name="visible">True</property> <property name="label" translatable="yes">Tab 2</property>
</object>
</property>
</object> </object>
</child> </child>
<child type="action-start"> <child type="action-start">
<object class="GtkButton"> <object class="GtkButton">
<property name="name">start</property> <property name="name">start</property>
<property name="label" translatable="yes">Action</property> <property name="label" translatable="yes">Action</property>
<property name="visible">True</property>
</object> </object>
</child> </child>
<child type="action-end"> <child type="action-end">
<object class="GtkButton"> <object class="GtkButton">
<property name="name">end</property> <property name="name">end</property>
<property name="label" translatable="yes">Action</property> <property name="label" translatable="yes">Action</property>
<property name="visible">True</property>
</object> </object>
</child> </child>
</object> </object>

54
testsuite/css/nodes/notebook.top.rtl.ui
View File

@ -1,52 +1,50 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface> <interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkWindow" id="window1"> <object class="GtkWindow" id="window1">
<property name="can_focus">False</property>
<property name="type">popup</property> <property name="type">popup</property>
<child> <child>
<object class="GtkNotebook"> <object class="GtkNotebook">
<property name="visible">True</property>
<child> <child>
<object class="GtkButton"> <object class="GtkNotebookPage">
<property name="name">page1</property> <property name="child">
<property name="label" translatable="yes">Yes</property> <object class="GtkButton">
<property name="visible">True</property> <property name="name">page1</property>
</object> <property name="label" translatable="yes">Yes</property>
</child> </object>
<child type="tab"> </property>
<object class="GtkLabel"> <property name="tab">
<property name="name">tab1</property> <object class="GtkLabel">
<property name="label" translatable="yes">Tab 1</property> <property name="name">tab1</property>
<property name="visible">True</property> <property name="label" translatable="yes">Tab 1</property>
</object>
</property>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkButton"> <object class="GtkNotebookPage">
<property name="name">page2</property> <property name="child">
<property name="label" translatable="yes">No</property> <object class="GtkButton">
<property name="visible">True</property> <property name="name">page2</property>
</object> <property name="label" translatable="yes">No</property>
</child> </object>
<child type="tab"> </property>
<object class="GtkLabel" id="tab2"> <property name="tab">
<property name="name">tab2</property> <object class="GtkLabel" id="tab2">
<property name="label" translatable="yes">Tab 2</property> <property name="name">tab2</property>
<property name="visible">True</property> <property name="label" translatable="yes">Tab 2</property>
</object>
</property>
</object> </object>
</child> </child>
<child type="action-start"> <child type="action-start">
<object class="GtkButton"> <object class="GtkButton">
<property name="name">start</property> <property name="name">start</property>
<property name="label" translatable="yes">Action</property> <property name="label" translatable="yes">Action</property>
<property name="visible">True</property>
</object> </object>
</child> </child>
<child type="action-end"> <child type="action-end">
<object class="GtkButton"> <object class="GtkButton">
<property name="name">end</property> <property name="name">end</property>
<property name="label" translatable="yes">Action</property> <property name="label" translatable="yes">Action</property>
<property name="visible">True</property>
</object> </object>
</child> </child>
</object> </object>

36
testsuite/gtk/builder.c
View File

@ -772,23 +772,31 @@ test_notebook (void)
"<interface>" "<interface>"
" <object class=\"GtkNotebook\" id=\"notebook1\">" " <object class=\"GtkNotebook\" id=\"notebook1\">"
" <child>" " <child>"
" <object class=\"GtkLabel\" id=\"label1\">" " <object class=\"GtkNotebookPage\">"
" <property name=\"label\">label1</property>" " <property name=\"child\">"
" </object>" " <object class=\"GtkLabel\" id=\"label1\">"
" </child>" " <property name=\"label\">label1</property>"
" <child type=\"tab\">" " </object>"
" <object class=\"GtkLabel\" id=\"tablabel1\">" " </property>"
" <property name=\"label\">tab_label1</property>" " <property name=\"tab\">"
" <object class=\"GtkLabel\" id=\"tablabel1\">"
" <property name=\"label\">tab_label1</property>"
" </object>"
" </property>"
" </object>" " </object>"
" </child>" " </child>"
" <child>" " <child>"
" <object class=\"GtkLabel\" id=\"label2\">" " <object class=\"GtkNotebookPage\">"
" <property name=\"label\">label2</property>" " <property name=\"child\">"
" </object>" " <object class=\"GtkLabel\" id=\"label2\">"
" </child>" " <property name=\"label\">label2</property>"
" <child type=\"tab\">" " </object>"
" <object class=\"GtkLabel\" id=\"tablabel2\">" " </property>"
" <property name=\"label\">tab_label2</property>" " <property name=\"tab\">"
" <object class=\"GtkLabel\" id=\"tablabel2\">"
" <property name=\"label\">tab_label2</property>"
" </object>"
" </property>"
" </object>" " </object>"
" </child>" " </child>"
" </object>" " </object>"

4
testsuite/gtk/defaultvalue.c
View File

@ -165,6 +165,10 @@ test_type (gconstpointer data)
(strcmp (pspec->name, "pages") == 0)) /* pages always gets a non-NULL value */ (strcmp (pspec->name, "pages") == 0)) /* pages always gets a non-NULL value */
continue; continue;
if (g_type_is_a (type, GTK_TYPE_NOTEBOOK) &&
(strcmp (pspec->name, "pages") == 0)) /* pages always gets a non-NULL value */
continue;
if (g_type_is_a (type, GTK_TYPE_POPOVER) && if (g_type_is_a (type, GTK_TYPE_POPOVER) &&
(strcmp (pspec->name, "pointing-to") == 0)) (strcmp (pspec->name, "pointing-to") == 0))
continue; continue;

5
testsuite/gtk/notify.c
View File

@ -617,6 +617,11 @@ test_type (gconstpointer data)
g_str_equal (pspec->name, "selected-item"))) g_str_equal (pspec->name, "selected-item")))
continue; continue;
/* can't set position without a notebook */
if (g_type_is_a (type, GTK_TYPE_NOTEBOOK_PAGE) &&
g_str_equal (pspec->name, "position"))
continue;
if (g_test_verbose ()) if (g_test_verbose ())
g_print ("Property %s.%s\n", g_type_name (pspec->owner_type), pspec->name); g_print ("Property %s.%s\n", g_type_name (pspec->owner_type), pspec->name);