# HG changeset patch
# User Colin Clark <colin.clark@cclark.uk>
# Date 1505037440 -3600
# Node ID 223438494692ab9cdf7f71782f1b4d8e99190f94
# Parent  4fc92ae7b16420eb31ba2ef2ce47c613eebed433
Add Collections to Shortcuts bar

diff -r 4fc92ae7b164 -r 223438494692 doc/docbook/GuideMainWindowFolderPane.xml
--- a/doc/docbook/GuideMainWindowFolderPane.xml	Sun Sep 10 10:10:47 2017 +0100
+++ b/doc/docbook/GuideMainWindowFolderPane.xml	Sun Sep 10 10:57:20 2017 +0100
@@ -195,9 +195,22 @@
     </section>
     <section id="Shortcutslist">
       <title>Shortcuts</title>
-      <para>This is a list of shortcuts (bookmarks) to commonly used folders or images. A context menu will appear by right clicking on an item, or pressing the menu key when the item has the focus.</para>
+      <para>This is a list of shortcuts (bookmarks) to commonly used folders, images and collections. A context menu will appear by right clicking on an item, or pressing the menu key when the item has the focus.</para>
       <para>Folders or images can be added to the list by activating the Add button at the bottom of the pane, or dragging a folder or image onto the list.</para>
       <para>
+        Collections may be added by opening the
+        <menuchoice>
+          <shortcut>
+            <keycombo>
+              <keycap>O</keycap>
+            </keycombo>
+          </shortcut>
+          <guimenu>File</guimenu>
+          <guimenuitem>Open collection...</guimenuitem>
+        </menuchoice>
+        dialog and dragging a collection onto the list.
+      </para>
+      <para>
         To edit an item select
         <emphasis role="bold">Properties</emphasis>
         from its context menu. A dialog will appear allowing the Name, Path, and Icon for the item to be changed. Select OK to close the dialog and apply the changes, or Cancel to close the dialog and discard the changes.
diff -r 4fc92ae7b164 -r 223438494692 src/shortcuts.c
--- a/src/shortcuts.c	Sun Sep 10 10:10:47 2017 +0100
+++ b/src/shortcuts.c	Sun Sep 10 10:57:20 2017 +0100
@@ -22,6 +22,7 @@
 #include "main.h"
 #include "shortcuts.h"
 
+#include "collect.h"
 #include "layout.h"
 #include "utilops.h"
 #include "ui_bookmark.h"
@@ -47,7 +48,15 @@
 {
 	ShortcutsData *scd = data;
 
-	layout_set_path(scd->lw, path);
+	if (file_extension_match(path, GQ_COLLECTION_EXT))
+		{
+		collection_window_new(path);
+		}
+	else
+		{
+		layout_set_path(scd->lw, path);
+		}
+
 }
 
 static void shortcuts_add_close(ShortcutsData *scd)