diff options
Diffstat (limited to 'frontends/gtk/res')
| l--------- | frontends/gtk/res/en/maps.html | 1 | ||||
| l--------- | frontends/gtk/res/fr/credits.html | 1 | ||||
| l--------- | frontends/gtk/res/fr/licence.html | 1 | ||||
| l--------- | frontends/gtk/res/fr/welcome.html | 1 | ||||
| -rw-r--r-- | frontends/gtk/res/gtk2/cookies.ui (renamed from frontends/gtk/res/cookies.gtk2.ui) | 0 | ||||
| -rw-r--r-- | frontends/gtk/res/gtk2/downloads.ui (renamed from frontends/gtk/res/downloads.gtk2.ui) | 0 | ||||
| -rw-r--r-- | frontends/gtk/res/gtk2/globalhistory.ui (renamed from frontends/gtk/res/globalhistory.gtk2.ui) | 0 | ||||
| -rw-r--r-- | frontends/gtk/res/gtk2/hotlist.ui (renamed from frontends/gtk/res/hotlist.gtk2.ui) | 0 | ||||
| -rw-r--r-- | frontends/gtk/res/gtk2/localhistory.ui (renamed from frontends/gtk/res/localhistory.gtk2.ui) | 1 | ||||
| -rw-r--r-- | frontends/gtk/res/gtk2/netsurf.ui (renamed from frontends/gtk/res/netsurf.gtk2.ui) | 0 | ||||
| -rw-r--r-- | frontends/gtk/res/gtk2/options.ui (renamed from frontends/gtk/res/options.gtk2.ui) | 83 | ||||
| -rw-r--r-- | frontends/gtk/res/gtk2/pageinfo.ui | 16 | ||||
| -rw-r--r-- | frontends/gtk/res/gtk2/password.ui (renamed from frontends/gtk/res/password.gtk2.ui) | 0 | ||||
| -rw-r--r-- | frontends/gtk/res/gtk2/tabcontents.ui (renamed from frontends/gtk/res/tabcontents.gtk2.ui) | 0 | ||||
| -rw-r--r-- | frontends/gtk/res/gtk2/toolbar.ui (renamed from frontends/gtk/res/toolbar.gtk2.ui) | 0 | ||||
| -rw-r--r-- | frontends/gtk/res/gtk2/viewdata.ui (renamed from frontends/gtk/res/viewdata.gtk2.ui) | 0 | ||||
| -rw-r--r-- | frontends/gtk/res/gtk2/warning.ui (renamed from frontends/gtk/res/warning.gtk2.ui) | 0 | ||||
| -rw-r--r-- | frontends/gtk/res/gtk3/cookies.ui (renamed from frontends/gtk/res/cookies.gtk3.ui) | 2 | ||||
| -rw-r--r-- | frontends/gtk/res/gtk3/downloads.ui (renamed from frontends/gtk/res/downloads.gtk3.ui) | 0 | ||||
| -rw-r--r-- | frontends/gtk/res/gtk3/globalhistory.ui (renamed from frontends/gtk/res/globalhistory.gtk3.ui) | 2 | ||||
| -rw-r--r-- | frontends/gtk/res/gtk3/hotlist.ui (renamed from frontends/gtk/res/hotlist.gtk3.ui) | 2 | ||||
| -rw-r--r-- | frontends/gtk/res/gtk3/localhistory.ui (renamed from frontends/gtk/res/localhistory.gtk3.ui) | 3 | ||||
| -rw-r--r-- | frontends/gtk/res/gtk3/netsurf.ui (renamed from frontends/gtk/res/netsurf.gtk3.ui) | 0 | ||||
| -rw-r--r-- | frontends/gtk/res/gtk3/options.ui (renamed from frontends/gtk/res/options.gtk3.ui) | 216 | ||||
| -rw-r--r-- | frontends/gtk/res/gtk3/pageinfo.ui | 22 | ||||
| -rw-r--r-- | frontends/gtk/res/gtk3/password.ui (renamed from frontends/gtk/res/password.gtk3.ui) | 0 | ||||
| -rw-r--r-- | frontends/gtk/res/gtk3/tabcontents.ui (renamed from frontends/gtk/res/tabcontents.gtk3.ui) | 0 | ||||
| -rw-r--r-- | frontends/gtk/res/gtk3/toolbar.ui (renamed from frontends/gtk/res/toolbar.gtk3.ui) | 0 | ||||
| -rw-r--r-- | frontends/gtk/res/gtk3/viewdata.ui (renamed from frontends/gtk/res/viewdata.gtk3.ui) | 0 | ||||
| -rw-r--r-- | frontends/gtk/res/gtk3/warning.ui (renamed from frontends/gtk/res/warning.gtk3.ui) | 0 | ||||
| l--------- | frontends/gtk/res/maps.html | 1 | ||||
| -rw-r--r-- | frontends/gtk/res/messages.gresource.xml | 1 | ||||
| -rw-r--r-- | frontends/gtk/res/netsurf.gresource.xml | 33 | ||||
| -rw-r--r-- | frontends/gtk/res/ssl.gtk2.ui | 202 | ||||
| -rw-r--r-- | frontends/gtk/res/ssl.gtk3.ui | 181 | ||||
| -rw-r--r-- | frontends/gtk/res/ui.gresource.xml | 18 | ||||
| l--------- | frontends/gtk/res/zh_CN/credits.html | 1 | ||||
| l--------- | frontends/gtk/res/zh_CN/licence.html | 1 | ||||
| l--------- | frontends/gtk/res/zh_CN/welcome.html | 1 |
39 files changed, 163 insertions, 627 deletions
diff --git a/frontends/gtk/res/en/maps.html b/frontends/gtk/res/en/maps.html deleted file mode 120000 index 507a4b248..000000000 --- a/frontends/gtk/res/en/maps.html +++ /dev/null @@ -1 +0,0 @@ -../../../../resources/en/maps.html
\ No newline at end of file diff --git a/frontends/gtk/res/fr/credits.html b/frontends/gtk/res/fr/credits.html new file mode 120000 index 000000000..47da488e8 --- /dev/null +++ b/frontends/gtk/res/fr/credits.html @@ -0,0 +1 @@ +../../../../resources/fr/credits.html
\ No newline at end of file diff --git a/frontends/gtk/res/fr/licence.html b/frontends/gtk/res/fr/licence.html new file mode 120000 index 000000000..2fd247ba8 --- /dev/null +++ b/frontends/gtk/res/fr/licence.html @@ -0,0 +1 @@ +../../../../resources/fr/licence.html
\ No newline at end of file diff --git a/frontends/gtk/res/fr/welcome.html b/frontends/gtk/res/fr/welcome.html new file mode 120000 index 000000000..a7a2023ea --- /dev/null +++ b/frontends/gtk/res/fr/welcome.html @@ -0,0 +1 @@ +../../../../resources/fr/welcome.html
\ No newline at end of file diff --git a/frontends/gtk/res/cookies.gtk2.ui b/frontends/gtk/res/gtk2/cookies.ui index 86f15c765..86f15c765 100644 --- a/frontends/gtk/res/cookies.gtk2.ui +++ b/frontends/gtk/res/gtk2/cookies.ui diff --git a/frontends/gtk/res/downloads.gtk2.ui b/frontends/gtk/res/gtk2/downloads.ui index 1e71328a4..1e71328a4 100644 --- a/frontends/gtk/res/downloads.gtk2.ui +++ b/frontends/gtk/res/gtk2/downloads.ui diff --git a/frontends/gtk/res/globalhistory.gtk2.ui b/frontends/gtk/res/gtk2/globalhistory.ui index 2b89ecb4b..2b89ecb4b 100644 --- a/frontends/gtk/res/globalhistory.gtk2.ui +++ b/frontends/gtk/res/gtk2/globalhistory.ui diff --git a/frontends/gtk/res/hotlist.gtk2.ui b/frontends/gtk/res/gtk2/hotlist.ui index af0fd5696..af0fd5696 100644 --- a/frontends/gtk/res/hotlist.gtk2.ui +++ b/frontends/gtk/res/gtk2/hotlist.ui diff --git a/frontends/gtk/res/localhistory.gtk2.ui b/frontends/gtk/res/gtk2/localhistory.ui index 9512b6289..2003ed69a 100644 --- a/frontends/gtk/res/localhistory.gtk2.ui +++ b/frontends/gtk/res/gtk2/localhistory.ui @@ -2,6 +2,7 @@ <interface> <!-- interface-requires gtk+ 3.0 --> <object class="GtkWindow" id="wndHistory"> + <property name="type">GTK_WINDOW_POPUP</property> <property name="can_focus">False</property> <property name="title" translatable="yes">NetSurf Local History</property> <property name="window_position">center</property> diff --git a/frontends/gtk/res/netsurf.gtk2.ui b/frontends/gtk/res/gtk2/netsurf.ui index adca54001..adca54001 100644 --- a/frontends/gtk/res/netsurf.gtk2.ui +++ b/frontends/gtk/res/gtk2/netsurf.ui diff --git a/frontends/gtk/res/options.gtk2.ui b/frontends/gtk/res/gtk2/options.ui index a1162585d..907d0b511 100644 --- a/frontends/gtk/res/options.gtk2.ui +++ b/frontends/gtk/res/gtk2/options.ui @@ -1143,38 +1143,6 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="checkDisablePlugins"> - <property name="label" translatable="yes">preferencesControlDisable</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="nsgtk_preferences_checkDisablePlugins_toggled" swapped="no"/> - <signal name="realize" handler="nsgtk_preferences_checkDisablePlugins_realize" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="checkResampleImages"> - <property name="label" translatable="yes">preferencesControlHigh</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="nsgtk_preferences_checkResampleImages_toggled" swapped="no"/> - <signal name="realize" handler="nsgtk_preferences_checkResampleImages_realize" swapped="no"/> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> - </child> - <child> <object class="GtkHBox" id="hbox8"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -1215,7 +1183,7 @@ <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">3</property> </packing> </child> </object> @@ -1272,55 +1240,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkHBox" id="hbox9"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="label19"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">preferencesAnimationMinimum</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="spinAnimationSpeed"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">preferencesAnimationMinimumTooltip</property> - <property name="invisible_char">●</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> - <property name="adjustment">adjustment_animation_time</property> - <property name="climb_rate">1</property> - <property name="digits">1</property> - <property name="numeric">True</property> - <property name="update_policy">if-valid</property> - <signal name="value-changed" handler="nsgtk_preferences_spinAnimationSpeed_valuechanged" swapped="no"/> - <signal name="realize" handler="nsgtk_preferences_spinAnimationSpeed_realize" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> </object> </child> </object> diff --git a/frontends/gtk/res/gtk2/pageinfo.ui b/frontends/gtk/res/gtk2/pageinfo.ui new file mode 100644 index 000000000..3d541d653 --- /dev/null +++ b/frontends/gtk/res/gtk2/pageinfo.ui @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<interface> + <requires lib="gtk+" version="2.24"/> + <!-- interface-naming-policy project-wide --> + <object class="GtkWindow" id="PGIWindow"> + <property name="type">GTK_WINDOW_POPUP</property> + <property name="can_focus">False</property> + <child> + <object class="GtkDrawingArea" id="PGIDrawingArea"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property> + </object> + </child> + </object> +</interface> diff --git a/frontends/gtk/res/password.gtk2.ui b/frontends/gtk/res/gtk2/password.ui index eb51e4f8f..eb51e4f8f 100644 --- a/frontends/gtk/res/password.gtk2.ui +++ b/frontends/gtk/res/gtk2/password.ui diff --git a/frontends/gtk/res/tabcontents.gtk2.ui b/frontends/gtk/res/gtk2/tabcontents.ui index c47e6a2ef..c47e6a2ef 100644 --- a/frontends/gtk/res/tabcontents.gtk2.ui +++ b/frontends/gtk/res/gtk2/tabcontents.ui diff --git a/frontends/gtk/res/toolbar.gtk2.ui b/frontends/gtk/res/gtk2/toolbar.ui index 61723065b..61723065b 100644 --- a/frontends/gtk/res/toolbar.gtk2.ui +++ b/frontends/gtk/res/gtk2/toolbar.ui diff --git a/frontends/gtk/res/viewdata.gtk2.ui b/frontends/gtk/res/gtk2/viewdata.ui index 7589022ca..7589022ca 100644 --- a/frontends/gtk/res/viewdata.gtk2.ui +++ b/frontends/gtk/res/gtk2/viewdata.ui diff --git a/frontends/gtk/res/warning.gtk2.ui b/frontends/gtk/res/gtk2/warning.ui index e4fb4e662..e4fb4e662 100644 --- a/frontends/gtk/res/warning.gtk2.ui +++ b/frontends/gtk/res/gtk2/warning.ui diff --git a/frontends/gtk/res/cookies.gtk3.ui b/frontends/gtk/res/gtk3/cookies.ui index 44dcb80b8..85f9aae76 100644 --- a/frontends/gtk/res/cookies.gtk3.ui +++ b/frontends/gtk/res/gtk3/cookies.ui @@ -187,7 +187,7 @@ <object class="GtkDrawingArea" id="cookiesDrawingArea"> <property name="visible">True</property> <property name="app_paintable">True</property> - <property name="can_focus">False</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> diff --git a/frontends/gtk/res/downloads.gtk3.ui b/frontends/gtk/res/gtk3/downloads.ui index 1e71328a4..1e71328a4 100644 --- a/frontends/gtk/res/downloads.gtk3.ui +++ b/frontends/gtk/res/gtk3/downloads.ui diff --git a/frontends/gtk/res/globalhistory.gtk3.ui b/frontends/gtk/res/gtk3/globalhistory.ui index 7fa598f1e..c0496964f 100644 --- a/frontends/gtk/res/globalhistory.gtk3.ui +++ b/frontends/gtk/res/gtk3/globalhistory.ui @@ -219,7 +219,7 @@ <child> <object class="GtkDrawingArea" id="globalHistoryDrawingArea"> <property name="visible">True</property> - <property name="can_focus">False</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> diff --git a/frontends/gtk/res/hotlist.gtk3.ui b/frontends/gtk/res/gtk3/hotlist.ui index b0e075c4b..ccd193637 100644 --- a/frontends/gtk/res/hotlist.gtk3.ui +++ b/frontends/gtk/res/gtk3/hotlist.ui @@ -236,7 +236,7 @@ <child> <object class="GtkDrawingArea" id="hotlistDrawingArea"> <property name="visible">True</property> - <property name="can_focus">False</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> diff --git a/frontends/gtk/res/localhistory.gtk3.ui b/frontends/gtk/res/gtk3/localhistory.ui index 1a4b9004d..9a36a91a7 100644 --- a/frontends/gtk/res/localhistory.gtk3.ui +++ b/frontends/gtk/res/gtk3/localhistory.ui @@ -2,6 +2,7 @@ <interface> <!-- interface-requires gtk+ 3.0 --> <object class="GtkWindow" id="wndHistory"> + <property name="type">GTK_WINDOW_POPUP</property> <property name="can_focus">False</property> <property name="title" translatable="yes">NetSurf Local History</property> <property name="window_position">center</property> @@ -26,7 +27,7 @@ <child> <object class="GtkDrawingArea" id="HistoryDrawingArea"> <property name="visible">True</property> - <property name="can_focus">False</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> diff --git a/frontends/gtk/res/netsurf.gtk3.ui b/frontends/gtk/res/gtk3/netsurf.ui index 6ea8f07a7..6ea8f07a7 100644 --- a/frontends/gtk/res/netsurf.gtk3.ui +++ b/frontends/gtk/res/gtk3/netsurf.ui diff --git a/frontends/gtk/res/options.gtk3.ui b/frontends/gtk/res/gtk3/options.ui index 2a3516f09..82a3e175a 100644 --- a/frontends/gtk/res/options.gtk3.ui +++ b/frontends/gtk/res/gtk3/options.ui @@ -143,9 +143,10 @@ <property name="visible">True</property> <property name="can_focus">True</property> <child> - <object class="GtkVBox" id="vbox_main"> + <object class="GtkBox" id="vbox_main"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</property> <property name="valign">start</property> <property name="spacing">6</property> <child> @@ -162,14 +163,16 @@ <property name="left_padding">12</property> <property name="right_padding">12</property> <child> - <object class="GtkVBox" id="vbox2"> + <object class="GtkBox" id="vbox2"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkHBox" id="hbox1"> + <object class="GtkBox" id="hbox1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">horizontal</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="label_startup_page"> @@ -207,9 +210,10 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox2"> + <object class="GtkBox" id="hbox2"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">horizontal</property> <property name="spacing">6</property> <child> <placeholder/> @@ -289,9 +293,10 @@ <property name="left_padding">12</property> <property name="right_padding">12</property> <child> - <object class="GtkVBox" id="vbox3"> + <object class="GtkBox" id="vbox3"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="checkUrlSearch"> @@ -314,9 +319,10 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox3"> + <object class="GtkBox" id="hbox3"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">horizontal</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="label5"> @@ -393,9 +399,10 @@ <property name="left_padding">12</property> <property name="right_padding">12</property> <child> - <object class="GtkVBox" id="vbox4"> + <object class="GtkBox" id="vbox4"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="checkClearDownloads"> @@ -438,9 +445,10 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox4"> + <object class="GtkBox" id="hbox4"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">horizontal</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="label8"> @@ -510,9 +518,10 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox_appearance"> + <object class="GtkBox" id="vbox_appearance"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</property> <property name="valign">start</property> <property name="spacing">6</property> <child> @@ -529,9 +538,10 @@ <property name="left_padding">12</property> <property name="right_padding">12</property> <child> - <object class="GtkVBox" id="vbox5"> + <object class="GtkBox" id="vbox5"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="checkShowSingleTab"> @@ -594,9 +604,10 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox5"> + <object class="GtkBox" id="hbox5"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">horizontal</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="label9"> @@ -672,14 +683,16 @@ <property name="left_padding">12</property> <property name="right_padding">12</property> <child> - <object class="GtkVBox" id="vbox1"> + <object class="GtkBox" id="vbox1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkHBox" id="hbox6"> + <object class="GtkBox" id="hbox6"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">horizontal</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="label13"> @@ -755,9 +768,10 @@ <property name="left_padding">12</property> <property name="right_padding">12</property> <child> - <object class="GtkVBox" id="vbox7"> + <object class="GtkBox" id="vbox7"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="checkDisplayRecentURLs"> @@ -813,14 +827,16 @@ <property name="left_padding">12</property> <property name="right_padding">12</property> <child> - <object class="GtkVBox" id="vbox8"> + <object class="GtkBox" id="vbox8"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkHBox" id="hbox7"> + <object class="GtkBox" id="hbox7"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">horizontal</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label16"> @@ -899,10 +915,11 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox_content"> + <object class="GtkBox" id="vbox_content"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">start</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkFrame" id="frame_content_control"> @@ -918,9 +935,10 @@ <property name="left_padding">12</property> <property name="right_padding">12</property> <child> - <object class="GtkVBox" id="vbox6"> + <object class="GtkBox" id="vbox6"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="checkDisablePopups"> @@ -983,49 +1001,10 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="checkDisablePlugins"> - <property name="label" translatable="yes">preferencesControlDisable</property> - <property name="use_action_appearance">False</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">start</property> - <property name="use_action_appearance">False</property> - <property name="xalign">0.5</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="nsgtk_preferences_checkDisablePlugins_toggled" swapped="no"/> - <signal name="realize" handler="nsgtk_preferences_checkDisablePlugins_realize" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="checkResampleImages"> - <property name="label" translatable="yes">preferencesControlHigh</property> - <property name="use_action_appearance">False</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">start</property> - <property name="use_action_appearance">False</property> - <property name="xalign">0.5</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="nsgtk_preferences_checkResampleImages_toggled" swapped="no"/> - <signal name="realize" handler="nsgtk_preferences_checkResampleImages_realize" swapped="no"/> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox8"> + <object class="GtkBox" id="hbox8"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">horizontal</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label17"> @@ -1064,7 +1043,7 @@ <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">3</property> </packing> </child> </object> @@ -1101,9 +1080,10 @@ <property name="left_padding">12</property> <property name="right_padding">12</property> <child> - <object class="GtkVBox" id="vbox9"> + <object class="GtkBox" id="vbox9"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="checkEnableAnimations"> @@ -1125,51 +1105,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkHBox" id="hbox9"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="label19"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">preferencesAnimationMinimum</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="spinAnimationSpeed"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">preferencesAnimationMinimumTooltip</property> - <property name="invisible_char">●</property> - <property name="adjustment">adjustment_animation_time</property> - <property name="climb_rate">1</property> - <property name="digits">1</property> - <property name="numeric">True</property> - <property name="update_policy">if-valid</property> - <signal name="value-changed" handler="nsgtk_preferences_spinAnimationSpeed_valuechanged" swapped="no"/> - <signal name="realize" handler="nsgtk_preferences_spinAnimationSpeed_realize" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> </object> </child> </object> @@ -1204,14 +1139,16 @@ <property name="left_padding">12</property> <property name="right_padding">12</property> <child> - <object class="GtkHBox" id="hbox11"> + <object class="GtkBox" id="hbox11"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">horizontal</property> <property name="spacing">12</property> <child> - <object class="GtkHBox" id="hbox12"> + <object class="GtkBox" id="hbox12"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">horizontal</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label26"> @@ -1253,9 +1190,10 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox13"> + <object class="GtkBox" id="hbox13"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">horizontal</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label27"> @@ -1349,14 +1287,16 @@ <property name="left_padding">12</property> <property name="right_padding">12</property> <child> - <object class="GtkVBox" id="vbox10"> + <object class="GtkBox" id="vbox10"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkHBox" id="hbox10"> + <object class="GtkBox" id="hbox10"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">horizontal</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="label21"> @@ -1446,10 +1386,11 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox_privacy"> + <object class="GtkBox" id="vbox_privacy"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">start</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkFrame" id="frame_privacy_general"> @@ -1465,9 +1406,10 @@ <property name="left_padding">12</property> <property name="right_padding">12</property> <child> - <object class="GtkVBox" id="vbox15"> + <object class="GtkBox" id="vbox15"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="checkSendReferer"> @@ -1543,9 +1485,10 @@ <property name="left_padding">12</property> <property name="right_padding">12</property> <child> - <object class="GtkVBox" id="vbox11"> + <object class="GtkBox" id="vbox11"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="checkHoverURLs"> @@ -1568,9 +1511,10 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox14"> + <object class="GtkBox" id="hbox14"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">horizontal</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label28"> @@ -1657,9 +1601,10 @@ <property name="left_padding">12</property> <property name="right_padding">12</property> <child> - <object class="GtkVBox" id="vbox12"> + <object class="GtkBox" id="vbox12"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkTable" id="table3"> @@ -1815,9 +1760,10 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox17"> + <object class="GtkBox" id="hbox17"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">horizontal</property> <child> <placeholder/> </child> @@ -1881,10 +1827,11 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox_network"> + <object class="GtkBox" id="vbox_network"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">start</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkFrame" id="frame_network_proxy"> @@ -1979,9 +1926,10 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox19"> + <object class="GtkBox" id="hbox19"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">horizontal</property> <property name="spacing">6</property> <child> <object class="GtkEntry" id="entryProxyHost"> @@ -2285,10 +2233,11 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox_pdfexport"> + <object class="GtkBox" id="vbox_pdfexport"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">start</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkFrame" id="frame_pdfexport_appearance"> @@ -2304,9 +2253,10 @@ <property name="left_padding">12</property> <property name="right_padding">12</property> <child> - <object class="GtkVBox" id="vbox13"> + <object class="GtkBox" id="vbox13"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="checkSuppressImages"> @@ -2369,9 +2319,10 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox15"> + <object class="GtkBox" id="hbox15"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">horizontal</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label59"> @@ -2458,14 +2409,16 @@ <property name="left_padding">12</property> <property name="right_padding">12</property> <child> - <object class="GtkVBox" id="vbox16"> + <object class="GtkBox" id="vbox16"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkHBox" id="hbox22"> + <object class="GtkBox" id="hbox22"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">horizontal</property> <child> <object class="GtkLabel" id="label62"> <property name="visible">True</property> @@ -2504,9 +2457,10 @@ <placeholder/> </child> <child> - <object class="GtkHBox" id="hbox16"> + <object class="GtkBox" id="hbox16"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">horizontal</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label51"> @@ -2548,9 +2502,10 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox18"> + <object class="GtkBox" id="hbox18"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">horizontal</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label52"> @@ -2593,9 +2548,10 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox20"> + <object class="GtkBox" id="hbox20"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">horizontal</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label53"> @@ -2639,9 +2595,10 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox21"> + <object class="GtkBox" id="hbox21"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">horizontal</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label54"> @@ -2746,9 +2703,10 @@ <property name="left_padding">12</property> <property name="right_padding">12</property> <child> - <object class="GtkVBox" id="vbox14"> + <object class="GtkBox" id="vbox14"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</property> <property name="spacing">7</property> <child> <object class="GtkCheckButton" id="checkCompressPDF"> diff --git a/frontends/gtk/res/gtk3/pageinfo.ui b/frontends/gtk/res/gtk3/pageinfo.ui new file mode 100644 index 000000000..fdee5ac8d --- /dev/null +++ b/frontends/gtk/res/gtk3/pageinfo.ui @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.22.1 --> +<interface> + <requires lib="gtk+" version="3.20"/> + <object class="GtkWindow" id="PGIWindow"> + <property name="type">GTK_WINDOW_POPUP</property> + <property name="can_focus">False</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_BUTTON_MOTION_MASK | GDK_STRUCTURE_MASK</property> + <property name="resizable">False</property> + <child> + <placeholder/> + </child> + <child> + <object class="GtkDrawingArea" id="PGIDrawingArea"> + <property name="name">PGIDrawingArea</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="events">GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property> + </object> + </child> + </object> +</interface> diff --git a/frontends/gtk/res/password.gtk3.ui b/frontends/gtk/res/gtk3/password.ui index eb51e4f8f..eb51e4f8f 100644 --- a/frontends/gtk/res/password.gtk3.ui +++ b/frontends/gtk/res/gtk3/password.ui diff --git a/frontends/gtk/res/tabcontents.gtk3.ui b/frontends/gtk/res/gtk3/tabcontents.ui index b07cf92e0..b07cf92e0 100644 --- a/frontends/gtk/res/tabcontents.gtk3.ui +++ b/frontends/gtk/res/gtk3/tabcontents.ui diff --git a/frontends/gtk/res/toolbar.gtk3.ui b/frontends/gtk/res/gtk3/toolbar.ui index 60452f472..60452f472 100644 --- a/frontends/gtk/res/toolbar.gtk3.ui +++ b/frontends/gtk/res/gtk3/toolbar.ui diff --git a/frontends/gtk/res/viewdata.gtk3.ui b/frontends/gtk/res/gtk3/viewdata.ui index b742d5f6b..b742d5f6b 100644 --- a/frontends/gtk/res/viewdata.gtk3.ui +++ b/frontends/gtk/res/gtk3/viewdata.ui diff --git a/frontends/gtk/res/warning.gtk3.ui b/frontends/gtk/res/gtk3/warning.ui index e4fb4e662..e4fb4e662 100644 --- a/frontends/gtk/res/warning.gtk3.ui +++ b/frontends/gtk/res/gtk3/warning.ui diff --git a/frontends/gtk/res/maps.html b/frontends/gtk/res/maps.html deleted file mode 120000 index a32f725fb..000000000 --- a/frontends/gtk/res/maps.html +++ /dev/null @@ -1 +0,0 @@ -en/maps.html
\ No newline at end of file diff --git a/frontends/gtk/res/messages.gresource.xml b/frontends/gtk/res/messages.gresource.xml index 684a10862..6da406245 100644 --- a/frontends/gtk/res/messages.gresource.xml +++ b/frontends/gtk/res/messages.gresource.xml @@ -6,5 +6,6 @@ <file>de/Messages</file> <file>fr/Messages</file> <file>it/Messages</file> + <file>zh_CN/Messages</file> </gresource> </gresources> diff --git a/frontends/gtk/res/netsurf.gresource.xml b/frontends/gtk/res/netsurf.gresource.xml index a81500b68..21a2e7723 100644 --- a/frontends/gtk/res/netsurf.gresource.xml +++ b/frontends/gtk/res/netsurf.gresource.xml @@ -1,32 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <gresources> <gresource prefix="/org/netsurf"> - <file>cookies.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>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>viewdata.gtk2.ui</file> - <file>downloads.gtk3.ui</file> - <file>options.gtk3.ui</file> - <file>tabcontents.gtk2.ui</file> - <file>viewdata.gtk3.ui</file> - <file>localhistory.gtk2.ui</file> - <file>globalhistory.gtk2.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> <file preprocess="to-pixdata">menu_cursor.png</file> @@ -40,17 +14,22 @@ <file preprocess="to-pixdata">throbber/throbber7.png</file> <file preprocess="to-pixdata">throbber/throbber8.png</file> <file>credits.html</file> + <file>fr/credits.html</file> <file>it/credits.html</file> <file>nl/credits.html</file> + <file>zh_CN/credits.html</file> <file>licence.html</file> + <file>fr/licence.html</file> <file>it/licence.html</file> <file>nl/licence.html</file> + <file>zh_CN/licence.html</file> <file>welcome.html</file> <file>de/welcome.html</file> + <file>fr/welcome.html</file> <file>it/welcome.html</file> <file>ja/welcome.html</file> <file>nl/welcome.html</file> - <file>maps.html</file> + <file>zh_CN/welcome.html</file> <file>adblock.css</file> <file>default.css</file> <file>internal.css</file> diff --git a/frontends/gtk/res/ssl.gtk2.ui b/frontends/gtk/res/ssl.gtk2.ui deleted file mode 100644 index 90f449ddd..000000000 --- a/frontends/gtk/res/ssl.gtk2.ui +++ /dev/null @@ -1,202 +0,0 @@ -<?xml version="1.0"?> -<!--*- mode: xml -*--> -<interface> - <object class="GtkDialog" id="wndSSLProblem"> - <property name="border_width">1</property> - <property name="title" translatable="yes">SSL certificate problem</property> - <property name="modal">True</property> - <property name="default_width">500</property> - <property name="default_height">250</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> - <child internal-child="vbox"> - <object class="GtkVBox" id="dialog-vbox3"> - <property name="visible">True</property> - <child> - <object class="GtkHBox" id="hbox15"> - <property name="visible">True</property> - <child> - <object class="GtkImage" id="image6"> - <property name="visible">True</property> - <property name="yalign">0</property> - <property name="icon_size">6</property> - <property name="icon_name">gtk-dialog-warning</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <object class="GtkVBox" id="vbox13"> - <property name="visible">True</property> - <child> - <object class="GtkLabel" id="label62"> - <property name="visible">True</property> - <property name="label" translatable="yes">NetSurf failed to verify the authenticity of an SSL certificate. Please verify the details presented below.</property> - <property name="justify">GTK_JUSTIFY_CENTER</property> - <property name="wrap">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <object class="GtkFrame" id="frame13"> - <property name="visible">True</property> - <property name="border_width">5</property> - <property name="label_xalign">0</property> - <child> - <object class="GtkAlignment" id="alignment17"> - <property name="visible">True</property> - <property name="left_padding">12</property> - <child> - <object class="GtkScrolledWindow" id="SSLScrolled"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="shadow_type">GTK_SHADOW_IN</property> - <child> - <object class="GtkViewport" id="SSLViewport"> - <property name="visible">True</property> - <property name="resize_mode">GTK_RESIZE_QUEUE</property> - <child> - <object class="GtkDrawingArea" id="SSLDrawingArea"> - <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> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="label63"> - <property name="visible">True</property> - <property name="label" translatable="yes"><b>Certificate chain</b></property> - <property name="use_markup">True</property> - </object> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="position">2</property> - </packing> - </child> - <child internal-child="action_area"> - <object class="GtkHButtonBox" id="dialog-action_area3"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - <child> - <object class="GtkButton" id="sslreject"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <child> - <object class="GtkAlignment" id="alignment16"> - <property name="visible">True</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <child> - <object class="GtkHBox" id="hbox14"> - <property name="visible">True</property> - <property name="spacing">2</property> - <child> - <object class="GtkImage" id="image5"> - <property name="visible">True</property> - <property name="stock">gtk-cancel</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label61"> - <property name="visible">True</property> - <property name="label" translatable="yes">Reject</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - </child> - </object> - </child> - <child> - <object class="GtkButton" id="sslaccept"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <child> - <object class="GtkAlignment" id="alignment15"> - <property name="visible">True</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <child> - <object class="GtkHBox" id="hbox13"> - <property name="visible">True</property> - <property name="spacing">2</property> - <child> - <object class="GtkImage" id="image4"> - <property name="visible">True</property> - <property name="stock">gtk-apply</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label60"> - <property name="visible">True</property> - <property name="label" translatable="yes">Accept</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="pack_type">GTK_PACK_END</property> - </packing> - </child> - </object> - </child> - <action-widgets> - <action-widget response="-6">sslreject</action-widget> - <action-widget response="-5">sslaccept</action-widget> - </action-widgets> - </object> -</interface> diff --git a/frontends/gtk/res/ssl.gtk3.ui b/frontends/gtk/res/ssl.gtk3.ui deleted file mode 100644 index dace2a49e..000000000 --- a/frontends/gtk/res/ssl.gtk3.ui +++ /dev/null @@ -1,181 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<interface> - <!-- interface-requires gtk+ 3.0 --> - <object class="GtkImage" id="image2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-apply</property> - </object> - <object class="GtkImage" id="image3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-cancel</property> - </object> - <object class="GtkDialog" id="wndSSLProblem"> - <property name="can_focus">False</property> - <property name="border_width">5</property> - <property name="default_width">440</property> - <property name="default_height">260</property> - <property name="destroy_with_parent">True</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="GtkButton" id="sslreject"> - <property name="label" translatable="yes">_Reject</property> - <property name="use_action_appearance">False</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> - <property name="image">image3</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="sslaccept"> - <property name="label" translatable="yes">_Accept</property> - <property name="use_action_appearance">False</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> - <property name="image">image2</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">end</property> - <property name="position">0</property> - </packing> - </child> - <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="GtkBox" id="box2"> - <property name="visible">True</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="margin_right">8</property> - <property name="stock">gtk-dialog-warning</property> - <property name="icon-size">6</property> - </object> - <packing> - <property name="expand">False</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">NetSurf failed to verify the authenticity of an SSL certificate. Please verify the details presented below.</property> - <property name="wrap">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkFrame" id="frame1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> - <child> - <object class="GtkAlignment" id="alignment1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="left_padding">12</property> - <child> - <object class="GtkScrolledWindow" id="SSLScrolled"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkViewport" id="SSLViewport"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkDrawingArea" id="SSLDrawingArea"> - <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> - <property name="valign">start</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - </object> - </child> - </object> - </child> - </object> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes"><b>Certificate Chain</b></property> - <property name="use_markup">True</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - <action-widgets> - <action-widget response="-6">sslreject</action-widget> - <action-widget response="-5">sslaccept</action-widget> - </action-widgets> - </object> -</interface> diff --git a/frontends/gtk/res/ui.gresource.xml b/frontends/gtk/res/ui.gresource.xml new file mode 100644 index 000000000..dd43ddf59 --- /dev/null +++ b/frontends/gtk/res/ui.gresource.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<gresources> + <gresource prefix="/org/netsurf"> + <file>cookies.ui</file> + <file>downloads.ui</file> + <file>globalhistory.ui</file> + <file>hotlist.ui</file> + <file>localhistory.ui</file> + <file>netsurf.ui</file> + <file>options.ui</file> + <file>pageinfo.ui</file> + <file>password.ui</file> + <file>tabcontents.ui</file> + <file>toolbar.ui</file> + <file>viewdata.ui</file> + <file>warning.ui</file> + </gresource> +</gresources> diff --git a/frontends/gtk/res/zh_CN/credits.html b/frontends/gtk/res/zh_CN/credits.html new file mode 120000 index 000000000..6fd96ea63 --- /dev/null +++ b/frontends/gtk/res/zh_CN/credits.html @@ -0,0 +1 @@ +../../../../resources/zh_CN/credits.html
\ No newline at end of file diff --git a/frontends/gtk/res/zh_CN/licence.html b/frontends/gtk/res/zh_CN/licence.html new file mode 120000 index 000000000..d757031d5 --- /dev/null +++ b/frontends/gtk/res/zh_CN/licence.html @@ -0,0 +1 @@ +../../../../resources/zh_CN/licence.html
\ No newline at end of file diff --git a/frontends/gtk/res/zh_CN/welcome.html b/frontends/gtk/res/zh_CN/welcome.html new file mode 120000 index 000000000..fa10c2a20 --- /dev/null +++ b/frontends/gtk/res/zh_CN/welcome.html @@ -0,0 +1 @@ +../../../../resources/zh_CN/welcome.html
\ No newline at end of file |