Version bump

Author: mrgodhani

package.json

@@ -1,7 +1,7 @@
 {
   "name": "raven-reader",
   "productName": "Raven Reader",
-  "version": "1.0.48",
+  "version": "1.0.49",
   "author": "Hello Efficiency Inc. <[email protected]>",
   "description": "Simple desktop RSS Reader",
   "license": "MIT",

public/locales/en-US/translation.missing.json

@@ -1 +1 @@
-{"Connect Feedbin":"Connect Feedbin","Log into Feedbin":"Log into Feedbin","Connect Self-hosted (Google Reader API)":"Connect Self-hosted (Google Reader API)","Log into Self Hosted RSS Service":"Log into Self Hosted RSS Service","Enter username":"Enter username","Connect Fever":"Connect Fever","Log into Fever":"Log into Fever","Disconnect Self-hosted (Google Reader API)":"Disconnect Self-hosted (Google Reader API)","Copy link":"Copy link","Copy feed link":"Copy feed link","Edit feed":"Edit feed","Unsubscribe":"Unsubscribe","start in tray":"start in tray","Automatically add to Recently Read":"Automatically add to Recently Read","Manage Categories":"Manage Categories","Categories":"Categories","Manage categories":"Manage categories","Title":"Title","Subscription title updated":{"":"Subscription title updated."},"Category":"Category","Rename folder":"Rename folder","Delete":"Delete","Category renamed":"Category renamed","No categories available":"No categories available","Feed in this categories would not be deleted":"Feed in this categories would not be deleted","Feeds":"Feeds","Action":"Action","Are you sure you want delete this Category?":"Are you sure you want delete this Category?","Manage Feeds":"Manage Feeds","Manage feeds":"Manage feeds","No feeds available":"No feeds available","Feed":"Feed","selected":"selected","Articles":"Articles","Add Category":"Add Category","[object Object]":"[object Object]","Add category":"Add category","Please select atleast one feed":"Please select atleast one feed","Add to new folder":"Add to new folder","Move to folder":"Move to folder","Move to category":"Move to category","Move":"Move","Add to new category":"Add to new category","Please subscribe to atleast one feed to add category":"Please subscribe to atleast one feed to add category","Add new feed":"Add new feed","add":"add","Category cannot be empty":{"":"Category cannot be empty."},"Articles would inside this feed would be deleted":"Articles would inside this feed would be deleted","Are you sure you want unsubscrube this Feed?":"Are you sure you want unsubscrube this Feed?","Articles inside this feed would be deleted":"Articles inside this feed would be deleted","Edit Feedbin":"Edit Feedbin","Disconnect Feedbin":"Disconnect Feedbin"}
+{"Connect Feedbin":"Connect Feedbin","Log into Feedbin":"Log into Feedbin","Connect Self-hosted (Google Reader API)":"Connect Self-hosted (Google Reader API)","Log into Self Hosted RSS Service":"Log into Self Hosted RSS Service","Enter username":"Enter username","Connect Fever":"Connect Fever","Log into Fever":"Log into Fever","Disconnect Self-hosted (Google Reader API)":"Disconnect Self-hosted (Google Reader API)","Copy link":"Copy link","Copy feed link":"Copy feed link","Edit feed":"Edit feed","Unsubscribe":"Unsubscribe","start in tray":"start in tray","Automatically add to Recently Read":"Automatically add to Recently Read","Manage Categories":"Manage Categories","Categories":"Categories","Manage categories":"Manage categories","Title":"Title","Subscription title updated":{"":"Subscription title updated."},"Category":"Category","Rename folder":"Rename folder","Delete":"Delete","Category renamed":"Category renamed","No categories available":"No categories available","Feed in this categories would not be deleted":"Feed in this categories would not be deleted","Feeds":"Feeds","Action":"Action","Are you sure you want delete this Category?":"Are you sure you want delete this Category?","Manage Feeds":"Manage Feeds","Manage feeds":"Manage feeds","No feeds available":"No feeds available","Feed":"Feed","selected":"selected","Articles":"Articles","Add Category":"Add Category","[object Object]":"[object Object]","Add category":"Add category","Please select atleast one feed":"Please select atleast one feed","Add to new folder":"Add to new folder","Move to folder":"Move to folder","Move to category":"Move to category","Move":"Move","Add to new category":"Add to new category","Please subscribe to atleast one feed to add category":"Please subscribe to atleast one feed to add category","Add new feed":"Add new feed","add":"add","Category cannot be empty":{"":"Category cannot be empty."},"Articles would inside this feed would be deleted":"Articles would inside this feed would be deleted","Are you sure you want unsubscrube this Feed?":"Are you sure you want unsubscrube this Feed?","Articles inside this feed would be deleted":"Articles inside this feed would be deleted","Edit Feedbin":"Edit Feedbin","Disconnect Feedbin":"Disconnect Feedbin","Disable content preview":"Disable content preview","Content preview":"Content preview"}

public/locales/fr/translation.json

@@ -1,11 +1,11 @@
 {
-    "All Feeds": "Tous les aliments",
+    "All Feeds": "Tous les flux",
     "Favourites": "Favoris",
     "Unread Articles": "Articles non lus",
     "Recently Read": "Lu récemment",
     "Recently Played": "Joué récemment",
     "Saved articles": "Articles sauvegardés",
-    "Show more": "En savoir plus",
+    "Show more": "Montrer plus",
     "Show less": "Montrer moins",
     "Subscriptions": "Abonnements",
     "Add": "Ajouter",
@@ -19,7 +19,7 @@
     "Enter website or feed url": "Entrez l'url du site web ou du flux",
     "Enter new category": "Entrez dans une nouvelle catégorie",
     "Search": "Recherchez",
-    "Refresh All Feeds": "Rafraîchir tous les aliments",
+    "Refresh All Feeds": "Rafraîchir tous les flux",
     "Mark all as read": "Tout marquer comme lu",
     "Settings": "Paramètres",
     "Preferences": "Préférences",
@@ -29,22 +29,22 @@
     "Oldest articles first": "Les articles les plus anciens en premier",
     "Disable images in Articles": "Désactiver les images dans les articles",
     "Full article view by default": "Affichage de l'article complet par défaut",
-    "Delete all feed, category and article data": "Supprimer toutes les données relatives aux aliments pour animaux, aux catégories et aux articles",
+    "Delete all feed, category and article data": "Supprimer les données de flux, de catégorie et d'article",
     "Clear all data": "Effacer toutes les données",
-    "Proxy Setting": "Paramètres de procuration",
+    "Proxy Setting": "Paramètres du proxy",
     "Web Server (HTTP)": "Serveur web (HTTP) :",
     "Secure Web Server (HTTPS)": "Serveur Web sécurisé (HTTPS) :",
     "Bypass proxy settings for these hosts & domains": "Contournez les paramètres de proxy pour ces hôtes et domaines :",
-    "Set proxy & restart": "Définir la procuration et redémarrer",
-    "Connect Instapaper": "Connect Instapaper",
-    "Connect pocket": "Connect pocket",
+    "Set proxy & restart": "Définir le proxy et redémarrer",
+    "Connect Instapaper": "Se connecter à Instapaper",
+    "Connect pocket": "Se connecter à Pocket",
     "Log into Instapaper": "Se connecter à Instapaper",
     "Enter endpoint": "Entrer le point final",
     "Enter email": "Entrez votre adresse électronique",
     "Enter password": "Entrez le mot de passe",
-    "Read it later services": "Lisez-le plus tard services",
+    "Read it later services": "Services de lecture différée",
     "Sharing": "Partage",
-    "Save articles to read it later services": "Sauvegarder les articles pour les lire plus tard services",
+    "Save articles to read it later services": "Sauvegarder les articles vers un service de lecture différée",
     "Instapaper": "Instapaper",
     "Connect": "Connexion",
     "Pocket": "Pocket",
@@ -71,25 +71,25 @@
     "Format Options": "Options de format",
     "Mark as unread": "Marquer comme non lu",
     "Mark as read": "Marquer comme lu",
-    "Mark as unfavourite": "Marquer comme défavorable",
+    "Mark as unfavourite": "Retirer des favoris",
     "Mark as favourite": "Marquer comme favori",
     "Disconnect": "déconnecter",
     "Sync Account": "Compte de synchronisation",
     "Quit": "quitter",
     "Edit": "Éditer",
-    "View": "Voir",
+    "View": "Affichage",
     "Add subscription": "Ajouter un abonnement",
-    "Item": "Point",
-    "Next item": "Point suivant",
-    "Previous item": "Point précédent",
+    "Item": "Élément",
+    "Next item": "Élément suivant",
+    "Previous item": "Élément précédent",
     "Toggle read": "Basculer pour lire",
     "Toggle favourite": "Basculer le favori",
     "Mark all read": "Marquer tout comme lu",
     "Save offline": "Sauvegarder hors ligne",
     "View in browser": "Afficher dans le navigateur",
     "Import and Export": "Importation et exportation",
-    "Import subscriptions": "Abonnements à l'importation",
-    "Export subscriptions": "Abonnements à l'exportation",
+    "Import subscriptions": "Importer des abonnements",
+    "Export subscriptions": "Exporter des abonnements",
     "Speech": "Discours",
     "Automatically add to Recently": "Ajouter automatiquement à Récemment"
 }

src/background.js

@@ -78,7 +78,9 @@ async function createWindow () {
   })
 
   // Maximize window on startup when not in development
-  if (!isDevelopment) win.maximize()
+  if (!isDevelopment && win !== null) {
+    win.maximize()
+  }
 
   i18nextBackend.mainBindings(ipcMain, win, fs)
 
@@ -100,10 +102,6 @@ async function createWindow () {
   // Load the index.html when not in development
   win.loadURL(winUrl)
 
-  win.on('closed', () => {
-    win = null
-  })
-
   const proxy = store.get('settings.proxy') ? store.get('settings.proxy') : null
   let proxyRules = 'direct://'
   if (proxy) {
@@ -316,7 +314,7 @@ ipcMain.on('online-status-changed', (event, status) => {
 app.on('activate', () => {
   // On macOS it's common to re-create a window in the app when the
   // dock icon is clicked and there are no other windows open.
-  if (win === null) {
+  if (BrowserWindow.getAllWindows().length === 0) {
     createWindow()
   }
 })
@@ -355,7 +353,9 @@ app.whenReady().then(() => {
 app.on('before-quit', () => {
   app.isQuiting = true
   globalShortcut.unregisterAll()
-  tray.destroy()
+  if (typeof tray !== typeof undefined) {
+    tray.destroy()
+  }
 })
 
 // Exit cleanly on request from parent process in development mode.

src/components/ArticleListItem.vue

@@ -26,13 +26,13 @@
       </div>
       <h6><strong>{{ article.articles.title }}</strong></h6>
       <img
-        v-if="article.articles.cover"
+        v-if="contentPreview && article.articles.cover"
         :src="article.articles.cover"
         class="img-fluid ratio-16x9 my-2"
         :alt="article.articles.title"
         loading="lazy"
       >
-      <p>{{ article.articles.contentSnippet }}</p>
+      <p v-if="contentPreview">{{ article.articles.contentSnippet }}</p>
       <p
         v-if="article.articles.favourite"
         class="text-right mb-0"
@@ -66,6 +66,11 @@ export default {
       default: null
     }
   },
+  computed: {
+    contentPreview () {
+      return this.$store.state.Setting.contentPreview
+    }
+  },
   methods: {
     formatDate (article) {
       let formatDate

src/components/PreferenceWindowModal.vue

@@ -100,6 +100,18 @@
                 @input="saveFullArticlePreferences"
               />
             </b-form-group>
+            <b-form-group :label="getTranslatedLabel('Content preview')">
+              <b-form-radio-group
+                id="contentPreview"
+                v-model="contentPreview"
+                buttons
+                button-variant="outline-primary"
+                size="sm"
+                :options="options"
+                name="contentPreview"
+                @input="saveContentPreviewPreferences"
+              />
+            </b-form-group>
             <b-form-group :label="getTranslatedLabel('Delete all feed, category and article data')">
               <b-button
                 variant="danger"
@@ -369,6 +381,7 @@ export default {
       disableImages: 'off',
       recentlyRead: 'off',
       fullArticleDefault: 'off',
+      contentPreview: 'on',
       keepread_options: [
         { value: 1, text: '1 week' },
         { value: 2, text: '2 weeks' },
@@ -435,6 +448,7 @@ export default {
       this.disableImages = this.$store.state.Setting.disableImages ? 'on' : 'off'
       this.recentlyRead = this.$store.state.Setting.recentlyReadPreference ? 'on' : 'off'
       this.fullArticleDefault = this.$store.state.Setting.fullArticleDefault ? 'on' : 'off'
+      this.contentPreview = this.$store.state.Setting.contentPreview ? 'on' : 'off'
       if (this.$store.state.Setting.proxy) {
         this.proxy.http = this.$store.state.Setting.proxy.http
         this.proxy.https = this.$store.state.Setting.proxy.https
@@ -502,6 +516,17 @@ export default {
       })
       this.hideModal()
     },
+    saveContentPreviewPreferences (preference) {
+      this.$store.dispatch('setContentPreviewPreference', preference).then(() => {
+        this.$store.dispatch('loadArticles')
+      })
+      this.$toasted.show('Content Preview preference changed.', {
+        theme: 'outline',
+        position: 'top-center',
+        duration: 3000
+      })
+      this.hideModal()
+    },
     saveFullArticlePreferences (preference) {
       this.$store.dispatch('setFullArticlePreference', preference)
       this.$toasted.show('Full Article preference changed.', {

src/main/tray.js

@@ -54,7 +54,9 @@ export default function createTray (mainWindow, i18nextMain) {
     tray.setContextMenu(contextMenu)
   }
   tray.on('click', () => {
-    mainWindow.show()
+    if (mainWindow !== null) {
+      mainWindow.show()
+    }
     if (process.platform === 'darwin' && !app.dock.isVisible()) {
       app.dock.show()
     }

src/store/modules/Setting.js

@@ -37,6 +37,7 @@ const state = {
   disableImages: false,
   fullArticleDefault: false,
   recentlyReadPreference: false,
+  contentPreview: false,
   offline: false,
   proxy: {
     http: '',
@@ -79,6 +80,9 @@ const mutations = {
   SET_THEME_OPTION (state, data) {
     state.darkMode = data
   },
+  SET_CONTENT_PREVIEW_PREFERENCE (state, data) {
+    state.contentPreview = data
+  },
   SET_FULL_ARTICLE_PREFERENCE (state, data) {
     state.fullArticleDefault = data
   },
@@ -242,6 +246,10 @@ const actions = {
     electronstore.storeSetSettingItem('set', 'settings.recentlyReadPreference', data === 'on')
     commit('SET_RECENTLY_READ_PREFERENCE', data === 'on')
   },
+  setContentPreviewPreference ({ commit }, data) {
+    electronstore.storeSetSettingItem('set', 'settings.contentPreviewPreference', data === 'on')
+    commit('SET_CONTENT_PREVIEW_PREFERENCE', data === 'on')
+  },
   setFullArticlePreference ({ commit }, data) {
     electronstore.storeSetSettingItem('set', 'settings.fullArticlePreference', data === 'on')
     commit('SET_FULL_ARTICLE_PREFERENCE', data === 'on')