From dbf55fce0e37447df68d9a69d21bc5c5bbe97992 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs?= <heckyel@hyperbola.info>
Date: Mon, 9 Nov 2020 16:21:42 -0500
Subject: Update from upstream

- Documented the configuration options in `man fair-viewer`.
- Fixed the `--page=i` option.
- Added the `--dimension=3d` option.
- Added the `--license=creative_commons` option.
- Some code clean-up.
---
 share/gtk-fair-viewer.glade | 42 +-----------------------------------------
 1 file changed, 1 insertion(+), 41 deletions(-)

(limited to 'share/gtk-fair-viewer.glade')

diff --git a/share/gtk-fair-viewer.glade b/share/gtk-fair-viewer.glade
index 09ecfe5..6b07d93 100644
--- a/share/gtk-fair-viewer.glade
+++ b/share/gtk-fair-viewer.glade
@@ -1120,51 +1120,11 @@ long – longer than 20 minutes</property>
                                                 <property name="position">4</property>
                                               </packing>
                                             </child>
-                                            <child>
-                                              <object class="GtkFrame" id="frame21">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <property name="label_xalign">0</property>
-                                                <property name="shadow_type">none</property>
-                                                <child>
-                                                  <object class="GtkAlignment" id="alignment20">
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
-                                                    <property name="left_padding">12</property>
-                                                    <child>
-                                                      <object class="GtkComboBoxText" id="comboboxtext5">
-                                                        <property name="visible">True</property>
-                                                        <property name="can_focus">False</property>
-                                                        <property name="active">1</property>
-                                                        <items>
-                                                          <item translatable="yes">none</item>
-                                                          <item translatable="yes">moderate</item>
-                                                          <item translatable="yes">strict</item>
-                                                        </items>
-                                                        <signal name="changed" handler="combobox_safesearch_changed" swapped="no"/>
-                                                      </object>
-                                                    </child>
-                                                  </object>
-                                                </child>
-                                                <child type="label">
-                                                  <object class="GtkLabel" id="label26">
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
-                                                    <property name="label" translatable="yes">&lt;b&gt;Safe Search:&lt;/b&gt;</property>
-                                                    <property name="use_markup">True</property>
-                                                  </object>
-                                                </child>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">False</property>
-                                                <property name="position">5</property>
-                                              </packing>
-                                            </child>
                                             <child>
                                               <object class="GtkExpander" id="more_options_expander">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
+                                                <property name="expanded">True</property>
                                                 <signal name="activate" handler="activate_more_options_expander" swapped="no"/>
                                                 <child>
                                                   <object class="GtkBox" id="vbox20">
-- 
cgit v1.2.3