Merge branch 'master' into check-notification-borgbase#1632

TheLazron · Apr 1, 2024 · ad17e68 · ad17e68
2 parents e17e5c0 + d721011
commit ad17e68
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 2 deletions.
diff --git a/src/vorta/assets/UI/scheduletab.ui b/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">

diff --git a/src/vorta/assets/exclusion_presets/dev.json b/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"
     }
 ]
diff --git a/src/vorta/views/schedule_tab.py b/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)