Skip to content

Commit

Permalink
feat(comparison): added new ui for locked and important folders
Browse files Browse the repository at this point in the history
  • Loading branch information
@theophanemayaud
theophanemayaud committed May 22, 2021
1 parent 0560d28 commit 57dd50c
Showing 1 changed file with 154 additions and 23 deletions.
177 changes: 154 additions & 23 deletions QtProject/app/comparison.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
</size>
</property>
<property name="currentIndex">
<number>0</number>
<number>1</number>
</property>
<widget class="QWidget" name="tab">
<attribute name="title">
Expand Down Expand Up @@ -949,6 +949,9 @@
</property>
<item>
<layout class="QVBoxLayout" name="verticalLayout_3">
<property name="spacing">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label_15">
<property name="sizePolicy">
Expand All @@ -971,6 +974,152 @@
</property>
</widget>
</item>
<item>
<widget class="Line" name="line_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_8">
<item>
<widget class="QLabel" name="label_11">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>General settings</string>
</property>
<property name="alignment">
<set>Qt::AlignHCenter|Qt::AlignTop</set>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_10">
<item>
<widget class="QLabel" name="label_13">
<property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
</size>
</property>
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Important folders</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_17">
<property name="minimumSize">
<size>
<width>320</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Duplicates in these folders will be kept first, keeping the one in the highest folder in the list. However if two are placed within the same level folder, one of them will still be deleted. </string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QListWidget" name="importantFolderslistWidget">
<property name="dragEnabled">
<bool>true</bool>
</property>
<property name="dragDropMode">
<enum>QAbstractItemView::InternalMove</enum>
</property>
<property name="horizontalScrollMode">
<enum>QAbstractItemView::ScrollPerItem</enum>
</property>
<property name="itemAlignment">
<set>Qt::AlignRight</set>
</property>
<property name="sortingEnabled">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_12">
<item>
<widget class="QLabel" name="label_24">
<property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
</size>
</property>
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Locked folders</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_25">
<property name="minimumSize">
<size>
<width>320</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Duplicates in these folders will never be deleted. Note that if one of a duplicate pair is in a locked folder, and that the current choice of deletion would be the locked one, the software will not delete the other one, but keep both !</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QListWidget" name="lockedFolderslistWidget">
<property name="verticalScrollBarPolicy">
<enum>Qt::ScrollBarAsNeeded</enum>
</property>
<property name="showDropIndicator" stdset="0">
<bool>false</bool>
</property>
<property name="dragEnabled">
<bool>false</bool>
</property>
<property name="dragDropMode">
<enum>QAbstractItemView::NoDragDrop</enum>
</property>
<property name="horizontalScrollMode">
<enum>QAbstractItemView::ScrollPerItem</enum>
</property>
<property name="itemAlignment">
<set>Qt::AlignRight</set>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
<item>
<widget class="Line" name="line_4">
<property name="orientation">
Expand Down Expand Up @@ -1020,22 +1169,6 @@
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="autoIdenticalFilesNamesMustBeContainedCheckbox">
<property name="enabled">
Expand Down Expand Up @@ -1068,7 +1201,7 @@
</property>
<property name="minimumSize">
<size>
<width>300</width>
<width>200</width>
<height>0</height>
</size>
</property>
Expand Down Expand Up @@ -1121,13 +1254,11 @@
<number>2</number>
</property>
<property name="text">
<string>If both have :
<string>Keeps the bigger file if both have :
- max 1 second time duration difference
- same resolution
- same FPS
- different file sizes

Keeps the bigger file.</string>
- different file sizes</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -1166,7 +1297,7 @@ Keeps the bigger file.</string>
</property>
<property name="minimumSize">
<size>
<width>300</width>
<width>200</width>
<height>0</height>
</size>
</property>
Expand Down

0 comments on commit 57dd50c

Please sign in to comment.