diff options
Diffstat (limited to 'frontends/gtk/res')
28 files changed, 647 insertions, 578 deletions
diff --git a/frontends/gtk/res/accelerators b/frontends/gtk/res/accelerators new file mode 100644 index 000000000..2da229aff --- /dev/null +++ b/frontends/gtk/res/accelerators @@ -0,0 +1,40 @@ +# GTK accelerator keys for menu entries +# The keys must match those in the menus to be applied +# +# These are passed to gtk_accelerator_parse and must not be translated +# The key names are the same as those in the gdk/gdkkeysyms.h header file +# but without the leading “GDK_KEY_”. + +gtkNextTab:<Control>Page_Down +gtkPrevTab:<Control>Page_Up +gtkCloseTab:<Control>w +gtkNewTab:<Control>t +gtkNewWindow:<Control>n +gtkOpenFile:<Control>o +gtkCloseWindow:<Control><shift>w +gtkSavePage:<Control>s +gtkPrintPreview:<Control><shift>p +gtkPrint:<Control>p +gtkQuitMenu:<Control>q +gtkCut:<Control>x +gtkCopy:<Control>c +gtkPaste:<Control>v +gtkSelectAll:<Control>a +gtkFind:<Control>f +gtkStop:Escape +gtkReload:F5 +gtkZoomPlus:<Control>plus +gtkZoomMinus:<Control>minus +gtkZoomNormal:<Control>0 +gtkFullScreen:F11 +gtkPageSource:<Control>U +gtkDownloads:<Control>j +gtkBack:<alt>Left +gtkForward:<alt>Right +gtkHome:<alt>Down +gtkLocalHistory:<Control>h +gtkGlobalHistory:<Control><shift>h +gtkAddBookMarks:<Control>d +gtkShowBookMarks:F6 +gtkShowCookies:F9 +gtkOpenLocation:<Control>l diff --git a/frontends/gtk/res/adblock.css b/frontends/gtk/res/adblock.css index ff2485622..0d12aaa7c 120000 --- a/frontends/gtk/res/adblock.css +++ b/frontends/gtk/res/adblock.css @@ -1 +1 @@ -../../../!NetSurf/Resources/AdBlock,f79
\ No newline at end of file +../../../resources/adblock.css
\ No newline at end of file diff --git a/frontends/gtk/res/ca-bundle.txt b/frontends/gtk/res/ca-bundle.txt index 0b0e416ad..1187fa51a 120000 --- a/frontends/gtk/res/ca-bundle.txt +++ b/frontends/gtk/res/ca-bundle.txt @@ -1 +1 @@ -../../../!NetSurf/Resources/ca-bundle
\ No newline at end of file +../../../resources/ca-bundle
\ No newline at end of file diff --git a/frontends/gtk/res/de/welcome.html b/frontends/gtk/res/de/welcome.html index 98a53b215..b77e23743 120000 --- a/frontends/gtk/res/de/welcome.html +++ b/frontends/gtk/res/de/welcome.html @@ -1 +1 @@ -../../../../!NetSurf/Resources/de/welcome.html,faf
\ No newline at end of file +../../../../resources/de/welcome.html
\ No newline at end of file diff --git a/frontends/gtk/res/default.css b/frontends/gtk/res/default.css index a8579eb7c..fa3ae6c26 120000 --- a/frontends/gtk/res/default.css +++ b/frontends/gtk/res/default.css @@ -1 +1 @@ -../../../!NetSurf/Resources/CSS,f79
\ No newline at end of file +../../../resources/default.css
\ No newline at end of file diff --git a/frontends/gtk/res/en/credits.html b/frontends/gtk/res/en/credits.html index 252516fd7..f73ecd4aa 120000 --- a/frontends/gtk/res/en/credits.html +++ b/frontends/gtk/res/en/credits.html @@ -1 +1 @@ -../../../../!NetSurf/Resources/en/credits.html,faf
\ No newline at end of file +../../../../resources/en/credits.html
\ No newline at end of file diff --git a/frontends/gtk/res/en/licence.html b/frontends/gtk/res/en/licence.html index 79f73669b..0c3b430b7 120000 --- a/frontends/gtk/res/en/licence.html +++ b/frontends/gtk/res/en/licence.html @@ -1 +1 @@ -../../../../!NetSurf/Resources/en/licence.html,faf
\ No newline at end of file +../../../../resources/en/licence.html
\ No newline at end of file diff --git a/frontends/gtk/res/en/maps.html b/frontends/gtk/res/en/maps.html index bb3ffcbe7..507a4b248 120000 --- a/frontends/gtk/res/en/maps.html +++ b/frontends/gtk/res/en/maps.html @@ -1 +1 @@ -../../../../!NetSurf/Resources/en/maps.html,faf
\ No newline at end of file +../../../../resources/en/maps.html
\ No newline at end of file diff --git a/frontends/gtk/res/en/welcome.html b/frontends/gtk/res/en/welcome.html index 601099223..543f31ddd 120000 --- a/frontends/gtk/res/en/welcome.html +++ b/frontends/gtk/res/en/welcome.html @@ -1 +1 @@ -../../../../!NetSurf/Resources/en/welcome.html,faf
\ No newline at end of file +../../../../resources/en/welcome.html
\ No newline at end of file diff --git a/frontends/gtk/res/history.gtk2.ui b/frontends/gtk/res/globalhistory.gtk2.ui index 2b89ecb4b..2b89ecb4b 100644 --- a/frontends/gtk/res/history.gtk2.ui +++ b/frontends/gtk/res/globalhistory.gtk2.ui diff --git a/frontends/gtk/res/history.gtk3.ui b/frontends/gtk/res/globalhistory.gtk3.ui index 7fa598f1e..7fa598f1e 100644 --- a/frontends/gtk/res/history.gtk3.ui +++ b/frontends/gtk/res/globalhistory.gtk3.ui diff --git a/frontends/gtk/res/icons b/frontends/gtk/res/icons index 187efd6f9..94d2dc0df 120000 --- a/frontends/gtk/res/icons +++ b/frontends/gtk/res/icons @@ -1 +1 @@ -../../../!NetSurf/Resources/Icons/
\ No newline at end of file +../../../resources/icons
\ No newline at end of file diff --git a/frontends/gtk/res/internal.css b/frontends/gtk/res/internal.css index 17f9f1504..5583a9811 120000 --- a/frontends/gtk/res/internal.css +++ b/frontends/gtk/res/internal.css @@ -1 +1 @@ -../../../!NetSurf/Resources/internal.css,f79
\ No newline at end of file +../../../resources/internal.css
\ No newline at end of file diff --git a/frontends/gtk/res/it/credits.html b/frontends/gtk/res/it/credits.html index 64b78982e..2b7c99542 120000 --- a/frontends/gtk/res/it/credits.html +++ b/frontends/gtk/res/it/credits.html @@ -1 +1 @@ -../../../../!NetSurf/Resources/it/credits.html,faf
\ No newline at end of file +../../../../resources/it/credits.html
\ No newline at end of file diff --git a/frontends/gtk/res/it/licence.html b/frontends/gtk/res/it/licence.html index 4abc825d3..92afce85b 120000 --- a/frontends/gtk/res/it/licence.html +++ b/frontends/gtk/res/it/licence.html @@ -1 +1 @@ -../../../../!NetSurf/Resources/it/licence.html,faf
\ No newline at end of file +../../../../resources/it/licence.html
\ No newline at end of file diff --git a/frontends/gtk/res/it/welcome.html b/frontends/gtk/res/it/welcome.html index 59cef0551..2673ba948 120000 --- a/frontends/gtk/res/it/welcome.html +++ b/frontends/gtk/res/it/welcome.html @@ -1 +1 @@ -../../../../!NetSurf/Resources/it/welcome.html,faf
\ No newline at end of file +../../../../resources/it/welcome.html
\ No newline at end of file diff --git a/frontends/gtk/res/ja/welcome.html b/frontends/gtk/res/ja/welcome.html index a2556ee4e..8b603f3df 120000 --- a/frontends/gtk/res/ja/welcome.html +++ b/frontends/gtk/res/ja/welcome.html @@ -1 +1 @@ -../../../../!NetSurf/Resources/ja/welcome.html,faf
\ No newline at end of file +../../../../resources/ja/welcome.html
\ No newline at end of file diff --git a/frontends/gtk/res/localhistory.gtk2.ui b/frontends/gtk/res/localhistory.gtk2.ui new file mode 100644 index 000000000..9512b6289 --- /dev/null +++ b/frontends/gtk/res/localhistory.gtk2.ui @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> +<interface> + <!-- interface-requires gtk+ 3.0 --> + <object class="GtkWindow" id="wndHistory"> + <property name="can_focus">False</property> + <property name="title" translatable="yes">NetSurf Local History</property> + <property name="window_position">center</property> + <property name="default_width">20</property> + <property name="default_height">20</property> + <property name="type_hint">utility</property> + <property name="decorated">False</property> + <child> + <object class="GtkVBox" id="vbox1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkScrolledWindow" id="HistoryScrolled"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <child> + <object class="GtkViewport" id="HistoryViewport"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="resize_mode">queue</property> + <child> + <object class="GtkDrawingArea" id="HistoryDrawingArea"> + <property name="visible">True</property> + <property name="app_paintable">True</property> + <property name="can_focus">True</property> + <property name="events">GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_STRUCTURE_MASK</property> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> +</interface> diff --git a/frontends/gtk/res/localhistory.gtk3.ui b/frontends/gtk/res/localhistory.gtk3.ui new file mode 100644 index 000000000..1a4b9004d --- /dev/null +++ b/frontends/gtk/res/localhistory.gtk3.ui @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> +<interface> + <!-- interface-requires gtk+ 3.0 --> + <object class="GtkWindow" id="wndHistory"> + <property name="can_focus">False</property> + <property name="title" translatable="yes">NetSurf Local History</property> + <property name="window_position">center</property> + <property name="default_width">20</property> + <property name="default_height">20</property> + <property name="type_hint">utility</property> + <property name="decorated">False</property> + <child> + <object class="GtkBox" id="box1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkScrolledWindow" id="HistoryScrolled"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkViewport" id="HistoryViewport"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkDrawingArea" id="HistoryDrawingArea"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="events">GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_STRUCTURE_MASK</property> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> +</interface> diff --git a/frontends/gtk/res/netsurf.gresource.xml b/frontends/gtk/res/netsurf.gresource.xml index c7626b053..e8243254a 100644 --- a/frontends/gtk/res/netsurf.gresource.xml +++ b/frontends/gtk/res/netsurf.gresource.xml @@ -2,30 +2,32 @@ <gresources> <gresource prefix="/org/netsurf"> <file>cookies.gtk2.ui</file> - <file>history.gtk3.ui</file> - <file>netsurf.gtk2.ui</file> - <file>password.gtk3.ui</file> - <file>toolbar.gtk2.ui</file> + <file>globalhistory.gtk3.ui</file> + <file>localhistory.gtk3.ui</file> + <file>netsurf.gtk2.ui</file> + <file>password.gtk3.ui</file> + <file>toolbar.gtk2.ui</file> <file>warning.gtk3.ui</file> - <file>cookies.gtk3.ui</file> - <file>hotlist.gtk2.ui</file> - <file>netsurf.gtk3.ui</file> - <file>ssl.gtk2.ui</file> + <file>cookies.gtk3.ui</file> + <file>hotlist.gtk2.ui</file> + <file>netsurf.gtk3.ui</file> + <file>ssl.gtk2.ui</file> <file>toolbar.gtk3.ui</file> - <file>downloads.gtk2.ui</file> - <file>hotlist.gtk3.ui</file> - <file>options.gtk2.ui</file> - <file>ssl.gtk3.ui</file> + <file>downloads.gtk2.ui</file> + <file>hotlist.gtk3.ui</file> + <file>options.gtk2.ui</file> + <file>ssl.gtk3.ui</file> <file>viewdata.gtk2.ui</file> - <file>downloads.gtk3.ui</file> - <file>login.gtk2.ui</file> - <file>options.gtk3.ui</file> - <file>tabcontents.gtk2.ui</file> + <file>downloads.gtk3.ui</file> + <file>login.gtk2.ui</file> + <file>options.gtk3.ui</file> + <file>tabcontents.gtk2.ui</file> <file>viewdata.gtk3.ui</file> - <file>history.gtk2.ui</file> - <file>login.gtk3.ui</file> - <file>password.gtk2.ui</file> - <file>tabcontents.gtk3.ui</file> + <file>localhistory.gtk2.ui</file> + <file>globalhistory.gtk2.ui</file> + <file>login.gtk3.ui</file> + <file>password.gtk2.ui</file> + <file>tabcontents.gtk3.ui</file> <file>warning.gtk2.ui</file> <file preprocess="to-pixdata">favicon.png</file> <file preprocess="to-pixdata">netsurf.xpm</file> @@ -66,5 +68,6 @@ <file>icons/hotlist-rmv.png</file> <file>icons/search.png</file> <file>languages</file> + <file>accelerators</file> </gresource> </gresources> diff --git a/frontends/gtk/res/netsurf.png b/frontends/gtk/res/netsurf.png index 905512c25..d0ab72a5e 120000 --- a/frontends/gtk/res/netsurf.png +++ b/frontends/gtk/res/netsurf.png @@ -1 +1 @@ -../../../!NetSurf/Resources/netsurf.png,b60
\ No newline at end of file +../../../resources/netsurf.png
\ No newline at end of file diff --git a/frontends/gtk/res/nl/credits.html b/frontends/gtk/res/nl/credits.html index 9c983987a..71b27e40a 120000 --- a/frontends/gtk/res/nl/credits.html +++ b/frontends/gtk/res/nl/credits.html @@ -1 +1 @@ -../../../../!NetSurf/Resources/nl/credits.html,faf
\ No newline at end of file +../../../../resources/nl/credits.html
\ No newline at end of file diff --git a/frontends/gtk/res/nl/licence.html b/frontends/gtk/res/nl/licence.html index 8a10d2073..5aaf1cb44 120000 --- a/frontends/gtk/res/nl/licence.html +++ b/frontends/gtk/res/nl/licence.html @@ -1 +1 @@ -../../../../!NetSurf/Resources/nl/licence.html,faf
\ No newline at end of file +../../../../resources/nl/licence.html
\ No newline at end of file diff --git a/frontends/gtk/res/nl/welcome.html b/frontends/gtk/res/nl/welcome.html index 6b2ba7742..ef7a97cc9 120000 --- a/frontends/gtk/res/nl/welcome.html +++ b/frontends/gtk/res/nl/welcome.html @@ -1 +1 @@ -../../../../!NetSurf/Resources/nl/welcome.html,faf
\ No newline at end of file +../../../../resources/nl/welcome.html
\ No newline at end of file diff --git a/frontends/gtk/res/options.gtk2.ui b/frontends/gtk/res/options.gtk2.ui index d5542ba5d..a1162585d 100644 --- a/frontends/gtk/res/options.gtk2.ui +++ b/frontends/gtk/res/options.gtk2.ui @@ -2,6 +2,297 @@ <interface> <requires lib="gtk+" version="2.16"/> <!-- interface-naming-policy project-wide --> + <object class="GtkAdjustment" id="adjustment_animation_time"> + <property name="lower">0.10000000000000001</property> + <property name="upper">10</property> + <property name="value">0.10000000000000001</property> + <property name="step_increment">0.10000000000000001</property> + <property name="page_increment">1</property> + </object> + <object class="GtkAdjustment" id="adjustment_cache_disc_size"> + <property name="upper">4096</property> + <property name="value">1024</property> + <property name="step_increment">32</property> + <property name="page_increment">256</property> + </object> + <object class="GtkAdjustment" id="adjustment_cache_memory_size"> + <property name="upper">2048</property> + <property name="value">16</property> + <property name="step_increment">4</property> + <property name="page_increment">16</property> + </object> + <object class="GtkAdjustment" id="adjustment_disc_cache_age"> + <property name="upper">999</property> + <property name="value">28</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> + <object class="GtkAdjustment" id="adjustment_fetching_cached"> + <property name="upper">100</property> + <property name="value">1</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> + <object class="GtkAdjustment" id="adjustment_fetching_max"> + <property name="lower">1</property> + <property name="upper">100</property> + <property name="value">10</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> + <object class="GtkAdjustment" id="adjustment_fetching_perhost"> + <property name="lower">1</property> + <property name="upper">100</property> + <property name="value">1</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> + <object class="GtkAdjustment" id="adjustment_font_default_size"> + <property name="lower">1</property> + <property name="upper">99.900000000000006</property> + <property name="value">16</property> + <property name="step_increment">0.10000000000000001</property> + <property name="page_increment">2</property> + </object> + <object class="GtkAdjustment" id="adjustment_history_age"> + <property name="upper">999</property> + <property name="value">28</property> + <property name="step_increment">1</property> + <property name="page_increment">28</property> + </object> + <object class="GtkAdjustment" id="adjustment_pdf_lmargin"> + <property name="upper">999</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> + <object class="GtkAdjustment" id="adjustment_pdf_scale"> + <property name="lower">1</property> + <property name="upper">1000</property> + <property name="value">100</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> + <object class="GtkAdjustment" id="adjustment_proxy_port"> + <property name="lower">1</property> + <property name="upper">65535</property> + <property name="value">3128</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xpad">3</property> + <property name="stock">gtk-apply</property> + </object> + <object class="GtkListStore" id="liststore_content_language"> + <columns> + <!-- column-name Code --> + <column type="gchararray"/> + <!-- column-name Description --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">en</col> + <col id="1" translatable="yes">English</col> + </row> + </data> + </object> + <object class="GtkListStore" id="liststore_defaultfont"> + <columns> + <!-- column-name Type --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">preferencesFonttypeSans</col> + </row> + <row> + <col id="0" translatable="yes">preferencesFonttypeSerif</col> + </row> + <row> + <col id="0" translatable="yes">preferencesFonttypeMonospace</col> + </row> + <row> + <col id="0" translatable="yes">preferencesFonttypeCursive</col> + </row> + <row> + <col id="0" translatable="yes">preferencesFonttypeFantasy</col> + </row> + </data> + </object> + <object class="GtkListStore" id="liststore_developer_view"> + <columns> + <!-- column-name Type --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">preferencesDeveloperViewWindow</col> + </row> + <row> + <col id="0" translatable="yes">preferencesDeveloperViewTab</col> + </row> + <row> + <col id="0" translatable="yes">preferencesDeveloperViewEditor</col> + </row> + </data> + </object> + <object class="GtkListStore" id="liststore_image_loading"> + <columns> + <!-- column-name Type --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">preferencesImageLoadBoth</col> + </row> + <row> + <col id="0" translatable="yes">preferencesImageLoadFore</col> + </row> + <row> + <col id="0" translatable="yes">preferencesImageLoadBack</col> + </row> + <row> + <col id="0" translatable="yes">preferencesImageLoadNone</col> + </row> + </data> + </object> + <object class="GtkListStore" id="liststore_proxy_type"> + <columns> + <!-- column-name Type --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">preferencesProxyTypeDirect</col> + </row> + <row> + <col id="0" translatable="yes">preferencesProxyTypeManual</col> + </row> + <row> + <col id="0" translatable="yes">preferencesProxyTypeBasic</col> + </row> + <row> + <col id="0" translatable="yes">preferencesProxyTypeNLTM</col> + </row> + <row> + <col id="0" translatable="yes">preferencesProxyTypeSystem</col> + </row> + </data> + </object> + <object class="GtkListStore" id="liststore_search_provider"> + <columns> + <!-- column-name Provider --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0">Google</col> + </row> + <row> + <col id="0">Yahoo!</col> + </row> + <row> + <col id="0">Microsoft Live</col> + </row> + <row> + <col id="0">Buisiness.com</col> + </row> + <row> + <col id="0">Omgili</col> + </row> + <row> + <col id="0">BBC News</col> + </row> + <row> + <col id="0">Ubuntu Packages</col> + </row> + <row> + <col id="0">Creative Commons</col> + </row> + <row> + <col id="0">Ask</col> + </row> + <row> + <col id="0">Answers</col> + </row> + <row> + <col id="0">Dictionary.com</col> + </row> + <row> + <col id="0">YouTube</col> + </row> + <row> + <col id="0">AeroMP3</col> + </row> + <row> + <col id="0">AOL</col> + </row> + <row> + <col id="0">Baidu</col> + </row> + <row> + <col id="0">Amazon</col> + </row> + <row> + <col id="0">Ebay</col> + </row> + <row> + <col id="0">IMBD</col> + </row> + <row> + <col id="0">ESPN</col> + </row> + <row> + <col id="0">Wikipedia</col> + </row> + <row> + <col id="0">DuckDuckGo</col> + </row> + </data> + </object> + <object class="GtkListStore" id="liststore_tab_position"> + <columns> + <!-- column-name Position --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">preferencesTabLocTop</col> + </row> + <row> + <col id="0" translatable="yes">preferencesTabLocLeft</col> + </row> + <row> + <col id="0" translatable="yes">preferencesTabLocRight</col> + </row> + <row> + <col id="0" translatable="yes">preferencesTabLocBottom</col> + </row> + </data> + </object> + <object class="GtkListStore" id="liststore_toolbar_buttontype"> + <columns> + <!-- column-name Type --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">preferencesButtonTypeSmall</col> + </row> + <row> + <col id="0" translatable="yes">preferencesButtonTypeLarge</col> + </row> + <row> + <col id="0" translatable="yes">preferencesButtonTypeLargeText</col> + </row> + <row> + <col id="0" translatable="yes">preferencesButtonTypeText</col> + </row> + </data> + </object> <object class="GtkDialog" id="dialogPreferences"> <property name="can_focus">False</property> <property name="border_width">5</property> @@ -2178,7 +2469,6 @@ </child> <child> <object class="GtkVBox" id="vbox_pdfexport"> - <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">6</property> <child> @@ -2583,6 +2873,12 @@ <property name="x_options">GTK_EXPAND</property> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="expand">True</property> @@ -2710,295 +3006,4 @@ <action-widget response="-7">close</action-widget> </action-widgets> </object> - <object class="GtkListStore" id="liststore_search_provider"> - <columns> - <!-- column-name Provider --> - <column type="gchararray"/> - </columns> - <data> - <row> - <col id="0">Google</col> - </row> - <row> - <col id="0">Yahoo!</col> - </row> - <row> - <col id="0">Microsoft Live</col> - </row> - <row> - <col id="0">Buisiness.com</col> - </row> - <row> - <col id="0">Omgili</col> - </row> - <row> - <col id="0">BBC News</col> - </row> - <row> - <col id="0">Ubuntu Packages</col> - </row> - <row> - <col id="0">Creative Commons</col> - </row> - <row> - <col id="0">Ask</col> - </row> - <row> - <col id="0">Answers</col> - </row> - <row> - <col id="0">Dictionary.com</col> - </row> - <row> - <col id="0">YouTube</col> - </row> - <row> - <col id="0">AeroMP3</col> - </row> - <row> - <col id="0">AOL</col> - </row> - <row> - <col id="0">Baidu</col> - </row> - <row> - <col id="0">Amazon</col> - </row> - <row> - <col id="0">Ebay</col> - </row> - <row> - <col id="0">IMBD</col> - </row> - <row> - <col id="0">ESPN</col> - </row> - <row> - <col id="0">Wikipedia</col> - </row> - <row> - <col id="0">DuckDuckGo</col> - </row> - </data> - </object> - <object class="GtkListStore" id="liststore_tab_position"> - <columns> - <!-- column-name Position --> - <column type="gchararray"/> - </columns> - <data> - <row> - <col id="0" translatable="yes">preferencesTabLocTop</col> - </row> - <row> - <col id="0" translatable="yes">preferencesTabLocLeft</col> - </row> - <row> - <col id="0" translatable="yes">preferencesTabLocRight</col> - </row> - <row> - <col id="0" translatable="yes">preferencesTabLocBottom</col> - </row> - </data> - </object> - <object class="GtkListStore" id="liststore_toolbar_buttontype"> - <columns> - <!-- column-name Type --> - <column type="gchararray"/> - </columns> - <data> - <row> - <col id="0" translatable="yes">preferencesButtonTypeSmall</col> - </row> - <row> - <col id="0" translatable="yes">preferencesButtonTypeLarge</col> - </row> - <row> - <col id="0" translatable="yes">preferencesButtonTypeLargeText</col> - </row> - <row> - <col id="0" translatable="yes">preferencesButtonTypeText</col> - </row> - </data> - </object> - <object class="GtkListStore" id="liststore_image_loading"> - <columns> - <!-- column-name Type --> - <column type="gchararray"/> - </columns> - <data> - <row> - <col id="0" translatable="yes">preferencesImageLoadBoth</col> - </row> - <row> - <col id="0" translatable="yes">preferencesImageLoadFore</col> - </row> - <row> - <col id="0" translatable="yes">preferencesImageLoadBack</col> - </row> - <row> - <col id="0" translatable="yes">preferencesImageLoadNone</col> - </row> - </data> - </object> - <object class="GtkListStore" id="liststore_defaultfont"> - <columns> - <!-- column-name Type --> - <column type="gchararray"/> - </columns> - <data> - <row> - <col id="0" translatable="yes">preferencesFonttypeSans</col> - </row> - <row> - <col id="0" translatable="yes">preferencesFonttypeSerif</col> - </row> - <row> - <col id="0" translatable="yes">preferencesFonttypeMonospace</col> - </row> - <row> - <col id="0" translatable="yes">preferencesFonttypeCursive</col> - </row> - <row> - <col id="0" translatable="yes">preferencesFonttypeFantasy</col> - </row> - </data> - </object> - <object class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xpad">3</property> - <property name="stock">gtk-apply</property> - </object> - <object class="GtkListStore" id="liststore_proxy_type"> - <columns> - <!-- column-name Type --> - <column type="gchararray"/> - </columns> - <data> - <row> - <col id="0" translatable="yes">preferencesProxyTypeDirect</col> - </row> - <row> - <col id="0" translatable="yes">preferencesProxyTypeManual</col> - </row> - <row> - <col id="0" translatable="yes">preferencesProxyTypeBasic</col> - </row> - <row> - <col id="0" translatable="yes">preferencesProxyTypeNLTM</col> - </row> - <row> - <col id="0" translatable="yes">preferencesProxyTypeSystem</col> - </row> - </data> - </object> - <object class="GtkAdjustment" id="adjustment_animation_time"> - <property name="value">0.10000000000000001</property> - <property name="lower">0.10000000000000001</property> - <property name="upper">10</property> - <property name="step_increment">0.10000000000000001</property> - <property name="page_increment">1</property> - </object> - <object class="GtkAdjustment" id="adjustment_font_default_size"> - <property name="value">16</property> - <property name="lower">1</property> - <property name="upper">99.900000000000006</property> - <property name="step_increment">0.10000000000000001</property> - <property name="page_increment">2</property> - </object> - <object class="GtkAdjustment" id="adjustment_history_age"> - <property name="value">28</property> - <property name="upper">999</property> - <property name="step_increment">1</property> - <property name="page_increment">28</property> - </object> - <object class="GtkAdjustment" id="adjustment_cache_memory_size"> - <property name="value">16</property> - <property name="upper">2048</property> - <property name="step_increment">4</property> - <property name="page_increment">16</property> - </object> - <object class="GtkAdjustment" id="adjustment_cache_disc_size"> - <property name="value">1024</property> - <property name="upper">4096</property> - <property name="step_increment">32</property> - <property name="page_increment">256</property> - </object> - <object class="GtkAdjustment" id="adjustment_disc_cache_age"> - <property name="value">28</property> - <property name="upper">999</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> - </object> - <object class="GtkAdjustment" id="adjustment_proxy_port"> - <property name="value">3128</property> - <property name="lower">1</property> - <property name="upper">65535</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> - </object> - <object class="GtkAdjustment" id="adjustment_fetching_max"> - <property name="value">10</property> - <property name="lower">1</property> - <property name="upper">100</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> - </object> - <object class="GtkAdjustment" id="adjustment_fetching_perhost"> - <property name="value">1</property> - <property name="lower">1</property> - <property name="upper">100</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> - </object> - <object class="GtkAdjustment" id="adjustment_fetching_cached"> - <property name="value">1</property> - <property name="upper">100</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> - </object> - <object class="GtkAdjustment" id="adjustment_pdf_scale"> - <property name="value">100</property> - <property name="lower">1</property> - <property name="upper">1000</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> - </object> - <object class="GtkAdjustment" id="adjustment_pdf_lmargin"> - <property name="upper">999</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> - </object> - <object class="GtkListStore" id="liststore_content_language"> - <columns> - <!-- column-name Code --> - <column type="gchararray"/> - <!-- column-name Description --> - <column type="gchararray"/> - </columns> - <data> - <row> - <col id="0" translatable="yes">en</col> - <col id="1" translatable="yes">English</col> - </row> - </data> - </object> - <object class="GtkListStore" id="liststore_developer_view"> - <columns> - <!-- column-name Type --> - <column type="gchararray"/> - </columns> - <data> - <row> - <col id="0" translatable="yes">preferencesDeveloperViewWindow</col> - </row> - <row> - <col id="0" translatable="yes">preferencesDeveloperViewTab</col> - </row> - <row> - <col id="0" translatable="yes">preferencesDeveloperViewEditor</col> - </row> - </data> - </object> </interface> diff --git a/frontends/gtk/res/quirks.css b/frontends/gtk/res/quirks.css index 88aabe48c..1e752cb9e 120000 --- a/frontends/gtk/res/quirks.css +++ b/frontends/gtk/res/quirks.css @@ -1 +1 @@ -../../../!NetSurf/Resources/Quirks,f79
\ No newline at end of file +../../../resources/quirks.css
\ No newline at end of file diff --git a/frontends/gtk/res/toolbar.gtk2.ui b/frontends/gtk/res/toolbar.gtk2.ui index d84db5c8c..4e8805a6f 100644 --- a/frontends/gtk/res/toolbar.gtk2.ui +++ b/frontends/gtk/res/toolbar.gtk2.ui @@ -1,67 +1,84 @@ -<?xml version="1.0"?> -<!--*- mode: xml -*--> +<?xml version="1.0" encoding="UTF-8"?> <interface> - <object class="GtkWindow" id="toolbarwindow"> + <!-- interface-requires gtk+ 2.12 --> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkDialog" id="dialogToolbar"> <property name="width_request">700</property> <property name="height_request">450</property> - <property name="title" translatable="yes"/> - <property name="type">GTK_WINDOW_TOPLEVEL</property> - <property name="window_position">GTK_WIN_POS_NONE</property> - <property name="modal">False</property> - <property name="resizable">True</property> - <property name="destroy_with_parent">False</property> - <property name="decorated">True</property> - <property name="skip_taskbar_hint">False</property> - <property name="skip_pager_hint">False</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> - <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="focus_on_map">True</property> - <property name="urgency_hint">False</property> - <child> - <object class="GtkVBox" id="windowvbox"> + <property name="can_focus">False</property> + <property name="border_width">5</property> + <property name="title" translatable="yes">gtkToolBarTitle</property> + <property name="window_position">center-on-parent</property> + <property name="destroy_with_parent">True</property> + <property name="type_hint">dialog</property> + <child internal-child="vbox"> + <object class="GtkVBox" id="dialog-vbox1"> <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> + <property name="can_focus">False</property> + <property name="spacing">2</property> <child> - <object class="GtkLabel" id="toolbarlabel"> + <object class="GtkHBox" id="hbox1"> <property name="visible">True</property> - <property name="label" translatable="yes">Move items from store to toolbar Rearrange items in toolbar Move items from toolbar to store</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> + <property name="can_focus">False</property> + <property name="homogeneous">True</property> + <child> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Move items from store to toolbar</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Rearrange items in toolbar</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Move items from toolbar to store</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> </object> <packing> - <property name="padding">0</property> <property name="expand">False</property> <property name="fill">True</property> + <property name="padding">2</property> + <property name="position">0</property> </packing> </child> <child> <object class="GtkScrolledWindow" id="scrolledwindow1"> <property name="visible">True</property> - <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="shadow_type">GTK_SHADOW_NONE</property> - <property name="window_placement">GTK_CORNER_TOP_LEFT</property> + <property name="can_focus">False</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> <child> <object class="GtkViewport" id="viewport1"> <property name="visible">True</property> - <property name="shadow_type">GTK_SHADOW_IN</property> + <property name="can_focus">False</property> <child> <object class="GtkVBox" id="widgetvbox"> <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> + <property name="can_focus">False</property> <child> <placeholder/> </child> @@ -71,119 +88,85 @@ </child> </object> <packing> - <property name="padding">0</property> <property name="expand">True</property> <property name="fill">True</property> + <property name="position">1</property> </packing> </child> - <child> - <object class="GtkHBox" id="buttonhbox"> + <child internal-child="action_area"> + <object class="GtkHButtonBox" id="dialog-action_area1"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> + <property name="can_focus">False</property> + <property name="layout_style">end</property> <child> - <object class="GtkButton" id="resetbutton"> + <object class="GtkButton" id="reset"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> + <property name="receives_default">False</property> <child> <object class="GtkHBox" id="button1hbox"> <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> + <property name="can_focus">False</property> <child> <object class="GtkImage" id="image1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="stock">gtk-refresh</property> - <property name="icon_size">4</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> </object> <packing> - <property name="padding">0</property> <property name="expand">False</property> <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> <object class="GtkLabel" id="refreshbuttonlabel"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Reset to defaults</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> </object> <packing> - <property name="padding">0</property> <property name="expand">True</property> <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> </child> </object> <packing> - <property name="padding">10</property> <property name="expand">False</property> <property name="fill">True</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <object class="GtkButton" id="okbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="has_focus">True</property> - <property name="label">gtk-apply</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - </object> - <packing> <property name="padding">10</property> - <property name="expand">False</property> - <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkButton" id="cancelbutton"> + <object class="GtkButton" id="close"> + <property name="label">gtk-close</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label">gtk-cancel</property> + <property name="receives_default">True</property> <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> </object> <packing> - <property name="padding">0</property> <property name="expand">False</property> - <property name="fill">True</property> + <property name="fill">False</property> + <property name="position">1</property> </packing> </child> </object> <packing> - <property name="padding">0</property> <property name="expand">False</property> <property name="fill">True</property> + <property name="position">2</property> </packing> </child> </object> </child> + <action-widgets> + <action-widget response="0">reset</action-widget> + <action-widget response="0">close</action-widget> + </action-widgets> </object> </interface> diff --git a/frontends/gtk/res/toolbar.gtk3.ui b/frontends/gtk/res/toolbar.gtk3.ui index d84db5c8c..1f1148703 100644 --- a/frontends/gtk/res/toolbar.gtk3.ui +++ b/frontends/gtk/res/toolbar.gtk3.ui @@ -1,186 +1,134 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <!--*- mode: xml -*--> <interface> - <object class="GtkWindow" id="toolbarwindow"> + <requires lib="gtk+" version="3.0"/> + <object class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-refresh</property> + </object> + <object class="GtkDialog" id="dialogToolbar"> <property name="width_request">700</property> <property name="height_request">450</property> - <property name="title" translatable="yes"/> - <property name="type">GTK_WINDOW_TOPLEVEL</property> - <property name="window_position">GTK_WIN_POS_NONE</property> - <property name="modal">False</property> - <property name="resizable">True</property> - <property name="destroy_with_parent">False</property> - <property name="decorated">True</property> - <property name="skip_taskbar_hint">False</property> - <property name="skip_pager_hint">False</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> - <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="focus_on_map">True</property> - <property name="urgency_hint">False</property> - <child> - <object class="GtkVBox" id="windowvbox"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - <child> - <object class="GtkLabel" id="toolbarlabel"> - <property name="visible">True</property> - <property name="label" translatable="yes">Move items from store to toolbar Rearrange items in toolbar Move items from toolbar to store</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </object> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow" id="scrolledwindow1"> - <property name="visible">True</property> - <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="shadow_type">GTK_SHADOW_NONE</property> - <property name="window_placement">GTK_CORNER_TOP_LEFT</property> + <property name="can_focus">False</property> + <property name="title" translatable="yes">gtkToolBarTitle</property> + <property name="type_hint">dialog</property> + <child internal-child="vbox"> + <object class="GtkBox" id="dialog-vbox1"> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">2</property> + <child internal-child="action_area"> + <object class="GtkButtonBox" id="dialog-action_area1"> + <property name="can_focus">False</property> + <property name="layout_style">end</property> <child> - <object class="GtkViewport" id="viewport1"> + <object class="GtkButton" id="reset"> + <property name="label" translatable="yes">Reset To Defaults</property> <property name="visible">True</property> - <property name="shadow_type">GTK_SHADOW_IN</property> - <child> - <object class="GtkVBox" id="widgetvbox"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - <child> - <placeholder/> - </child> - </object> - </child> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="image">image2</property> + <property name="yalign">0.52999997138977051</property> + <property name="always_show_image">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="close"> + <property name="label">gtk-close</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> </packing> </child> <child> - <object class="GtkHBox" id="buttonhbox"> + <object class="GtkGrid" id="grid1"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> + <property name="can_focus">False</property> + <property name="column_homogeneous">True</property> <child> - <object class="GtkButton" id="resetbutton"> + <object class="GtkLabel" id="label1"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <child> - <object class="GtkHBox" id="button1hbox"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - <child> - <object class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="stock">gtk-refresh</property> - <property name="icon_size">4</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </object> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="refreshbuttonlabel"> - <property name="visible">True</property> - <property name="label" translatable="yes">Reset to defaults</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </object> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </object> - </child> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Move items from store to toolbar</property> </object> <packing> - <property name="padding">10</property> - <property name="expand">False</property> - <property name="fill">True</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> </packing> </child> <child> - <placeholder/> - </child> - <child> - <object class="GtkButton" id="okbutton"> + <object class="GtkLabel" id="label2"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="has_focus">True</property> - <property name="label">gtk-apply</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Rearrange items in toolbar</property> </object> <packing> - <property name="padding">10</property> - <property name="expand">False</property> - <property name="fill">True</property> + <property name="left_attach">1</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkButton" id="cancelbutton"> + <object class="GtkLabel" id="label3"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-cancel</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Move items from toolbar to store</property> </object> <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> + <property name="left_attach">2</property> + <property name="top_attach">0</property> </packing> </child> </object> <packing> - <property name="padding">0</property> <property name="expand">False</property> <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <child> + <object class="GtkViewport" id="viewport1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkVBox" id="widgetvbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <placeholder/> + </child> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">2</property> </packing> </child> </object> |