From b0b271274c98274d4c53608c856194270ae12d0f Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Fri, 4 Sep 2020 08:26:04 +0100 Subject: Make GTK UI resources more consistent The GTK UI resources have to be different resources between major versions. When kept in one directory with slightly different filenames they were difficult to distinguish and resource definition was difficult to update. The resources for both gtk versions were stored in both builds resulting in unneccessary increased binary size. The new stratagy lists the UI files once in a single gresources file and only includes what is required. If a UI file is added it must be provided in both gtk2 and 3 or a build failure will occour rather than a runtime error. --- frontends/gtk/Makefile | 10 +- frontends/gtk/res/cookies.gtk2.ui | 174 -- frontends/gtk/res/cookies.gtk3.ui | 206 --- frontends/gtk/res/downloads.gtk2.ui | 175 -- frontends/gtk/res/downloads.gtk3.ui | 175 -- frontends/gtk/res/globalhistory.gtk2.ui | 242 --- frontends/gtk/res/globalhistory.gtk3.ui | 238 --- frontends/gtk/res/gtk2/cookies.ui | 174 ++ frontends/gtk/res/gtk2/downloads.ui | 175 ++ frontends/gtk/res/gtk2/globalhistory.ui | 242 +++ frontends/gtk/res/gtk2/hotlist.ui | 217 +++ frontends/gtk/res/gtk2/localhistory.ui | 46 + frontends/gtk/res/gtk2/netsurf.ui | 90 + frontends/gtk/res/gtk2/options.ui | 2928 ++++++++++++++++++++++++++++++ frontends/gtk/res/gtk2/pageinfo.ui | 16 + frontends/gtk/res/gtk2/password.ui | 415 +++++ frontends/gtk/res/gtk2/tabcontents.ui | 229 +++ frontends/gtk/res/gtk2/toolbar.ui | 120 ++ frontends/gtk/res/gtk2/viewdata.ui | 204 +++ frontends/gtk/res/gtk2/warning.ui | 77 + frontends/gtk/res/gtk3/cookies.ui | 206 +++ frontends/gtk/res/gtk3/downloads.ui | 175 ++ frontends/gtk/res/gtk3/globalhistory.ui | 238 +++ frontends/gtk/res/gtk3/hotlist.ui | 255 +++ frontends/gtk/res/gtk3/localhistory.ui | 46 + frontends/gtk/res/gtk3/netsurf.ui | 61 + frontends/gtk/res/gtk3/options.ui | 3015 +++++++++++++++++++++++++++++++ frontends/gtk/res/gtk3/pageinfo.ui | 22 + frontends/gtk/res/gtk3/password.ui | 415 +++++ frontends/gtk/res/gtk3/tabcontents.ui | 229 +++ frontends/gtk/res/gtk3/toolbar.ui | 126 ++ frontends/gtk/res/gtk3/viewdata.ui | 239 +++ frontends/gtk/res/gtk3/warning.ui | 77 + frontends/gtk/res/hotlist.gtk2.ui | 217 --- frontends/gtk/res/hotlist.gtk3.ui | 255 --- frontends/gtk/res/localhistory.gtk2.ui | 46 - frontends/gtk/res/localhistory.gtk3.ui | 46 - frontends/gtk/res/netsurf.gresource.xml | 26 - frontends/gtk/res/netsurf.gtk2.ui | 90 - frontends/gtk/res/netsurf.gtk3.ui | 61 - frontends/gtk/res/options.gtk2.ui | 2928 ------------------------------ frontends/gtk/res/options.gtk3.ui | 3015 ------------------------------- frontends/gtk/res/pageinfo.gtk2.ui | 16 - frontends/gtk/res/pageinfo.gtk3.ui | 22 - frontends/gtk/res/password.gtk2.ui | 415 ----- frontends/gtk/res/password.gtk3.ui | 415 ----- frontends/gtk/res/tabcontents.gtk2.ui | 229 --- frontends/gtk/res/tabcontents.gtk3.ui | 229 --- frontends/gtk/res/toolbar.gtk2.ui | 120 -- frontends/gtk/res/toolbar.gtk3.ui | 126 -- frontends/gtk/res/ui.gresource.xml | 18 + frontends/gtk/res/viewdata.gtk2.ui | 204 --- frontends/gtk/res/viewdata.gtk3.ui | 239 --- frontends/gtk/res/warning.gtk2.ui | 77 - frontends/gtk/res/warning.gtk3.ui | 77 - frontends/gtk/resources.c | 7 +- 56 files changed, 10065 insertions(+), 10070 deletions(-) delete mode 100644 frontends/gtk/res/cookies.gtk2.ui delete mode 100644 frontends/gtk/res/cookies.gtk3.ui delete mode 100644 frontends/gtk/res/downloads.gtk2.ui delete mode 100644 frontends/gtk/res/downloads.gtk3.ui delete mode 100644 frontends/gtk/res/globalhistory.gtk2.ui delete mode 100644 frontends/gtk/res/globalhistory.gtk3.ui create mode 100644 frontends/gtk/res/gtk2/cookies.ui create mode 100644 frontends/gtk/res/gtk2/downloads.ui create mode 100644 frontends/gtk/res/gtk2/globalhistory.ui create mode 100644 frontends/gtk/res/gtk2/hotlist.ui create mode 100644 frontends/gtk/res/gtk2/localhistory.ui create mode 100644 frontends/gtk/res/gtk2/netsurf.ui create mode 100644 frontends/gtk/res/gtk2/options.ui create mode 100644 frontends/gtk/res/gtk2/pageinfo.ui create mode 100644 frontends/gtk/res/gtk2/password.ui create mode 100644 frontends/gtk/res/gtk2/tabcontents.ui create mode 100644 frontends/gtk/res/gtk2/toolbar.ui create mode 100644 frontends/gtk/res/gtk2/viewdata.ui create mode 100644 frontends/gtk/res/gtk2/warning.ui create mode 100644 frontends/gtk/res/gtk3/cookies.ui create mode 100644 frontends/gtk/res/gtk3/downloads.ui create mode 100644 frontends/gtk/res/gtk3/globalhistory.ui create mode 100644 frontends/gtk/res/gtk3/hotlist.ui create mode 100644 frontends/gtk/res/gtk3/localhistory.ui create mode 100644 frontends/gtk/res/gtk3/netsurf.ui create mode 100644 frontends/gtk/res/gtk3/options.ui create mode 100644 frontends/gtk/res/gtk3/pageinfo.ui create mode 100644 frontends/gtk/res/gtk3/password.ui create mode 100644 frontends/gtk/res/gtk3/tabcontents.ui create mode 100644 frontends/gtk/res/gtk3/toolbar.ui create mode 100644 frontends/gtk/res/gtk3/viewdata.ui create mode 100644 frontends/gtk/res/gtk3/warning.ui delete mode 100644 frontends/gtk/res/hotlist.gtk2.ui delete mode 100644 frontends/gtk/res/hotlist.gtk3.ui delete mode 100644 frontends/gtk/res/localhistory.gtk2.ui delete mode 100644 frontends/gtk/res/localhistory.gtk3.ui delete mode 100644 frontends/gtk/res/netsurf.gtk2.ui delete mode 100644 frontends/gtk/res/netsurf.gtk3.ui delete mode 100644 frontends/gtk/res/options.gtk2.ui delete mode 100644 frontends/gtk/res/options.gtk3.ui delete mode 100644 frontends/gtk/res/pageinfo.gtk2.ui delete mode 100644 frontends/gtk/res/pageinfo.gtk3.ui delete mode 100644 frontends/gtk/res/password.gtk2.ui delete mode 100644 frontends/gtk/res/password.gtk3.ui delete mode 100644 frontends/gtk/res/tabcontents.gtk2.ui delete mode 100644 frontends/gtk/res/tabcontents.gtk3.ui delete mode 100644 frontends/gtk/res/toolbar.gtk2.ui delete mode 100644 frontends/gtk/res/toolbar.gtk3.ui create mode 100644 frontends/gtk/res/ui.gresource.xml delete mode 100644 frontends/gtk/res/viewdata.gtk2.ui delete mode 100644 frontends/gtk/res/viewdata.gtk3.ui delete mode 100644 frontends/gtk/res/warning.gtk2.ui delete mode 100644 frontends/gtk/res/warning.gtk3.ui (limited to 'frontends') diff --git a/frontends/gtk/Makefile b/frontends/gtk/Makefile index e4929e416..3bf3ea063 100644 --- a/frontends/gtk/Makefile +++ b/frontends/gtk/Makefile @@ -103,6 +103,7 @@ GLIB_COMPILE_RESOURCES := glib-compile-resources CFLAGS += -DWITH_GRESOURCE NETSURF_GRESOURCE_XML := $(NSGTK_RESOURCES_DIR)/netsurf.gresource.xml +UI_GRESOURCE_XML := $(NSGTK_RESOURCES_DIR)/ui.gresource.xml MESSAGES_GRESOURCE_XML := $(NSGTK_RESOURCES_DIR)/messages.gresource.xml # generate the netsurf gresource source files @@ -112,6 +113,13 @@ $(OBJROOT)/netsurf_gresource.c: $(NETSURF_GRESOURCE_XML) $(shell $(GLIB_COMPILE_ S_RESOURCE += $(OBJROOT)/netsurf_gresource.c +# generate the ui gresource source files +$(OBJROOT)/ui_gresource.c: $(UI_GRESOURCE_XML) $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir $(NSGTK_RESOURCES_DIR)/gtk$(NETSURF_GTK_MAJOR) --generate-dependencies $(UI_GRESOURCE_XML)) + $(VQ)echo "GRESORCE: $<" + $(Q)$(GLIB_COMPILE_RESOURCES) --generate-source --sourcedir $(NSGTK_RESOURCES_DIR)/gtk$(NETSURF_GTK_MAJOR) --target=$@ $< + +S_RESOURCE += $(OBJROOT)/ui_gresource.c + # generate the messages gresource source file $(OBJROOT)/messages_gresource.c: $(MESSAGES_GRESOURCE_XML) $(addsuffix /Messages,$(addprefix $(MESSAGES_TARGET)/,$(MESSAGES_LANGUAGES))) $(VQ)echo "GRESORCE: $<" @@ -182,7 +190,7 @@ GTK_RESOURCES_LIST := \ GTK_RESOURCES_LIST := \ $(addprefix $(NSGTK_RESOURCES_DIR)/, $(GTK_RESOURCES_LIST)) \ - $(wildcard $(NSGTK_RESOURCES_DIR)/*.gtk$(NETSURF_GTK_MAJOR).ui) + $(wildcard $(NSGTK_RESOURCES_DIR)/gtk$(NETSURF_GTK_MAJOR)/*.ui) # translations with more than just Messages files GTK_TRANSLATIONS_HTML := de en fr it ja nl zh_CN diff --git a/frontends/gtk/res/cookies.gtk2.ui b/frontends/gtk/res/cookies.gtk2.ui deleted file mode 100644 index 86f15c765..000000000 --- a/frontends/gtk/res/cookies.gtk2.ui +++ /dev/null @@ -1,174 +0,0 @@ - - - - - - Cookies - NetSurf - mouse - 600 - 500 - - - True - 2 - vertical - 2 - - - True - - - True - _Edit - True - - - True - - - True - _Delete - True - - - - - - True - D_elete all - True - - - - - True - _Select all - True - - - - - - True - _Clear selection - True - - - - - - - - - - True - _View - True - - - True - - - True - _Expand - True - - - True - - - True - _All - True - - - - - True - _Domains - True - - - - - True - _Cookies - True - - - - - - - - - True - Collapse - True - - - True - - - True - _All - True - - - - - True - _Domains - True - - - - - True - _Cookies - True - - - - - - - - - - - - - False - 0 - - - - - True - True - automatic - automatic - - - True - queue - - - True - True - True - 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 - - - - - - - 1 - - - - - - diff --git a/frontends/gtk/res/cookies.gtk3.ui b/frontends/gtk/res/cookies.gtk3.ui deleted file mode 100644 index 85f9aae76..000000000 --- a/frontends/gtk/res/cookies.gtk3.ui +++ /dev/null @@ -1,206 +0,0 @@ - - - - - False - NetSurf Cookies - mouse - 600 - 500 - - - True - False - vertical - - - True - False - - - False - True - False - _Edit - True - - - True - False - - - False - True - False - _Delete - True - - - - - False - True - False - D_elete all - True - - - - - False - True - False - _Select all - True - - - - - False - True - False - _Clear selection - True - - - - - - - - - False - True - False - _View - True - - - True - False - - - False - True - False - _Expand - True - - - True - False - - - False - True - False - _All - True - - - - - False - True - False - _Domains - True - - - - - False - True - False - _Cookies - True - - - - - - - - - False - True - False - Collapse - True - - - True - False - - - False - True - False - _All - True - - - - - False - True - False - _Domains - True - - - - - False - True - False - _Cookies - True - - - - - - - - - - - - - False - True - 0 - - - - - True - True - never - in - - - True - False - - - True - True - True - 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 - - - - - - - True - True - 1 - - - - - - diff --git a/frontends/gtk/res/downloads.gtk2.ui b/frontends/gtk/res/downloads.gtk2.ui deleted file mode 100644 index 1e71328a4..000000000 --- a/frontends/gtk/res/downloads.gtk2.ui +++ /dev/null @@ -1,175 +0,0 @@ - - - - - - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Downloads - NetSurf - mouse - 500 - 300 - True - - - True - - - True - True - never - automatic - - - True - True - 2 - False - True - - - - - 0 - - - - - True - - - False - 1 - - - - - True - - - True - 2 - 2 - 2 - 2 - - - True - True - 0% of 0 files - - - - - 0 - - - - - True - True - end - - - gtk-media-pause - True - False - True - True - none - True - - - False - False - 0 - - - - - True - False - True - True - none - - - True - - - True - gtk-media-play - 2 - - - 0 - - - - - True - Resume - - - 1 - - - - - - - False - False - 1 - - - - - gtk-cancel - True - False - True - True - none - True - - - False - False - 2 - - - - - gtk-clear - True - False - True - True - none - True - - - False - False - 3 - - - - - False - False - end - 1 - - - - - False - False - 2 - - - - - - diff --git a/frontends/gtk/res/downloads.gtk3.ui b/frontends/gtk/res/downloads.gtk3.ui deleted file mode 100644 index 1e71328a4..000000000 --- a/frontends/gtk/res/downloads.gtk3.ui +++ /dev/null @@ -1,175 +0,0 @@ - - - - - - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Downloads - NetSurf - mouse - 500 - 300 - True - - - True - - - True - True - never - automatic - - - True - True - 2 - False - True - - - - - 0 - - - - - True - - - False - 1 - - - - - True - - - True - 2 - 2 - 2 - 2 - - - True - True - 0% of 0 files - - - - - 0 - - - - - True - True - end - - - gtk-media-pause - True - False - True - True - none - True - - - False - False - 0 - - - - - True - False - True - True - none - - - True - - - True - gtk-media-play - 2 - - - 0 - - - - - True - Resume - - - 1 - - - - - - - False - False - 1 - - - - - gtk-cancel - True - False - True - True - none - True - - - False - False - 2 - - - - - gtk-clear - True - False - True - True - none - True - - - False - False - 3 - - - - - False - False - end - 1 - - - - - False - False - 2 - - - - - - diff --git a/frontends/gtk/res/globalhistory.gtk2.ui b/frontends/gtk/res/globalhistory.gtk2.ui deleted file mode 100644 index 2b89ecb4b..000000000 --- a/frontends/gtk/res/globalhistory.gtk2.ui +++ /dev/null @@ -1,242 +0,0 @@ - - - - - False - NetSurf Global History - center - 600 - 500 - utility - - - True - False - - - True - False - - - False - True - False - _File - True - - - True - False - - - False - True - False - _Export - True - - - - - - - - - - False - True - False - _Edit - True - - - True - False - - - False - True - False - _Delete - True - - - - - - False - True - False - D_elete all - True - - - - - False - True - False - _Select all - True - - - - - - False - True - False - _Clear selection - True - - - - - - - - - - False - True - False - _View - True - - - True - False - - - False - True - False - _Expand - True - - - True - False - - - False - True - False - _All - True - - - - - False - True - False - _Directories - True - - - - - False - True - False - Add_resses - True - - - - - - - - - False - True - False - _Collapse - True - - - True - False - - - False - True - False - _All - True - - - - - False - True - False - _Directories - True - - - - - False - True - False - Add_resses - True - - - - - - - - - - - - - False - True - False - _Launch - True - - - - - False - True - 0 - - - - - True - True - - - True - False - queue - - - True - True - True - 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 - - - - - - - True - True - 1 - - - - - - diff --git a/frontends/gtk/res/globalhistory.gtk3.ui b/frontends/gtk/res/globalhistory.gtk3.ui deleted file mode 100644 index c0496964f..000000000 --- a/frontends/gtk/res/globalhistory.gtk3.ui +++ /dev/null @@ -1,238 +0,0 @@ - - - - - False - NetSurf Global History - center - 600 - 500 - utility - - - True - False - vertical - - - True - False - - - False - True - False - _File - True - - - True - False - - - False - True - False - _Export - True - - - - - - - - - False - True - False - _Edit - True - - - True - False - - - False - True - False - _Delete - True - - - - - False - True - False - D_elete all - True - - - - - False - True - False - _Select all - True - - - - - False - True - False - _Clear selection - True - - - - - - - - - False - True - False - _View - True - - - True - False - - - False - True - False - _Expand - True - - - True - False - - - False - True - False - _All - True - - - - - False - True - False - _Directories - True - - - - - False - True - False - Add_resses - True - - - - - - - - - False - True - False - _Collapse - True - - - True - False - - - False - True - False - _All - True - - - - - False - True - False - _Directories - True - - - - - False - True - False - Add_resses - True - - - - - - - - - - - - - False - True - False - _Launch - True - - - - - False - True - 0 - - - - - True - True - in - - - True - False - - - True - True - 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 - - - - - - - True - True - 1 - - - - - - diff --git a/frontends/gtk/res/gtk2/cookies.ui b/frontends/gtk/res/gtk2/cookies.ui new file mode 100644 index 000000000..86f15c765 --- /dev/null +++ b/frontends/gtk/res/gtk2/cookies.ui @@ -0,0 +1,174 @@ + + + + + + Cookies - NetSurf + mouse + 600 + 500 + + + True + 2 + vertical + 2 + + + True + + + True + _Edit + True + + + True + + + True + _Delete + True + + + + + + True + D_elete all + True + + + + + True + _Select all + True + + + + + + True + _Clear selection + True + + + + + + + + + + True + _View + True + + + True + + + True + _Expand + True + + + True + + + True + _All + True + + + + + True + _Domains + True + + + + + True + _Cookies + True + + + + + + + + + True + Collapse + True + + + True + + + True + _All + True + + + + + True + _Domains + True + + + + + True + _Cookies + True + + + + + + + + + + + + + False + 0 + + + + + True + True + automatic + automatic + + + True + queue + + + True + True + True + 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 + + + + + + + 1 + + + + + + diff --git a/frontends/gtk/res/gtk2/downloads.ui b/frontends/gtk/res/gtk2/downloads.ui new file mode 100644 index 000000000..1e71328a4 --- /dev/null +++ b/frontends/gtk/res/gtk2/downloads.ui @@ -0,0 +1,175 @@ + + + + + + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Downloads - NetSurf + mouse + 500 + 300 + True + + + True + + + True + True + never + automatic + + + True + True + 2 + False + True + + + + + 0 + + + + + True + + + False + 1 + + + + + True + + + True + 2 + 2 + 2 + 2 + + + True + True + 0% of 0 files + + + + + 0 + + + + + True + True + end + + + gtk-media-pause + True + False + True + True + none + True + + + False + False + 0 + + + + + True + False + True + True + none + + + True + + + True + gtk-media-play + 2 + + + 0 + + + + + True + Resume + + + 1 + + + + + + + False + False + 1 + + + + + gtk-cancel + True + False + True + True + none + True + + + False + False + 2 + + + + + gtk-clear + True + False + True + True + none + True + + + False + False + 3 + + + + + False + False + end + 1 + + + + + False + False + 2 + + + + + + diff --git a/frontends/gtk/res/gtk2/globalhistory.ui b/frontends/gtk/res/gtk2/globalhistory.ui new file mode 100644 index 000000000..2b89ecb4b --- /dev/null +++ b/frontends/gtk/res/gtk2/globalhistory.ui @@ -0,0 +1,242 @@ + + + + + False + NetSurf Global History + center + 600 + 500 + utility + + + True + False + + + True + False + + + False + True + False + _File + True + + + True + False + + + False + True + False + _Export + True + + + + + + + + + + False + True + False + _Edit + True + + + True + False + + + False + True + False + _Delete + True + + + + + + False + True + False + D_elete all + True + + + + + False + True + False + _Select all + True + + + + + + False + True + False + _Clear selection + True + + + + + + + + + + False + True + False + _View + True + + + True + False + + + False + True + False + _Expand + True + + + True + False + + + False + True + False + _All + True + + + + + False + True + False + _Directories + True + + + + + False + True + False + Add_resses + True + + + + + + + + + False + True + False + _Collapse + True + + + True + False + + + False + True + False + _All + True + + + + + False + True + False + _Directories + True + + + + + False + True + False + Add_resses + True + + + + + + + + + + + + + False + True + False + _Launch + True + + + + + False + True + 0 + + + + + True + True + + + True + False + queue + + + True + True + True + 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 + + + + + + + True + True + 1 + + + + + + diff --git a/frontends/gtk/res/gtk2/hotlist.ui b/frontends/gtk/res/gtk2/hotlist.ui new file mode 100644 index 000000000..af0fd5696 --- /dev/null +++ b/frontends/gtk/res/gtk2/hotlist.ui @@ -0,0 +1,217 @@ + + + + + + Bookmarks - NetSurf + mouse + 600 + 500 + + + True + 2 + vertical + 2 + + + True + + + True + _File + True + + + True + + + True + _Export + True + + + + + + True + New _folder + True + + + + + + True + New _entry + True + + + + + + + + + + True + _Edit + True + + + True + + + True + _Edit + True + + + + + True + _Delete + True + + + + + + True + _Select all + True + + + + + + True + _Clear selection + True + + + + + + + + + + True + _View + True + + + True + + + True + _Expand + True + + + True + + + True + _All + True + + + + + True + _Directories + True + + + + + True + Add_resses + True + + + + + + + + + True + _Collapse + True + + + True + + + True + _All + True + + + + + True + _Directories + True + + + + + True + Add_resses + True + + + + + + + + + + + + + True + _Launch + True + + + + + False + 0 + + + + + True + True + automatic + automatic + + + True + queue + + + True + True + True + 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 + + + + + + + 1 + + + + + + diff --git a/frontends/gtk/res/gtk2/localhistory.ui b/frontends/gtk/res/gtk2/localhistory.ui new file mode 100644 index 000000000..2003ed69a --- /dev/null +++ b/frontends/gtk/res/gtk2/localhistory.ui @@ -0,0 +1,46 @@ + + + + + GTK_WINDOW_POPUP + False + NetSurf Local History + center + 20 + 20 + utility + False + + + True + False + + + True + True + + + True + False + queue + + + True + True + True + 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 + + + + + + + True + True + 1 + + + + + + diff --git a/frontends/gtk/res/gtk2/netsurf.ui b/frontends/gtk/res/gtk2/netsurf.ui new file mode 100644 index 000000000..adca54001 --- /dev/null +++ b/frontends/gtk/res/gtk2/netsurf.ui @@ -0,0 +1,90 @@ + + + + + + 100 + 0.5357142857142857 + 26 + 10 + 10 + + + 100 + 26 + 10 + 10 + + + False + NetSurf + center + + + True + False + + + True + False + + + False + False + 0 + + + + + True + False + False + False + True + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True + True + 1 + + + + + + diff --git a/frontends/gtk/res/gtk2/options.ui b/frontends/gtk/res/gtk2/options.ui new file mode 100644 index 000000000..907d0b511 --- /dev/null +++ b/frontends/gtk/res/gtk2/options.ui @@ -0,0 +1,2928 @@ + + + + + + 0.10000000000000001 + 10 + 0.10000000000000001 + 0.10000000000000001 + 1 + + + 4096 + 1024 + 32 + 256 + + + 2048 + 16 + 4 + 16 + + + 999 + 28 + 1 + 10 + + + 100 + 1 + 1 + 10 + + + 1 + 100 + 10 + 1 + 10 + + + 1 + 100 + 1 + 1 + 10 + + + 1 + 99.900000000000006 + 16 + 0.10000000000000001 + 2 + + + 999 + 28 + 1 + 28 + + + 999 + 1 + 10 + + + 1 + 1000 + 100 + 1 + 10 + + + 1 + 65535 + 3128 + 1 + 10 + + + True + False + 3 + gtk-apply + + + + + + + + + + + en + English + + + + + + + + + + + preferencesFonttypeSans + + + preferencesFonttypeSerif + + + preferencesFonttypeMonospace + + + preferencesFonttypeCursive + + + preferencesFonttypeFantasy + + + + + + + + + + + preferencesDeveloperViewWindow + + + preferencesDeveloperViewTab + + + preferencesDeveloperViewEditor + + + + + + + + + + + preferencesImageLoadBoth + + + preferencesImageLoadFore + + + preferencesImageLoadBack + + + preferencesImageLoadNone + + + + + + + + + + + preferencesProxyTypeDirect + + + preferencesProxyTypeManual + + + preferencesProxyTypeBasic + + + preferencesProxyTypeNLTM + + + preferencesProxyTypeSystem + + + + + + + + + + + Google + + + Yahoo! + + + Microsoft Live + + + Buisiness.com + + + Omgili + + + BBC News + + + Ubuntu Packages + + + Creative Commons + + + Ask + + + Answers + + + Dictionary.com + + + YouTube + + + AeroMP3 + + + AOL + + + Baidu + + + Amazon + + + Ebay + + + IMBD + + + ESPN + + + Wikipedia + + + DuckDuckGo + + + + + + + + + + + preferencesTabLocTop + + + preferencesTabLocLeft + + + preferencesTabLocRight + + + preferencesTabLocBottom + + + + + + + + + + + preferencesButtonTypeSmall + + + preferencesButtonTypeLarge + + + preferencesButtonTypeLargeText + + + preferencesButtonTypeText + + + + + False + 5 + preferencesTitle + center-on-parent + True + dialog + + + + + + True + False + 2 + + + True + False + edge + + + gtk-help + True + True + False + True + + + False + False + 0 + + + + + gtk-close + True + True + False + True + + + False + False + 1 + + + + + False + True + end + 0 + + + + + True + True + + + True + False + 6 + + + True + False + 0 + none + + + True + False + 6 + 12 + 12 + + + True + False + 6 + + + True + False + 12 + + + True + False + preferencesStartupPage + + + False + False + 0 + + + + + True + True + + False + False + True + True + + + + + True + True + end + 1 + + + + + True + True + 0 + + + + + True + False + 6 + + + + + + preferencesStartupPageDefault + True + True + True + + + + False + False + end + 1 + + + + + preferencesStartupPageCurrent + True + True + True + + + + False + False + end + 2 + + + + + True + False + 1 + + + + + + + + + True + False + preferencesStartup + True + + + + + False + True + 6 + 0 + + + + + True + False + 0 + none + + + True + False + 6 + 12 + 12 + + + True + False + 6 + + + preferencesSearchURLBar + True + True + False + True + + + + + True + True + 0 + + + + + True + False + 12 + + + True + False + preferencesSearchProvider + + + False + False + 0 + + + + + True + False + liststore_search_provider + + + + + + 0 + + + + + True + True + 1 + + + + + True + True + 1 + + + + + + + + + True + False + preferencesSearch + True + + + + + False + True + 6 + 1 + + + + + True + False + 0 + none + + + True + False + 6 + 12 + 12 + + + True + False + 6 + + + preferencesDownloadsRemove + True + True + False + True + + + + + False + True + 0 + + + + + preferencesDownloadsConfirm + True + True + False + True + + + + + False + True + 1 + + + + + True + False + 12 + + + True + False + preferencesDownloadsLocation + + + False + True + 0 + + + + + True + False + select-folder + + + + + True + True + 1 + + + + + False + True + 2 + + + + + + + + + True + False + preferencesDownloads + True + + + + + False + True + 6 + 2 + + + + + + + True + False + preferencesMainTabtitle + + + False + + + + + True + False + 6 + + + True + False + 0 + none + + + True + False + 6 + 12 + 12 + + + True + False + 6 + + + preferencesTabsAlways + True + True + False + True + + + + + True + True + 0 + + + + + preferencesTabsSwitch + True + True + False + True + + + + + True + True + 1 + + + + + preferencesTabsNewly + True + True + False + True + + + + + True + True + 2 + + + + + True + False + 12 + + + True + False + preferencesTabsPosition + + + False + False + 0 + + + + + True + False + liststore_tab_position + + + + + + 0 + + + + + True + True + 1 + + + + + True + True + 3 + + + + + + + + + True + False + preferencesTabs + True + + + + + False + True + 6 + 1 + + + + + True + False + 0 + none + + + True + False + 6 + 12 + 12 + + + True + False + 6 + + + True + False + 6 + + + True + False + preferencesDeveloperView + + + False + True + 0 + + + + + True + False + liststore_developer_view + + + + + + 0 + + + + + True + True + 1 + + + + + True + True + 0 + + + + + + + + + True + False + preferencesTools + True + + + + + False + True + 6 + 2 + + + + + True + False + 0 + none + + + True + False + 6 + 12 + 12 + + + True + False + 6 + + + preferencesURLbarDisplay + True + True + False + True + + + + + True + True + 0 + + + + + + + + + True + False + preferencesURLbar + True + + + + + False + True + 7 + 3 + + + + + True + False + 0 + none + + + True + False + 6 + 12 + 12 + + + True + False + 6 + + + True + False + 6 + + + True + False + preferencesToolbarButtons + + + False + True + 0 + + + + + True + False + liststore_toolbar_buttontype + + + + + + 0 + + + + + True + True + 1 + + + + + True + True + 0 + + + + + + + + + True + False + preferencesToolbar + True + + + + + False + True + 6 + 4 + + + + + 1 + + + + + True + False + preferencesAppearanceTabtitle + + + 1 + False + + + + + True + False + 6 + + + True + False + 0 + none + + + True + False + 6 + 12 + 12 + + + True + False + 6 + + + preferencesControlPrevent + True + True + False + True + + + + + False + False + 0 + + + + + preferencesControlHide + True + True + False + True + + + + + False + False + 1 + + + + + preferencesControlEnable + True + True + False + True + + + + + False + False + 2 + + + + + True + False + 6 + + + True + False + preferencesControlLoad + + + False + True + 0 + + + + + True + False + liststore_image_loading + + + + + + 0 + + + + + True + True + 1 + + + + + True + True + 3 + + + + + + + + + True + False + preferencesControl + True + + + + + False + True + 6 + 0 + + + + + True + False + 0 + none + + + True + False + 6 + 12 + 12 + + + True + False + 6 + + + preferencesAnimationEnable + True + True + False + True + + + + + True + True + 0 + + + + + + + + + True + False + preferencesAnimation + True + + + + + False + True + 6 + 1 + + + + + True + False + 0 + none + + + True + False + 6 + 12 + 12 + + + True + False + 12 + + + True + False + 6 + + + True + False + preferencesFontsDefault + + + False + True + 0 + + + + + True + False + liststore_defaultfont + + + + + + 0 + + + + + True + True + 1 + + + + + True + True + 0 + + + + + True + False + 6 + + + True + False + preferencesFontsSize + + + False + True + 0 + + + + + True + True + True + preferencesFontsSizeTooltip + 4 + + 4 + False + False + True + True + adjustment_font_default_size + 1 + 1 + True + + + + + False + True + 1 + + + + + False + True + 1 + + + + + preferencesFontsPreview + True + True + True + image1 + True + + + + False + True + 2 + + + + + + + + + True + False + preferencesFonts + True + + + + + False + True + 2 + + + + + True + False + 0 + none + + + True + False + 6 + 12 + 12 + + + True + False + 6 + + + True + False + 12 + + + True + False + preferencesLanguagePreferred + + + False + True + 0 + + + + + True + False + True + preferencesLanguagePreferredTooltip + liststore_content_language + + + + + 0 + + + 1 + + + + + 1 + + + 0 + + + + + True + True + 1 + + + + + True + True + 0 + + + + + + + + + True + False + preferencesLanguage + True + + + + + False + True + 3 + + + + + 2 + + + + + True + False + preferencesContentTabtitle + + + 2 + False + + + + + True + False + 6 + + + True + False + 0 + none + + + True + False + 6 + 12 + 12 + + + True + False + 6 + + + preferencesGeneralReferral + True + True + False + True + + + + + True + True + 0 + + + + + preferencesGeneralDNT + True + True + False + True + + + + + True + True + 1 + + + + + + + + + True + False + preferencesGeneral + True + + + + + False + True + 6 + 0 + + + + + True + False + 0 + none + + + True + False + 6 + 12 + 12 + + + True + False + 6 + + + preferencesHistoryShow + True + True + False + True + + + + + True + True + 0 + + + + + True + False + 6 + + + True + False + preferencesHistoryRemember + + + False + True + 0 + + + + + True + True + 4 + + 4 + False + False + True + True + adjustment_history_age + 1 + True + if-valid + + + + + False + True + 1 + + + + + True + False + preferencesHistoryDays + + + False + True + 2 + + + + + True + True + 1 + + + + + + + + + True + False + preferencesHistory + True + + + + + False + True + 6 + 1 + + + + + True + False + 0 + none + + + True + False + 6 + 12 + 12 + + + True + False + 6 + + + True + False + 3 + 3 + 6 + 6 + + + True + False + 0 + preferencesCacheMemory + + + GTK_FILL + + + + + True + False + 0 + preferencesCacheDisc + + + 1 + 2 + GTK_FILL + + + + + True + False + 0 + preferencesCacheExpire + + + 2 + 3 + GTK_FILL + + + + + True + True + + 5 + False + False + True + True + adjustment_cache_memory_size + 1 + True + + + + + 1 + 2 + GTK_FILL + + + + + True + True + + 5 + False + False + True + True + adjustment_cache_disc_size + 1 + True + + + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + True + True + + 3 + False + False + True + True + adjustment_disc_cache_age + 1 + True + + + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + True + False + 0 + MB + + + 2 + 3 + GTK_FILL + + + + + True + False + 0 + MB + + + 2 + 3 + 1 + 2 + GTK_FILL + + + + + True + False + 0 + preferencesHistoryDays + + + 2 + 3 + 2 + 3 + GTK_FILL + + + + + True + True + 0 + + + + + True + False + + + + + + preferencesCacheMaintenance + True + True + True + + + False + True + 1 + + + + + True + True + 1 + + + + + + + + + True + False + preferencesCache + True + + + + + False + True + 6 + 2 + + + + + 3 + + + + + True + False + preferencesPrivacyTabtitle + + + 3 + False + + + + + True + False + 6 + + + True + False + 0 + none + + + True + False + 6 + 12 + 12 + + + True + False + 5 + 2 + 6 + 6 + + + True + False + 0 + preferencesProxyType + + + GTK_FILL + + + + + True + False + 0 + preferencesProxyHost + + + 1 + 2 + GTK_FILL + + + + + True + False + 0 + preferencesProxyUsername + + + 2 + 3 + GTK_FILL + + + + + True + False + 0 + preferencesProxyPassword + + + 3 + 4 + GTK_FILL + + + + + True + False + True + preferencesProxyTypeTooltip + liststore_proxy_type + + + + + + 0 + + + + + 1 + 2 + + + + + True + False + 6 + + + True + True + True + preferencesProxyHostTooltip + + False + False + True + True + + + + + True + True + 0 + + + + + True + False + : + + + False + True + 1 + + + + + True + True + True + preferencesProxyPortTooltip + 5 + + 5 + False + False + True + True + adjustment_proxy_port + 1 + True + if-valid + + + + + False + True + 2 + + + + + 1 + 2 + 1 + 2 + + + + + True + True + True + preferencesProxyUsernameTooltip + + False + False + True + True + + + + + 1 + 2 + 2 + 3 + + + + + True + True + True + preferencesProxyPasswordTooltip + False + + False + False + True + True + + + + + 1 + 2 + 3 + 4 + + + + + True + False + 0 + preferencesProxyNoproxy + + + 4 + 5 + GTK_FILL + + + + + True + True + True + preferencesProxyNoproxyTooltip + False + False + False + True + True + + + + + 1 + 2 + 4 + 5 + + + + + + + + + True + False + preferencesProxy + True + + + + + False + True + 6 + 0 + + + + + True + False + 0 + none + + + True + False + 6 + 12 + 12 + + + True + False + 3 + 2 + 6 + 6 + + + True + False + 0 + preferencesFetchingMax + + + GTK_FILL + + + + + True + False + 0 + preferencesFetchingPerhost + + + 1 + 2 + GTK_FILL + + + + + True + False + 0 + preferencesFetchingCached + + + 2 + 3 + GTK_FILL + + + + + True + True + True + preferencesFetchingMaxTooltip + + 3 + False + False + True + True + adjustment_fetching_max + 1 + True + + + + + 1 + 2 + GTK_FILL + + + + + True + True + True + preferencesFetchingPerhostTooltip + + 3 + False + False + True + True + adjustment_fetching_perhost + 1 + True + + + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + True + True + True + preferencesFetchingCachedTooltip. + + 3 + False + False + True + True + adjustment_fetching_cached + 1 + True + + + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + + + + + True + False + preferencesFetching + True + + + + + False + True + 6 + 1 + + + + + 4 + + + + + True + False + preferencesNetworkTabtitle + + + 4 + False + + + + + False + 6 + + + True + False + 0 + none + + + True + False + 6 + 12 + 12 + + + True + False + 6 + + + preferencesAppearanceImages + True + True + False + True + + + + + True + True + 0 + + + + + preferencesAppearanceBackground + True + True + False + True + + + + + True + True + 1 + + + + + preferencesAppearanceScalefit + True + True + False + True + + + + + True + True + 2 + + + + + True + False + 6 + + + True + False + preferencesAppearanceScale + + + False + True + 0 + + + + + True + True + 4 + + 4 + 1 + False + False + True + True + adjustment_pdf_scale + 1 + True + + + + + False + True + 1 + + + + + True + False + % + + + False + True + 2 + + + + + True + True + 3 + + + + + + + + + True + False + preferencesAppearance + True + + + + + False + True + 6 + 0 + + + + + True + False + 0 + none + + + True + False + 6 + 12 + 12 + + + True + False + 6 + + + True + False + + + True + False + preferencesMarginsMeasurements + + + False + True + 0 + + + + + + + + True + True + 0 + + + + + True + False + 3 + 3 + + + + + + + + + + + + True + False + 6 + + + True + False + Top + + + False + True + 0 + + + + + True + True + 4 + + 5 + 1 + False + False + True + True + 1 + 1 + True + + + + + False + True + 1 + + + + + 1 + 2 + GTK_EXPAND + + + + + True + False + 6 + + + True + False + Left + + + False + True + 0 + + + + + True + True + 4 + + 5 + 1 + False + False + True + True + adjustment_pdf_lmargin + 1 + 1 + True + + + + + False + True + 1 + + + + + 1 + 2 + GTK_EXPAND + + + + + True + False + 6 + + + True + False + Bottom + + + False + True + 0 + + + + + True + True + 4 + + 5 + 1 + False + False + True + True + 1 + 1 + True + + + + + False + True + 1 + + + + + 1 + 2 + 2 + 3 + GTK_EXPAND + + + + + True + False + 6 + + + True + False + Right + + + False + True + 0 + + + + + True + True + 4 + + 5 + 1 + False + False + True + True + 1 + 1 + True + + + + + False + True + 1 + + + + + 2 + 3 + 1 + 2 + GTK_EXPAND + + + + + + + + + + + True + True + 1 + + + + + + + + + True + False + preferencesMargins + True + + + + + False + True + 6 + 1 + + + + + True + False + 0 + none + + + True + False + 6 + 12 + 12 + + + True + False + 7 + + + preferencesGenerationCompressed + True + True + False + True + + + + + True + True + 0 + + + + + preferencesGenerationPassword + True + True + False + True + + + + + True + True + 1 + + + + + + + + + True + False + preferencesGeneration + True + + + + + False + True + 6 + 2 + + + + + 5 + + + + + True + False + preferencesPDFTabtitle + + + 5 + False + + + + + True + True + 1 + + + + + + help + close + + + 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 @@ + + + + + + GTK_WINDOW_POPUP + False + + + True + False + GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK + + + + diff --git a/frontends/gtk/res/gtk2/password.ui b/frontends/gtk/res/gtk2/password.ui new file mode 100644 index 000000000..eb51e4f8f --- /dev/null +++ b/frontends/gtk/res/gtk2/password.ui @@ -0,0 +1,415 @@ + + + + + PDF Password + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER + True + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST + True + False + + + True + False + 0 + + + True + 6 + gtk-dialog-authentication + 0.5 + 0.10000000149 + 12 + 0 + + + 0 + False + False + + + + + 5 + True + False + 0 + + + 5 + True + True + 0 + + + True + Owner password + False + False + GTK_JUSTIFY_LEFT + False + False + 0.899999976158 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + 15 + False + 0 + + + 0 + False + True + + + + + True + True + True + False + 20 + + True + + False + 20 + + + 0 + False + False + + + + + 0 + False + False + + + + + 5 + True + True + 0 + + + True + Repeat password + False + False + GTK_JUSTIFY_LEFT + False + False + 0.899999976158 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + 15 + False + 0 + + + 0 + False + True + + + + + True + True + True + False + 20 + + True + + False + 20 + + + 0 + False + False + + + + + 0 + False + False + + + + + 5 + True + True + 0 + + + True + User password + False + False + GTK_JUSTIFY_LEFT + False + False + 0.899999976158 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + 15 + False + 0 + + + 0 + False + True + + + + + True + True + True + False + 20 + + True + + False + 20 + + + 0 + False + False + + + + + 0 + False + False + + + + + 5 + True + True + 0 + + + True + Repeat password + False + False + GTK_JUSTIFY_LEFT + False + False + 0.899999976158 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + 15 + False + 0 + + + 0 + False + True + + + + + True + True + True + False + 20 + + True + + False + 20 + + + 0 + False + False + + + + + 0 + False + False + + + + + 5 + True + GTK_BUTTONBOX_END + 10 + + + True + True + GTK_RELIEF_NORMAL + True + + + True + False + 0 + + + True + gtk-dialog-authentication + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + True + Use these as passwords + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + True + True + + + + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 0 + 0 + + + True + False + 0 + + + True + gtk-cancel + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + True + Do not set any passwords + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + True + True + + + + + + + + + + + 0 + False + False + + + + + 0 + True + True + + + + + + diff --git a/frontends/gtk/res/gtk2/tabcontents.ui b/frontends/gtk/res/gtk2/tabcontents.ui new file mode 100644 index 000000000..c47e6a2ef --- /dev/null +++ b/frontends/gtk/res/gtk2/tabcontents.ui @@ -0,0 +1,229 @@ + + + + + + 100 + 30 + 10 + 10 + + + 100 + 30 + 10 + 10 + + + True + False + + + True + False + both-horiz + + + False + False + 1 + + + + + False + both + + + True + False + + + True + True + False + False + True + True + + + + + True + + + + + True + False + gtkFindBack + True + go-up + + + False + True + + + + + True + False + gtkFindForward + True + go-down + + + False + True + + + + + True + False + + + gtkFindHighlightAll + True + True + False + show all matches + True + True + + + + + False + + + + + True + False + + + gtkFindMatchCase + True + True + False + Match case when searching + none + True + True + + + + + False + + + + + True + False + gtkFindClose + window-close + + + False + True + + + + + False + False + 2 + + + + + True + False + 2 + 2 + + + True + True + False + GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_STRUCTURE_MASK | GDK_SCROLL_MASK + layouthadjustment + layoutvadjustment + + + + + 1 + True + False + 2 + + + 1 + 2 + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + True + + + 1 + True + False + 0 + 4 + Status + + + False + False + + + + + True + False + layouthadjustment + + + True + True + + + + + 1 + 2 + GTK_FILL + + + + + True + False + layoutvadjustment + + + 1 + 2 + + + + + + True + True + 3 + + + + diff --git a/frontends/gtk/res/gtk2/toolbar.ui b/frontends/gtk/res/gtk2/toolbar.ui new file mode 100644 index 000000000..61723065b --- /dev/null +++ b/frontends/gtk/res/gtk2/toolbar.ui @@ -0,0 +1,120 @@ + + + + + + True + False + + + True + False + + + False + True + 0 + + + + + True + False + 0 + 6 + gtkCustomizeToolbarInstructions + + + False + True + 6 + 1 + + + + + True + True + automatic + automatic + + + True + False + + + True + False + + + + + + + + + + + + + True + True + 2 + + + + + True + False + end + + + Reset to defaults + True + True + True + + + False + False + 0 + + + + + gtk-discard + True + True + True + True + + + False + False + 1 + + + + + gtk-apply + True + True + True + True + + + False + False + 2 + + + + + False + False + 6 + 3 + + + + diff --git a/frontends/gtk/res/gtk2/viewdata.ui b/frontends/gtk/res/gtk2/viewdata.ui new file mode 100644 index 000000000..7589022ca --- /dev/null +++ b/frontends/gtk/res/gtk2/viewdata.ui @@ -0,0 +1,204 @@ + + + + + + 640 + 480 + + + True + vertical + + + True + + + True + _File + True + + + True + + + gtk-save-as + True + True + True + + + + + + gtk-print + True + True + True + + + + + + True + + + + + gtk-close + True + True + True + + + + + + + + + True + _Edit + True + + + True + + + gtk-select-all + True + True + True + + + + + + gtk-cut + True + True + True + + + + + gtk-copy + True + True + True + + + + + gtk-paste + True + True + True + + + + + gtk-delete + True + True + True + + + + + + + + + + True + _View + True + + + True + + + gtk-zoom-in + True + True + True + + + + + + gtk-zoom-out + True + True + True + + + + + + gtk-zoom-100 + True + True + True + + + + + + + + + + True + _Help + True + + + True + + + gtk-about + True + True + True + + + + + + + + + False + 0 + + + + + True + True + automatic + automatic + + + True + True + 1 + 1 + False + word + 3 + 3 + False + + + + + 1 + + + + + + diff --git a/frontends/gtk/res/gtk2/warning.ui b/frontends/gtk/res/gtk2/warning.ui new file mode 100644 index 000000000..e4fb4e662 --- /dev/null +++ b/frontends/gtk/res/gtk2/warning.ui @@ -0,0 +1,77 @@ + + + + + Warning from NetSurf + GTK_WIN_POS_CENTER + gtk-dialog-warning + GDK_WINDOW_TYPE_HINT_DIALOG + True + + + True + 2 + + + True + 3 + + + True + 12 + 6 + gtk-dialog-warning + + + False + False + + + + + True + Help help help! I'm being held prisoner by a bunch of RISC OS zealots! + True + + + 1 + 1 + + + + + + + True + + + False + 3 + 1 + + + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-ok + True + + + + + + False + False + 2 + + + + + + diff --git a/frontends/gtk/res/gtk3/cookies.ui b/frontends/gtk/res/gtk3/cookies.ui new file mode 100644 index 000000000..85f9aae76 --- /dev/null +++ b/frontends/gtk/res/gtk3/cookies.ui @@ -0,0 +1,206 @@ + + + + + False + NetSurf Cookies + mouse + 600 + 500 + + + True + False + vertical + + + True + False + + + False + True + False + _Edit + True + + + True + False + + + False + True + False + _Delete + True + + + + + False + True + False + D_elete all + True + + + + + False + True + False + _Select all + True + + + + + False + True + False + _Clear selection + True + + + + + + + + + False + True + False + _View + True + + + True + False + + + False + True + False + _Expand + True + + + True + False + + + False + True + False + _All + True + + + + + False + True + False + _Domains + True + + + + + False + True + False + _Cookies + True + + + + + + + + + False + True + False + Collapse + True + + + True + False + + + False + True + False + _All + True + + + + + False + True + False + _Domains + True + + + + + False + True + False + _Cookies + True + + + + + + + + + + + + + False + True + 0 + + + + + True + True + never + in + + + True + False + + + True + True + True + 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 + + + + + + + True + True + 1 + + + + + + diff --git a/frontends/gtk/res/gtk3/downloads.ui b/frontends/gtk/res/gtk3/downloads.ui new file mode 100644 index 000000000..1e71328a4 --- /dev/null +++ b/frontends/gtk/res/gtk3/downloads.ui @@ -0,0 +1,175 @@ + + + + + + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Downloads - NetSurf + mouse + 500 + 300 + True + + + True + + + True + True + never + automatic + + + True + True + 2 + False + True + + + + + 0 + + + + + True + + + False + 1 + + + + + True + + + True + 2 + 2 + 2 + 2 + + + True + True + 0% of 0 files + + + + + 0 + + + + + True + True + end + + + gtk-media-pause + True + False + True + True + none + True + + + False + False + 0 + + + + + True + False + True + True + none + + + True + + + True + gtk-media-play + 2 + + + 0 + + + + + True + Resume + + + 1 + + + + + + + False + False + 1 + + + + + gtk-cancel + True + False + True + True + none + True + + + False + False + 2 + + + + + gtk-clear + True + False + True + True + none + True + + + False + False + 3 + + + + + False + False + end + 1 + + + + + False + False + 2 + + + + + + diff --git a/frontends/gtk/res/gtk3/globalhistory.ui b/frontends/gtk/res/gtk3/globalhistory.ui new file mode 100644 index 000000000..c0496964f --- /dev/null +++ b/frontends/gtk/res/gtk3/globalhistory.ui @@ -0,0 +1,238 @@ + + + + + False + NetSurf Global History + center + 600 + 500 + utility + + + True + False + vertical + + + True + False + + + False + True + False + _File + True + + + True + False + + + False + True + False + _Export + True + + + + + + + + + False + True + False + _Edit + True + + + True + False + + + False + True + False + _Delete + True + + + + + False + True + False + D_elete all + True + + + + + False + True + False + _Select all + True + + + + + False + True + False + _Clear selection + True + + + + + + + + + False + True + False + _View + True + + + True + False + + + False + True + False + _Expand + True + + + True + False + + + False + True + False + _All + True + + + + + False + True + False + _Directories + True + + + + + False + True + False + Add_resses + True + + + + + + + + + False + True + False + _Collapse + True + + + True + False + + + False + True + False + _All + True + + + + + False + True + False + _Directories + True + + + + + False + True + False + Add_resses + True + + + + + + + + + + + + + False + True + False + _Launch + True + + + + + False + True + 0 + + + + + True + True + in + + + True + False + + + True + True + 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 + + + + + + + True + True + 1 + + + + + + diff --git a/frontends/gtk/res/gtk3/hotlist.ui b/frontends/gtk/res/gtk3/hotlist.ui new file mode 100644 index 000000000..ccd193637 --- /dev/null +++ b/frontends/gtk/res/gtk3/hotlist.ui @@ -0,0 +1,255 @@ + + + + + False + NetSurf Bookmarks + mouse + 600 + 500 + + + True + False + vertical + + + True + False + + + False + True + False + _File + True + + + True + False + + + False + True + False + _Export + True + + + + + False + True + False + New _folder + True + + + + + False + True + False + New _entry + True + + + + + + + + + False + True + False + _Edit + True + + + True + False + + + False + True + False + _Edit + True + + + + + False + True + False + _Delete + True + + + + + False + True + False + _Select all + True + + + + + False + True + False + _Clear selection + True + + + + + + + + + False + True + False + _View + True + + + True + False + + + False + True + False + _Expand + True + + + True + False + + + False + True + False + _All + True + + + + + False + True + False + _Directories + True + + + + + False + True + False + Add_resses + True + + + + + + + + + False + True + False + _Collapse + True + + + True + False + + + False + True + False + _All + True + + + + + False + True + False + _Directories + True + + + + + False + True + False + Add_resses + True + + + + + + + + + + + + + False + True + False + _Launch + True + + + + + False + True + 0 + + + + + True + True + in + + + True + False + + + True + True + 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 + + + + + + + True + True + 1 + + + + + + diff --git a/frontends/gtk/res/gtk3/localhistory.ui b/frontends/gtk/res/gtk3/localhistory.ui new file mode 100644 index 000000000..9a36a91a7 --- /dev/null +++ b/frontends/gtk/res/gtk3/localhistory.ui @@ -0,0 +1,46 @@ + + + + + GTK_WINDOW_POPUP + False + NetSurf Local History + center + 20 + 20 + utility + False + + + True + False + vertical + + + True + True + in + + + True + False + + + True + True + 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 + + + + + + + True + True + 1 + + + + + + diff --git a/frontends/gtk/res/gtk3/netsurf.ui b/frontends/gtk/res/gtk3/netsurf.ui new file mode 100644 index 000000000..6ea8f07a7 --- /dev/null +++ b/frontends/gtk/res/gtk3/netsurf.ui @@ -0,0 +1,61 @@ + + + + + + False + + + + + + True + False + vertical + + + True + False + + + False + True + 0 + + + + + True + True + False + False + True + + + + + + + + + + + + + + + + + + + + + True + True + 3 + + + + + + diff --git a/frontends/gtk/res/gtk3/options.ui b/frontends/gtk/res/gtk3/options.ui new file mode 100644 index 000000000..82a3e175a --- /dev/null +++ b/frontends/gtk/res/gtk3/options.ui @@ -0,0 +1,3015 @@ + + + + + 0.10000000000000001 + 10 + 0.10000000000000001 + 0.10000000000000001 + 1 + + + 4096 + 1024 + 4 + 16 + + + 1024 + 16 + 4 + 16 + + + 999 + 28 + 1 + 10 + + + 100 + 1 + 1 + 10 + + + 1 + 100 + 10 + 1 + 10 + + + 1 + 100 + 1 + 1 + 10 + + + 1 + 99.900000000000006 + 16 + 0.10000000000000001 + 2 + + + 999 + 28 + 1 + 28 + + + 999 + 1 + 10 + + + 1 + 1000 + 100 + 1 + 10 + + + 1 + 65535 + 3128 + 1 + 10 + + + False + 5 + preferencesTitle + center-on-parent + True + dialog + + + + + + True + False + vertical + 2 + + + True + False + + + gtk-help + False + True + True + False + False + True + + + False + False + 0 + + + + + gtk-close + False + True + True + False + False + True + + + False + False + 1 + + + + + False + True + end + 0 + + + + + True + True + + + True + False + vertical + start + 6 + + + True + False + 0 + none + + + True + False + 6 + 12 + 12 + + + True + False + vertical + 6 + + + True + False + horizontal + 12 + + + True + False + preferencesStartupPage + + + False + False + 0 + + + + + True + True + preferencesStartupPageTooltip + + + + + + True + True + end + 1 + + + + + True + True + 0 + + + + + True + False + horizontal + 6 + + + + + + preferencesStartupPageDefault + False + True + True + True + False + + + + False + False + end + 1 + + + + + preferencesStartupPageCurrent + False + True + True + True + False + + + + False + False + end + 2 + + + + + True + False + 1 + + + + + + + + + True + False + preferencesStartup + True + + + + + False + True + 6 + 0 + + + + + True + False + 0 + none + + + True + False + 6 + 12 + 12 + + + True + False + vertical + 6 + + + preferencesSearchURLBar + False + True + True + False + start + False + 0.5 + True + + + + + True + True + 0 + + + + + True + False + horizontal + 12 + + + True + False + preferencesSearchProvider + + + False + False + 0 + + + + + True + False + preferencesSearchProviderTooltip + start + liststore_search_provider + + + + + + 0 + + + + + True + True + 1 + + + + + True + True + 1 + + + + + + + + + True + False + preferencesSearch + True + + + + + False + True + 6 + 1 + + + + + True + False + 0 + none + + + True + False + 6 + 12 + 12 + + + True + False + vertical + 6 + + + preferencesDownloadsRemove + False + True + True + False + start + False + 0.5 + True + + + + + False + True + 0 + + + + + preferencesDownloadsConfirm + False + True + True + False + start + False + 0.5 + True + + + + + False + True + 1 + + + + + True + False + horizontal + 12 + + + True + False + preferencesDownloadsLocation + + + False + True + 0 + + + + + True + False + preferencesDownloadsLocationTooltip + start + select-folder + + + + + True + True + 1 + + + + + False + True + 2 + + + + + + + + + True + False + preferencesDownloads + True + + + + + False + True + 6 + 2 + + + + + + + True + False + preferencesMainTabtitle + + + False + + + + + True + False + vertical + start + 6 + + + True + False + 0 + none + + + True + False + 6 + 12 + 12 + + + True + False + vertical + 6 + + + preferencesTabsAlways + False + True + True + False + start + False + 0.5 + True + + + + + True + True + 0 + + + + + preferencesTabsSwitch + False + True + True + False + start + False + 0.5 + True + + + + + True + True + 1 + + + + + preferencesTabsNewly + False + True + True + False + start + False + 0.5 + True + + + + + True + True + 2 + + + + + True + False + horizontal + 12 + + + True + False + preferencesTabsPosition + + + False + False + 0 + + + + + True + False + start + liststore_tab_position + + + + + + 0 + + + + + True + True + 1 + + + + + True + True + 3 + + + + + + + + + True + False + preferencesTabs + True + + + + + False + True + 6 + 1 + + + + + True + False + 0 + none + + + True + False + 6 + 12 + 12 + + + True + False + vertical + 6 + + + True + False + horizontal + 12 + + + True + False + preferencesDeveloperView + + + False + True + 0 + + + + + True + False + start + liststore_developer_view + + + + + + 0 + + + + + True + True + 1 + + + + + True + True + 1 + + + + + + + + + True + False + preferencesTools + True + + + + + False + True + 6 + 2 + + + + + True + False + 0 + none + + + True + False + 6 + 12 + 12 + + + True + False + vertical + 6 + + + preferencesURLbarDisplay + False + True + True + False + start + False + 0.5 + True + + + + + True + True + 0 + + + + + + + + + True + False + preferencesURLbar + True + + + + + False + True + 7 + 3 + + + + + True + False + 0 + none + + + True + False + 6 + 12 + 12 + + + True + False + vertical + 6 + + + True + False + horizontal + 6 + + + True + False + preferencesToolbarButtons + + + False + True + 0 + + + + + True + False + start + liststore_toolbar_buttontype + + + + + + 0 + + + + + True + True + 1 + + + + + True + True + 0 + + + + + + + + + True + False + preferencesToolbar + True + + + + + False + True + 6 + 4 + + + + + 1 + + + + + True + False + preferencesAppearanceTabtitle + + + 1 + False + + + + + True + False + start + vertical + 6 + + + True + False + 0 + none + + + True + False + 6 + 12 + 12 + + + True + False + vertical + 6 + + + preferencesControlPrevent + False + True + True + False + start + False + 0.5 + True + + + + + False + False + 0 + + + + + preferencesControlHide + False + True + True + False + start + False + 0.5 + True + + + + + False + False + 1 + + + + + preferencesControlEnable + False + True + True + False + start + False + 0.5 + True + + + + + False + False + 2 + + + + + True + False + horizontal + 6 + + + True + False + preferencesControlLoad + + + False + True + 0 + + + + + True + False + start + liststore_image_loading + + + + + + 0 + + + + + True + True + 1 + + + + + True + True + 3 + + + + + + + + + True + False + preferencesControl + True + + + + + False + True + 6 + 0 + + + + + True + False + 0 + none + + + True + False + 6 + 12 + 12 + + + True + False + vertical + 6 + + + preferencesAnimationEnable + False + True + True + False + start + False + 0.5 + True + + + + + True + True + 0 + + + + + + + + + True + False + preferencesAnimation + True + + + + + False + True + 6 + 1 + + + + + True + False + 0 + none + + + True + False + 6 + 12 + 12 + + + True + False + horizontal + 12 + + + True + False + horizontal + 6 + + + True + False + preferencesFontsDefault + + + False + True + 0 + + + + + True + False + liststore_defaultfont + + + + + + 0 + + + + + True + True + 1 + + + + + True + True + 0 + + + + + True + False + horizontal + 6 + + + True + False + preferencesFontsSize + + + False + True + 0 + + + + + True + True + True + preferencesFontsSizeTooltip + 4 + + 4 + adjustment_font_default_size + 1 + 1 + True + + + + + False + True + 1 + + + + + False + True + 1 + + + + + preferencesFontsPreview + False + True + True + True + False + image1 + True + + + + False + True + 2 + + + + + + + + + True + False + preferencesFonts + True + + + + + False + True + 2 + + + + + True + False + 0 + none + + + True + False + 6 + 12 + 12 + + + True + False + vertical + 6 + + + True + False + horizontal + 12 + + + True + False + preferencesLanguagePreferred + + + False + True + 0 + + + + + True + False + True + preferencesLanguagePreferredTooltip + start + liststore_content_language + + + + + 0 + + + 1 + + + + + 1 + + + 0 + + + + + True + True + 1 + + + + + True + True + 0 + + + + + + + + + True + False + preferencesLanguage + True + + + + + False + True + 3 + + + + + 2 + + + + + True + False + preferencesContentTabtitle + + + 2 + False + + + + + True + False + start + vertical + 6 + + + True + False + 0 + none + + + True + False + 6 + 12 + 12 + + + True + False + vertical + 6 + + + preferencesGeneralReferral + False + True + True + False + start + False + 0.5 + True + + + + + True + True + 0 + + + + + preferencesGeneralDNT + False + True + True + False + start + False + 0.5 + True + + + + + True + True + 1 + + + + + + + + + True + False + preferencesGeneral + True + + + + + False + True + 6 + 0 + + + + + True + False + 0 + none + + + True + False + 6 + 12 + 12 + + + True + False + vertical + 6 + + + preferencesHistoryShow + False + True + True + False + start + False + 0.5 + True + + + + + True + True + 0 + + + + + True + False + horizontal + 6 + + + True + False + preferencesHistoryRemember + + + False + True + 0 + + + + + True + True + 4 + + 4 + adjustment_history_age + 1 + True + if-valid + + + + + False + True + 1 + + + + + True + False + preferencesHistoryDays + + + False + True + 2 + + + + + True + True + 1 + + + + + + + + + True + False + preferencesHistory + True + + + + + False + True + 6 + 1 + + + + + True + False + 0 + none + + + True + False + 6 + 12 + 12 + + + True + False + vertical + 6 + + + True + False + 3 + 3 + 6 + 6 + + + True + False + 0 + preferencesCacheMemory + + + GTK_FILL + + + + + True + False + 0 + preferencesCacheDisc + + + 1 + 2 + GTK_FILL + + + + + True + False + 0 + preferencesCacheExpire + + + 2 + 3 + GTK_FILL + + + + + True + True + + 5 + adjustment_cache_memory_size + 1 + True + + + + + 1 + 2 + GTK_FILL + + + + + True + True + + 5 + adjustment_cache_disc_size + 1 + True + + + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + True + True + + 3 + adjustment_disc_cache_age + 1 + True + + + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + True + False + 0 + MB + + + 2 + 3 + GTK_FILL + + + + + True + False + 0 + MB + + + 2 + 3 + 1 + 2 + GTK_FILL + + + + + True + False + 0 + preferencesCacheDays + + + 2 + 3 + 2 + 3 + GTK_FILL + + + + + True + True + 0 + + + + + True + False + horizontal + + + + + + preferencesCacheMaintenance + False + True + True + True + False + + + False + True + end + 1 + + + + + True + True + 1 + + + + + + + + + True + False + preferencesCache + True + + + + + False + True + 6 + 2 + + + + + 3 + + + + + True + False + preferencesPrivacyTabtitle + + + 3 + False + + + + + True + False + start + vertical + 6 + + + True + False + 0 + none + + + True + False + 6 + 12 + 12 + + + True + False + 5 + 2 + 6 + 6 + + + True + False + 0 + preferencesProxyType + + + GTK_FILL + + + + + True + False + 0 + preferencesProxyHost + + + 1 + 2 + GTK_FILL + + + + + True + False + 0 + preferencesProxyUsername + + + 2 + 3 + GTK_FILL + + + + + True + False + 0 + preferencesProxyPassword + + + 3 + 4 + GTK_FILL + + + + + True + False + True + preferencesProxyTypeTooltip + liststore_proxy_type + + + + + + 0 + + + + + 1 + 2 + + + + + True + False + horizontal + 6 + + + True + True + True + preferencesProxyHostTooltip + + + + + + True + True + 0 + + + + + True + False + : + + + False + True + 1 + + + + + True + True + True + preferencesProxyPortTooltip + 5 + + 5 + adjustment_proxy_port + 1 + True + if-valid + + + + + False + True + 2 + + + + + 1 + 2 + 1 + 2 + + + + + True + True + True + preferencesProxyUsernameTooltip + + + + + + 1 + 2 + 2 + 3 + + + + + True + True + True + preferencesProxyPasswordTooltip + False + + + + + + 1 + 2 + 3 + 4 + + + + + True + False + 0 + preferencesProxyNoproxy + + + 4 + 5 + GTK_FILL + + + + + True + True + True + preferencesProxyNoproxyTooltip + False + + + + + 1 + 2 + 4 + 5 + + + + + + + + + True + False + preferencesProxy + True + + + + + False + True + 6 + 0 + + + + + True + False + 0 + none + + + True + False + 6 + 12 + 12 + + + True + False + 3 + 2 + 6 + 6 + + + True + False + 0 + preferencesFetchingMax + + + GTK_FILL + + + + + True + False + 0 + preferencesFetchingPerhost + + + 1 + 2 + GTK_FILL + + + + + True + False + 0 + preferencesFetchingCached + + + 2 + 3 + GTK_FILL + + + + + True + True + True + preferencesFetchingMaxTooltip + + 3 + adjustment_fetching_max + 1 + True + + + + + 1 + 2 + GTK_FILL + + + + + True + True + True + preferencesFetchingPerhostTooltip + + 3 + adjustment_fetching_perhost + 1 + True + + + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + True + True + True + preferencesFetchingCachedTooltip + + 3 + adjustment_fetching_cached + 1 + True + + + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + + + + + True + False + preferencesFetching + True + + + + + False + True + 6 + 1 + + + + + 4 + + + + + True + False + preferencesNetworkTabtitle + + + 4 + False + + + + + True + False + start + vertical + 6 + + + True + False + 0 + none + + + True + False + 6 + 12 + 12 + + + True + False + vertical + 6 + + + preferencesAppearanceImages + False + True + True + False + start + False + 0.5 + True + + + + + True + True + 0 + + + + + preferencesAppearanceBackground + False + True + True + False + start + False + 0.5 + True + + + + + True + True + 1 + + + + + preferencesAppearanceScalefit + False + True + True + False + start + False + 0.5 + True + + + + + True + True + 2 + + + + + True + False + horizontal + 6 + + + True + False + preferencesAppearanceScale + + + False + True + 0 + + + + + True + True + 4 + + 4 + 1 + adjustment_pdf_scale + 1 + True + + + + + False + True + 1 + + + + + True + False + % + + + False + True + 2 + + + + + True + True + 3 + + + + + + + + + True + False + preferencesAppearance + True + + + + + False + True + 6 + 0 + + + + + True + False + 0 + none + + + True + False + 6 + 12 + 12 + + + True + False + vertical + 6 + + + True + False + horizontal + + + True + False + preferencesMarginsMeasurements + + + False + True + 0 + + + + + + + + True + True + 0 + + + + + True + False + 3 + 3 + + + + + + + + + + + + True + False + horizontal + 6 + + + True + False + Top + + + False + True + 0 + + + + + True + True + 4 + + 5 + 1 + 1 + 1 + True + + + + + False + True + 1 + + + + + 1 + 2 + GTK_EXPAND + + + + + True + False + horizontal + 6 + + + True + False + Left + + + False + True + 0 + + + + + True + True + 4 + + 5 + 1 + adjustment_pdf_lmargin + 1 + 1 + True + + + + + False + True + 1 + + + + + 1 + 2 + GTK_EXPAND + + + + + True + False + horizontal + 6 + + + True + False + Bottom + + + False + True + 0 + + + + + True + True + 4 + + 5 + 1 + 1 + 1 + True + + + + + False + True + 1 + + + + + 1 + 2 + 2 + 3 + GTK_EXPAND + + + + + True + False + horizontal + 6 + + + True + False + Right + + + False + True + 0 + + + + + True + True + 4 + + 5 + 1 + 1 + 1 + True + + + + + False + True + 1 + + + + + 2 + 3 + 1 + 2 + GTK_EXPAND + + + + + + + + + + + + + + + + + + + + + + + + + + True + True + 1 + + + + + + + + + True + False + preferencesMargins + True + + + + + False + True + 6 + 1 + + + + + True + False + 0 + none + + + True + False + 6 + 12 + 12 + + + True + False + vertical + 7 + + + preferencesGenerationCompressed + False + True + True + False + start + False + 0.5 + True + + + + + True + True + 0 + + + + + preferencesGenerationPassword + False + True + True + False + start + False + 0.5 + True + + + + + True + True + 1 + + + + + + + + + True + False + preferencesGeneration + True + + + + + False + True + 6 + 2 + + + + + 5 + + + + + True + False + preferencesPDFTabtitle + + + 5 + False + + + + + False + True + 1 + + + + + + help + close + + + + True + False + 3 + gtk-apply + + + + + + + + + + + en + English + + + + + + + + + + + preferencesFonttypeSans + + + preferencesFonttypeSerif + + + preferencesFonttypeMonospace + + + preferencesFonttypeCursive + + + preferencesFonttypeFantasy + + + + + + + + + + + preferencesDeveloperViewWindow + + + preferencesDeveloperViewTab + + + preferencesDeveloperViewEditor + + + + + + + + + + + preferencesImageLoadBoth + + + preferencesImageLoadFore + + + preferencesImageLoadBack + + + preferencesImageLoadNone + + + + + + + + + + + preferencesProxyTypeDirect + + + preferencesProxyTypeManual + + + preferencesProxyTypeBasic + + + preferencesProxyTypeNLTM + + + preferencesProxyTypeSystem + + + + + + + + + + + Google + + + Yahoo! + + + Microsoft Live + + + Buisiness.com + + + Omgili + + + BBC News + + + Ubuntu Packages + + + Creative Commons + + + Ask + + + Answers + + + Dictionary.com + + + YouTube + + + AeroMP3 + + + AOL + + + Baidu + + + Amazon + + + Ebay + + + IMBD + + + ESPN + + + Wikipedia + + + DuckDuckGo + + + + + + + + + + + preferencesTabLocTop + + + preferencesTabLocLeft + + + preferencesTabLocRight + + + preferencesTabLocBottom + + + + + + + + + + + preferencesButtonTypeSmall + + + preferencesButtonTypeLarge + + + preferencesButtonTypeLargeText + + + preferencesButtonTypeText + + + + 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 @@ + + + + + + GTK_WINDOW_POPUP + False + GDK_POINTER_MOTION_MASK | GDK_BUTTON_MOTION_MASK | GDK_STRUCTURE_MASK + False + + + + + + PGIDrawingArea + True + False + 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 + + + + diff --git a/frontends/gtk/res/gtk3/password.ui b/frontends/gtk/res/gtk3/password.ui new file mode 100644 index 000000000..eb51e4f8f --- /dev/null +++ b/frontends/gtk/res/gtk3/password.ui @@ -0,0 +1,415 @@ + + + + + PDF Password + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER + True + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST + True + False + + + True + False + 0 + + + True + 6 + gtk-dialog-authentication + 0.5 + 0.10000000149 + 12 + 0 + + + 0 + False + False + + + + + 5 + True + False + 0 + + + 5 + True + True + 0 + + + True + Owner password + False + False + GTK_JUSTIFY_LEFT + False + False + 0.899999976158 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + 15 + False + 0 + + + 0 + False + True + + + + + True + True + True + False + 20 + + True + + False + 20 + + + 0 + False + False + + + + + 0 + False + False + + + + + 5 + True + True + 0 + + + True + Repeat password + False + False + GTK_JUSTIFY_LEFT + False + False + 0.899999976158 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + 15 + False + 0 + + + 0 + False + True + + + + + True + True + True + False + 20 + + True + + False + 20 + + + 0 + False + False + + + + + 0 + False + False + + + + + 5 + True + True + 0 + + + True + User password + False + False + GTK_JUSTIFY_LEFT + False + False + 0.899999976158 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + 15 + False + 0 + + + 0 + False + True + + + + + True + True + True + False + 20 + + True + + False + 20 + + + 0 + False + False + + + + + 0 + False + False + + + + + 5 + True + True + 0 + + + True + Repeat password + False + False + GTK_JUSTIFY_LEFT + False + False + 0.899999976158 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + 15 + False + 0 + + + 0 + False + True + + + + + True + True + True + False + 20 + + True + + False + 20 + + + 0 + False + False + + + + + 0 + False + False + + + + + 5 + True + GTK_BUTTONBOX_END + 10 + + + True + True + GTK_RELIEF_NORMAL + True + + + True + False + 0 + + + True + gtk-dialog-authentication + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + True + Use these as passwords + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + True + True + + + + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 0 + 0 + + + True + False + 0 + + + True + gtk-cancel + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + True + Do not set any passwords + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + True + True + + + + + + + + + + + 0 + False + False + + + + + 0 + True + True + + + + + + diff --git a/frontends/gtk/res/gtk3/tabcontents.ui b/frontends/gtk/res/gtk3/tabcontents.ui new file mode 100644 index 000000000..b07cf92e0 --- /dev/null +++ b/frontends/gtk/res/gtk3/tabcontents.ui @@ -0,0 +1,229 @@ + + + + + + 100 + 1 + 10 + + + 100 + 1 + 10 + + + True + False + vertical + + + True + False + both + + + False + False + 1 + + + + + False + both + + + False + True + False + + + True + True + + gtkFindPlaceholder + + + + + True + False + + + + + False + True + False + gtkFindBack + gtkFindBack + True + gtk-go-up + + + False + True + + + + + False + True + False + gtkFindForward + gtkFindForward + True + gtk-go-down + + + False + True + + + + + False + True + False + + + gtkFindHighlightAll + False + True + True + False + 0 + True + + + + + False + False + + + + + False + True + False + + + gtkFindMatchCase + False + True + True + False + 0 + True + + + + + False + False + + + + + False + True + False + gtkFindClose + gtkFindClose + gtk-close + + + False + True + + + + + False + False + 2 + + + + + True + False + 2 + 2 + + + True + True + False + GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_STRUCTURE_MASK | GDK_SCROLL_MASK + layouthadjustment + layoutvadjustment + + + 0 + 0 + + + + + True + False + True + vertical + layoutvadjustment + + + 1 + 0 + + + + + True + True + True + + + True + False + 4 + Status + True + 0 + + + False + True + + + + + True + False + layouthadjustment + + + True + True + + + + + 0 + 1 + + + + + + + + True + True + 3 + + + + diff --git a/frontends/gtk/res/gtk3/toolbar.ui b/frontends/gtk/res/gtk3/toolbar.ui new file mode 100644 index 000000000..60452f472 --- /dev/null +++ b/frontends/gtk/res/gtk3/toolbar.ui @@ -0,0 +1,126 @@ + + + + + + + True + False + gtk-refresh + + + True + False + vertical + + + True + False + + + False + True + 0 + + + + + True + False + 6 + gtkCustomizeToolbarInstructions + True + 0 + + + False + True + 6 + 1 + + + + + True + True + in + + + True + False + + + True + False + vertical + + + + + + + + + + True + True + 2 + + + + + True + False + end + + + Reset + True + True + True + image2 + + + True + True + 0 + + + + + gtk-discard + True + True + True + True + + + True + True + 1 + + + + + gtk-apply + True + True + True + True + + + True + True + 2 + + + + + False + False + 6 + 3 + + + + diff --git a/frontends/gtk/res/gtk3/viewdata.ui b/frontends/gtk/res/gtk3/viewdata.ui new file mode 100644 index 000000000..b742d5f6b --- /dev/null +++ b/frontends/gtk/res/gtk3/viewdata.ui @@ -0,0 +1,239 @@ + + + + + False + 640 + 480 + + + True + False + vertical + + + True + False + + + False + True + False + _File + True + + + True + False + + + gtk-save-as + False + True + False + True + True + + + + + gtk-print + False + True + False + True + True + + + + + False + True + False + + + + + gtk-close + False + True + False + True + True + + + + + + + + + False + True + False + _Edit + True + + + True + False + + + gtk-select-all + False + True + False + True + True + + + + + gtk-cut + False + True + False + True + True + + + + + gtk-copy + False + True + False + True + True + + + + + gtk-paste + False + True + False + True + True + + + + + gtk-delete + False + True + False + True + True + + + + + + + + + False + True + False + _View + True + + + True + False + + + gtk-zoom-in + False + True + False + True + True + + + + + gtk-zoom-out + False + True + False + True + True + + + + + gtk-zoom-100 + False + True + False + True + True + + + + + + + + + False + True + False + _Help + True + + + True + False + + + gtk-about + False + True + False + True + True + + + + + + + + + False + True + 0 + + + + + True + True + bottom-right + + + True + True + 1 + 1 + False + word + 3 + 3 + False + + + + + True + True + 1 + + + + + + diff --git a/frontends/gtk/res/gtk3/warning.ui b/frontends/gtk/res/gtk3/warning.ui new file mode 100644 index 000000000..e4fb4e662 --- /dev/null +++ b/frontends/gtk/res/gtk3/warning.ui @@ -0,0 +1,77 @@ + + + + + Warning from NetSurf + GTK_WIN_POS_CENTER + gtk-dialog-warning + GDK_WINDOW_TYPE_HINT_DIALOG + True + + + True + 2 + + + True + 3 + + + True + 12 + 6 + gtk-dialog-warning + + + False + False + + + + + True + Help help help! I'm being held prisoner by a bunch of RISC OS zealots! + True + + + 1 + 1 + + + + + + + True + + + False + 3 + 1 + + + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-ok + True + + + + + + False + False + 2 + + + + + + diff --git a/frontends/gtk/res/hotlist.gtk2.ui b/frontends/gtk/res/hotlist.gtk2.ui deleted file mode 100644 index af0fd5696..000000000 --- a/frontends/gtk/res/hotlist.gtk2.ui +++ /dev/null @@ -1,217 +0,0 @@ - - - - - - Bookmarks - NetSurf - mouse - 600 - 500 - - - True - 2 - vertical - 2 - - - True - - - True - _File - True - - - True - - - True - _Export - True - - - - - - True - New _folder - True - - - - - - True - New _entry - True - - - - - - - - - - True - _Edit - True - - - True - - - True - _Edit - True - - - - - True - _Delete - True - - - - - - True - _Select all - True - - - - - - True - _Clear selection - True - - - - - - - - - - True - _View - True - - - True - - - True - _Expand - True - - - True - - - True - _All - True - - - - - True - _Directories - True - - - - - True - Add_resses - True - - - - - - - - - True - _Collapse - True - - - True - - - True - _All - True - - - - - True - _Directories - True - - - - - True - Add_resses - True - - - - - - - - - - - - - True - _Launch - True - - - - - False - 0 - - - - - True - True - automatic - automatic - - - True - queue - - - True - True - True - 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 - - - - - - - 1 - - - - - - diff --git a/frontends/gtk/res/hotlist.gtk3.ui b/frontends/gtk/res/hotlist.gtk3.ui deleted file mode 100644 index ccd193637..000000000 --- a/frontends/gtk/res/hotlist.gtk3.ui +++ /dev/null @@ -1,255 +0,0 @@ - - - - - False - NetSurf Bookmarks - mouse - 600 - 500 - - - True - False - vertical - - - True - False - - - False - True - False - _File - True - - - True - False - - - False - True - False - _Export - True - - - - - False - True - False - New _folder - True - - - - - False - True - False - New _entry - True - - - - - - - - - False - True - False - _Edit - True - - - True - False - - - False - True - False - _Edit - True - - - - - False - True - False - _Delete - True - - - - - False - True - False - _Select all - True - - - - - False - True - False - _Clear selection - True - - - - - - - - - False - True - False - _View - True - - - True - False - - - False - True - False - _Expand - True - - - True - False - - - False - True - False - _All - True - - - - - False - True - False - _Directories - True - - - - - False - True - False - Add_resses - True - - - - - - - - - False - True - False - _Collapse - True - - - True - False - - - False - True - False - _All - True - - - - - False - True - False - _Directories - True - - - - - False - True - False - Add_resses - True - - - - - - - - - - - - - False - True - False - _Launch - True - - - - - False - True - 0 - - - - - True - True - in - - - True - False - - - True - True - 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 - - - - - - - True - True - 1 - - - - - - diff --git a/frontends/gtk/res/localhistory.gtk2.ui b/frontends/gtk/res/localhistory.gtk2.ui deleted file mode 100644 index 2003ed69a..000000000 --- a/frontends/gtk/res/localhistory.gtk2.ui +++ /dev/null @@ -1,46 +0,0 @@ - - - - - GTK_WINDOW_POPUP - False - NetSurf Local History - center - 20 - 20 - utility - False - - - True - False - - - True - True - - - True - False - queue - - - True - True - True - 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 - - - - - - - True - True - 1 - - - - - - diff --git a/frontends/gtk/res/localhistory.gtk3.ui b/frontends/gtk/res/localhistory.gtk3.ui deleted file mode 100644 index 9a36a91a7..000000000 --- a/frontends/gtk/res/localhistory.gtk3.ui +++ /dev/null @@ -1,46 +0,0 @@ - - - - - GTK_WINDOW_POPUP - False - NetSurf Local History - center - 20 - 20 - utility - False - - - True - False - vertical - - - True - True - in - - - True - False - - - True - True - 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 - - - - - - - True - True - 1 - - - - - - diff --git a/frontends/gtk/res/netsurf.gresource.xml b/frontends/gtk/res/netsurf.gresource.xml index 272c1ade2..ada2d59fc 100644 --- a/frontends/gtk/res/netsurf.gresource.xml +++ b/frontends/gtk/res/netsurf.gresource.xml @@ -1,32 +1,6 @@ - cookies.gtk2.ui - cookies.gtk3.ui - downloads.gtk2.ui - downloads.gtk3.ui - globalhistory.gtk2.ui - globalhistory.gtk3.ui - hotlist.gtk2.ui - hotlist.gtk3.ui - localhistory.gtk2.ui - localhistory.gtk3.ui - netsurf.gtk2.ui - netsurf.gtk3.ui - options.gtk2.ui - options.gtk3.ui - pageinfo.gtk2.ui - pageinfo.gtk3.ui - password.gtk2.ui - password.gtk3.ui - tabcontents.gtk2.ui - tabcontents.gtk3.ui - toolbar.gtk2.ui - toolbar.gtk3.ui - viewdata.gtk2.ui - viewdata.gtk3.ui - warning.gtk3.ui - warning.gtk2.ui favicon.png netsurf.xpm menu_cursor.png diff --git a/frontends/gtk/res/netsurf.gtk2.ui b/frontends/gtk/res/netsurf.gtk2.ui deleted file mode 100644 index adca54001..000000000 --- a/frontends/gtk/res/netsurf.gtk2.ui +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - 100 - 0.5357142857142857 - 26 - 10 - 10 - - - 100 - 26 - 10 - 10 - - - False - NetSurf - center - - - True - False - - - True - False - - - False - False - 0 - - - - - True - False - False - False - True - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True - True - 1 - - - - - - diff --git a/frontends/gtk/res/netsurf.gtk3.ui b/frontends/gtk/res/netsurf.gtk3.ui deleted file mode 100644 index 6ea8f07a7..000000000 --- a/frontends/gtk/res/netsurf.gtk3.ui +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - False - - - - - - True - False - vertical - - - True - False - - - False - True - 0 - - - - - True - True - False - False - True - - - - - - - - - - - - - - - - - - - - - True - True - 3 - - - - - - diff --git a/frontends/gtk/res/options.gtk2.ui b/frontends/gtk/res/options.gtk2.ui deleted file mode 100644 index 907d0b511..000000000 --- a/frontends/gtk/res/options.gtk2.ui +++ /dev/null @@ -1,2928 +0,0 @@ - - - - - - 0.10000000000000001 - 10 - 0.10000000000000001 - 0.10000000000000001 - 1 - - - 4096 - 1024 - 32 - 256 - - - 2048 - 16 - 4 - 16 - - - 999 - 28 - 1 - 10 - - - 100 - 1 - 1 - 10 - - - 1 - 100 - 10 - 1 - 10 - - - 1 - 100 - 1 - 1 - 10 - - - 1 - 99.900000000000006 - 16 - 0.10000000000000001 - 2 - - - 999 - 28 - 1 - 28 - - - 999 - 1 - 10 - - - 1 - 1000 - 100 - 1 - 10 - - - 1 - 65535 - 3128 - 1 - 10 - - - True - False - 3 - gtk-apply - - - - - - - - - - - en - English - - - - - - - - - - - preferencesFonttypeSans - - - preferencesFonttypeSerif - - - preferencesFonttypeMonospace - - - preferencesFonttypeCursive - - - preferencesFonttypeFantasy - - - - - - - - - - - preferencesDeveloperViewWindow - - - preferencesDeveloperViewTab - - - preferencesDeveloperViewEditor - - - - - - - - - - - preferencesImageLoadBoth - - - preferencesImageLoadFore - - - preferencesImageLoadBack - - - preferencesImageLoadNone - - - - - - - - - - - preferencesProxyTypeDirect - - - preferencesProxyTypeManual - - - preferencesProxyTypeBasic - - - preferencesProxyTypeNLTM - - - preferencesProxyTypeSystem - - - - - - - - - - - Google - - - Yahoo! - - - Microsoft Live - - - Buisiness.com - - - Omgili - - - BBC News - - - Ubuntu Packages - - - Creative Commons - - - Ask - - - Answers - - - Dictionary.com - - - YouTube - - - AeroMP3 - - - AOL - - - Baidu - - - Amazon - - - Ebay - - - IMBD - - - ESPN - - - Wikipedia - - - DuckDuckGo - - - - - - - - - - - preferencesTabLocTop - - - preferencesTabLocLeft - - - preferencesTabLocRight - - - preferencesTabLocBottom - - - - - - - - - - - preferencesButtonTypeSmall - - - preferencesButtonTypeLarge - - - preferencesButtonTypeLargeText - - - preferencesButtonTypeText - - - - - False - 5 - preferencesTitle - center-on-parent - True - dialog - - - - - - True - False - 2 - - - True - False - edge - - - gtk-help - True - True - False - True - - - False - False - 0 - - - - - gtk-close - True - True - False - True - - - False - False - 1 - - - - - False - True - end - 0 - - - - - True - True - - - True - False - 6 - - - True - False - 0 - none - - - True - False - 6 - 12 - 12 - - - True - False - 6 - - - True - False - 12 - - - True - False - preferencesStartupPage - - - False - False - 0 - - - - - True - True - - False - False - True - True - - - - - True - True - end - 1 - - - - - True - True - 0 - - - - - True - False - 6 - - - - - - preferencesStartupPageDefault - True - True - True - - - - False - False - end - 1 - - - - - preferencesStartupPageCurrent - True - True - True - - - - False - False - end - 2 - - - - - True - False - 1 - - - - - - - - - True - False - preferencesStartup - True - - - - - False - True - 6 - 0 - - - - - True - False - 0 - none - - - True - False - 6 - 12 - 12 - - - True - False - 6 - - - preferencesSearchURLBar - True - True - False - True - - - - - True - True - 0 - - - - - True - False - 12 - - - True - False - preferencesSearchProvider - - - False - False - 0 - - - - - True - False - liststore_search_provider - - - - - - 0 - - - - - True - True - 1 - - - - - True - True - 1 - - - - - - - - - True - False - preferencesSearch - True - - - - - False - True - 6 - 1 - - - - - True - False - 0 - none - - - True - False - 6 - 12 - 12 - - - True - False - 6 - - - preferencesDownloadsRemove - True - True - False - True - - - - - False - True - 0 - - - - - preferencesDownloadsConfirm - True - True - False - True - - - - - False - True - 1 - - - - - True - False - 12 - - - True - False - preferencesDownloadsLocation - - - False - True - 0 - - - - - True - False - select-folder - - - - - True - True - 1 - - - - - False - True - 2 - - - - - - - - - True - False - preferencesDownloads - True - - - - - False - True - 6 - 2 - - - - - - - True - False - preferencesMainTabtitle - - - False - - - - - True - False - 6 - - - True - False - 0 - none - - - True - False - 6 - 12 - 12 - - - True - False - 6 - - - preferencesTabsAlways - True - True - False - True - - - - - True - True - 0 - - - - - preferencesTabsSwitch - True - True - False - True - - - - - True - True - 1 - - - - - preferencesTabsNewly - True - True - False - True - - - - - True - True - 2 - - - - - True - False - 12 - - - True - False - preferencesTabsPosition - - - False - False - 0 - - - - - True - False - liststore_tab_position - - - - - - 0 - - - - - True - True - 1 - - - - - True - True - 3 - - - - - - - - - True - False - preferencesTabs - True - - - - - False - True - 6 - 1 - - - - - True - False - 0 - none - - - True - False - 6 - 12 - 12 - - - True - False - 6 - - - True - False - 6 - - - True - False - preferencesDeveloperView - - - False - True - 0 - - - - - True - False - liststore_developer_view - - - - - - 0 - - - - - True - True - 1 - - - - - True - True - 0 - - - - - - - - - True - False - preferencesTools - True - - - - - False - True - 6 - 2 - - - - - True - False - 0 - none - - - True - False - 6 - 12 - 12 - - - True - False - 6 - - - preferencesURLbarDisplay - True - True - False - True - - - - - True - True - 0 - - - - - - - - - True - False - preferencesURLbar - True - - - - - False - True - 7 - 3 - - - - - True - False - 0 - none - - - True - False - 6 - 12 - 12 - - - True - False - 6 - - - True - False - 6 - - - True - False - preferencesToolbarButtons - - - False - True - 0 - - - - - True - False - liststore_toolbar_buttontype - - - - - - 0 - - - - - True - True - 1 - - - - - True - True - 0 - - - - - - - - - True - False - preferencesToolbar - True - - - - - False - True - 6 - 4 - - - - - 1 - - - - - True - False - preferencesAppearanceTabtitle - - - 1 - False - - - - - True - False - 6 - - - True - False - 0 - none - - - True - False - 6 - 12 - 12 - - - True - False - 6 - - - preferencesControlPrevent - True - True - False - True - - - - - False - False - 0 - - - - - preferencesControlHide - True - True - False - True - - - - - False - False - 1 - - - - - preferencesControlEnable - True - True - False - True - - - - - False - False - 2 - - - - - True - False - 6 - - - True - False - preferencesControlLoad - - - False - True - 0 - - - - - True - False - liststore_image_loading - - - - - - 0 - - - - - True - True - 1 - - - - - True - True - 3 - - - - - - - - - True - False - preferencesControl - True - - - - - False - True - 6 - 0 - - - - - True - False - 0 - none - - - True - False - 6 - 12 - 12 - - - True - False - 6 - - - preferencesAnimationEnable - True - True - False - True - - - - - True - True - 0 - - - - - - - - - True - False - preferencesAnimation - True - - - - - False - True - 6 - 1 - - - - - True - False - 0 - none - - - True - False - 6 - 12 - 12 - - - True - False - 12 - - - True - False - 6 - - - True - False - preferencesFontsDefault - - - False - True - 0 - - - - - True - False - liststore_defaultfont - - - - - - 0 - - - - - True - True - 1 - - - - - True - True - 0 - - - - - True - False - 6 - - - True - False - preferencesFontsSize - - - False - True - 0 - - - - - True - True - True - preferencesFontsSizeTooltip - 4 - - 4 - False - False - True - True - adjustment_font_default_size - 1 - 1 - True - - - - - False - True - 1 - - - - - False - True - 1 - - - - - preferencesFontsPreview - True - True - True - image1 - True - - - - False - True - 2 - - - - - - - - - True - False - preferencesFonts - True - - - - - False - True - 2 - - - - - True - False - 0 - none - - - True - False - 6 - 12 - 12 - - - True - False - 6 - - - True - False - 12 - - - True - False - preferencesLanguagePreferred - - - False - True - 0 - - - - - True - False - True - preferencesLanguagePreferredTooltip - liststore_content_language - - - - - 0 - - - 1 - - - - - 1 - - - 0 - - - - - True - True - 1 - - - - - True - True - 0 - - - - - - - - - True - False - preferencesLanguage - True - - - - - False - True - 3 - - - - - 2 - - - - - True - False - preferencesContentTabtitle - - - 2 - False - - - - - True - False - 6 - - - True - False - 0 - none - - - True - False - 6 - 12 - 12 - - - True - False - 6 - - - preferencesGeneralReferral - True - True - False - True - - - - - True - True - 0 - - - - - preferencesGeneralDNT - True - True - False - True - - - - - True - True - 1 - - - - - - - - - True - False - preferencesGeneral - True - - - - - False - True - 6 - 0 - - - - - True - False - 0 - none - - - True - False - 6 - 12 - 12 - - - True - False - 6 - - - preferencesHistoryShow - True - True - False - True - - - - - True - True - 0 - - - - - True - False - 6 - - - True - False - preferencesHistoryRemember - - - False - True - 0 - - - - - True - True - 4 - - 4 - False - False - True - True - adjustment_history_age - 1 - True - if-valid - - - - - False - True - 1 - - - - - True - False - preferencesHistoryDays - - - False - True - 2 - - - - - True - True - 1 - - - - - - - - - True - False - preferencesHistory - True - - - - - False - True - 6 - 1 - - - - - True - False - 0 - none - - - True - False - 6 - 12 - 12 - - - True - False - 6 - - - True - False - 3 - 3 - 6 - 6 - - - True - False - 0 - preferencesCacheMemory - - - GTK_FILL - - - - - True - False - 0 - preferencesCacheDisc - - - 1 - 2 - GTK_FILL - - - - - True - False - 0 - preferencesCacheExpire - - - 2 - 3 - GTK_FILL - - - - - True - True - - 5 - False - False - True - True - adjustment_cache_memory_size - 1 - True - - - - - 1 - 2 - GTK_FILL - - - - - True - True - - 5 - False - False - True - True - adjustment_cache_disc_size - 1 - True - - - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - True - True - - 3 - False - False - True - True - adjustment_disc_cache_age - 1 - True - - - - - 1 - 2 - 2 - 3 - GTK_FILL - - - - - True - False - 0 - MB - - - 2 - 3 - GTK_FILL - - - - - True - False - 0 - MB - - - 2 - 3 - 1 - 2 - GTK_FILL - - - - - True - False - 0 - preferencesHistoryDays - - - 2 - 3 - 2 - 3 - GTK_FILL - - - - - True - True - 0 - - - - - True - False - - - - - - preferencesCacheMaintenance - True - True - True - - - False - True - 1 - - - - - True - True - 1 - - - - - - - - - True - False - preferencesCache - True - - - - - False - True - 6 - 2 - - - - - 3 - - - - - True - False - preferencesPrivacyTabtitle - - - 3 - False - - - - - True - False - 6 - - - True - False - 0 - none - - - True - False - 6 - 12 - 12 - - - True - False - 5 - 2 - 6 - 6 - - - True - False - 0 - preferencesProxyType - - - GTK_FILL - - - - - True - False - 0 - preferencesProxyHost - - - 1 - 2 - GTK_FILL - - - - - True - False - 0 - preferencesProxyUsername - - - 2 - 3 - GTK_FILL - - - - - True - False - 0 - preferencesProxyPassword - - - 3 - 4 - GTK_FILL - - - - - True - False - True - preferencesProxyTypeTooltip - liststore_proxy_type - - - - - - 0 - - - - - 1 - 2 - - - - - True - False - 6 - - - True - True - True - preferencesProxyHostTooltip - - False - False - True - True - - - - - True - True - 0 - - - - - True - False - : - - - False - True - 1 - - - - - True - True - True - preferencesProxyPortTooltip - 5 - - 5 - False - False - True - True - adjustment_proxy_port - 1 - True - if-valid - - - - - False - True - 2 - - - - - 1 - 2 - 1 - 2 - - - - - True - True - True - preferencesProxyUsernameTooltip - - False - False - True - True - - - - - 1 - 2 - 2 - 3 - - - - - True - True - True - preferencesProxyPasswordTooltip - False - - False - False - True - True - - - - - 1 - 2 - 3 - 4 - - - - - True - False - 0 - preferencesProxyNoproxy - - - 4 - 5 - GTK_FILL - - - - - True - True - True - preferencesProxyNoproxyTooltip - False - False - False - True - True - - - - - 1 - 2 - 4 - 5 - - - - - - - - - True - False - preferencesProxy - True - - - - - False - True - 6 - 0 - - - - - True - False - 0 - none - - - True - False - 6 - 12 - 12 - - - True - False - 3 - 2 - 6 - 6 - - - True - False - 0 - preferencesFetchingMax - - - GTK_FILL - - - - - True - False - 0 - preferencesFetchingPerhost - - - 1 - 2 - GTK_FILL - - - - - True - False - 0 - preferencesFetchingCached - - - 2 - 3 - GTK_FILL - - - - - True - True - True - preferencesFetchingMaxTooltip - - 3 - False - False - True - True - adjustment_fetching_max - 1 - True - - - - - 1 - 2 - GTK_FILL - - - - - True - True - True - preferencesFetchingPerhostTooltip - - 3 - False - False - True - True - adjustment_fetching_perhost - 1 - True - - - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - True - True - True - preferencesFetchingCachedTooltip. - - 3 - False - False - True - True - adjustment_fetching_cached - 1 - True - - - - - 1 - 2 - 2 - 3 - GTK_FILL - - - - - - - - - True - False - preferencesFetching - True - - - - - False - True - 6 - 1 - - - - - 4 - - - - - True - False - preferencesNetworkTabtitle - - - 4 - False - - - - - False - 6 - - - True - False - 0 - none - - - True - False - 6 - 12 - 12 - - - True - False - 6 - - - preferencesAppearanceImages - True - True - False - True - - - - - True - True - 0 - - - - - preferencesAppearanceBackground - True - True - False - True - - - - - True - True - 1 - - - - - preferencesAppearanceScalefit - True - True - False - True - - - - - True - True - 2 - - - - - True - False - 6 - - - True - False - preferencesAppearanceScale - - - False - True - 0 - - - - - True - True - 4 - - 4 - 1 - False - False - True - True - adjustment_pdf_scale - 1 - True - - - - - False - True - 1 - - - - - True - False - % - - - False - True - 2 - - - - - True - True - 3 - - - - - - - - - True - False - preferencesAppearance - True - - - - - False - True - 6 - 0 - - - - - True - False - 0 - none - - - True - False - 6 - 12 - 12 - - - True - False - 6 - - - True - False - - - True - False - preferencesMarginsMeasurements - - - False - True - 0 - - - - - - - - True - True - 0 - - - - - True - False - 3 - 3 - - - - - - - - - - - - True - False - 6 - - - True - False - Top - - - False - True - 0 - - - - - True - True - 4 - - 5 - 1 - False - False - True - True - 1 - 1 - True - - - - - False - True - 1 - - - - - 1 - 2 - GTK_EXPAND - - - - - True - False - 6 - - - True - False - Left - - - False - True - 0 - - - - - True - True - 4 - - 5 - 1 - False - False - True - True - adjustment_pdf_lmargin - 1 - 1 - True - - - - - False - True - 1 - - - - - 1 - 2 - GTK_EXPAND - - - - - True - False - 6 - - - True - False - Bottom - - - False - True - 0 - - - - - True - True - 4 - - 5 - 1 - False - False - True - True - 1 - 1 - True - - - - - False - True - 1 - - - - - 1 - 2 - 2 - 3 - GTK_EXPAND - - - - - True - False - 6 - - - True - False - Right - - - False - True - 0 - - - - - True - True - 4 - - 5 - 1 - False - False - True - True - 1 - 1 - True - - - - - False - True - 1 - - - - - 2 - 3 - 1 - 2 - GTK_EXPAND - - - - - - - - - - - True - True - 1 - - - - - - - - - True - False - preferencesMargins - True - - - - - False - True - 6 - 1 - - - - - True - False - 0 - none - - - True - False - 6 - 12 - 12 - - - True - False - 7 - - - preferencesGenerationCompressed - True - True - False - True - - - - - True - True - 0 - - - - - preferencesGenerationPassword - True - True - False - True - - - - - True - True - 1 - - - - - - - - - True - False - preferencesGeneration - True - - - - - False - True - 6 - 2 - - - - - 5 - - - - - True - False - preferencesPDFTabtitle - - - 5 - False - - - - - True - True - 1 - - - - - - help - close - - - diff --git a/frontends/gtk/res/options.gtk3.ui b/frontends/gtk/res/options.gtk3.ui deleted file mode 100644 index 82a3e175a..000000000 --- a/frontends/gtk/res/options.gtk3.ui +++ /dev/null @@ -1,3015 +0,0 @@ - - - - - 0.10000000000000001 - 10 - 0.10000000000000001 - 0.10000000000000001 - 1 - - - 4096 - 1024 - 4 - 16 - - - 1024 - 16 - 4 - 16 - - - 999 - 28 - 1 - 10 - - - 100 - 1 - 1 - 10 - - - 1 - 100 - 10 - 1 - 10 - - - 1 - 100 - 1 - 1 - 10 - - - 1 - 99.900000000000006 - 16 - 0.10000000000000001 - 2 - - - 999 - 28 - 1 - 28 - - - 999 - 1 - 10 - - - 1 - 1000 - 100 - 1 - 10 - - - 1 - 65535 - 3128 - 1 - 10 - - - False - 5 - preferencesTitle - center-on-parent - True - dialog - - - - - - True - False - vertical - 2 - - - True - False - - - gtk-help - False - True - True - False - False - True - - - False - False - 0 - - - - - gtk-close - False - True - True - False - False - True - - - False - False - 1 - - - - - False - True - end - 0 - - - - - True - True - - - True - False - vertical - start - 6 - - - True - False - 0 - none - - - True - False - 6 - 12 - 12 - - - True - False - vertical - 6 - - - True - False - horizontal - 12 - - - True - False - preferencesStartupPage - - - False - False - 0 - - - - - True - True - preferencesStartupPageTooltip - - - - - - True - True - end - 1 - - - - - True - True - 0 - - - - - True - False - horizontal - 6 - - - - - - preferencesStartupPageDefault - False - True - True - True - False - - - - False - False - end - 1 - - - - - preferencesStartupPageCurrent - False - True - True - True - False - - - - False - False - end - 2 - - - - - True - False - 1 - - - - - - - - - True - False - preferencesStartup - True - - - - - False - True - 6 - 0 - - - - - True - False - 0 - none - - - True - False - 6 - 12 - 12 - - - True - False - vertical - 6 - - - preferencesSearchURLBar - False - True - True - False - start - False - 0.5 - True - - - - - True - True - 0 - - - - - True - False - horizontal - 12 - - - True - False - preferencesSearchProvider - - - False - False - 0 - - - - - True - False - preferencesSearchProviderTooltip - start - liststore_search_provider - - - - - - 0 - - - - - True - True - 1 - - - - - True - True - 1 - - - - - - - - - True - False - preferencesSearch - True - - - - - False - True - 6 - 1 - - - - - True - False - 0 - none - - - True - False - 6 - 12 - 12 - - - True - False - vertical - 6 - - - preferencesDownloadsRemove - False - True - True - False - start - False - 0.5 - True - - - - - False - True - 0 - - - - - preferencesDownloadsConfirm - False - True - True - False - start - False - 0.5 - True - - - - - False - True - 1 - - - - - True - False - horizontal - 12 - - - True - False - preferencesDownloadsLocation - - - False - True - 0 - - - - - True - False - preferencesDownloadsLocationTooltip - start - select-folder - - - - - True - True - 1 - - - - - False - True - 2 - - - - - - - - - True - False - preferencesDownloads - True - - - - - False - True - 6 - 2 - - - - - - - True - False - preferencesMainTabtitle - - - False - - - - - True - False - vertical - start - 6 - - - True - False - 0 - none - - - True - False - 6 - 12 - 12 - - - True - False - vertical - 6 - - - preferencesTabsAlways - False - True - True - False - start - False - 0.5 - True - - - - - True - True - 0 - - - - - preferencesTabsSwitch - False - True - True - False - start - False - 0.5 - True - - - - - True - True - 1 - - - - - preferencesTabsNewly - False - True - True - False - start - False - 0.5 - True - - - - - True - True - 2 - - - - - True - False - horizontal - 12 - - - True - False - preferencesTabsPosition - - - False - False - 0 - - - - - True - False - start - liststore_tab_position - - - - - - 0 - - - - - True - True - 1 - - - - - True - True - 3 - - - - - - - - - True - False - preferencesTabs - True - - - - - False - True - 6 - 1 - - - - - True - False - 0 - none - - - True - False - 6 - 12 - 12 - - - True - False - vertical - 6 - - - True - False - horizontal - 12 - - - True - False - preferencesDeveloperView - - - False - True - 0 - - - - - True - False - start - liststore_developer_view - - - - - - 0 - - - - - True - True - 1 - - - - - True - True - 1 - - - - - - - - - True - False - preferencesTools - True - - - - - False - True - 6 - 2 - - - - - True - False - 0 - none - - - True - False - 6 - 12 - 12 - - - True - False - vertical - 6 - - - preferencesURLbarDisplay - False - True - True - False - start - False - 0.5 - True - - - - - True - True - 0 - - - - - - - - - True - False - preferencesURLbar - True - - - - - False - True - 7 - 3 - - - - - True - False - 0 - none - - - True - False - 6 - 12 - 12 - - - True - False - vertical - 6 - - - True - False - horizontal - 6 - - - True - False - preferencesToolbarButtons - - - False - True - 0 - - - - - True - False - start - liststore_toolbar_buttontype - - - - - - 0 - - - - - True - True - 1 - - - - - True - True - 0 - - - - - - - - - True - False - preferencesToolbar - True - - - - - False - True - 6 - 4 - - - - - 1 - - - - - True - False - preferencesAppearanceTabtitle - - - 1 - False - - - - - True - False - start - vertical - 6 - - - True - False - 0 - none - - - True - False - 6 - 12 - 12 - - - True - False - vertical - 6 - - - preferencesControlPrevent - False - True - True - False - start - False - 0.5 - True - - - - - False - False - 0 - - - - - preferencesControlHide - False - True - True - False - start - False - 0.5 - True - - - - - False - False - 1 - - - - - preferencesControlEnable - False - True - True - False - start - False - 0.5 - True - - - - - False - False - 2 - - - - - True - False - horizontal - 6 - - - True - False - preferencesControlLoad - - - False - True - 0 - - - - - True - False - start - liststore_image_loading - - - - - - 0 - - - - - True - True - 1 - - - - - True - True - 3 - - - - - - - - - True - False - preferencesControl - True - - - - - False - True - 6 - 0 - - - - - True - False - 0 - none - - - True - False - 6 - 12 - 12 - - - True - False - vertical - 6 - - - preferencesAnimationEnable - False - True - True - False - start - False - 0.5 - True - - - - - True - True - 0 - - - - - - - - - True - False - preferencesAnimation - True - - - - - False - True - 6 - 1 - - - - - True - False - 0 - none - - - True - False - 6 - 12 - 12 - - - True - False - horizontal - 12 - - - True - False - horizontal - 6 - - - True - False - preferencesFontsDefault - - - False - True - 0 - - - - - True - False - liststore_defaultfont - - - - - - 0 - - - - - True - True - 1 - - - - - True - True - 0 - - - - - True - False - horizontal - 6 - - - True - False - preferencesFontsSize - - - False - True - 0 - - - - - True - True - True - preferencesFontsSizeTooltip - 4 - - 4 - adjustment_font_default_size - 1 - 1 - True - - - - - False - True - 1 - - - - - False - True - 1 - - - - - preferencesFontsPreview - False - True - True - True - False - image1 - True - - - - False - True - 2 - - - - - - - - - True - False - preferencesFonts - True - - - - - False - True - 2 - - - - - True - False - 0 - none - - - True - False - 6 - 12 - 12 - - - True - False - vertical - 6 - - - True - False - horizontal - 12 - - - True - False - preferencesLanguagePreferred - - - False - True - 0 - - - - - True - False - True - preferencesLanguagePreferredTooltip - start - liststore_content_language - - - - - 0 - - - 1 - - - - - 1 - - - 0 - - - - - True - True - 1 - - - - - True - True - 0 - - - - - - - - - True - False - preferencesLanguage - True - - - - - False - True - 3 - - - - - 2 - - - - - True - False - preferencesContentTabtitle - - - 2 - False - - - - - True - False - start - vertical - 6 - - - True - False - 0 - none - - - True - False - 6 - 12 - 12 - - - True - False - vertical - 6 - - - preferencesGeneralReferral - False - True - True - False - start - False - 0.5 - True - - - - - True - True - 0 - - - - - preferencesGeneralDNT - False - True - True - False - start - False - 0.5 - True - - - - - True - True - 1 - - - - - - - - - True - False - preferencesGeneral - True - - - - - False - True - 6 - 0 - - - - - True - False - 0 - none - - - True - False - 6 - 12 - 12 - - - True - False - vertical - 6 - - - preferencesHistoryShow - False - True - True - False - start - False - 0.5 - True - - - - - True - True - 0 - - - - - True - False - horizontal - 6 - - - True - False - preferencesHistoryRemember - - - False - True - 0 - - - - - True - True - 4 - - 4 - adjustment_history_age - 1 - True - if-valid - - - - - False - True - 1 - - - - - True - False - preferencesHistoryDays - - - False - True - 2 - - - - - True - True - 1 - - - - - - - - - True - False - preferencesHistory - True - - - - - False - True - 6 - 1 - - - - - True - False - 0 - none - - - True - False - 6 - 12 - 12 - - - True - False - vertical - 6 - - - True - False - 3 - 3 - 6 - 6 - - - True - False - 0 - preferencesCacheMemory - - - GTK_FILL - - - - - True - False - 0 - preferencesCacheDisc - - - 1 - 2 - GTK_FILL - - - - - True - False - 0 - preferencesCacheExpire - - - 2 - 3 - GTK_FILL - - - - - True - True - - 5 - adjustment_cache_memory_size - 1 - True - - - - - 1 - 2 - GTK_FILL - - - - - True - True - - 5 - adjustment_cache_disc_size - 1 - True - - - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - True - True - - 3 - adjustment_disc_cache_age - 1 - True - - - - - 1 - 2 - 2 - 3 - GTK_FILL - - - - - True - False - 0 - MB - - - 2 - 3 - GTK_FILL - - - - - True - False - 0 - MB - - - 2 - 3 - 1 - 2 - GTK_FILL - - - - - True - False - 0 - preferencesCacheDays - - - 2 - 3 - 2 - 3 - GTK_FILL - - - - - True - True - 0 - - - - - True - False - horizontal - - - - - - preferencesCacheMaintenance - False - True - True - True - False - - - False - True - end - 1 - - - - - True - True - 1 - - - - - - - - - True - False - preferencesCache - True - - - - - False - True - 6 - 2 - - - - - 3 - - - - - True - False - preferencesPrivacyTabtitle - - - 3 - False - - - - - True - False - start - vertical - 6 - - - True - False - 0 - none - - - True - False - 6 - 12 - 12 - - - True - False - 5 - 2 - 6 - 6 - - - True - False - 0 - preferencesProxyType - - - GTK_FILL - - - - - True - False - 0 - preferencesProxyHost - - - 1 - 2 - GTK_FILL - - - - - True - False - 0 - preferencesProxyUsername - - - 2 - 3 - GTK_FILL - - - - - True - False - 0 - preferencesProxyPassword - - - 3 - 4 - GTK_FILL - - - - - True - False - True - preferencesProxyTypeTooltip - liststore_proxy_type - - - - - - 0 - - - - - 1 - 2 - - - - - True - False - horizontal - 6 - - - True - True - True - preferencesProxyHostTooltip - - - - - - True - True - 0 - - - - - True - False - : - - - False - True - 1 - - - - - True - True - True - preferencesProxyPortTooltip - 5 - - 5 - adjustment_proxy_port - 1 - True - if-valid - - - - - False - True - 2 - - - - - 1 - 2 - 1 - 2 - - - - - True - True - True - preferencesProxyUsernameTooltip - - - - - - 1 - 2 - 2 - 3 - - - - - True - True - True - preferencesProxyPasswordTooltip - False - - - - - - 1 - 2 - 3 - 4 - - - - - True - False - 0 - preferencesProxyNoproxy - - - 4 - 5 - GTK_FILL - - - - - True - True - True - preferencesProxyNoproxyTooltip - False - - - - - 1 - 2 - 4 - 5 - - - - - - - - - True - False - preferencesProxy - True - - - - - False - True - 6 - 0 - - - - - True - False - 0 - none - - - True - False - 6 - 12 - 12 - - - True - False - 3 - 2 - 6 - 6 - - - True - False - 0 - preferencesFetchingMax - - - GTK_FILL - - - - - True - False - 0 - preferencesFetchingPerhost - - - 1 - 2 - GTK_FILL - - - - - True - False - 0 - preferencesFetchingCached - - - 2 - 3 - GTK_FILL - - - - - True - True - True - preferencesFetchingMaxTooltip - - 3 - adjustment_fetching_max - 1 - True - - - - - 1 - 2 - GTK_FILL - - - - - True - True - True - preferencesFetchingPerhostTooltip - - 3 - adjustment_fetching_perhost - 1 - True - - - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - True - True - True - preferencesFetchingCachedTooltip - - 3 - adjustment_fetching_cached - 1 - True - - - - - 1 - 2 - 2 - 3 - GTK_FILL - - - - - - - - - True - False - preferencesFetching - True - - - - - False - True - 6 - 1 - - - - - 4 - - - - - True - False - preferencesNetworkTabtitle - - - 4 - False - - - - - True - False - start - vertical - 6 - - - True - False - 0 - none - - - True - False - 6 - 12 - 12 - - - True - False - vertical - 6 - - - preferencesAppearanceImages - False - True - True - False - start - False - 0.5 - True - - - - - True - True - 0 - - - - - preferencesAppearanceBackground - False - True - True - False - start - False - 0.5 - True - - - - - True - True - 1 - - - - - preferencesAppearanceScalefit - False - True - True - False - start - False - 0.5 - True - - - - - True - True - 2 - - - - - True - False - horizontal - 6 - - - True - False - preferencesAppearanceScale - - - False - True - 0 - - - - - True - True - 4 - - 4 - 1 - adjustment_pdf_scale - 1 - True - - - - - False - True - 1 - - - - - True - False - % - - - False - True - 2 - - - - - True - True - 3 - - - - - - - - - True - False - preferencesAppearance - True - - - - - False - True - 6 - 0 - - - - - True - False - 0 - none - - - True - False - 6 - 12 - 12 - - - True - False - vertical - 6 - - - True - False - horizontal - - - True - False - preferencesMarginsMeasurements - - - False - True - 0 - - - - - - - - True - True - 0 - - - - - True - False - 3 - 3 - - - - - - - - - - - - True - False - horizontal - 6 - - - True - False - Top - - - False - True - 0 - - - - - True - True - 4 - - 5 - 1 - 1 - 1 - True - - - - - False - True - 1 - - - - - 1 - 2 - GTK_EXPAND - - - - - True - False - horizontal - 6 - - - True - False - Left - - - False - True - 0 - - - - - True - True - 4 - - 5 - 1 - adjustment_pdf_lmargin - 1 - 1 - True - - - - - False - True - 1 - - - - - 1 - 2 - GTK_EXPAND - - - - - True - False - horizontal - 6 - - - True - False - Bottom - - - False - True - 0 - - - - - True - True - 4 - - 5 - 1 - 1 - 1 - True - - - - - False - True - 1 - - - - - 1 - 2 - 2 - 3 - GTK_EXPAND - - - - - True - False - horizontal - 6 - - - True - False - Right - - - False - True - 0 - - - - - True - True - 4 - - 5 - 1 - 1 - 1 - True - - - - - False - True - 1 - - - - - 2 - 3 - 1 - 2 - GTK_EXPAND - - - - - - - - - - - - - - - - - - - - - - - - - - True - True - 1 - - - - - - - - - True - False - preferencesMargins - True - - - - - False - True - 6 - 1 - - - - - True - False - 0 - none - - - True - False - 6 - 12 - 12 - - - True - False - vertical - 7 - - - preferencesGenerationCompressed - False - True - True - False - start - False - 0.5 - True - - - - - True - True - 0 - - - - - preferencesGenerationPassword - False - True - True - False - start - False - 0.5 - True - - - - - True - True - 1 - - - - - - - - - True - False - preferencesGeneration - True - - - - - False - True - 6 - 2 - - - - - 5 - - - - - True - False - preferencesPDFTabtitle - - - 5 - False - - - - - False - True - 1 - - - - - - help - close - - - - True - False - 3 - gtk-apply - - - - - - - - - - - en - English - - - - - - - - - - - preferencesFonttypeSans - - - preferencesFonttypeSerif - - - preferencesFonttypeMonospace - - - preferencesFonttypeCursive - - - preferencesFonttypeFantasy - - - - - - - - - - - preferencesDeveloperViewWindow - - - preferencesDeveloperViewTab - - - preferencesDeveloperViewEditor - - - - - - - - - - - preferencesImageLoadBoth - - - preferencesImageLoadFore - - - preferencesImageLoadBack - - - preferencesImageLoadNone - - - - - - - - - - - preferencesProxyTypeDirect - - - preferencesProxyTypeManual - - - preferencesProxyTypeBasic - - - preferencesProxyTypeNLTM - - - preferencesProxyTypeSystem - - - - - - - - - - - Google - - - Yahoo! - - - Microsoft Live - - - Buisiness.com - - - Omgili - - - BBC News - - - Ubuntu Packages - - - Creative Commons - - - Ask - - - Answers - - - Dictionary.com - - - YouTube - - - AeroMP3 - - - AOL - - - Baidu - - - Amazon - - - Ebay - - - IMBD - - - ESPN - - - Wikipedia - - - DuckDuckGo - - - - - - - - - - - preferencesTabLocTop - - - preferencesTabLocLeft - - - preferencesTabLocRight - - - preferencesTabLocBottom - - - - - - - - - - - preferencesButtonTypeSmall - - - preferencesButtonTypeLarge - - - preferencesButtonTypeLargeText - - - preferencesButtonTypeText - - - - diff --git a/frontends/gtk/res/pageinfo.gtk2.ui b/frontends/gtk/res/pageinfo.gtk2.ui deleted file mode 100644 index 3d541d653..000000000 --- a/frontends/gtk/res/pageinfo.gtk2.ui +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - GTK_WINDOW_POPUP - False - - - True - False - GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK - - - - diff --git a/frontends/gtk/res/pageinfo.gtk3.ui b/frontends/gtk/res/pageinfo.gtk3.ui deleted file mode 100644 index fdee5ac8d..000000000 --- a/frontends/gtk/res/pageinfo.gtk3.ui +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - GTK_WINDOW_POPUP - False - GDK_POINTER_MOTION_MASK | GDK_BUTTON_MOTION_MASK | GDK_STRUCTURE_MASK - False - - - - - - PGIDrawingArea - True - False - 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 - - - - diff --git a/frontends/gtk/res/password.gtk2.ui b/frontends/gtk/res/password.gtk2.ui deleted file mode 100644 index eb51e4f8f..000000000 --- a/frontends/gtk/res/password.gtk2.ui +++ /dev/null @@ -1,415 +0,0 @@ - - - - - PDF Password - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER - True - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - True - False - 0 - - - True - 6 - gtk-dialog-authentication - 0.5 - 0.10000000149 - 12 - 0 - - - 0 - False - False - - - - - 5 - True - False - 0 - - - 5 - True - True - 0 - - - True - Owner password - False - False - GTK_JUSTIFY_LEFT - False - False - 0.899999976158 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - 15 - False - 0 - - - 0 - False - True - - - - - True - True - True - False - 20 - - True - - False - 20 - - - 0 - False - False - - - - - 0 - False - False - - - - - 5 - True - True - 0 - - - True - Repeat password - False - False - GTK_JUSTIFY_LEFT - False - False - 0.899999976158 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - 15 - False - 0 - - - 0 - False - True - - - - - True - True - True - False - 20 - - True - - False - 20 - - - 0 - False - False - - - - - 0 - False - False - - - - - 5 - True - True - 0 - - - True - User password - False - False - GTK_JUSTIFY_LEFT - False - False - 0.899999976158 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - 15 - False - 0 - - - 0 - False - True - - - - - True - True - True - False - 20 - - True - - False - 20 - - - 0 - False - False - - - - - 0 - False - False - - - - - 5 - True - True - 0 - - - True - Repeat password - False - False - GTK_JUSTIFY_LEFT - False - False - 0.899999976158 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - 15 - False - 0 - - - 0 - False - True - - - - - True - True - True - False - 20 - - True - - False - 20 - - - 0 - False - False - - - - - 0 - False - False - - - - - 5 - True - GTK_BUTTONBOX_END - 10 - - - True - True - GTK_RELIEF_NORMAL - True - - - True - False - 0 - - - True - gtk-dialog-authentication - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - True - Use these as passwords - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - True - True - - - - - - - - - True - True - GTK_RELIEF_NORMAL - True - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 0 - 0 - - - True - False - 0 - - - True - gtk-cancel - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - True - Do not set any passwords - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - True - True - - - - - - - - - - - 0 - False - False - - - - - 0 - True - True - - - - - - diff --git a/frontends/gtk/res/password.gtk3.ui b/frontends/gtk/res/password.gtk3.ui deleted file mode 100644 index eb51e4f8f..000000000 --- a/frontends/gtk/res/password.gtk3.ui +++ /dev/null @@ -1,415 +0,0 @@ - - - - - PDF Password - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER - True - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - True - False - 0 - - - True - 6 - gtk-dialog-authentication - 0.5 - 0.10000000149 - 12 - 0 - - - 0 - False - False - - - - - 5 - True - False - 0 - - - 5 - True - True - 0 - - - True - Owner password - False - False - GTK_JUSTIFY_LEFT - False - False - 0.899999976158 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - 15 - False - 0 - - - 0 - False - True - - - - - True - True - True - False - 20 - - True - - False - 20 - - - 0 - False - False - - - - - 0 - False - False - - - - - 5 - True - True - 0 - - - True - Repeat password - False - False - GTK_JUSTIFY_LEFT - False - False - 0.899999976158 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - 15 - False - 0 - - - 0 - False - True - - - - - True - True - True - False - 20 - - True - - False - 20 - - - 0 - False - False - - - - - 0 - False - False - - - - - 5 - True - True - 0 - - - True - User password - False - False - GTK_JUSTIFY_LEFT - False - False - 0.899999976158 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - 15 - False - 0 - - - 0 - False - True - - - - - True - True - True - False - 20 - - True - - False - 20 - - - 0 - False - False - - - - - 0 - False - False - - - - - 5 - True - True - 0 - - - True - Repeat password - False - False - GTK_JUSTIFY_LEFT - False - False - 0.899999976158 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - 15 - False - 0 - - - 0 - False - True - - - - - True - True - True - False - 20 - - True - - False - 20 - - - 0 - False - False - - - - - 0 - False - False - - - - - 5 - True - GTK_BUTTONBOX_END - 10 - - - True - True - GTK_RELIEF_NORMAL - True - - - True - False - 0 - - - True - gtk-dialog-authentication - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - True - Use these as passwords - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - True - True - - - - - - - - - True - True - GTK_RELIEF_NORMAL - True - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 0 - 0 - - - True - False - 0 - - - True - gtk-cancel - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - True - Do not set any passwords - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - True - True - - - - - - - - - - - 0 - False - False - - - - - 0 - True - True - - - - - - diff --git a/frontends/gtk/res/tabcontents.gtk2.ui b/frontends/gtk/res/tabcontents.gtk2.ui deleted file mode 100644 index c47e6a2ef..000000000 --- a/frontends/gtk/res/tabcontents.gtk2.ui +++ /dev/null @@ -1,229 +0,0 @@ - - - - - - 100 - 30 - 10 - 10 - - - 100 - 30 - 10 - 10 - - - True - False - - - True - False - both-horiz - - - False - False - 1 - - - - - False - both - - - True - False - - - True - True - False - False - True - True - - - - - True - - - - - True - False - gtkFindBack - True - go-up - - - False - True - - - - - True - False - gtkFindForward - True - go-down - - - False - True - - - - - True - False - - - gtkFindHighlightAll - True - True - False - show all matches - True - True - - - - - False - - - - - True - False - - - gtkFindMatchCase - True - True - False - Match case when searching - none - True - True - - - - - False - - - - - True - False - gtkFindClose - window-close - - - False - True - - - - - False - False - 2 - - - - - True - False - 2 - 2 - - - True - True - False - GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_STRUCTURE_MASK | GDK_SCROLL_MASK - layouthadjustment - layoutvadjustment - - - - - 1 - True - False - 2 - - - 1 - 2 - 1 - 2 - GTK_FILL - GTK_FILL - - - - - True - True - - - 1 - True - False - 0 - 4 - Status - - - False - False - - - - - True - False - layouthadjustment - - - True - True - - - - - 1 - 2 - GTK_FILL - - - - - True - False - layoutvadjustment - - - 1 - 2 - - - - - - True - True - 3 - - - - diff --git a/frontends/gtk/res/tabcontents.gtk3.ui b/frontends/gtk/res/tabcontents.gtk3.ui deleted file mode 100644 index b07cf92e0..000000000 --- a/frontends/gtk/res/tabcontents.gtk3.ui +++ /dev/null @@ -1,229 +0,0 @@ - - - - - - 100 - 1 - 10 - - - 100 - 1 - 10 - - - True - False - vertical - - - True - False - both - - - False - False - 1 - - - - - False - both - - - False - True - False - - - True - True - - gtkFindPlaceholder - - - - - True - False - - - - - False - True - False - gtkFindBack - gtkFindBack - True - gtk-go-up - - - False - True - - - - - False - True - False - gtkFindForward - gtkFindForward - True - gtk-go-down - - - False - True - - - - - False - True - False - - - gtkFindHighlightAll - False - True - True - False - 0 - True - - - - - False - False - - - - - False - True - False - - - gtkFindMatchCase - False - True - True - False - 0 - True - - - - - False - False - - - - - False - True - False - gtkFindClose - gtkFindClose - gtk-close - - - False - True - - - - - False - False - 2 - - - - - True - False - 2 - 2 - - - True - True - False - GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_STRUCTURE_MASK | GDK_SCROLL_MASK - layouthadjustment - layoutvadjustment - - - 0 - 0 - - - - - True - False - True - vertical - layoutvadjustment - - - 1 - 0 - - - - - True - True - True - - - True - False - 4 - Status - True - 0 - - - False - True - - - - - True - False - layouthadjustment - - - True - True - - - - - 0 - 1 - - - - - - - - True - True - 3 - - - - diff --git a/frontends/gtk/res/toolbar.gtk2.ui b/frontends/gtk/res/toolbar.gtk2.ui deleted file mode 100644 index 61723065b..000000000 --- a/frontends/gtk/res/toolbar.gtk2.ui +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - True - False - - - True - False - - - False - True - 0 - - - - - True - False - 0 - 6 - gtkCustomizeToolbarInstructions - - - False - True - 6 - 1 - - - - - True - True - automatic - automatic - - - True - False - - - True - False - - - - - - - - - - - - - True - True - 2 - - - - - True - False - end - - - Reset to defaults - True - True - True - - - False - False - 0 - - - - - gtk-discard - True - True - True - True - - - False - False - 1 - - - - - gtk-apply - True - True - True - True - - - False - False - 2 - - - - - False - False - 6 - 3 - - - - diff --git a/frontends/gtk/res/toolbar.gtk3.ui b/frontends/gtk/res/toolbar.gtk3.ui deleted file mode 100644 index 60452f472..000000000 --- a/frontends/gtk/res/toolbar.gtk3.ui +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - True - False - gtk-refresh - - - True - False - vertical - - - True - False - - - False - True - 0 - - - - - True - False - 6 - gtkCustomizeToolbarInstructions - True - 0 - - - False - True - 6 - 1 - - - - - True - True - in - - - True - False - - - True - False - vertical - - - - - - - - - - True - True - 2 - - - - - True - False - end - - - Reset - True - True - True - image2 - - - True - True - 0 - - - - - gtk-discard - True - True - True - True - - - True - True - 1 - - - - - gtk-apply - True - True - True - True - - - True - True - 2 - - - - - False - False - 6 - 3 - - - - 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 @@ + + + + cookies.ui + downloads.ui + globalhistory.ui + hotlist.ui + localhistory.ui + netsurf.ui + options.ui + pageinfo.ui + password.ui + tabcontents.ui + toolbar.ui + viewdata.ui + warning.ui + + diff --git a/frontends/gtk/res/viewdata.gtk2.ui b/frontends/gtk/res/viewdata.gtk2.ui deleted file mode 100644 index 7589022ca..000000000 --- a/frontends/gtk/res/viewdata.gtk2.ui +++ /dev/null @@ -1,204 +0,0 @@ - - - - - - 640 - 480 - - - True - vertical - - - True - - - True - _File - True - - - True - - - gtk-save-as - True - True - True - - - - - - gtk-print - True - True - True - - - - - - True - - - - - gtk-close - True - True - True - - - - - - - - - True - _Edit - True - - - True - - - gtk-select-all - True - True - True - - - - - - gtk-cut - True - True - True - - - - - gtk-copy - True - True - True - - - - - gtk-paste - True - True - True - - - - - gtk-delete - True - True - True - - - - - - - - - - True - _View - True - - - True - - - gtk-zoom-in - True - True - True - - - - - - gtk-zoom-out - True - True - True - - - - - - gtk-zoom-100 - True - True - True - - - - - - - - - - True - _Help - True - - - True - - - gtk-about - True - True - True - - - - - - - - - False - 0 - - - - - True - True - automatic - automatic - - - True - True - 1 - 1 - False - word - 3 - 3 - False - - - - - 1 - - - - - - diff --git a/frontends/gtk/res/viewdata.gtk3.ui b/frontends/gtk/res/viewdata.gtk3.ui deleted file mode 100644 index b742d5f6b..000000000 --- a/frontends/gtk/res/viewdata.gtk3.ui +++ /dev/null @@ -1,239 +0,0 @@ - - - - - False - 640 - 480 - - - True - False - vertical - - - True - False - - - False - True - False - _File - True - - - True - False - - - gtk-save-as - False - True - False - True - True - - - - - gtk-print - False - True - False - True - True - - - - - False - True - False - - - - - gtk-close - False - True - False - True - True - - - - - - - - - False - True - False - _Edit - True - - - True - False - - - gtk-select-all - False - True - False - True - True - - - - - gtk-cut - False - True - False - True - True - - - - - gtk-copy - False - True - False - True - True - - - - - gtk-paste - False - True - False - True - True - - - - - gtk-delete - False - True - False - True - True - - - - - - - - - False - True - False - _View - True - - - True - False - - - gtk-zoom-in - False - True - False - True - True - - - - - gtk-zoom-out - False - True - False - True - True - - - - - gtk-zoom-100 - False - True - False - True - True - - - - - - - - - False - True - False - _Help - True - - - True - False - - - gtk-about - False - True - False - True - True - - - - - - - - - False - True - 0 - - - - - True - True - bottom-right - - - True - True - 1 - 1 - False - word - 3 - 3 - False - - - - - True - True - 1 - - - - - - diff --git a/frontends/gtk/res/warning.gtk2.ui b/frontends/gtk/res/warning.gtk2.ui deleted file mode 100644 index e4fb4e662..000000000 --- a/frontends/gtk/res/warning.gtk2.ui +++ /dev/null @@ -1,77 +0,0 @@ - - - - - Warning from NetSurf - GTK_WIN_POS_CENTER - gtk-dialog-warning - GDK_WINDOW_TYPE_HINT_DIALOG - True - - - True - 2 - - - True - 3 - - - True - 12 - 6 - gtk-dialog-warning - - - False - False - - - - - True - Help help help! I'm being held prisoner by a bunch of RISC OS zealots! - True - - - 1 - 1 - - - - - - - True - - - False - 3 - 1 - - - - - True - GTK_BUTTONBOX_END - - - True - True - True - gtk-ok - True - - - - - - False - False - 2 - - - - - - diff --git a/frontends/gtk/res/warning.gtk3.ui b/frontends/gtk/res/warning.gtk3.ui deleted file mode 100644 index e4fb4e662..000000000 --- a/frontends/gtk/res/warning.gtk3.ui +++ /dev/null @@ -1,77 +0,0 @@ - - - - - Warning from NetSurf - GTK_WIN_POS_CENTER - gtk-dialog-warning - GDK_WINDOW_TYPE_HINT_DIALOG - True - - - True - 2 - - - True - 3 - - - True - 12 - 6 - gtk-dialog-warning - - - False - False - - - - - True - Help help help! I'm being held prisoner by a bunch of RISC OS zealots! - True - - - 1 - 1 - - - - - - - True - - - False - 3 - 1 - - - - - True - GTK_BUTTONBOX_END - - - True - True - True - gtk-ok - True - - - - - - False - False - 2 - - - - - - diff --git a/frontends/gtk/resources.c b/frontends/gtk/resources.c index 432ddb8b5..fc17f7418 100644 --- a/frontends/gtk/resources.c +++ b/frontends/gtk/resources.c @@ -345,11 +345,6 @@ init_pixbuf_resource(char **respath, struct nsgtk_resource_s *resource) */ static nserror init_ui_resource(char **respath, struct nsgtk_resource_s *ui_res) { -#if GTK_CHECK_VERSION(3,0,0) - int gtkv = 3; -#else - int gtkv = 2; -#endif int resnamelen; char *resname; struct nsgtk_resource_s resource; @@ -361,7 +356,7 @@ static nserror init_ui_resource(char **respath, struct nsgtk_resource_s *ui_res) if (resname == NULL) { return NSERROR_NOMEM; } - snprintf(resname, resnamelen, "%s.gtk%d.ui", ui_res->name, gtkv); + snprintf(resname, resnamelen, "%s.ui", ui_res->name); resource.name = resname; resource.len = ui_res->len; resource.path = NULL; -- cgit v1.2.3