Commit 3b67184f authored by Matthias Clasen's avatar Matthias Clasen

gtk-demo: Simplify ui files

parent a5316336
......@@ -3,9 +3,7 @@
<object class="GtkGrid" id="grid">
<child>
<object class="GtkToolbar" id="toolbar">
<property name="orientation">horizontal</property>
<property name="halign">fill</property>
<property name="hexpand">True</property>
<property name="hexpand">1</property>
<style>
<class name="primary-toolbar"/>
</style>
......@@ -37,16 +35,14 @@
</child>
<child>
<object class="GtkInfoBar" id="infobar">
<property name="no-show-all">True</property>
<property name="halign">fill</property>
<property name="hexpand">True</property>
<property name="no-show-all">1</property>
<property name="hexpand">1</property>
<child internal-child="content_area">
<object class="GtkBox" id="content_area">
<child>
<object class="GtkLabel" id="message">
<property name="visible">True</property>
<property name="hexpand">True</property>
<property name="halign">fill</property>
<property name="visible">1</property>
<property name="hexpand">1</property>
</object>
</child>
</object>
......@@ -55,10 +51,10 @@
<object class="GtkBox" id="action_area">
<child>
<object class="GtkButton" id="button">
<property name="visible">True</property>
<property name="visible">1</property>
<property name="valign">center</property>
<property name="label" translatable="yes">_OK</property>
<property name="use_underline">True</property>
<property name="label" translatable="1">_OK</property>
<property name="use_underline">1</property>
</object>
</child>
</object>
......@@ -74,10 +70,8 @@
<property name="shadow-type">in</property>
<child>
<object class="GtkTextView" id="contents">
<property name="halign">fill</property>
<property name="valign">fill</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="hexpand">1</property>
<property name="vexpand">1</property>
</object>
</child>
</object>
......@@ -88,9 +82,8 @@
</child>
<child>
<object class="GtkStatusbar" id="status">
<property name="halign">fill</property>
<property name="hexpand">True</property>
<property name="visible">True</property>
<property name="hexpand">1</property>
<property name="visible">1</property>
</object>
<packing>
<property name="left-attach">0</property>
......
......@@ -24,8 +24,8 @@
</data>
</object>
<object class="GtkAboutDialog" id="aboutdialog1">
<property name="program-name" translatable="yes">Builder demo</property>
<property name="logo-icon-name" translatable="yes">gtk3-demo</property>
<property name="program-name" translatable="1">Builder demo</property>
<property name="logo-icon-name" translatable="1">gtk3-demo</property>
<accessibility>
<relation target="window1" type="subwindow-of"/>
</accessibility>
......@@ -33,13 +33,13 @@
<object class="GtkWindow" id="window1">
<property name="default_height">250</property>
<property name="default_width">440</property>
<property name="title" translatable="yes">Builder</property>
<property name="title" translatable="1">Builder</property>
<child>
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
<property name="visible">1</property>
<child>
<object class="GtkMenuBar" id="menubar1">
<property name="visible">True</property>
<property name="visible">1</property>
<child internal-child="accessible">
<object class="AtkObject" id="a11y-menubar">
<property name="AtkObject::accessible-name">The menubar</property>
......@@ -47,49 +47,49 @@
</child>
<child>
<object class="GtkMenuItem">
<property name="visible">True</property>
<property name="label" translatable="yes">_File</property>
<property name="use-underline">True</property>
<property name="visible">1</property>
<property name="label" translatable="1">_File</property>
<property name="use-underline">1</property>
<child type="submenu">
<object class="GtkMenu">
<child>
<object class="GtkMenuItem" id="new_item">
<property name="visible">True</property>
<property name="label" translatable="yes">_New</property>
<property name="use-underline">True</property>
<property name="visible">1</property>
<property name="label" translatable="1">_New</property>
<property name="use-underline">1</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="open_item">
<property name="visible">True</property>
<property name="label" translatable="yes">_Open</property>
<property name="use-underline">True</property>
<property name="visible">1</property>
<property name="label" translatable="1">_Open</property>
<property name="use-underline">1</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="save_item">
<property name="visible">True</property>
<property name="label" translatable="yes">_Save</property>
<property name="use-underline">True</property>
<property name="visible">1</property>
<property name="label" translatable="1">_Save</property>
<property name="use-underline">1</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="save_as_item">
<property name="visible">True</property>
<property name="label" translatable="yes">Save _As</property>
<property name="use-underline">True</property>
<property name="visible">1</property>
<property name="label" translatable="1">Save _As</property>
<property name="use-underline">1</property>
</object>
</child>
<child>
<object class="GtkSeparatorMenuItem">
<property name="visible">True</property>
<property name="visible">1</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="quit_item">
<property name="visible">True</property>
<property name="label" translatable="yes">_Quit</property>
<property name="use-underline">True</property>
<property name="visible">1</property>
<property name="label" translatable="1">_Quit</property>
<property name="use-underline">1</property>
<property name="action-name">win.quit</property>
</object>
</child>
......@@ -99,30 +99,30 @@
</child>
<child>
<object class="GtkMenuItem">
<property name="visible">True</property>
<property name="label" translatable="yes">_Edit</property>
<property name="use-underline">True</property>
<property name="visible">1</property>
<property name="label" translatable="1">_Edit</property>
<property name="use-underline">1</property>
<child type="submenu">
<object class="GtkMenu">
<child>
<object class="GtkMenuItem" id="copy_item">
<property name="visible">True</property>
<property name="label" translatable="yes">_Copy</property>
<property name="use-underline">True</property>
<property name="visible">1</property>
<property name="label" translatable="1">_Copy</property>
<property name="use-underline">1</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="cut_item">
<property name="visible">True</property>
<property name="label" translatable="yes">_Cut</property>
<property name="use-underline">True</property>
<property name="visible">1</property>
<property name="label" translatable="1">_Cut</property>
<property name="use-underline">1</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="paste_item">
<property name="visible">True</property>
<property name="label" translatable="yes">_Paste</property>
<property name="use-underline">True</property>
<property name="visible">1</property>
<property name="label" translatable="1">_Paste</property>
<property name="use-underline">1</property>
</object>
</child>
</object>
......@@ -131,24 +131,24 @@
</child>
<child>
<object class="GtkMenuItem">
<property name="visible">True</property>
<property name="label" translatable="yes">_Help</property>
<property name="use-underline">True</property>
<property name="visible">1</property>
<property name="label" translatable="1">_Help</property>
<property name="use-underline">1</property>
<child type="submenu">
<object class="GtkMenu">
<child>
<object class="GtkMenuItem" id="help_item">
<property name="visible">True</property>
<property name="label" translatable="yes">_Help</property>
<property name="use-underline">True</property>
<property name="visible">1</property>
<property name="label" translatable="1">_Help</property>
<property name="use-underline">1</property>
<property name="action-name">win.help</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="about_item">
<property name="visible">True</property>
<property name="label" translatable="yes">_About</property>
<property name="use-underline">True</property>
<property name="visible">1</property>
<property name="label" translatable="1">_About</property>
<property name="use-underline">1</property>
<property name="action-name">win.about</property>
</object>
</child>
......@@ -157,13 +157,10 @@
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
</packing>
</child>
<child>
<object class="GtkToolbar" id="toolbar1">
<property name="visible">True</property>
<property name="visible">1</property>
<child internal-child="accessible">
<object class="AtkObject" id="a11y-toolbar">
<property name="AtkObject::accessible-name">The toolbar</property>
......@@ -171,71 +168,70 @@
</child>
<child>
<object class="GtkToolButton">
<property name="visible">True</property>
<property name="label" translatable="yes">New</property>
<property name="tooltip-text" translatable="yes">Create a new file</property>
<property name="visible">1</property>
<property name="label" translatable="1">New</property>
<property name="tooltip-text" translatable="1">Create a new file</property>
<property name="icon-name">document-new</property>
</object>
</child>
<child>
<object class="GtkToolButton">
<property name="visible">True</property>
<property name="label" translatable="yes">Open</property>
<property name="tooltip-text" translatable="yes">Open a file</property>
<property name="visible">1</property>
<property name="label" translatable="1">Open</property>
<property name="tooltip-text" translatable="1">Open a file</property>
<property name="icon-name">document-open</property>
</object>
</child>
<child>
<object class="GtkToolButton">
<property name="visible">True</property>
<property name="label" translatable="yes">Save</property>
<property name="tooltip-text" translatable="yes">Save a file</property>
<property name="visible">1</property>
<property name="label" translatable="1">Save</property>
<property name="tooltip-text" translatable="1">Save a file</property>
<property name="icon-name">document-save</property>
<property name="is-important">True</property>
<property name="is-important">1</property>
</object>
</child>
<child>
<object class="GtkSeparatorToolItem">
<property name="visible">True</property>
<property name="visible">1</property>
</object>
</child>
<child>
<object class="GtkToolButton">
<property name="visible">True</property>
<property name="label" translatable="yes">Copy</property>
<property name="tooltip-text" translatable="yes">Copy selected object into the clipboard</property>
<property name="visible">1</property>
<property name="label" translatable="1">Copy</property>
<property name="tooltip-text" translatable="1">Copy selected object into the clipboard</property>
<property name="icon-name">edit-copy</property>
</object>
</child>
<child>
<object class="GtkToolButton">
<property name="visible">True</property>
<property name="label" translatable="yes">Cut</property>
<property name="tooltip-text" translatable="yes">Cut selected object into the clipboard</property>
<property name="visible">1</property>
<property name="label" translatable="1">Cut</property>
<property name="tooltip-text" translatable="1">Cut selected object into the clipboard</property>
<property name="icon-name">edit-cut</property>
</object>
</child>
<child>
<object class="GtkToolButton">
<property name="visible">True</property>
<property name="label" translatable="yes">Paste</property>
<property name="tooltip-text" translatable="yes">Paste object from the clipboard</property>
<property name="visible">1</property>
<property name="label" translatable="1">Paste</property>
<property name="tooltip-text" translatable="1">Paste object from the clipboard</property>
<property name="icon-name">edit-paste</property>
</object>
</child>
</object>
<packing>
<property name="position">1</property>
<property name="expand">False</property>
</packing>
</child>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="shadow_type">in</property>
<property name="visible">True</property>
<property name="visible">1</property>
<child>
<object class="GtkTreeView" id="treeview1">
<property name="visible">True</property>
<property name="visible">1</property>
<property name="model">liststore1</property>
<property name="tooltip-column">3</property>
<child internal-child="accessible">
......@@ -284,16 +280,15 @@
</object>
<packing>
<property name="position">2</property>
<property name="expand">True</property>
<property name="expand">1</property>
</packing>
</child>
<child>
<object class="GtkStatusbar" id="statusbar1">
<property name="visible">True</property>
<property name="visible">1</property>
</object>
<packing>
<property name="position">3</property>
<property name="expand">False</property>
</packing>
</child>
</object>
......
......@@ -25,24 +25,21 @@
</data>
</object>
<object class="GtkWindow" id="window1">
<property name="can_focus">False</property>
<property name="title" translatable="yes">Filter Model</property>
<property name="title" translatable="1">Filter Model</property>
<child>
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="visible">1</property>
<property name="margin_left">10</property>
<property name="margin_right">10</property>
<property name="margin_top">10</property>
<property name="margin_bottom">10</property>
<property name="row_spacing">10</property>
<property name="column_spacing">10</property>
<property name="column_homogeneous">True</property>
<property name="column_homogeneous">1</property>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Original</property>
<property name="visible">1</property>
<property name="label" translatable="1">Original</property>
<property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
......@@ -55,16 +52,16 @@
</child>
<child>
<object class="GtkTreeView" id="treeview1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="visible">1</property>
<property name="can_focus">1</property>
<property name="model">liststore1</property>
<property name="headers_clickable">False</property>
<property name="headers_clickable">0</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="treeview-selection1"/>
</child>
<child>
<object class="GtkTreeViewColumn" id="treeviewcolumn1">
<property name="title" translatable="yes">Width</property>
<property name="title" translatable="1">Width</property>
<child>
<object class="GtkCellRendererText" id="cellrenderertext1"/>
</child>
......@@ -72,7 +69,7 @@
</child>
<child>
<object class="GtkTreeViewColumn" id="treeviewcolumn2">
<property name="title" translatable="yes">Height</property>
<property name="title" translatable="1">Height</property>
<child>
<object class="GtkCellRendererText" id="cellrenderertext2"/>
</child>
......@@ -86,16 +83,16 @@
</child>
<child>
<object class="GtkTreeView" id="treeview2">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_clickable">False</property>
<property name="visible">1</property>
<property name="can_focus">1</property>
<property name="headers_clickable">0</property>
<property name="search_column">0</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="treeview-selection3"/>
</child>
<child>
<object class="GtkTreeViewColumn" id="treeviewcolumn3">
<property name="title" translatable="yes">Width</property>
<property name="title" translatable="1">Width</property>
<child>
<object class="GtkCellRendererText" id="cellrenderertext3"/>
</child>
......@@ -103,7 +100,7 @@
</child>
<child>
<object class="GtkTreeViewColumn" id="treeviewcolumn4">
<property name="title" translatable="yes">Height</property>
<property name="title" translatable="1">Height</property>
<child>
<object class="GtkCellRendererText" id="cellrenderertext4"/>
</child>
......@@ -111,7 +108,7 @@
</child>
<child>
<object class="GtkTreeViewColumn" id="treeviewcolumn5">
<property name="title" translatable="yes">Area</property>
<property name="title" translatable="1">Area</property>
<child>
<object class="GtkCellRendererText" id="cellrenderertext5"/>
</child>
......@@ -119,7 +116,7 @@
</child>
<child>
<object class="GtkTreeViewColumn" id="treeviewcolumn6">
<property name="title" translatable="yes">Square</property>
<property name="title" translatable="1">Square</property>
<child>
<object class="GtkCellRendererPixbuf" id="cellrendererpixbuf1">
<property name="icon-name">object-select-symbolic</property>
......@@ -135,9 +132,8 @@
</child>
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Computed Columns</property>
<property name="visible">1</property>
<property name="label" translatable="1">Computed Columns</property>
<property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
......@@ -150,9 +146,8 @@
</child>
<child>
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Filtered</property>
<property name="visible">1</property>
<property name="label" translatable="1">Filtered</property>
<property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
......@@ -165,16 +160,16 @@
</child>
<child>
<object class="GtkTreeView" id="treeview3">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_clickable">False</property>
<property name="visible">1</property>
<property name="can_focus">1</property>
<property name="headers_clickable">0</property>
<property name="search_column">0</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="treeview-selection5"/>
</child>
<child>
<object class="GtkTreeViewColumn" id="treeviewcolumn7">
<property name="title" translatable="yes">Width</property>
<property name="title" translatable="1">Width</property>
<child>
<object class="GtkCellRendererText" id="cellrenderertext6"/>
</child>
......@@ -182,7 +177,7 @@
</child>
<child>
<object class="GtkTreeViewColumn" id="treeviewcolumn8">
<property name="title" translatable="yes">Height</property>
<property name="title" translatable="1">Height</property>
<child>
<object class="GtkCellRendererText" id="cellrenderertext7"/>
</child>
......@@ -194,12 +189,6 @@
<property name="top_attach">3</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object>
</child>
</object>
......
This diff is collapsed.
This diff is collapsed.
......@@ -33,62 +33,54 @@
<object class="GtkApplicationWindow" id="window">
<property name="default-width">800</property>
<property name="default-height">600</property>
<property name="can_focus">False</property>
<property name="title">GTK+ Demo</property>
<signal name="delete-event" handler="gtk_false" swapped="no"/>
<signal name="destroy" handler="gtk_main_quit" swapped="no"/>
<child type="titlebar">
<object class="GtkHeaderBar" id="headerbar">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="show-close-button">True</property>
<property name="visible">1</property>
<property name="show-close-button">1</property>
<child>
<object class="GtkButton" id="run_button">
<property name="visible">True</property>
<property name="visible">1</property>
<property name="valign">center</property>
<property name="can_focus">True</property>
<property name="can_focus">1</property>
<property name="action_name">win.run</property>
<style>
<class name="text-button"/>
</style>
<child>
<object class="GtkLabel" id="run_label">
<property name="visible">True</property>
<property name="label" translatable="yes">Run</property>
<property name="visible">1</property>
<property name="label" translatable="1">Run</property>
</object>
</child>
</object>
<packing>
<property name="pack_type">start</property>
</packing>
</child>
</object>
</child>
<child>
<object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">0</property>
<property name="visible">1</property>
<child>
<object class="GtkFrame">
<property name="visible">True</property>
<property name="visible">1</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow">
<property name="width_request">120</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="visible">1</property>
<property name="can_focus">1</property>
<property name="hscrollbar_policy">never</property>
<property name="shadow_type">none</property>
<property name="min_content_width">150</property>
<style>
<class name="sidebar"/>
</style>
<child>
<object class="GtkTreeView" id="treeview">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="visible">1</property>
<property name="can_focus">1</property>
<property name="model">treestore</property>
<property name="headers_visible">False</property>
<property name="headers_visible">0</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="treeview-selection">
<property name="mode">browse</property>
......@@ -96,7 +88,7 @@
</child>
<child>
<object class="GtkTreeViewColumn" id="treeviewcolumn1">
<property name="title" translatable="yes">column</property>
<property name="title" translatable="1">column</property>
<child>
<object class="GtkCellRendererText" id="cellrenderertext1"/>
<attributes>
......@@ -111,94 +103,84 @@
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkNotebook" id="notebook">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="scrollable">True</property>
<property name="enable_popup">True</property>
<property name="show_border">False</property>
<property name="visible">1</property>
<property name="can_focus">1</property>
<property name="scrollable">1</property>
<property name="enable_popup">1</property>
<property name="show_border">0</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="shadow_type">none</property>
<property name="visible">1</property>
<property name="can_focus">1</property>
<child>
<object class="GtkTextView" id="info-textview">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="visible">1</property>
<property name="can_focus">1</property>
<property name="left-margin">20</property>
<property name="right-margin">20</property>
<property name="top-margin">20</property>
<property name="bottom-margin">20</property>
<property name="pixels_above_lines">2</property>
<property name="pixels_below_lines">2</property>
<property name="editable">False</property>
<property name="editable">0</property>
<property name="wrap_mode">word</property>
<property name="cursor_visible">False</property>
<property name="cursor_visible">0</property>
</object>
</child>
</object>
<packing>
<property name="tab_expand">True</property>
<property name="tab_expand">1</property>
</packing>
</child>
<child type="tab">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Info</property>
<property name="use_underline">True</property>
<property name="visible">1</property>
<property name="label" translatable="1">_Info</property>
<property name="use_underline">1</property>
</object>
<packing>
<property name="tab_expand">True</property>
<property name="tab_fill">False</property>
<property name="tab_expand">1</property>
<property name="tab_fill">0</property>
</packing>
</child>
<child>
<object class="GtkScrolledWindow" id="source-scrolledwindow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="shadow_type">none</property>
<property name="visible">1</property>
<property name="can_focus">1</property>
<child>
<object class="GtkTextView" id="source-textview">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="visible">1</property>
<property name="can_focus">1</property>
<property name="left-margin">20</property>
<property name="right-margin">20</property>
<property name="top-margin">20</property>
<property name="bottom-margin">20</property>
<property name="editable">False</property>
<property name="cursor_visible">False</property>
<property name="editable">0</property>
<property name="cursor_visible">0</property>
</object>
</child>
</object>
<packing>
<property name="position">1</property>
<property name="tab_expand">True</property>
<property name="tab_expand">1</property>
</packing>
</child>