From 079a0f5906ce58b9e71a85d6b4f77c45ba9a3c7e Mon Sep 17 00:00:00 2001
From: Jim Miller <retiefjimm@gmail.com>
Date: Thu, 6 Sep 2012 17:23:25 -0500
Subject: [PATCH] Scroll custom columns config, bump versions.

---
 app.yaml                   |  2 +-
 calibre-plugin/__init__.py |  2 +-
 calibre-plugin/config.py   | 16 ++++++++++++----
 index.html                 | 12 ++++--------
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/app.yaml b/app.yaml
index cef72bfe..a9abd30c 100644
--- a/app.yaml
+++ b/app.yaml
@@ -1,6 +1,6 @@
 # ffd-retief-hrd fanfictiondownloader
 application: fanfictiondownloader
-version: 4-4-23
+version: 4-4-24
 runtime: python27
 api_version: 1
 threadsafe: true
diff --git a/calibre-plugin/__init__.py b/calibre-plugin/__init__.py
index efc5ff54..9f0bcd2e 100644
--- a/calibre-plugin/__init__.py
+++ b/calibre-plugin/__init__.py
@@ -27,7 +27,7 @@ class FanFictionDownLoaderBase(InterfaceActionBase):
     description         = 'UI plugin to download FanFiction stories from various sites.'
     supported_platforms = ['windows', 'osx', 'linux']
     author              = 'Jim Miller'
-    version             = (1, 6, 7)
+    version             = (1, 6, 8)
     minimum_calibre_version = (0, 8, 57)
 
     #: This field defines the GUI plugin class that contains all the code
diff --git a/calibre-plugin/config.py b/calibre-plugin/config.py
index 63749743..59ad45e4 100644
--- a/calibre-plugin/config.py
+++ b/calibre-plugin/config.py
@@ -795,6 +795,15 @@ class CustomColumnsTab(QWidget):
         self.custcol_dropdowns = {}
         self.custcol_newonlycheck = {}
 
+        scrollable = QScrollArea()
+        scrollcontent = QWidget()
+        scrollable.setWidget(scrollcontent)
+        scrollable.setWidgetResizable(True)
+        self.l.addWidget(scrollable)
+
+        self.sl = QVBoxLayout()
+        scrollcontent.setLayout(self.sl)
+        
         for key, column in custom_columns.iteritems():
 
             if column['datatype'] in permitted_values:
@@ -825,9 +834,9 @@ class CustomColumnsTab(QWidget):
                     newonlycheck.setChecked(prefs['custom_cols_newonly'][key])
                 horz.addWidget(newonlycheck)
                 
-                self.l.addLayout(horz)
+                self.sl.addLayout(horz)
         
-        self.l.insertStretch(-1)
+        self.sl.insertStretch(-1)
 
         self.l.addSpacing(5)
         label = QLabel("Special column:")
@@ -849,8 +858,7 @@ class CustomColumnsTab(QWidget):
         self.errorcol.setCurrentIndex(self.errorcol.findData(QVariant(prefs['errorcol'])))
         horz.addWidget(self.errorcol)
         self.l.addLayout(horz)
-        
-        
+
         #print("prefs['custom_cols'] %s"%prefs['custom_cols'])
 
 
diff --git a/index.html b/index.html
index 97da2472..d61996d4 100644
--- a/index.html
+++ b/index.html
@@ -54,14 +54,10 @@
 	      much easier. </p>
 	  </div>
 	  <!-- put announcements here, h3 is a good title size. -->
-	  <h3>New Sites</h3>
+	  <h3>New Feature</h3>
 	  <p>
-	    Now supporing www.dracoandginny.com,
-	    www.scarvesandcoffee.net, www.thepetulantpoetess.com,
-	    www.wolverineandrogue.com and www.sinful-desire.com.  Thanks, Ida!
-	  </p>
-	  <p>
-	    FFDL now supports over 70 different fanfiction sites.
+	    FFDL now records 'Relationships' as metadata for those sites that provide it.
+	    
 	  </p>
 	  <p>
 	    Questions?  Check out our 
@@ -71,7 +67,7 @@
 	    If you have any problems with this application, please
 	    report them in
 	    the <a href="http://groups.google.com/group/fanfic-downloader">FanFictionDownLoader Google Group</a>.  The
-	    <a href="http://4-4-22.fanfictiondownloader.appspot.com">Previous Version</a> is also available for you to use if necessary.
+	    <a href="http://4-4-23.fanfictiondownloader.appspot.com">Previous Version</a> is also available for you to use if necessary.
 	  </p>
 	  <div id='error'>
 	    {{ error_message }}