[epiphany] Rearrange preferences to four content pages



commit 115f4e29cf5a20a67dd5f786785d2763f09a39d7
Author: Jan-Michael Brummer <jan brummer tabos org>
Date:   Fri Dec 27 16:32:48 2019 +0100

    Rearrange preferences to four content pages
    
    Move language part into general page and create a new privacy section containing personal data.

 src/resources/gtk/prefs-dialog.ui | 663 ++++++++++++++++++--------------------
 1 file changed, 320 insertions(+), 343 deletions(-)
---
diff --git a/src/resources/gtk/prefs-dialog.ui b/src/resources/gtk/prefs-dialog.ui
index 5dd4baad4..b9e97affd 100644
--- a/src/resources/gtk/prefs-dialog.ui
+++ b/src/resources/gtk/prefs-dialog.ui
@@ -143,69 +143,6 @@
                     </child>
                   </object>
                 </child>
-                <child>
-                  <object class="HdyPreferencesGroup" id="browsing_box">
-                    <property name="title" translatable="yes">Browsing</property>
-                    <property name="visible">True</property>
-                    <child>
-                      <object class="HdyActionRow">
-                        <property name="activatable_widget">enable_smooth_scrolling_switch</property>
-                        <property name="title" translatable="yes">Enable sm_ooth scrolling</property>
-                        <property name="use_underline">True</property>
-                        <property name="visible">True</property>
-                        <child type="action">
-                          <object class="GtkSwitch" id="enable_smooth_scrolling_switch">
-                            <property name="valign">center</property>
-                            <property name="visible">True</property>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="HdyActionRow">
-                        <property name="activatable_widget">enable_mouse_gesture_switch</property>
-                        <property name="title" translatable="yes">Enable mouse _gesture</property>
-                        <property name="use_underline">True</property>
-                        <property name="visible">True</property>
-                        <child type="action">
-                          <object class="GtkSwitch" id="enable_mouse_gesture_switch">
-                            <property name="valign">center</property>
-                            <property name="visible">True</property>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="HdyPreferencesGroup" id="download_box">
-                    <property name="title" translatable="yes">Downloads</property>
-                    <property name="visible">True</property>
-                    <child>
-                      <object class="HdyActionRow">
-                        <property name="activatable_widget">ask_on_download_switch</property>
-                        <property name="title" translatable="yes">Always ask o_n download</property>
-                        <property name="use_underline">True</property>
-                        <property name="visible">True</property>
-                        <child type="action">
-                          <object class="GtkSwitch" id="ask_on_download_switch">
-                            <property name="margin-start">12</property>
-                            <property name="valign">center</property>
-                            <property name="visible">True</property>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="HdyActionRow" id="download_folder_row">
-                        <property name="sensitive" bind-source="ask_on_download_switch" 
bind-property="active" bind-flags="sync-create|invert-boolean"/>
-                        <property name="title" translatable="yes">_Download folder</property>
-                        <property name="use_underline">True</property>
-                        <property name="visible">True</property>
-                      </object>
-                    </child>
-                  </object>
-                </child>
                 <child>
                   <object class="HdyPreferencesGroup" id="homepage_box">
                     <property name="title" translatable="yes">Homepage</property>
@@ -264,6 +201,35 @@
                     </child>
                   </object>
                 </child>
+                <child>
+                  <object class="HdyPreferencesGroup" id="download_box">
+                    <property name="title" translatable="yes">Downloads</property>
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="HdyActionRow">
+                        <property name="activatable_widget">ask_on_download_switch</property>
+                        <property name="title" translatable="yes">Always ask o_n download</property>
+                        <property name="use_underline">True</property>
+                        <property name="visible">True</property>
+                        <child type="action">
+                          <object class="GtkSwitch" id="ask_on_download_switch">
+                            <property name="margin-start">12</property>
+                            <property name="valign">center</property>
+                            <property name="visible">True</property>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="HdyActionRow" id="download_folder_row">
+                        <property name="sensitive" bind-source="ask_on_download_switch" 
bind-property="active" bind-flags="sync-create|invert-boolean"/>
+                        <property name="title" translatable="yes">_Download folder</property>
+                        <property name="use_underline">True</property>
+                        <property name="visible">True</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
                 <child>
                   <object class="HdyPreferencesGroup" id="search_box">
                     <property name="title" translatable="yes">Search Engines</property>
@@ -331,31 +297,17 @@
                   </object>
                 </child>
                 <child>
-                  <object class="HdyPreferencesGroup">
-                    <property name="title" translatable="yes">Web Content</property>
+                  <object class="HdyPreferencesGroup" id="browsing_box">
+                    <property name="title" translatable="yes">Browsing</property>
                     <property name="visible">True</property>
-                    <child>
-                      <object class="HdyActionRow" id="adblock_allow_row">
-                        <property name="activatable_widget">adblock_allow_switch</property>
-                        <property name="title" translatable="yes">Try to block _advertisements</property>
-                        <property name="use_underline">True</property>
-                        <property name="visible">True</property>
-                        <child type="action">
-                          <object class="GtkSwitch" id="adblock_allow_switch">
-                            <property name="valign">center</property>
-                            <property name="visible">True</property>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
                     <child>
                       <object class="HdyActionRow">
-                        <property name="activatable_widget">popups_allow_switch</property>
-                        <property name="title" translatable="yes">Block popup _windows</property>
+                        <property name="activatable_widget">enable_smooth_scrolling_switch</property>
+                        <property name="title" translatable="yes">Enable sm_ooth scrolling</property>
                         <property name="use_underline">True</property>
                         <property name="visible">True</property>
                         <child type="action">
-                          <object class="GtkSwitch" id="popups_allow_switch">
+                          <object class="GtkSwitch" id="enable_smooth_scrolling_switch">
                             <property name="valign">center</property>
                             <property name="visible">True</property>
                           </object>
@@ -364,12 +316,12 @@
                     </child>
                     <child>
                       <object class="HdyActionRow">
-                        <property name="activatable_widget">enable_safe_browsing_switch</property>
-                        <property name="title" translatable="yes">Try to block dangerous web_sites</property>
+                        <property name="activatable_widget">enable_mouse_gesture_switch</property>
+                        <property name="title" translatable="yes">Enable mouse _gesture</property>
                         <property name="use_underline">True</property>
                         <property name="visible">True</property>
                         <child type="action">
-                          <object class="GtkSwitch" id="enable_safe_browsing_switch">
+                          <object class="GtkSwitch" id="enable_mouse_gesture_switch">
                             <property name="valign">center</property>
                             <property name="visible">True</property>
                           </object>
@@ -378,86 +330,150 @@
                     </child>
                   </object>
                 </child>
-              </object>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">General</property>
-              </object>
-              <packing>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="HdyPreferencesPage">
-                <property name="icon_name">document-edit-symbolic</property>
-                <property name="title" translatable="yes">Fonts &amp; Style</property>
-                <property name="visible">True</property>
-                <style>
-                  <class name="background"/>
-                </style>
                 <child>
                   <object class="HdyPreferencesGroup">
-                    <property name="title" translatable="yes">Fonts</property>
+                    <property name="title" translatable="yes">Languages</property>
                     <property name="visible">True</property>
                     <child>
-                      <object class="HdyExpanderRow" id="use_gnome_fonts_row">
-                        <property name="show_enable_switch">True</property>
-                        <property name="title" translatable="yes">Use custom fonts</property>
+                      <object class="GtkBox">
+                        <property name="orientation">vertical</property>
                         <property name="visible">True</property>
                         <child>
-                          <object class="GtkSeparator">
-                            <property name="margin-start">24</property>
+                          <object class="GtkFrame">
                             <property name="visible">True</property>
+                            <property name="hexpand">True</property>
+                            <child>
+                              <object class="GtkTreeView" id="lang_treeview">
+                                <property name="visible">True</property>
+                                <property name="headers-visible">False</property>
+                                <property name="fixed-height-mode">True</property>
+                                <child internal-child="selection">
+                                  <object class="GtkTreeSelection" id="treeview-selection"/>
+                                </child>
+                              </object>
+                            </child>
                           </object>
                         </child>
                         <child>
-                          <object class="GtkListBox" id="use_custom_fonts_list">
-                            <property name="margin-start">24</property>
-                            <property name="selection_mode">none</property>
+                          <object class="GtkToolbar">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="toolbar_style">icons</property>
+                            <property name="show_arrow">False</property>
+                            <property name="icon_size">1</property>
+                            <style>
+                              <class name="inline-toolbar"/>
+                            </style>
                             <child>
-                              <object class="HdyActionRow">
-                                <property name="activatable">False</property>
-                                <property name="title" translatable="yes">Sans serif font</property>
+                              <object class="GtkToolItem">
                                 <property name="visible">True</property>
-                                <child type="action">
-                                  <object class="GtkFontButton" id="sans_fontbutton">
-                                    <property name="font">Sans 12</property>
-                                    <property name="use-font">True</property>
-                                    <property name="valign">center</property>
+                                <property name="can_focus">False</property>
+                                <child>
+                                  <object class="GtkBox">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <child>
+                                      <object class="GtkButton" id="lang_add_button">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">True</property>
+                                        <child internal-child="accessible">
+                                          <object class="AtkObject">
+                                            <property name="accessible-name" translatable="yes">Add 
language</property>
+                                          </object>
+                                        </child>
+                                        <child>
+                                          <object class="GtkImage">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="icon_name">list-add-symbolic</property>
+                                            <property name="icon-size">1</property>
+                                          </object>
+                                        </child>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkButton" id="lang_remove_button">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">True</property>
+                                        <child internal-child="accessible">
+                                          <object class="AtkObject">
+                                            <property name="accessible-name" translatable="yes">Remove 
language</property>
+                                          </object>
+                                        </child>
+                                        <child>
+                                          <object class="GtkImage">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="icon_name">list-remove-symbolic</property>
+                                            <property name="icon-size">1</property>
+                                          </object>
+                                        </child>
+                                      </object>
+                                    </child>
                                   </object>
                                 </child>
                               </object>
                             </child>
                             <child>
-                              <object class="HdyActionRow">
-                                <property name="activatable">False</property>
-                                <property name="title" translatable="yes">Serif font</property>
+                              <object class="GtkSeparatorToolItem">
                                 <property name="visible">True</property>
-                                <child type="action">
-                                  <object class="GtkFontButton" id="serif_fontbutton">
-                                    <property name="font">Sans 12</property>
-                                    <property name="use-font">True</property>
-                                    <property name="valign">center</property>
-                                    <property name="visible">True</property>
-                                  </object>
-                                </child>
+                                <property name="can_focus">False</property>
+                                <property name="draw">False</property>
                               </object>
+                              <packing>
+                                <property name="expand">True</property>
+                              </packing>
                             </child>
                             <child>
-                              <object class="HdyActionRow">
-                                <property name="activatable">False</property>
-                                <property name="title" translatable="yes">Monospace font</property>
+                              <object class="GtkToolItem">
                                 <property name="visible">True</property>
-                                <child type="action">
-                                  <object class="GtkFontButton" id="mono_fontbutton">
-                                    <property name="font">Sans 12</property>
-                                    <property name="use-font">True</property>
-                                    <property name="valign">center</property>
+                                <property name="can_focus">False</property>
+                                <child>
+                                  <object class="GtkBox">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <child>
+                                      <object class="GtkButton" id="lang_up_button">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">True</property>
+                                        <child internal-child="accessible">
+                                          <object class="AtkObject">
+                                            <property name="accessible-name" translatable="yes">Move 
language up</property>
+                                          </object>
+                                        </child>
+                                        <child>
+                                          <object class="GtkImage">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="icon_name">go-up-symbolic</property>
+                                            <property name="icon-size">1</property>
+                                          </object>
+                                        </child>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkButton" id="lang_down_button">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">True</property>
+                                        <child internal-child="accessible">
+                                          <object class="AtkObject">
+                                            <property name="accessible-name" translatable="yes">Move 
language down</property>
+                                          </object>
+                                        </child>
+                                        <child>
+                                          <object class="GtkImage">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="icon_name">go-down-symbolic</property>
+                                            <property name="icon-size">1</property>
+                                          </object>
+                                        </child>
+                                      </object>
+                                    </child>
                                   </object>
                                 </child>
                               </object>
@@ -469,61 +485,70 @@
                   </object>
                 </child>
                 <child>
-                  <object class="HdyPreferencesGroup" id="reader_mode_box">
-                    <property name="title" translatable="yes">Reader Mode</property>
+                  <object class="HdyPreferencesGroup">
+                    <property name="title" translatable="yes"></property>
                     <property name="visible">True</property>
                     <child>
-                      <object class="HdyComboRow" id="reader_mode_font_style">
-                        <property name="title" translatable="yes">Font style</property>
-                        <property name="visible">True</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="HdyComboRow" id="reader_mode_color_scheme">
-                        <property name="title" translatable="yes">Color scheme</property>
+                      <object class="HdyActionRow">
+                        <property name="activatable_widget">enable_spell_checking_switch</property>
+                        <property name="title" translatable="yes">_Enable spell checking</property>
+                        <property name="use_underline">True</property>
                         <property name="visible">True</property>
+                        <child type="action">
+                          <object class="GtkSwitch" id="enable_spell_checking_switch">
+                            <property name="valign">center</property>
+                            <property name="visible">True</property>
+                          </object>
+                        </child>
                       </object>
                     </child>
                   </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">3</property>
-                  </packing>
                 </child>
+              </object>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">General</property>
+              </object>
+              <packing>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="HdyPreferencesPage">
+                <property name="icon_name">preferences-system-privacy-symbolic</property>
+                <property name="title" translatable="yes">Privacy</property>
+                <property name="visible">True</property>
+                <style>
+                  <class name="background"/>
+                </style>
                 <child>
                   <object class="HdyPreferencesGroup">
-                    <property name="title" translatable="yes">Style</property>
+                    <property name="title" translatable="yes">Web Content</property>
                     <property name="visible">True</property>
                     <child>
-                      <object class="HdyActionRow">
-                        <property name="activatable_widget">css_switch</property>
-                        <property name="title" translatable="yes">Use custom stylesheet</property>
+                      <object class="HdyActionRow" id="adblock_allow_row">
+                        <property name="activatable_widget">adblock_allow_switch</property>
+                        <property name="title" translatable="yes">Try to block _advertisements</property>
+                        <property name="use_underline">True</property>
                         <property name="visible">True</property>
                         <child type="action">
-                          <object class="GtkButton" id="css_edit_button">
+                          <object class="GtkSwitch" id="adblock_allow_switch">
                             <property name="valign">center</property>
                             <property name="visible">True</property>
-                            <style>
-                              <class name="image-button"/>
-                            </style>
-                            <child>
-                              <object class="GtkImage">
-                                <property name="icon_name">document-edit-symbolic</property>
-                                <property name="visible">True</property>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <child type="action">
-                          <object class="GtkSeparator">
-                            <property name="margin_bottom">8</property>
-                            <property name="margin_top">8</property>
-                            <property name="visible">True</property>
                           </object>
                         </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="HdyActionRow">
+                        <property name="activatable_widget">popups_allow_switch</property>
+                        <property name="title" translatable="yes">Block popup _windows</property>
+                        <property name="use_underline">True</property>
+                        <property name="visible">True</property>
                         <child type="action">
-                          <object class="GtkSwitch" id="css_switch">
+                          <object class="GtkSwitch" id="popups_allow_switch">
                             <property name="valign">center</property>
                             <property name="visible">True</property>
                           </object>
@@ -532,49 +557,20 @@
                     </child>
                     <child>
                       <object class="HdyActionRow">
-                        <property name="activatable">False</property>
-                        <property name="title" translatable="yes">Default zoom level</property>
+                        <property name="activatable_widget">enable_safe_browsing_switch</property>
+                        <property name="title" translatable="yes">Try to block dangerous web_sites</property>
+                        <property name="use_underline">True</property>
                         <property name="visible">True</property>
                         <child type="action">
-                          <object class="GtkSpinButton" id="default_zoom_spin_button">
-                            <property name="adjustment">zoom_adjustment</property>
-                            <property name="can_focus">True</property>
-                            <property name="input_purpose">number</property>
-                            <property name="max_width_chars">5</property>
+                          <object class="GtkSwitch" id="enable_safe_browsing_switch">
                             <property name="valign">center</property>
-                            <property name="value">100</property>
-                            <property name="visible">True</property>
-                            <signal name="output" handler="on_default_zoom_spin_button_output"/>
-                            <signal name="value-changed" 
handler="on_default_zoom_spin_button_value_changed"/>
+                            <property name="visible">True</property>
                           </object>
                         </child>
                       </object>
                     </child>
                   </object>
                 </child>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Fonts &amp; Style</property>
-              </object>
-              <packing>
-                <property name="position">1</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="HdyPreferencesPage">
-                <property name="icon_name">drive-harddisk-symbolic</property>
-                <property name="title" translatable="yes">Stored Data</property>
-                <property name="visible">True</property>
-                <style>
-                  <class name="background"/>
-                </style>
                 <child>
                   <object class="HdyPreferencesGroup">
                     <property name="title" translatable="yes">Cookies</property>
@@ -726,171 +722,88 @@
                 </child>
               </object>
               <packing>
-                <property name="position">2</property>
+                <property name="position">1</property>
               </packing>
             </child>
             <child type="tab">
               <object class="GtkLabel">
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">Stored Data</property>
+                <property name="label" translatable="yes">Privacy</property>
               </object>
               <packing>
-                <property name="position">2</property>
+                <property name="position">1</property>
                 <property name="tab_fill">False</property>
               </packing>
             </child>
             <child>
               <object class="HdyPreferencesPage">
-                <property name="icon_name">emoji-flags-symbolic</property>
-                <property name="title" translatable="yes">Language</property>
+                <property name="icon_name">document-edit-symbolic</property>
+                <property name="title" translatable="yes">Appearance</property>
                 <property name="visible">True</property>
                 <style>
                   <class name="background"/>
                 </style>
                 <child>
                   <object class="HdyPreferencesGroup">
-                    <property name="title" translatable="yes">Languages</property>
+                    <property name="title" translatable="yes">Fonts</property>
                     <property name="visible">True</property>
                     <child>
-                      <object class="GtkBox">
-                        <property name="orientation">vertical</property>
+                      <object class="HdyExpanderRow" id="use_gnome_fonts_row">
+                        <property name="show_enable_switch">True</property>
+                        <property name="title" translatable="yes">Use custom fonts</property>
                         <property name="visible">True</property>
                         <child>
-                          <object class="GtkFrame">
+                          <object class="GtkSeparator">
+                            <property name="margin-start">24</property>
                             <property name="visible">True</property>
-                            <property name="hexpand">True</property>
-                            <child>
-                              <object class="GtkTreeView" id="lang_treeview">
-                                <property name="visible">True</property>
-                                <property name="headers-visible">False</property>
-                                <property name="fixed-height-mode">True</property>
-                                <child internal-child="selection">
-                                  <object class="GtkTreeSelection" id="treeview-selection"/>
-                                </child>
-                              </object>
-                            </child>
                           </object>
                         </child>
                         <child>
-                          <object class="GtkToolbar">
+                          <object class="GtkListBox" id="use_custom_fonts_list">
+                            <property name="margin-start">24</property>
+                            <property name="selection_mode">none</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="toolbar_style">icons</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">1</property>
-                            <style>
-                              <class name="inline-toolbar"/>
-                            </style>
                             <child>
-                              <object class="GtkToolItem">
+                              <object class="HdyActionRow">
+                                <property name="activatable">False</property>
+                                <property name="title" translatable="yes">Sans serif font</property>
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <child>
-                                  <object class="GtkBox">
+                                <child type="action">
+                                  <object class="GtkFontButton" id="sans_fontbutton">
+                                    <property name="font">Sans 12</property>
+                                    <property name="use-font">True</property>
+                                    <property name="valign">center</property>
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <child>
-                                      <object class="GtkButton" id="lang_add_button">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">True</property>
-                                        <child internal-child="accessible">
-                                          <object class="AtkObject">
-                                            <property name="accessible-name" translatable="yes">Add 
language</property>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkImage">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="icon_name">list-add-symbolic</property>
-                                            <property name="icon-size">1</property>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkButton" id="lang_remove_button">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">True</property>
-                                        <child internal-child="accessible">
-                                          <object class="AtkObject">
-                                            <property name="accessible-name" translatable="yes">Remove 
language</property>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkImage">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="icon_name">list-remove-symbolic</property>
-                                            <property name="icon-size">1</property>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
                                   </object>
                                 </child>
                               </object>
                             </child>
                             <child>
-                              <object class="GtkSeparatorToolItem">
+                              <object class="HdyActionRow">
+                                <property name="activatable">False</property>
+                                <property name="title" translatable="yes">Serif font</property>
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="draw">False</property>
+                                <child type="action">
+                                  <object class="GtkFontButton" id="serif_fontbutton">
+                                    <property name="font">Sans 12</property>
+                                    <property name="use-font">True</property>
+                                    <property name="valign">center</property>
+                                    <property name="visible">True</property>
+                                  </object>
+                                </child>
                               </object>
-                              <packing>
-                                <property name="expand">True</property>
-                              </packing>
                             </child>
                             <child>
-                              <object class="GtkToolItem">
+                              <object class="HdyActionRow">
+                                <property name="activatable">False</property>
+                                <property name="title" translatable="yes">Monospace font</property>
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <child>
-                                  <object class="GtkBox">
+                                <child type="action">
+                                  <object class="GtkFontButton" id="mono_fontbutton">
+                                    <property name="font">Sans 12</property>
+                                    <property name="use-font">True</property>
+                                    <property name="valign">center</property>
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <child>
-                                      <object class="GtkButton" id="lang_up_button">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">True</property>
-                                        <child internal-child="accessible">
-                                          <object class="AtkObject">
-                                            <property name="accessible-name" translatable="yes">Move 
language up</property>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkImage">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="icon_name">go-up-symbolic</property>
-                                            <property name="icon-size">1</property>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkButton" id="lang_down_button">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">True</property>
-                                        <child internal-child="accessible">
-                                          <object class="AtkObject">
-                                            <property name="accessible-name" translatable="yes">Move 
language down</property>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkImage">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="icon_name">go-down-symbolic</property>
-                                            <property name="icon-size">1</property>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
                                   </object>
                                 </child>
                               </object>
@@ -901,20 +814,84 @@
                     </child>
                   </object>
                 </child>
+                <child>
+                  <object class="HdyPreferencesGroup" id="reader_mode_box">
+                    <property name="title" translatable="yes">Reader Mode</property>
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="HdyComboRow" id="reader_mode_font_style">
+                        <property name="title" translatable="yes">Font style</property>
+                        <property name="visible">True</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="HdyComboRow" id="reader_mode_color_scheme">
+                        <property name="title" translatable="yes">Color scheme</property>
+                        <property name="visible">True</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
                 <child>
                   <object class="HdyPreferencesGroup">
-                    <property name="title" translatable="yes">Spell Checking</property>
+                    <property name="title" translatable="yes">Style</property>
                     <property name="visible">True</property>
                     <child>
                       <object class="HdyActionRow">
-                        <property name="activatable_widget">enable_spell_checking_switch</property>
-                        <property name="title" translatable="yes">_Enable spell checking</property>
-                        <property name="use_underline">True</property>
+                        <property name="activatable_widget">css_switch</property>
+                        <property name="title" translatable="yes">Use custom stylesheet</property>
                         <property name="visible">True</property>
                         <child type="action">
-                          <object class="GtkSwitch" id="enable_spell_checking_switch">
+                          <object class="GtkButton" id="css_edit_button">
+                            <property name="valign">center</property>
+                            <property name="visible">True</property>
+                            <style>
+                              <class name="image-button"/>
+                            </style>
+                            <child>
+                              <object class="GtkImage">
+                                <property name="icon_name">document-edit-symbolic</property>
+                                <property name="visible">True</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                        <child type="action">
+                          <object class="GtkSeparator">
+                            <property name="margin_bottom">8</property>
+                            <property name="margin_top">8</property>
+                            <property name="visible">True</property>
+                          </object>
+                        </child>
+                        <child type="action">
+                          <object class="GtkSwitch" id="css_switch">
+                            <property name="valign">center</property>
+                            <property name="visible">True</property>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="HdyActionRow">
+                        <property name="activatable">False</property>
+                        <property name="title" translatable="yes">Default zoom level</property>
+                        <property name="visible">True</property>
+                        <child type="action">
+                          <object class="GtkSpinButton" id="default_zoom_spin_button">
+                            <property name="adjustment">zoom_adjustment</property>
+                            <property name="can_focus">True</property>
+                            <property name="input_purpose">number</property>
+                            <property name="max_width_chars">5</property>
                             <property name="valign">center</property>
+                            <property name="value">100</property>
                             <property name="visible">True</property>
+                            <signal name="output" handler="on_default_zoom_spin_button_output"/>
+                            <signal name="value-changed" 
handler="on_default_zoom_spin_button_value_changed"/>
                           </object>
                         </child>
                       </object>
@@ -923,16 +900,16 @@
                 </child>
               </object>
               <packing>
-                <property name="position">3</property>
+                <property name="position">2</property>
               </packing>
             </child>
             <child type="tab">
               <object class="GtkLabel">
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">Language</property>
+                <property name="label" translatable="yes">Appearance</property>
               </object>
               <packing>
-                <property name="position">3</property>
+                <property name="position">2</property>
                 <property name="tab_fill">False</property>
               </packing>
             </child>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]