mirror/vorta
1
0
Fork 0
mirror of https://github.com/borgbase/vorta synced 2025-02-23 14:50:42 +00:00
Code Issues Releases Wiki Activity

Enable word wrapping for repo/ssh-add and main window status display. Fixes #30

Browse source
This commit is contained in:
Manu 2018-11-22 09:48:05 +08:00
parent ef1966c27a
commit 3800b4f459
4 changed files with 74 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
src/vorta/assets/UI/mainwindow.ui
View file

@ -170,6 +170,57 @@
</item> </item>
<item> <item>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="1" column="1">
<widget class="QLabel" name="createProgressText">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="font">
<font>
<pointsize>11</pointsize>
</font>
</property>
<property name="text">
<string/>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QPushButton" name="cancelButton">
<property name="enabled">
<bool>false</bool>
</property>
<property name="font">
<font>
<pointsize>11</pointsize>
</font>
</property>
<property name="autoFillBackground">
<bool>false</bool>
</property>
<property name="text">
<string>Cancel</string>
</property>
<property name="flat">
<bool>false</bool>
</property>
</widget>
</item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QProgressBar" name="createProgress"> <widget class="QProgressBar" name="createProgress">
<property name="enabled"> <property name="enabled">
@ -233,42 +284,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1">
<widget class="QLabel" name="createProgressText">
<property name="font">
<font>
<pointsize>11</pointsize>
</font>
</property>
<property name="text">
<string/>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QPushButton" name="cancelButton">
<property name="enabled">
<bool>false</bool>
</property>
<property name="font">
<font>
<pointsize>11</pointsize>
</font>
</property>
<property name="autoFillBackground">
<bool>false</bool>
</property>
<property name="text">
<string>Cancel</string>
</property>
<property name="flat">
<bool>false</bool>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
</layout> </layout>

15
src/vorta/assets/UI/repoadd.ui
View file

@ -65,7 +65,7 @@
<string>...</string> <string>...</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../icons/collection.qrc"> <iconset>
<normaloff>:/icons/folder-open.svg</normaloff>:/icons/folder-open.svg</iconset> <normaloff>:/icons/folder-open.svg</normaloff>:/icons/folder-open.svg</iconset>
</property> </property>
</widget> </widget>
@ -76,7 +76,7 @@
<string>...</string> <string>...</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../icons/collection.qrc"> <iconset>
<normaloff>:/icons/globe.svg</normaloff>:/icons/globe.svg</iconset> <normaloff>:/icons/globe.svg</normaloff>:/icons/globe.svg</iconset>
</property> </property>
</widget> </widget>
@ -159,14 +159,17 @@
</item> </item>
<item row="7" column="1"> <item row="7" column="1">
<widget class="QLabel" name="errorText"> <widget class="QLabel" name="errorText">
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="font"> <property name="font">
<font> <font>
<pointsize>11</pointsize> <pointsize>11</pointsize>
</font> </font>
</property> </property>
<property name="text">
<string/>
</property>
<property name="textFormat"> <property name="textFormat">
<enum>Qt::PlainText</enum> <enum>Qt::PlainText</enum>
</property> </property>
@ -174,7 +177,7 @@
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property> </property>
<property name="wordWrap"> <property name="wordWrap">
<bool>false</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>

9
src/vorta/assets/UI/sshadd.ui
View file

@ -131,6 +131,12 @@
</item> </item>
<item alignment="Qt::AlignBottom"> <item alignment="Qt::AlignBottom">
<widget class="QLabel" name="errors"> <widget class="QLabel" name="errors">
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="font"> <property name="font">
<font> <font>
<pointsize>10</pointsize> <pointsize>10</pointsize>
@ -139,6 +145,9 @@
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item> <item>

6
src/vorta/models.py
View file

@ -6,7 +6,7 @@
import peewee as pw import peewee as pw
import json import json
from datetime import datetime from datetime import datetime, timedelta
from playhouse.migrate import SqliteMigrator, migrate from playhouse.migrate import SqliteMigrator, migrate
SCHEMA_VERSION = 7 SCHEMA_VERSION = 7
@ -177,6 +177,10 @@ def init_db(con):
default_profile = BackupProfileModel(name='Default Profile') default_profile = BackupProfileModel(name='Default Profile')
default_profile.save() default_profile.save()
# Delete old log entries after 3 months.
three_months_ago = datetime.now() - timedelta(days=180)
EventLogModel.delete().where(EventLogModel.start_time < three_months_ago)
# Migrations # Migrations
# See http://docs.peewee-orm.com/en/latest/peewee/playhouse.html#schema-migrations # See http://docs.peewee-orm.com/en/latest/peewee/playhouse.html#schema-migrations
current_schema, created = SchemaVersion.get_or_create(id=1, defaults={'version': SCHEMA_VERSION}) current_schema, created = SchemaVersion.get_or_create(id=1, defaults={'version': SCHEMA_VERSION})