Merge branch 'master' into patch-1

Author: real-yfprojects

src/vorta/assets/UI/abouttab.ui

@@ -213,7 +213,7 @@
          <item>
           <widget class="QLabel" name="label">
            <property name="text">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;https://github.com/borgbase/vorta&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0984e3;&quot;&gt;Click here&lt;/span&gt;&lt;/a&gt; for view Git repo.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;https://github.com/borgbase/vorta&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0984e3;&quot;&gt;Click here&lt;/span&gt;&lt;/a&gt; to view Git repo.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
            </property>
            <property name="openExternalLinks">
             <bool>true</bool>
@@ -241,7 +241,7 @@
           <number>20</number>
          </property>
          <item>
-          <widget class="QLabel" name="label">
+          <widget class="QLabel" name="copyrightLabel">
            <property name="text">
             <string>
              Vorta is a cross-platform, open-source client designed to simplify the management of Borg backups.

src/vorta/assets/UI/scheduletab.ui

@@ -626,6 +626,19 @@
          </column>
         </widget>
        </item>
+        <item row="2" column="0">
+    <widget class="QLabel" name="logLink">
+        <property name="text">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;file:///&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0984e3;&quot;&gt;View the logs&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        </property>
+        <property name="indent">
+            <number>0</number>
+        </property>
+        <property name="openExternalLinks">
+            <bool>true</bool>
+        </property>
+    </widget>
+</item>
       </layout>
      </widget>
      <widget class="QWidget" name="page_3">

src/vorta/assets/exclusion_presets/dev.json

@@ -5,7 +5,8 @@
         "patterns":
         [
             "fm:*/node_modules",
-            "fm:*/.npm"
+            "fm:*/.npm",
+            "fm:*/npm-global"
         ],
         "tags": ["type:dev", "lang:javascript", "os:linux", "os:darwin"],
         "author": "Divi"
@@ -33,5 +34,27 @@
         ],
         "tags": ["type:dev", "lang:rust", "os:linux", "os:darwin"],
         "author": "Divi"
+    },
+    {
+        "name": "Visual Studio Code cache and config files",
+        "slug": "vscode-cache",
+        "patterns": [
+            "fm:*/.config/Code",
+            "fm:*/.vscode/extensions/*"
+        ],
+        "tags": ["type:editor", "editor:vscode", "os:linux"],
+        "author": "shivansh02"
+    },
+    {
+        "name": "Android Studio Artefacts",
+        "slug": "android-studio",
+        "patterns": [
+            "fm:*/.android",
+            "fm:*/.gradle",
+            "fm:*/Android/Sdk",
+            "fm:*/.AndroidStudio"
+        ],
+        "tags": ["type:dev", "editor:android-studio", "os:linux"],
+        "author": "shivansh02"
     }
 ]

src/vorta/views/about_tab.py

@@ -1,4 +1,5 @@
 import logging
+from datetime import datetime
 
 from PyQt6 import QtCore, uic
 
@@ -28,6 +29,9 @@ def __init__(self, parent=None):
         )
         self.gpl_logo.setPixmap(get_colored_icon('gpl_logo', scaled_height=40, return_qpixmap=True))
         self.python_logo.setPixmap(get_colored_icon('python_logo', scaled_height=40, return_qpixmap=True))
+        copyright_text = self.copyrightLabel.text()
+        copyright_text = copyright_text.replace('2020', str(datetime.now().year))
+        self.copyrightLabel.setText(copyright_text)
 
     def set_borg_details(self, version, path):
         self.borgVersion.setText(version)

src/vorta/views/schedule_tab.py

@@ -8,7 +8,7 @@
     QTableWidgetItem,
 )
 
-from vorta import application
+from vorta import application, config
 from vorta.i18n import get_locale
 from vorta.scheduler import ScheduleStatusType
 from vorta.store.models import BackupProfileMixin, EventLogModel, WifiSettingModel
@@ -43,6 +43,10 @@ def __init__(self, parent=None):
         # Set up log table
         self.logTableWidget.setAlternatingRowColors(True)
         header = self.logTableWidget.horizontalHeader()
+        self.logLink.setText(
+            f'<a href="file://{config.LOG_DIR}"><span style="text-decoration:'
+            'underline; color:#0984e3;">Click here</span></a> for complete logs.'
+        )
         header.setVisible(True)
         [header.setSectionResizeMode(i, QHeaderView.ResizeMode.ResizeToContents) for i in range(5)]
         header.setSectionResizeMode(3, QHeaderView.ResizeMode.Stretch)