New upstream version 4.1.0+dfsg

17 files changed, 399 insertions, 248 deletions

diff --git a/ui/bookmarks.gtkbuilder b/ui/bookmarks.gtkbuilder
index 9c37c8f..d598b77 100644
--- a/ui/bookmarks.gtkbuilder
+++ b/ui/bookmarks.gtkbuilder
@@ -102,7 +102,7 @@
             </child>
             <child>
               <object class="GtkButton" id="button2">
-                <property name="label">_Cancel</property>
+                <property name="label" translatable="yes">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
diff --git a/ui/bookmarks_old.gtkbuilder b/ui/bookmarks_old.gtkbuilder
index 1e64256..175acea 100644
--- a/ui/bookmarks_old.gtkbuilder
+++ b/ui/bookmarks_old.gtkbuilder
@@ -134,7 +134,7 @@
                 <property name="visible">True</property>
                 <property name="can_default">True</property>
                 <property name="can_focus">True</property>
-                <property name="label">_Cancel</property>
+                <property name="label" translatable="yes">_Cancel</property>
                 <property name="use_stock">True</property>
                 <property name="relief">GTK_RELIEF_NORMAL</property>
                 <property name="focus_on_click">True</property>
diff --git a/ui/editor_link_dialog.gtkbuilder b/ui/editor_link_dialog.gtkbuilder
new file mode 100644
index 0000000..bdf9305
--- /dev/null
+++ b/ui/editor_link_dialog.gtkbuilder
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
+<interface>
+  <requires lib="gtk+" version="3.20"/>
+  <object class="GtkImage" id="image1">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">insert-link</property>
+  </object>
+  <object class="GtkDialog" id="dialog1">
+    <property name="can_focus">False</property>
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Insert Link</property>
+    <property name="default_width">402</property>
+    <property name="default_height">164</property>
+    <property name="type_hint">normal</property>
+    <child>
+      <placeholder/>
+    </child>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="button_cancel">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+                <signal name="clicked" handler="button_cancel_clicked_cb" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button_test">
+                <property name="label" translatable="yes">Test Link</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="image">image1</property>
+                <signal name="clicked" handler="button_test_clicked_cb" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button_ok">
+                <property name="label">gtk-ok</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+                <signal name="clicked" handler="button_ok_clicked_cb" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox" id="hbox1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <object class="GtkImage" id="image2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="pixel_size">107</property>
+                <property name="icon_name">insert-link</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkGrid">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="column_spacing">4</property>
+                <property name="row_homogeneous">True</property>
+                <child>
+                  <object class="GtkLabel" id="label1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Verse</property>
+                    <property name="xalign">1</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Module</property>
+                    <property name="xalign">1</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label3">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Link Text</property>
+                    <property name="xalign">1</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkEntry" id="entry_verse">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">●</property>
+                    <signal name="changed" handler="entry_verse_changed_cb" swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkEntry" id="entry_module">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">●</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkEntry" id="entry_text">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">●</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="hbox2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkRadioButton" id="radio_direct">
+                        <property name="label" translatable="yes">Link directly</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="active">True</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkRadioButton" id="radio_verse_list">
+                        <property name="label" translatable="yes">Link via verse list</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">radio_direct</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">3</property>
+                    <property name="width">2</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="padding">5</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="0">button_cancel</action-widget>
+      <action-widget response="1">button_test</action-widget>
+      <action-widget response="2">button_ok</action-widget>
+    </action-widgets>
+  </object>
+</interface>
diff --git a/ui/editor_link_dialog.xml b/ui/editor_link_dialog_old.gtkbuilder
index 4b7462e..4b7462e 100644
--- a/ui/editor_link_dialog.xml
+++ b/ui/editor_link_dialog_old.gtkbuilder
diff --git a/ui/export-dialog_old.gtkbuilder b/ui/export-dialog_old.gtkbuilder
index 696ae75..f18a034 100644
--- a/ui/export-dialog_old.gtkbuilder
+++ b/ui/export-dialog_old.gtkbuilder
@@ -31,7 +31,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="cancelbutton1">
-                <property name="label">_Cancel</property>
+                <property name="label" translatable="yes">_Cancel</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
diff --git a/ui/gtk_webedit.ui b/ui/gtk_webedit.ui
index 6a700d0..a25101b 100644
--- a/ui/gtk_webedit.ui
+++ b/ui/gtk_webedit.ui
@@ -269,7 +269,7 @@
             </child>
             <child>
               <object class="GtkButton" id="button_cancel">
-                <property name="label">_Cancel</property>
+                <property name="label" translatable="yes">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
diff --git a/ui/module-manager_old.gtkbuilder b/ui/module-manager_old.gtkbuilder
index c991a72..8adb2d0 100644
--- a/ui/module-manager_old.gtkbuilder
+++ b/ui/module-manager_old.gtkbuilder
@@ -221,7 +221,7 @@
             </child>
             <child>
               <object class="GtkButton" id="button_cancel">
-                <property name="label">_Cancel</property>
+                <property name="label" translatable="yes">_Cancel</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
@@ -1091,7 +1091,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button10">
-                <property name="label">_Cancel</property>
+                <property name="label" translatable="yes">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
diff --git a/ui/navbar_versekey.glade b/ui/navbar_versekey.glade
index ffc715d..daceb3f 100644
--- a/ui/navbar_versekey.glade
+++ b/ui/navbar_versekey.glade
@@ -171,14 +171,6 @@
                                 <property name="position">0</property>
                               </packing>
                             </child>
-                            <child>
-                              <widget class="GtkImage" id="image13">
-                                <property name="pixbuf">arrow_up_box.png</property>
-                              </widget>
-                              <packing>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
                           </widget>
                         </child>
                       </widget>
@@ -204,14 +196,6 @@
                                 <property name="position">0</property>
                               </packing>
                             </child>
-                            <child>
-                              <widget class="GtkImage" id="image15">
-                                <property name="pixbuf">arrow_down_box.png</property>
-                              </widget>
-                              <packing>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
                           </widget>
                         </child>
                       </widget>
@@ -299,14 +283,6 @@
                                 <property name="position">0</property>
                               </packing>
                             </child>
-                            <child>
-                              <widget class="GtkImage" id="image9">
-                                <property name="pixbuf">arrow_up_box.png</property>
-                              </widget>
-                              <packing>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
                           </widget>
                         </child>
                       </widget>
@@ -332,14 +308,6 @@
                                 <property name="position">0</property>
                               </packing>
                             </child>
-                            <child>
-                              <widget class="GtkImage" id="image11">
-                                <property name="pixbuf">arrow_down_box.png</property>
-                              </widget>
-                              <packing>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
                           </widget>
                         </child>
                       </widget>
@@ -424,14 +392,6 @@
                                 <property name="position">0</property>
                               </packing>
                             </child>
-                            <child>
-                              <widget class="GtkImage" id="image7">
-                                <property name="pixbuf">arrow_up_box.png</property>
-                              </widget>
-                              <packing>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
                           </widget>
                         </child>
                       </widget>
@@ -460,14 +420,6 @@
                                 <property name="position">0</property>
                               </packing>
                             </child>
-                            <child>
-                              <widget class="GtkImage" id="image16">
-                                <property name="pixbuf">arrow_down_box.png</property>
-                              </widget>
-                              <packing>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
                           </widget>
                         </child>
                       </widget>
diff --git a/ui/navbar_versekey.gtkbuilder b/ui/navbar_versekey.gtkbuilder
index 7b330e1..de8073a 100644
--- a/ui/navbar_versekey.gtkbuilder
+++ b/ui/navbar_versekey.gtkbuilder
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
-  <requires lib="gtk+" version="3.14"/>
+  <requires lib="gtk+" version="3.20"/>
   <object class="GtkBox" id="navbar">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -10,7 +10,6 @@
     <property name="margin_bottom">3</property>
     <child>
       <object class="GtkToggleButton" id="togglebutton_sync">
-        <property name="use_action_appearance">False</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
         <property name="relief">none</property>
@@ -30,7 +29,6 @@
     </child>
     <child>
       <object class="GtkButton" id="button_history_back">
-        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
@@ -57,7 +55,6 @@
         <property name="homogeneous">True</property>
         <child>
           <object class="GtkToggleButton" id="togglebutton_history_list">
-            <property name="use_action_appearance">False</property>
             <property name="height_request">26</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
@@ -87,7 +84,6 @@
     </child>
     <child>
       <object class="GtkButton" id="button_history_foward">
-        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
@@ -116,7 +112,6 @@
             <property name="can_focus">False</property>
             <child>
               <object class="GtkToggleButton" id="togglebutton_book">
-                <property name="use_action_appearance">False</property>
                 <property name="width_request">160</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -130,9 +125,9 @@
                         <property name="width_request">150</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0.029999999329447746</property>
                         <property name="label" translatable="yes">&lt;b&gt;Revelation of John&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
+                        <property name="xalign">0.029999999329447746</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -167,32 +162,10 @@
                 <property name="can_focus">False</property>
                 <property name="above_child">True</property>
                 <child>
-                  <object class="GtkBox" id="hbox12">
+                  <object class="GtkImage" id="image12">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <child>
-                      <object class="GtkImage" id="image13">
-                        <property name="can_focus">False</property>
-                        <property name="icon_name">pan-up-symbolic</property>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkImage" id="image12">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="icon_name">pan-up-symbolic</property>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
+                    <property name="icon_name">pan-up-symbolic</property>
                   </object>
                 </child>
               </object>
@@ -208,32 +181,10 @@
                 <property name="can_focus">False</property>
                 <property name="above_child">True</property>
                 <child>
-                  <object class="GtkBox" id="hbox13">
+                  <object class="GtkImage" id="image14">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <child>
-                      <object class="GtkImage" id="image15">
-                        <property name="can_focus">False</property>
-                        <property name="icon_name">pan-down-symbolic</property>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkImage" id="image14">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="icon_name">pan-down-symbolic</property>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
+                    <property name="icon_name">pan-down-symbolic</property>
                   </object>
                 </child>
               </object>
@@ -268,11 +219,9 @@
             <property name="can_focus">False</property>
             <child>
               <object class="GtkToggleButton" id="togglebutton_chapter">
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="xalign">1</property>
                 <child>
                   <object class="GtkBox" id="hbox6">
                     <property name="visible">True</property>
@@ -281,7 +230,6 @@
                       <object class="GtkLabel" id="label_chapter">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xpad">3</property>
                         <property name="label" translatable="yes">1</property>
                         <property name="use_markup">True</property>
                         <property name="justify">right</property>
@@ -319,32 +267,10 @@
                 <property name="can_focus">False</property>
                 <property name="above_child">True</property>
                 <child>
-                  <object class="GtkBox" id="hbox10">
+                  <object class="GtkImage" id="image8">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <child>
-                      <object class="GtkImage" id="image9">
-                        <property name="can_focus">False</property>
-                        <property name="icon_name">pan-up-symbolic</property>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkImage" id="image8">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="icon_name">pan-up-symbolic</property>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
+                    <property name="icon_name">pan-up-symbolic</property>
                   </object>
                 </child>
               </object>
@@ -360,32 +286,10 @@
                 <property name="can_focus">False</property>
                 <property name="above_child">True</property>
                 <child>
-                  <object class="GtkBox" id="hbox11">
+                  <object class="GtkImage" id="image10">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <child>
-                      <object class="GtkImage" id="image11">
-                        <property name="can_focus">False</property>
-                        <property name="icon_name">pan-down-symbolic</property>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkImage" id="image10">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="icon_name">pan-down-symbolic</property>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
+                    <property name="icon_name">pan-down-symbolic</property>
                   </object>
                 </child>
               </object>
@@ -420,7 +324,6 @@
             <property name="can_focus">False</property>
             <child>
               <object class="GtkToggleButton" id="togglebutton_verse">
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -433,7 +336,6 @@
                       <object class="GtkLabel" id="label_verse">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xpad">3</property>
                         <property name="label" translatable="yes">1</property>
                         <property name="use_markup">True</property>
                         <property name="justify">right</property>
@@ -470,32 +372,10 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <child>
-                  <object class="GtkBox" id="hbox9">
+                  <object class="GtkImage" id="image6">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <child>
-                      <object class="GtkImage" id="image7">
-                        <property name="can_focus">False</property>
-                        <property name="icon_name">pan-up-symbolic</property>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkImage" id="image6">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="icon_name">pan-up-symbolic</property>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
+                    <property name="icon_name">pan-up-symbolic</property>
                   </object>
                 </child>
               </object>
@@ -511,32 +391,10 @@
                 <property name="can_focus">False</property>
                 <property name="above_child">True</property>
                 <child>
-                  <object class="GtkBox" id="hbox8">
+                  <object class="GtkImage" id="image5">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <child>
-                      <object class="GtkImage" id="image16">
-                        <property name="can_focus">False</property>
-                        <property name="icon_name">pan-down-symbolic</property>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkImage" id="image5">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="icon_name">pan-down-symbolic</property>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
+                    <property name="icon_name">pan-down-symbolic</property>
                   </object>
                 </child>
               </object>
diff --git a/ui/prefs.glade b/ui/prefs.glade
index b4c3171..5746a65 100644
--- a/ui/prefs.glade
+++ b/ui/prefs.glade
@@ -986,11 +986,19 @@
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="labeln2">
+                          <widget class="GtkCheckButton" id="checkbutton_BSP_keyboard">
+                            <property name="label" translatable="yes">_Keyboard only</property>
                             <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes"> </property>
-                            <property name="use_markup">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="has_tooltip">True</property>
+                            <property name="tooltip" translatable="yes">When checked, do not transmit every time Xiphos navigates; instead, transmit only using keyboard shortcut (Ctrl-Shift-Alt-N).</property>
+                            <property name="use_underline">True</property>
+                            <property name="active">True</property>
+                            <property name="draw_indicator">True</property>
+                            <accessibility>
+                              <atkproperty name="AtkObject::accessible-name" translatable="yes">BSP keyboard button</atkproperty>
+                            </accessibility>
                           </widget>
                           <packing>
                             <property name="expand">True</property>
diff --git a/ui/prefs.gtkbuilder b/ui/prefs.gtkbuilder
index 53e7d8d..10871f0 100644
--- a/ui/prefs.gtkbuilder
+++ b/ui/prefs.gtkbuilder
@@ -1206,12 +1206,22 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="labeln2">
+                          <object class="GtkCheckButton" id="checkbutton_BSP_keyboard">
+                            <property name="label" translatable="yes">_Keyboard only</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes"> </property>
-                            <property name="use_markup">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="has_tooltip">True</property>
+                            <property name="tooltip_text" translatable="yes">When checked, do not transmit every time Xiphos navigates; instead, transmit only using keyboard shortcut (Ctrl-Shift-Alt-N).</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0.5</property>
+                            <property name="active">True</property>
+                            <property name="draw_indicator">True</property>
+                            <child internal-child="accessible">
+                              <object class="AtkObject" id="checkbutton_BSP_keyboard-atkobject">
+                                <property name="AtkObject::accessible-name" translatable="yes">BSP keyboard button</property>
+                              </object>
+                            </child>
                           </object>
                           <packing>
                             <property name="expand">True</property>
diff --git a/ui/wscript_build b/ui/wscript_build
index 5825eea..4f4ba43 100644
--- a/ui/wscript_build
+++ b/ui/wscript_build
@@ -9,5 +9,4 @@ bld.install_files('${PACKAGE_DATA_DIR}', """
 languages
 editor_studypad.xml
 editor_note.xml
-editor_link_dialog.xml
 """)
diff --git a/ui/xi-menus.glade b/ui/xi-menus.glade
index 9627e9d..e2bbbf6 100644
--- a/ui/xi-menus.glade
+++ b/ui/xi-menus.glade
@@ -390,16 +390,6 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkMenuItem" id="attach_detach_sidebar">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Attach/Detach Sidebar</property>
-		      <property name="use_underline">True</property>
-		      <property name="tooltip" translatable="yes">Operate the sidebar as a separate window</property>
-		      <signal name="activate" handler="on_attach_detach_sidebar_activate" last_modification_time="Sat, 07 Mar 2009 00:36:34 GMT"/>
-		    </widget>
-		  </child>
-
-		  <child>
 		    <widget class="GtkMenuItem" id="show_hide_sidebar">
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">_Show/Hide Attached Sidebar</property>
diff --git a/ui/xi-menus.gtkbuilder b/ui/xi-menus.gtkbuilder
index c2c258b..9645080 100644
--- a/ui/xi-menus.gtkbuilder
+++ b/ui/xi-menus.gtkbuilder
@@ -254,15 +254,6 @@
               </object>
             </child>
             <child>
-              <object class="GtkMenuItem" id="attach_detach_sidebar">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">_Attach/Detach Sidebar</property>
-                <property name="use_underline">True</property>
-                <signal name="activate" handler="on_attach_detach_sidebar_activate" swapped="no"/>
-              </object>
-            </child>
-            <child>
               <object class="GtkMenuItem" id="show_hide_sidebar">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
diff --git a/ui/xi-menus_old.gtkbuilder b/ui/xi-menus_old.gtkbuilder
index ca4dfb3..2f50583 100644
--- a/ui/xi-menus_old.gtkbuilder
+++ b/ui/xi-menus_old.gtkbuilder
@@ -222,14 +222,6 @@
               </object>
             </child>
             <child>
-              <object class="GtkMenuItem" id="attach_detach_sidebar">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">_Attach/Detach Sidebar</property>
-                <property name="use_underline">True</property>
-                <signal name="activate" handler="on_attach_detach_sidebar_activate"/>
-              </object>
-            </child>
-            <child>
               <object class="GtkMenuItem" id="show_hide_sidebar">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">_Show/Hide Attached Sidebar</property>
diff --git a/ui/xi-splash.gtkbuilder b/ui/xi-splash.gtkbuilder
new file mode 100644
index 0000000..4daf430
--- /dev/null
+++ b/ui/xi-splash.gtkbuilder
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk+" version="3.14"/>
+  <object class="GtkWindow" id="window">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">window</property>
+    <property name="window_position">center-always</property>
+    <property name="default_width">500</property>
+    <property name="default_height">400</property>
+    <property name="type_hint">splashscreen</property>
+    <child>
+      <object class="GtkEventBox" id="eventbox1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <child>
+          <object class="GtkBox" id="vbox1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="GtkImage" id="image1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="pixbuf">splash.png</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox" id="hbox1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="homogeneous">True</property>
+		<property name="orientation">horizontal</property>
+                <child>
+                  <object class="GtkImage" id="image2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="pixbuf">gnome-windows.png</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkImage" id="image3">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="pixbuf">sword.png</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkImage" id="image4">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="pixbuf">gnome-session.png</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkImage" id="image5">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="pixbuf">gs2-48x48.png</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkProgressBar" id="progressbar1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">False</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
diff --git a/ui/xi-splash.ui b/ui/xi-splash_old.gtkbuilder
index 09be40a..09be40a 100644
--- a/ui/xi-splash.ui
+++ b/ui/xi-splash_old.gtkbuilder