Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/62d884a3c6658f3efbcf02516295a4d08260bdc4
...commit
http://git.netsurf-browser.org/netsurf.git/commit/62d884a3c6658f3efbcf02516295a4d08260bdc4
...tree
http://git.netsurf-browser.org/netsurf.git/tree/62d884a3c6658f3efbcf02516295a4d08260bdc4
The branch, vince/gtk-tab-restyle has been updated
via 62d884a3c6658f3efbcf02516295a4d08260bdc4 (commit)
from d55a41e070e851a3dca0f0561a3002bedde80fd6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=62d884a3c6658f3efbcf02516295a4d08260bdc4
commit 62d884a3c6658f3efbcf02516295a4d08260bdc4
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
fixup the gtk2 ui builders
diff --git a/frontends/gtk/res/netsurf.gtk2.ui
b/frontends/gtk/res/netsurf.gtk2.ui
index 431eab4..adca540 100644
--- a/frontends/gtk/res/netsurf.gtk2.ui
+++ b/frontends/gtk/res/netsurf.gtk2.ui
@@ -1,156 +1,43 @@
-<?xml version="1.0"?>
-<!--Generated with glade3 3.4.5 on Wed Apr 7 17:10:28 2010 -->
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
+ <!-- interface-requires gtk+ 2.12 -->
+ <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">100</property>
- <property name="lower">0</property>
- <property name="page_increment">10</property>
+ <property name="value">0.5357142857142857</property>
<property name="step_increment">26</property>
+ <property name="page_increment">10</property>
<property name="page_size">10</property>
- <property name="value">0.5357142857142857</property>
</object>
<object class="GtkAdjustment" id="adjustment2">
<property name="upper">100</property>
- <property name="lower">0</property>
- <property name="page_increment">10</property>
<property name="step_increment">26</property>
+ <property name="page_increment">10</property>
<property name="page_size">10</property>
- <property name="value">0</property>
- </object>
- <object class="GtkUIManager" id="uimanager1">
- <ui>
- <menubar name="menubar"/>
- </ui>
</object>
<object class="GtkWindow" id="wndBrowser">
+ <property name="can_focus">False</property>
<property name="title" translatable="yes">NetSurf</property>
- <property name="window_position">GTK_WIN_POS_CENTER</property>
+ <property name="window_position">center</property>
<child>
<object class="GtkVBox" id="vbox14">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
- <object class="GtkMenuBar" constructor="uimanager1" id="menubar">
+ <object class="GtkMenuBar" id="menubar">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</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">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkNotebook" id="notebook">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="show_tabs">False</property>
<property name="show_border">False</property>
<property name="scrollable">True</property>
@@ -192,7 +79,9 @@
</child>
</object>
<packing>
- <property name="position">2</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
diff --git a/frontends/gtk/res/tabcontents.gtk2.ui
b/frontends/gtk/res/tabcontents.gtk2.ui
index cbd7759..c47e6a2 100644
--- a/frontends/gtk/res/tabcontents.gtk2.ui
+++ b/frontends/gtk/res/tabcontents.gtk2.ui
@@ -1,13 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 2.12 -->
<!-- interface-naming-policy toplevel-contextual -->
+ <object class="GtkAdjustment" id="layouthadjustment">
+ <property name="upper">100</property>
+ <property name="step_increment">30</property>
+ <property name="page_increment">10</property>
+ <property name="page_size">10</property>
+ </object>
+ <object class="GtkAdjustment" id="layoutvadjustment">
+ <property name="upper">100</property>
+ <property name="step_increment">30</property>
+ <property name="page_increment">10</property>
+ <property name="page_size">10</property>
+ </object>
<object class="GtkVBox" id="tabBox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkToolbar" id="toolbar">
<property name="visible">True</property>
- <property name="toolbar_style">GTK_TOOLBAR_BOTH_HORIZ</property>
+ <property name="can_focus">False</property>
+ <property name="toolbar_style">both-horiz</property>
</object>
<packing>
<property name="expand">False</property>
@@ -16,79 +30,65 @@
</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>
+ <object class="GtkToolbar" id="findbar">
+ <property name="can_focus">False</property>
+ <property name="toolbar_style">both</property>
<child>
- <object class="GtkToolItem" id="searchLabelItem">
+ <object class="GtkToolItem" id="toolitemFind">
<property name="visible">True</property>
+ <property name="can_focus">False</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">
+ <object class="GtkEntry" id="Find">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="primary_icon_sensitive">True</property>
+ <property name="secondary_icon_sensitive">True</property>
</object>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="homogeneous">False</property>
+ <property name="expand">True</property>
</packing>
</child>
<child>
- <object class="GtkToolButton" id="searchBackButton">
+ <object class="GtkToolButton" id="FindBack">
<property name="visible">True</property>
- <property name="label" translatable="yes">Search _Back</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">gtkFindBack</property>
<property name="use_underline">True</property>
- <property name="stock_id">gtk-go-back</property>
+ <property name="icon_name">go-up</property>
</object>
<packing>
<property name="expand">False</property>
+ <property name="homogeneous">True</property>
</packing>
</child>
<child>
- <object class="GtkToolButton" id="searchForwardButton">
+ <object class="GtkToolButton" id="FindForward">
<property name="visible">True</property>
- <property name="label" translatable="yes">Search
_Forward</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">gtkFindForward</property>
<property name="use_underline">True</property>
- <property name="stock_id">gtk-go-forward</property>
+ <property name="icon_name">go-down</property>
</object>
<packing>
<property name="expand">False</property>
+ <property name="homogeneous">True</property>
</packing>
</child>
<child>
- <object class="GtkToolItem" id="checkAllSearchItem">
+ <object class="GtkToolItem" id="toolitemFindHighlightAll">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
- <object class="GtkCheckButton" id="checkAllSearch">
+ <object class="GtkCheckButton" id="FindHighlightAll">
+ <property name="label"
translatable="yes">gtkFindHighlightAll</property>
<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="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">show all
matches</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -96,19 +96,20 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">False</property>
</packing>
</child>
<child>
- <object class="GtkToolItem" id="caseSensItem">
+ <object class="GtkToolItem" id="toolitemFindMatchCase">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
- <object class="GtkCheckButton" id="caseSensButton">
+ <object class="GtkCheckButton" id="FindMatchCase">
+ <property name="label"
translatable="yes">gtkFindMatchCase</property>
<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="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">Match case
when searching</property>
+ <property name="relief">none</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -116,7 +117,18 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="FindClose">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">gtkFindClose</property>
+ <property name="icon_name">window-close</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
</packing>
</child>
</object>
@@ -129,12 +141,14 @@
<child>
<object class="GtkTable" id="tabContents">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">2</property>
<property name="n_columns">2</property>
<child>
<object class="GtkLayout" id="layout">
<property name="visible">True</property>
<property name="app_paintable">True</property>
+ <property name="can_focus">False</property>
<property name="events">GDK_EXPOSURE_MASK |
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK
| GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK |
GDK_LEAVE_NOTIFY_MASK | GDK_STRUCTURE_MASK | GDK_SCROLL_MASK</property>
<property name="hadjustment">layouthadjustment</property>
<property name="vadjustment">layoutvadjustment</property>
@@ -144,6 +158,7 @@
<object class="GtkStatusbar" id="resizer">
<property name="height_request">1</property>
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">2</property>
</object>
<packing>
@@ -163,6 +178,7 @@
<object class="GtkLabel" id="status_bar">
<property name="width_request">1</property>
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="xpad">4</property>
<property name="label" translatable="yes">Status</property>
@@ -175,6 +191,7 @@
<child>
<object class="GtkHScrollbar" id="hscrollbar">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="adjustment">layouthadjustment</property>
</object>
<packing>
@@ -192,31 +209,21 @@
<child>
<object class="GtkVScrollbar" id="vscrollbar">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
<property name="adjustment">layoutvadjustment</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="x_options"></property>
+ <property name="x_options"/>
</packing>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
</object>
- <object class="GtkAdjustment" id="layouthadjustment">
- <property name="upper">100</property>
- <property name="step_increment">30</property>
- <property name="page_increment">10</property>
- <property name="page_size">10</property>
- </object>
- <object class="GtkAdjustment" id="layoutvadjustment">
- <property name="upper">100</property>
- <property name="step_increment">30</property>
- <property name="page_increment">10</property>
- <property name="page_size">10</property>
- </object>
</interface>
diff --git a/frontends/gtk/res/toolbar.gtk2.ui
b/frontends/gtk/res/toolbar.gtk2.ui
index eb882f3..2288971 100644
--- a/frontends/gtk/res/toolbar.gtk2.ui
+++ b/frontends/gtk/res/toolbar.gtk2.ui
@@ -17,6 +17,20 @@
</packing>
</child>
<child>
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="xpad">6</property>
+ <property name="label"
translatable="yes">gtkCustomizeToolbarInstructions</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -44,7 +58,7 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -98,7 +112,7 @@
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">6</property>
- <property name="position">2</property>
+ <property name="position">3</property>
</packing>
</child>
</object>
diff --git a/frontends/gtk/search.c b/frontends/gtk/search.c
index ead511f..a7e343e 100644
--- a/frontends/gtk/search.c
+++ b/frontends/gtk/search.c
@@ -307,7 +307,7 @@ nsgtk_search_create(GtkBuilder *builder,
search->close = GTK_TOOL_BUTTON(gtk_builder_get_object(builder,
"FindClose"));
search->checkAll = GTK_CHECK_BUTTON(gtk_builder_get_object(builder,
- "FindHightlightAll"));
+ "FindHighlightAll"));
search->caseSens = GTK_CHECK_BUTTON(gtk_builder_get_object(builder,
"FindMatchCase"));
-----------------------------------------------------------------------
Summary of changes:
frontends/gtk/res/netsurf.gtk2.ui | 143 ++++-----------------------------
frontends/gtk/res/tabcontents.gtk2.ui | 135 ++++++++++++++++---------------
frontends/gtk/res/toolbar.gtk2.ui | 18 ++++-
frontends/gtk/search.c | 2 +-
4 files changed, 104 insertions(+), 194 deletions(-)
diff --git a/frontends/gtk/res/netsurf.gtk2.ui
b/frontends/gtk/res/netsurf.gtk2.ui
index 431eab4..adca540 100644
--- a/frontends/gtk/res/netsurf.gtk2.ui
+++ b/frontends/gtk/res/netsurf.gtk2.ui
@@ -1,156 +1,43 @@
-<?xml version="1.0"?>
-<!--Generated with glade3 3.4.5 on Wed Apr 7 17:10:28 2010 -->
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
+ <!-- interface-requires gtk+ 2.12 -->
+ <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">100</property>
- <property name="lower">0</property>
- <property name="page_increment">10</property>
+ <property name="value">0.5357142857142857</property>
<property name="step_increment">26</property>
+ <property name="page_increment">10</property>
<property name="page_size">10</property>
- <property name="value">0.5357142857142857</property>
</object>
<object class="GtkAdjustment" id="adjustment2">
<property name="upper">100</property>
- <property name="lower">0</property>
- <property name="page_increment">10</property>
<property name="step_increment">26</property>
+ <property name="page_increment">10</property>
<property name="page_size">10</property>
- <property name="value">0</property>
- </object>
- <object class="GtkUIManager" id="uimanager1">
- <ui>
- <menubar name="menubar"/>
- </ui>
</object>
<object class="GtkWindow" id="wndBrowser">
+ <property name="can_focus">False</property>
<property name="title" translatable="yes">NetSurf</property>
- <property name="window_position">GTK_WIN_POS_CENTER</property>
+ <property name="window_position">center</property>
<child>
<object class="GtkVBox" id="vbox14">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
- <object class="GtkMenuBar" constructor="uimanager1" id="menubar">
+ <object class="GtkMenuBar" id="menubar">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</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">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkNotebook" id="notebook">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="show_tabs">False</property>
<property name="show_border">False</property>
<property name="scrollable">True</property>
@@ -192,7 +79,9 @@
</child>
</object>
<packing>
- <property name="position">2</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
diff --git a/frontends/gtk/res/tabcontents.gtk2.ui
b/frontends/gtk/res/tabcontents.gtk2.ui
index cbd7759..c47e6a2 100644
--- a/frontends/gtk/res/tabcontents.gtk2.ui
+++ b/frontends/gtk/res/tabcontents.gtk2.ui
@@ -1,13 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 2.12 -->
<!-- interface-naming-policy toplevel-contextual -->
+ <object class="GtkAdjustment" id="layouthadjustment">
+ <property name="upper">100</property>
+ <property name="step_increment">30</property>
+ <property name="page_increment">10</property>
+ <property name="page_size">10</property>
+ </object>
+ <object class="GtkAdjustment" id="layoutvadjustment">
+ <property name="upper">100</property>
+ <property name="step_increment">30</property>
+ <property name="page_increment">10</property>
+ <property name="page_size">10</property>
+ </object>
<object class="GtkVBox" id="tabBox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkToolbar" id="toolbar">
<property name="visible">True</property>
- <property name="toolbar_style">GTK_TOOLBAR_BOTH_HORIZ</property>
+ <property name="can_focus">False</property>
+ <property name="toolbar_style">both-horiz</property>
</object>
<packing>
<property name="expand">False</property>
@@ -16,79 +30,65 @@
</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>
+ <object class="GtkToolbar" id="findbar">
+ <property name="can_focus">False</property>
+ <property name="toolbar_style">both</property>
<child>
- <object class="GtkToolItem" id="searchLabelItem">
+ <object class="GtkToolItem" id="toolitemFind">
<property name="visible">True</property>
+ <property name="can_focus">False</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">
+ <object class="GtkEntry" id="Find">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="primary_icon_sensitive">True</property>
+ <property name="secondary_icon_sensitive">True</property>
</object>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="homogeneous">False</property>
+ <property name="expand">True</property>
</packing>
</child>
<child>
- <object class="GtkToolButton" id="searchBackButton">
+ <object class="GtkToolButton" id="FindBack">
<property name="visible">True</property>
- <property name="label" translatable="yes">Search _Back</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">gtkFindBack</property>
<property name="use_underline">True</property>
- <property name="stock_id">gtk-go-back</property>
+ <property name="icon_name">go-up</property>
</object>
<packing>
<property name="expand">False</property>
+ <property name="homogeneous">True</property>
</packing>
</child>
<child>
- <object class="GtkToolButton" id="searchForwardButton">
+ <object class="GtkToolButton" id="FindForward">
<property name="visible">True</property>
- <property name="label" translatable="yes">Search
_Forward</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">gtkFindForward</property>
<property name="use_underline">True</property>
- <property name="stock_id">gtk-go-forward</property>
+ <property name="icon_name">go-down</property>
</object>
<packing>
<property name="expand">False</property>
+ <property name="homogeneous">True</property>
</packing>
</child>
<child>
- <object class="GtkToolItem" id="checkAllSearchItem">
+ <object class="GtkToolItem" id="toolitemFindHighlightAll">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
- <object class="GtkCheckButton" id="checkAllSearch">
+ <object class="GtkCheckButton" id="FindHighlightAll">
+ <property name="label"
translatable="yes">gtkFindHighlightAll</property>
<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="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">show all
matches</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -96,19 +96,20 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">False</property>
</packing>
</child>
<child>
- <object class="GtkToolItem" id="caseSensItem">
+ <object class="GtkToolItem" id="toolitemFindMatchCase">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
- <object class="GtkCheckButton" id="caseSensButton">
+ <object class="GtkCheckButton" id="FindMatchCase">
+ <property name="label"
translatable="yes">gtkFindMatchCase</property>
<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="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">Match case
when searching</property>
+ <property name="relief">none</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -116,7 +117,18 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="FindClose">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">gtkFindClose</property>
+ <property name="icon_name">window-close</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
</packing>
</child>
</object>
@@ -129,12 +141,14 @@
<child>
<object class="GtkTable" id="tabContents">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">2</property>
<property name="n_columns">2</property>
<child>
<object class="GtkLayout" id="layout">
<property name="visible">True</property>
<property name="app_paintable">True</property>
+ <property name="can_focus">False</property>
<property name="events">GDK_EXPOSURE_MASK |
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK
| GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK |
GDK_LEAVE_NOTIFY_MASK | GDK_STRUCTURE_MASK | GDK_SCROLL_MASK</property>
<property name="hadjustment">layouthadjustment</property>
<property name="vadjustment">layoutvadjustment</property>
@@ -144,6 +158,7 @@
<object class="GtkStatusbar" id="resizer">
<property name="height_request">1</property>
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">2</property>
</object>
<packing>
@@ -163,6 +178,7 @@
<object class="GtkLabel" id="status_bar">
<property name="width_request">1</property>
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="xpad">4</property>
<property name="label" translatable="yes">Status</property>
@@ -175,6 +191,7 @@
<child>
<object class="GtkHScrollbar" id="hscrollbar">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="adjustment">layouthadjustment</property>
</object>
<packing>
@@ -192,31 +209,21 @@
<child>
<object class="GtkVScrollbar" id="vscrollbar">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
<property name="adjustment">layoutvadjustment</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="x_options"></property>
+ <property name="x_options"/>
</packing>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
</object>
- <object class="GtkAdjustment" id="layouthadjustment">
- <property name="upper">100</property>
- <property name="step_increment">30</property>
- <property name="page_increment">10</property>
- <property name="page_size">10</property>
- </object>
- <object class="GtkAdjustment" id="layoutvadjustment">
- <property name="upper">100</property>
- <property name="step_increment">30</property>
- <property name="page_increment">10</property>
- <property name="page_size">10</property>
- </object>
</interface>
diff --git a/frontends/gtk/res/toolbar.gtk2.ui
b/frontends/gtk/res/toolbar.gtk2.ui
index eb882f3..2288971 100644
--- a/frontends/gtk/res/toolbar.gtk2.ui
+++ b/frontends/gtk/res/toolbar.gtk2.ui
@@ -17,6 +17,20 @@
</packing>
</child>
<child>
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="xpad">6</property>
+ <property name="label"
translatable="yes">gtkCustomizeToolbarInstructions</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -44,7 +58,7 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -98,7 +112,7 @@
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">6</property>
- <property name="position">2</property>
+ <property name="position">3</property>
</packing>
</child>
</object>
diff --git a/frontends/gtk/search.c b/frontends/gtk/search.c
index ead511f..a7e343e 100644
--- a/frontends/gtk/search.c
+++ b/frontends/gtk/search.c
@@ -307,7 +307,7 @@ nsgtk_search_create(GtkBuilder *builder,
search->close = GTK_TOOL_BUTTON(gtk_builder_get_object(builder,
"FindClose"));
search->checkAll = GTK_CHECK_BUTTON(gtk_builder_get_object(builder,
- "FindHightlightAll"));
+ "FindHighlightAll"));
search->caseSens = GTK_CHECK_BUTTON(gtk_builder_get_object(builder,
"FindMatchCase"));
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
