summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2015-03-01 17:41:09 +0000
committerVincent Sanders <vince@kyllikki.org>2015-03-06 17:16:09 +0000
commit5d3cc513a3ecadb98ed8f6e34c4521db634e09cf (patch)
treee729bceb6232036b74049c75fe25a812eebedbda
parent7247f48d2f5de82b52b7d3050dec513af971b3d7 (diff)
downloadnetsurf-5d3cc513a3ecadb98ed8f6e34c4521db634e09cf.tar.gz
netsurf-5d3cc513a3ecadb98ed8f6e34c4521db634e09cf.tar.bz2
Fixup gtk viewdata window to open at appropriate size
The size hints given were insufficient for gtk to open the window at a sensible size or position. This fixes it to open with a default 640x480 size which is a reasonable compromise. The gtk3 ui builder file was completely reconstructed from fresh as it was broken and was not working.
-rw-r--r--gtk/res/viewdata.gtk2.ui4
-rw-r--r--gtk/res/viewdata.gtk3.ui346
2 files changed, 205 insertions, 145 deletions
diff --git a/gtk/res/viewdata.gtk2.ui b/gtk/res/viewdata.gtk2.ui
index c54545415..7589022ca 100644
--- a/gtk/res/viewdata.gtk2.ui
+++ b/gtk/res/viewdata.gtk2.ui
@@ -3,6 +3,8 @@
<!-- interface-requires gtk+ 2.12 -->
<!-- interface-naming-policy toplevel-contextual -->
<object class="GtkWindow" id="ViewDataWindow">
+ <property name="default_width">640</property>
+ <property name="default_height">480</property>
<child>
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
@@ -180,8 +182,6 @@
<property name="vscrollbar_policy">automatic</property>
<child>
<object class="GtkTextView" id="viewdata_view">
- <property name="width_request">600</property>
- <property name="height_request">400</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="pixels_above_lines">1</property>
diff --git a/gtk/res/viewdata.gtk3.ui b/gtk/res/viewdata.gtk3.ui
index e06aaf373..b742d5f6b 100644
--- a/gtk/res/viewdata.gtk3.ui
+++ b/gtk/res/viewdata.gtk3.ui
@@ -1,168 +1,226 @@
-<?xml version="1.0"?>
-<!--Generated with glade3 3.4.5 on Mon Apr 20 21:28:45 2009 -->
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <object class="GtkUIManager" id="uimanager1">
- <child>
- <object class="GtkActionGroup" id="actiongroup1">
- <child>
- <object class="GtkAction" id="menuitem1">
- <property name="name">menuitem1</property>
- <property name="label" translatable="yes">_File</property>
- </object>
- </child>
- <child>
- <object class="GtkAction" id="source_save_as">
- <property name="stock_id" translatable="yes">gtk-save-as</property>
- <property name="name">source_save_as</property>
- </object>
- <accelerator key="S" modifiers="GDK_CONTROL_MASK"/>
- </child>
- <child>
- <object class="GtkAction" id="source_print">
- <property name="stock_id" translatable="yes">gtk-print</property>
- <property name="name">source_print</property>
- </object>
- <accelerator key="P" modifiers="GDK_CONTROL_MASK"/>
- </child>
- <child>
- <object class="GtkAction" id="source_close">
- <property name="stock_id" translatable="yes">gtk-close</property>
- <property name="name">source_close</property>
- </object>
- </child>
- <child>
- <object class="GtkAction" id="menuitem2">
- <property name="name">menuitem2</property>
- <property name="label" translatable="yes">_Edit</property>
- </object>
- </child>
- <child>
- <object class="GtkAction" id="viewdata_select_all">
- <property name="stock_id" translatable="yes">gtk-select-all</property>
- <property name="name">viewdata_select_all</property>
- </object>
- <accelerator key="A" modifiers="GDK_CONTROL_MASK"/>
- </child>
- <child>
- <object class="GtkAction" id="viewdata_cut">
- <property name="stock_id" translatable="yes">gtk-cut</property>
- <property name="name">viewdata_cut</property>
- </object>
- </child>
- <child>
- <object class="GtkAction" id="viewdata_copy">
- <property name="stock_id" translatable="yes">gtk-copy</property>
- <property name="name">viewdata_copy</property>
- </object>
- </child>
- <child>
- <object class="GtkAction" id="viewdata_paste">
- <property name="stock_id" translatable="yes">gtk-paste</property>
- <property name="name">viewdata_paste</property>
- </object>
- </child>
- <child>
- <object class="GtkAction" id="viewdata_delete">
- <property name="stock_id" translatable="yes">gtk-delete</property>
- <property name="name">viewdata_delete</property>
- </object>
- <accelerator key="Delete" modifiers=""/>
- </child>
- <child>
- <object class="GtkAction" id="menuitem3">
- <property name="name">menuitem3</property>
- <property name="label" translatable="yes">_View</property>
- </object>
- </child>
- <child>
- <object class="GtkAction" id="viewdata_zoom_in">
- <property name="stock_id" translatable="yes">gtk-zoom-in</property>
- <property name="name">viewdata_zoom_in</property>
- </object>
- <accelerator key="plus" modifiers="GDK_CONTROL_MASK"/>
- </child>
- <child>
- <object class="GtkAction" id="viewdata_zoom_out">
- <property name="stock_id" translatable="yes">gtk-zoom-out</property>
- <property name="name">viewdata_zoom_out</property>
- </object>
- <accelerator key="minus" modifiers="GDK_CONTROL_MASK"/>
- </child>
- <child>
- <object class="GtkAction" id="viewdata_zoom_normal">
- <property name="stock_id" translatable="yes">gtk-zoom-100</property>
- <property name="name">viewdata_zoom_normal</property>
- </object>
- <accelerator key="0" modifiers="GDK_CONTROL_MASK"/>
- </child>
- <child>
- <object class="GtkAction" id="menuitem4">
- <property name="name">menuitem4</property>
- <property name="label" translatable="yes">_Help</property>
- </object>
- </child>
- <child>
- <object class="GtkAction" id="viewdata_about">
- <property name="stock_id" translatable="yes">gtk-about</property>
- <property name="name">viewdata_about</property>
- </object>
- </child>
- </object>
- </child>
- <ui>
- <menubar name="menubar1">
- <menu action="menuitem1">
- <menuitem action="viewdata_save_as"/>
- <menuitem action="viewdata_print"/>
- <separator/>
- <menuitem action="viewdata_close"/>
- </menu>
- <menu action="menuitem2">
- <menuitem action="viewdata_select_all"/>
- <menuitem action="viewdata_cut"/>
- <menuitem action="viewdata_copy"/>
- <menuitem action="viewdata_paste"/>
- <menuitem action="viewdata_delete"/>
- </menu>
- <menu action="menuitem3">
- <menuitem action="viewdata_zoom_in"/>
- <menuitem action="viewdata_zoom_out"/>
- <menuitem action="viewdata_zoom_normal"/>
- </menu>
- <menu action="menuitem4">
- <menuitem action="viewdata_about"/>
- </menu>
- </menubar>
- </ui>
- </object>
+ <!-- interface-requires gtk+ 3.0 -->
<object class="GtkWindow" id="ViewDataWindow">
+ <property name="can_focus">False</property>
+ <property name="default_width">640</property>
+ <property name="default_height">480</property>
<child>
- <object class="GtkVBox" id="vbox1">
+ <object class="GtkBox" id="box1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkMenuBar" constructor="uimanager1" id="menubar1">
+ <object class="GtkMenuBar" id="menubar1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkMenuItem" id="menuitem1">
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_File</property>
+ <property name="use_underline">True</property>
+ <child type="submenu">
+ <object class="GtkMenu" id="menu1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkImageMenuItem" id="viewdata_save_as">
+ <property name="label">gtk-save-as</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="viewdata_print">
+ <property name="label">gtk-print</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="separatormenuitem1">
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="viewdata_close">
+ <property name="label">gtk-close</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="menuitem2">
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Edit</property>
+ <property name="use_underline">True</property>
+ <child type="submenu">
+ <object class="GtkMenu" id="menu2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkImageMenuItem" id="viewdata_select_all">
+ <property name="label">gtk-select-all</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="viewdata_cut">
+ <property name="label">gtk-cut</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="viewdata_copy">
+ <property name="label">gtk-copy</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="viewdata_paste">
+ <property name="label">gtk-paste</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="viewdata_delete">
+ <property name="label">gtk-delete</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="menuitem3">
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_View</property>
+ <property name="use_underline">True</property>
+ <child type="submenu">
+ <object class="GtkMenu" id="menu4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkImageMenuItem" id="viewdata_zoom_in">
+ <property name="label">gtk-zoom-in</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="viewdata_zoom_out">
+ <property name="label">gtk-zoom-out</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="viewdata_zoom_normal">
+ <property name="label">gtk-zoom-100</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="menuitem4">
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Help</property>
+ <property name="use_underline">True</property>
+ <child type="submenu">
+ <object class="GtkMenu" id="menu3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkImageMenuItem" id="viewdata_about">
+ <property name="label">gtk-about</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkScrolledWindow" id="sourcescrolled">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="window_placement">bottom-right</property>
<child>
<object class="GtkTextView" id="viewdata_view">
- <property name="width_request">600</property>
- <property name="height_request">400</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="pixels_above_lines">1</property>
<property name="pixels_below_lines">1</property>
<property name="editable">False</property>
- <property name="wrap_mode">GTK_WRAP_WORD</property>
+ <property name="wrap_mode">word</property>
<property name="left_margin">3</property>
<property name="right_margin">3</property>
<property name="accepts_tab">False</property>
@@ -170,6 +228,8 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>