diff options
author | Vincent Sanders <vince@kyllikki.org> | 2019-08-18 23:45:19 +0100 |
---|---|---|
committer | Daniel Silverstone <dsilvers@digital-scurf.org> | 2019-09-21 10:53:41 +0100 |
commit | 89fb88f6dee5322beb3161497cab7a848cb9a4a8 (patch) | |
tree | bb2f25136a54572d9c1aa6d2830e22fc657f7e16 /frontends/gtk/res | |
parent | 65d169da106d159d9fb53ceb55a5b5899cc0762f (diff) | |
download | netsurf-89fb88f6dee5322beb3161497cab7a848cb9a4a8.tar.gz netsurf-89fb88f6dee5322beb3161497cab7a848cb9a4a8.tar.bz2 |
move toolbar to be in tab contents
Diffstat (limited to 'frontends/gtk/res')
-rw-r--r-- | frontends/gtk/res/netsurf.gtk2.ui | 15 | ||||
-rw-r--r-- | frontends/gtk/res/tabcontents.gtk2.ui | 130 |
2 files changed, 132 insertions, 13 deletions
diff --git a/frontends/gtk/res/netsurf.gtk2.ui b/frontends/gtk/res/netsurf.gtk2.ui index 68812b364..431eab41c 100644 --- a/frontends/gtk/res/netsurf.gtk2.ui +++ b/frontends/gtk/res/netsurf.gtk2.ui @@ -38,17 +38,6 @@ </packing> </child> <child> - <object class="GtkToolbar" id="toolbar"> - <property name="visible">True</property> - <property name="toolbar_style">GTK_TOOLBAR_BOTH_HORIZ</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> <object class="GtkToolbar" id="searchbar"> <property name="toolbar_style">GTK_TOOLBAR_BOTH</property> <child> @@ -156,7 +145,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <child> @@ -203,7 +192,7 @@ </child> </object> <packing> - <property name="position">3</property> + <property name="position">2</property> </packing> </child> </object> diff --git a/frontends/gtk/res/tabcontents.gtk2.ui b/frontends/gtk/res/tabcontents.gtk2.ui index 63e290e8b..cbd775971 100644 --- a/frontends/gtk/res/tabcontents.gtk2.ui +++ b/frontends/gtk/res/tabcontents.gtk2.ui @@ -2,6 +2,131 @@ <interface> <!-- interface-requires gtk+ 2.12 --> <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkVBox" id="tabBox"> + <property name="visible">True</property> + <child> + <object class="GtkToolbar" id="toolbar"> + <property name="visible">True</property> + <property name="toolbar_style">GTK_TOOLBAR_BOTH_HORIZ</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkToolbar" id="searchbar"> + <property name="toolbar_style">GTK_TOOLBAR_BOTH</property> + <child> + <object class="GtkToolButton" id="closeSearchButton"> + <property name="visible">True</property> + <property name="stock_id">gtk-close</property> + </object> + <packing> + <property name="expand">False</property> + </packing> + </child> + <child> + <object class="GtkToolItem" id="searchLabelItem"> + <property name="visible">True</property> + <child> + <object class="GtkLabel" id="searchlabel"> + <property name="visible">True</property> + <property name="xpad">4</property> + <property name="label" translatable="yes">Match</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolItem" id="toolSearch"> + <property name="visible">True</property> + <child> + <object class="GtkEntry" id="searchEntry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="searchBackButton"> + <property name="visible">True</property> + <property name="label" translatable="yes">Search _Back</property> + <property name="use_underline">True</property> + <property name="stock_id">gtk-go-back</property> + </object> + <packing> + <property name="expand">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="searchForwardButton"> + <property name="visible">True</property> + <property name="label" translatable="yes">Search _Forward</property> + <property name="use_underline">True</property> + <property name="stock_id">gtk-go-forward</property> + </object> + <packing> + <property name="expand">False</property> + </packing> + </child> + <child> + <object class="GtkToolItem" id="checkAllSearchItem"> + <property name="visible">True</property> + <child> + <object class="GtkCheckButton" id="checkAllSearch"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip-text" translatable="yes">show all matches</property> + <property name="label" translatable="yes">All </property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolItem" id="caseSensItem"> + <property name="visible">True</property> + <child> + <object class="GtkCheckButton" id="caseSensButton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip-text" translatable="yes">Match case when searching</property> + <property name="label" translatable="yes">Case</property> + <property name="relief">GTK_RELIEF_NONE</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + <child> <object class="GtkTable" id="tabContents"> <property name="visible">True</property> <property name="n_rows">2</property> @@ -77,6 +202,11 @@ </packing> </child> </object> + <packing> + <property name="position">3</property> + </packing> + </child> + </object> <object class="GtkAdjustment" id="layouthadjustment"> <property name="upper">100</property> <property name="step_increment">30</property> |