adjustments for changed radiobutton behavior

diff --git a/rss-application/src/main/kotlin/de/unixwork/rssreader/App.kt b/rss-application/src/main/kotlin/de/unixwork/rssreader/App.kt
index 9d2a62cd848385fe68034ce45f3c6d1617367b0a..6b0bb0415dce8aa625e74e49369c121f8894e4b7 100644 (file)
--- a/rss-application/src/main/kotlin/de/unixwork/rssreader/App.kt
+++ b/rss-application/src/main/kotlin/de/unixwork/rssreader/App.kt
@@ -180,7 +180,6 @@ object App : Application {
                 markAllAsRead()
             }
             separator()
-            /*
             menu("Filter") {
                 radioItem(label = "All items", varname = "filter") { event ->
                     if(event.intValue == 1) {
@@ -199,7 +198,6 @@ object App : Application {
                 }
             }
 
-             */
             separator()
             radioItem(label = "Open item with default settings", varname = "browserSetting")
             radioItem(label = "Open item description", varname = "browserSetting")

diff --git a/rss-application/src/main/kotlin/de/unixwork/rssreader/FeedList.kt b/rss-application/src/main/kotlin/de/unixwork/rssreader/FeedList.kt
index 8cb92d4dfc2a4e12a34ce69d18886e3dfc91c621..70c5940d6362dca33eb89768af0d1bc71bc66886 100644 (file)
--- a/rss-application/src/main/kotlin/de/unixwork/rssreader/FeedList.kt
+++ b/rss-application/src/main/kotlin/de/unixwork/rssreader/FeedList.kt
@@ -21,9 +21,9 @@ class FeedList(window: MainWindow) : Document() {
     val starred = integer("starred")
     val browser = integer("browser")
 
-    // 0: use feed settings
-    // 1: load item description
-    // 2: load item link in internal browser
+    // 1: use feed settings
+    // 2: load item description
+    // 3: load item link in internal browser
     val browserSetting = integer("browserSetting")
 
     val filter = integer("filter")
@@ -34,6 +34,11 @@ class FeedList(window: MainWindow) : Document() {
     // Currently requested feed
     var showFeed: Feed? = null
 
+    init {
+        browserSetting.setIntValue(1)
+        filter.setIntValue(1)
+    }
+
     fun loadFeed(feed: Feed) {
         if(feed.itemStateMode > 0 && feed.unreadItemsCount > 0) {
             // Only reset the unread counter if the feed is not already opened
@@ -171,13 +176,13 @@ class FeedList(window: MainWindow) : Document() {
         window.window.setState(MainWindow.ITEM_SELETED)
 
         val browserSetting = browserSetting.intValue()
-        if(browserSetting == 0) {
+        if(browserSetting == 1) {
             currentFeed?.let { feed ->
                 browser.setBooleanValue(feed.internalBrowser)
             } ?: {
                 browser.setBooleanValue(false)
             }
-        } else if(browserSetting == 1) {
+        } else if(browserSetting == 2) {
             browser.setBooleanValue(false)
         } else {
             browser.setBooleanValue(true)