mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-20 11:12:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

fixup the gtk2 ui builders

Browse Source
This commit is contained in:
Vincent Sanders 2019-09-17 21:57:09 +01:00 committed by Daniel Silverstone
parent a013a24d5f
commit e9b5b56ba6
4 changed files with 122 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

145
frontends/gtk/res/netsurf.gtk2.ui
View File

@ -1,156 +1,43 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="UTF-8"?>
<!--Generated with glade3 3.4.5 on Wed Apr 7 17:10:28 2010 -->
<interface> <interface>
<!-- interface-requires gtk+ 2.12 -->
<!-- interface-naming-policy toplevel-contextual -->
<object class="GtkAdjustment" id="adjustment1"> <object class="GtkAdjustment" id="adjustment1">
<property name="upper">100</property> <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_size">10</property>
<property name="value">0.5357142857142857</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>
</object> </object>
<object class="GtkAdjustment" id="adjustment2"> <object class="GtkAdjustment" id="adjustment2">
<property name="upper">100</property> <property name="upper">100</property>
<property name="lower">0</property>
<property name="page_increment">10</property>
<property name="step_increment">26</property> <property name="step_increment">26</property>
<property name="page_increment">10</property>
<property name="page_size">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>
<object class="GtkWindow" id="wndBrowser"> <object class="GtkWindow" id="wndBrowser">
<property name="can_focus">False</property>
<property name="title" translatable="yes">NetSurf</property> <property name="title" translatable="yes">NetSurf</property>
<property name="window_position">GTK_WIN_POS_CENTER</property> <property name="window_position">center</property>
<child> <child>
<object class="GtkVBox" id="vbox14"> <object class="GtkVBox" id="vbox14">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property>
<child> <child>
<object class="GtkMenuBar" constructor="uimanager1" id="menubar"> <object class="GtkMenuBar" id="menubar">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">False</property> <property name="fill">False</property>
</packing> <property name="position">0</property>
</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>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkNotebook" id="notebook"> <object class="GtkNotebook" id="notebook">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="show_tabs">False</property> <property name="show_tabs">False</property>
<property name="show_border">False</property> <property name="show_border">False</property>
<property name="scrollable">True</property> <property name="scrollable">True</property>
@ -192,7 +79,9 @@
</child> </child>
</object> </object>
<packing> <packing>
<property name="position">2</property> <property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing> </packing>
</child> </child>
</object> </object>

169
frontends/gtk/res/tabcontents.gtk2.ui
View File

@ -1,13 +1,27 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="UTF-8"?>
<interface> <interface>
<!-- interface-requires gtk+ 2.12 --> <!-- interface-requires gtk+ 2.12 -->
<!-- interface-naming-policy toplevel-contextual --> <!-- 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"> <object class="GtkVBox" id="tabBox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property>
<child> <child>
<object class="GtkToolbar" id="toolbar"> <object class="GtkToolbar" id="toolbar">
<property name="visible">True</property> <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> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -16,79 +30,65 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkToolbar" id="searchbar"> <object class="GtkToolbar" id="findbar">
<property name="toolbar_style">GTK_TOOLBAR_BOTH</property> <property name="can_focus">False</property>
<property name="toolbar_style">both</property>
<child> <child>
<object class="GtkToolButton" id="closeSearchButton"> <object class="GtkToolItem" id="toolitemFind">
<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> <property name="visible">True</property>
<property name="can_focus">False</property>
<child> <child>
<object class="GtkLabel" id="searchlabel"> <object class="GtkEntry" id="Find">
<property name="visible">True</property> <property name="visible">True</property>
<property name="xpad">4</property> <property name="can_focus">True</property>
<property name="label" translatable="yes">Match</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> </object>
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">True</property>
<property name="homogeneous">False</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkToolItem" id="toolSearch"> <object class="GtkToolButton" id="FindBack">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">gtkFindBack</property>
<property name="use_underline">True</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="FindForward">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">gtkFindForward</property>
<property name="use_underline">True</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="toolitemFindHighlightAll">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child> <child>
<object class="GtkEntry" id="searchEntry"> <object class="GtkCheckButton" id="FindHighlightAll">
<property name="label" translatable="yes">gtkFindHighlightAll</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
</object> <property name="receives_default">False</property>
</child> <property name="tooltip_text" translatable="yes">show all matches</property>
</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="use_underline">True</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
</object> </object>
@ -96,19 +96,20 @@
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="homogeneous">False</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkToolItem" id="caseSensItem"> <object class="GtkToolItem" id="toolitemFindMatchCase">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property>
<child> <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="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="tooltip-text" translatable="yes">Match case when searching</property> <property name="receives_default">False</property>
<property name="label" translatable="yes">Case</property> <property name="tooltip_text" translatable="yes">Match case when searching</property>
<property name="relief">GTK_RELIEF_NONE</property> <property name="relief">none</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
</object> </object>
@ -116,7 +117,18 @@
</object> </object>
<packing> <packing>
<property name="expand">False</property> <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> </packing>
</child> </child>
</object> </object>
@ -129,12 +141,14 @@
<child> <child>
<object class="GtkTable" id="tabContents"> <object class="GtkTable" id="tabContents">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="n_rows">2</property> <property name="n_rows">2</property>
<property name="n_columns">2</property> <property name="n_columns">2</property>
<child> <child>
<object class="GtkLayout" id="layout"> <object class="GtkLayout" id="layout">
<property name="visible">True</property> <property name="visible">True</property>
<property name="app_paintable">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="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="hadjustment">layouthadjustment</property>
<property name="vadjustment">layoutvadjustment</property> <property name="vadjustment">layoutvadjustment</property>
@ -144,6 +158,7 @@
<object class="GtkStatusbar" id="resizer"> <object class="GtkStatusbar" id="resizer">
<property name="height_request">1</property> <property name="height_request">1</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">2</property> <property name="spacing">2</property>
</object> </object>
<packing> <packing>
@ -163,6 +178,7 @@
<object class="GtkLabel" id="status_bar"> <object class="GtkLabel" id="status_bar">
<property name="width_request">1</property> <property name="width_request">1</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="xpad">4</property> <property name="xpad">4</property>
<property name="label" translatable="yes">Status</property> <property name="label" translatable="yes">Status</property>
@ -175,6 +191,7 @@
<child> <child>
<object class="GtkHScrollbar" id="hscrollbar"> <object class="GtkHScrollbar" id="hscrollbar">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="adjustment">layouthadjustment</property> <property name="adjustment">layouthadjustment</property>
</object> </object>
<packing> <packing>
@ -192,31 +209,21 @@
<child> <child>
<object class="GtkVScrollbar" id="vscrollbar"> <object class="GtkVScrollbar" id="vscrollbar">
<property name="visible">True</property> <property name="visible">True</property>
<property name="orientation">vertical</property> <property name="can_focus">False</property>
<property name="adjustment">layoutvadjustment</property> <property name="adjustment">layoutvadjustment</property>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="right_attach">2</property> <property name="right_attach">2</property>
<property name="x_options"></property> <property name="x_options"/>
</packing> </packing>
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">3</property> <property name="position">3</property>
</packing> </packing>
</child> </child>
</object> </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> </interface>

18
frontends/gtk/res/toolbar.gtk2.ui
View File

@ -16,6 +16,20 @@
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
</child> </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> <child>
<object class="GtkScrolledWindow" id="scrolledwindow1"> <object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property> <property name="visible">True</property>
@ -44,7 +58,7 @@
<packing> <packing>
<property name="expand">True</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">2</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -98,7 +112,7 @@
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">False</property> <property name="fill">False</property>
<property name="padding">6</property> <property name="padding">6</property>
<property name="position">2</property> <property name="position">3</property>
</packing> </packing>
</child> </child>
</object> </object>

2
frontends/gtk/search.c
View File

@ -307,7 +307,7 @@ nsgtk_search_create(GtkBuilder *builder,
search->close = GTK_TOOL_BUTTON(gtk_builder_get_object(builder, search->close = GTK_TOOL_BUTTON(gtk_builder_get_object(builder,
"FindClose")); "FindClose"));
search->checkAll = GTK_CHECK_BUTTON(gtk_builder_get_object(builder, search->checkAll = GTK_CHECK_BUTTON(gtk_builder_get_object(builder,
"FindHightlightAll")); "FindHighlightAll"));
search->caseSens = GTK_CHECK_BUTTON(gtk_builder_get_object(builder, search->caseSens = GTK_CHECK_BUTTON(gtk_builder_get_object(builder,
"FindMatchCase")); "FindMatchCase"));