# HG changeset patch
# User dirk
# Date 1367641400 -7200
# Node ID b0de75d57e78ddc2a9c874babaf85557f25e5223
# Parent  524cbf9e413c87c9439e6e6514e284fd54237b38# Parent  1ac0b8e2feae3bd8336dded8247ae201b13d9ca1
Merge with 1ac0b8e2feae3bd8336dded8247ae201b13d9ca1

diff -r 524cbf9e413c -r b0de75d57e78 FeedSettings.py
--- a/FeedSettings.py	Wed Nov 28 01:53:29 2012 +0100
+++ b/FeedSettings.py	Sat May 04 06:23:20 2013 +0200
@@ -17,6 +17,7 @@
         self.initUi()
 
     def initUi(self):
+        self.ui.urlLabel.setText(self.feed.rss_url)
         self.ui.feedTitle.setText(self.feed.title)
         self.ui.updateInterval.setText(str(self.feed.update_interval))
         self.ui.autoLoadArticle.setChecked(self.feed.auto_load_entry_link)
diff -r 524cbf9e413c -r b0de75d57e78 Ui_FeedSettings.ui
--- a/Ui_FeedSettings.ui	Wed Nov 28 01:53:29 2012 +0100
+++ b/Ui_FeedSettings.ui	Sat May 04 06:23:20 2013 +0200
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
-    <height>178</height>
+    <width>474</width>
+    <height>222</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -21,7 +21,7 @@
    <property name="geometry">
     <rect>
      <x>20</x>
-     <y>135</y>
+     <y>180</y>
      <width>341</width>
      <height>32</height>
     </rect>
@@ -37,8 +37,8 @@
    <property name="geometry">
     <rect>
      <x>10</x>
-     <y>80</y>
-     <width>331</width>
+     <y>110</y>
+     <width>361</width>
      <height>22</height>
     </rect>
    </property>
@@ -46,35 +46,12 @@
     <string>load article's url  instead of displaying summary</string>
    </property>
   </widget>
-  <widget class="QLineEdit" name="feedTitle">
-   <property name="geometry">
-    <rect>
-     <x>42</x>
-     <y>10</y>
-     <width>341</width>
-     <height>23</height>
-    </rect>
-   </property>
-  </widget>
-  <widget class="QLabel" name="label">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>14</y>
-     <width>26</width>
-     <height>17</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>Title</string>
-   </property>
-  </widget>
   <widget class="QCheckBox" name="alwaysOpenInBrowser">
    <property name="geometry">
     <rect>
      <x>10</x>
-     <y>105</y>
-     <width>371</width>
+     <y>140</y>
+     <width>410</width>
      <height>22</height>
     </rect>
    </property>
@@ -82,41 +59,91 @@
     <string>when loading article's url, always use external browser</string>
    </property>
   </widget>
-  <widget class="QLabel" name="label_2">
+  <widget class="QLabel" name="label_4">
    <property name="geometry">
     <rect>
-     <x>10</x>
-     <y>50</y>
-     <width>91</width>
-     <height>17</height>
+     <x>11</x>
+     <y>11</y>
+     <width>28</width>
+     <height>16</height>
+    </rect>
+   </property>
+   <property name="maximumSize">
+    <size>
+     <width>35</width>
+     <height>16777215</height>
+    </size>
+   </property>
+   <property name="text">
+    <string>URL</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="urlLabel">
+   <property name="geometry">
+    <rect>
+     <x>52</x>
+     <y>11</y>
+     <width>358</width>
+     <height>16</height>
     </rect>
    </property>
    <property name="text">
-    <string>Update every</string>
+    <string/>
    </property>
-  </widget>
-  <widget class="QLineEdit" name="updateInterval">
-   <property name="geometry">
-    <rect>
-     <x>105</x>
-     <y>45</y>
-     <width>46</width>
-     <height>23</height>
-    </rect>
+   <property name="textInteractionFlags">
+    <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
    </property>
   </widget>
-  <widget class="QLabel" name="label_3">
+  <widget class="QWidget" name="">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>30</y>
+     <width>401</width>
+     <height>28</height>
+    </rect>
+   </property>
+   <layout class="QHBoxLayout" name="horizontalLayout">
+    <item>
+     <widget class="QLabel" name="label">
+      <property name="text">
+       <string>Title</string>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QLineEdit" name="feedTitle"/>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QWidget" name="">
    <property name="geometry">
     <rect>
-     <x>160</x>
-     <y>50</y>
-     <width>61</width>
-     <height>17</height>
+     <x>10</x>
+     <y>70</y>
+     <width>221</width>
+     <height>28</height>
     </rect>
    </property>
-   <property name="text">
-    <string>minutes</string>
-   </property>
+   <layout class="QHBoxLayout" name="horizontalLayout_2">
+    <item>
+     <widget class="QLabel" name="label_2">
+      <property name="text">
+       <string>Update every</string>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QLineEdit" name="updateInterval"/>
+    </item>
+    <item>
+     <widget class="QLabel" name="label_3">
+      <property name="text">
+       <string>minutes</string>
+      </property>
+     </widget>
+    </item>
+   </layout>
   </widget>
  </widget>
  <resources>
diff -r 524cbf9e413c -r b0de75d57e78 backend/couchdb/CouchDbBackend.py
--- a/backend/couchdb/CouchDbBackend.py	Wed Nov 28 01:53:29 2012 +0100
+++ b/backend/couchdb/CouchDbBackend.py	Sat May 04 06:23:20 2013 +0200
@@ -108,7 +108,10 @@
         allFeeds = Feed.all(self.database)
         for feed in allFeeds:
             if feed.needsUpdate():
-                FeedUpdater(self.database, self.preferences()).update(feed)
+                try:
+                    FeedUpdater(self.database, self.preferences()).update(feed)
+                except Exception as ex:
+                    logging.getLogger("FeedUpdate").error("Exception during fetch: " + str(ex))
 
     def expireFeedEntries(self):
         expireDate = self._calculateExpireDate()