mirror of
https://github.com/nextcloud/desktop.git
synced 2024-11-28 02:20:24 +03:00
0e004ec570
the wrong table when I made the change to allow multiple accounts. Minor GUI enhancements on the conflict resolution screen.
649 lines
22 KiB
XML
649 lines
22 KiB
XML
<?xml version="1.0" encoding="UTF-8"?>
|
|
<ui version="4.0">
|
|
<class>SyncWindow</class>
|
|
<widget class="QMainWindow" name="SyncWindow">
|
|
<property name="geometry">
|
|
<rect>
|
|
<x>0</x>
|
|
<y>0</y>
|
|
<width>771</width>
|
|
<height>407</height>
|
|
</rect>
|
|
</property>
|
|
<property name="windowTitle">
|
|
<string>SyncWindow</string>
|
|
</property>
|
|
<widget class="QWidget" name="centralWidget">
|
|
<layout class="QGridLayout" name="gridLayout">
|
|
<item row="0" column="0">
|
|
<widget class="QStackedWidget" name="stackedWidget">
|
|
<property name="lineWidth">
|
|
<number>0</number>
|
|
</property>
|
|
<property name="currentIndex">
|
|
<number>1</number>
|
|
</property>
|
|
<widget class="QWidget" name="page">
|
|
<layout class="QGridLayout" name="gridLayout_2">
|
|
<item row="7" column="0" colspan="3">
|
|
<widget class="QTextBrowser" name="textBrowser"/>
|
|
</item>
|
|
<item row="4" column="0" colspan="3">
|
|
<widget class="QLabel" name="status">
|
|
<property name="text">
|
|
<string/>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="5" column="0">
|
|
<widget class="QLabel" name="label">
|
|
<property name="text">
|
|
<string>File Progress:</string>
|
|
</property>
|
|
<property name="alignment">
|
|
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="6" column="1" colspan="2">
|
|
<widget class="QProgressBar" name="progressTotal">
|
|
<property name="value">
|
|
<number>0</number>
|
|
</property>
|
|
<property name="textVisible">
|
|
<bool>true</bool>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="6" column="0">
|
|
<widget class="QLabel" name="label_3">
|
|
<property name="text">
|
|
<string>Total Progress:</string>
|
|
</property>
|
|
<property name="alignment">
|
|
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="0" column="0" rowspan="2">
|
|
<widget class="QLabel" name="labelImage">
|
|
<property name="text">
|
|
<string/>
|
|
</property>
|
|
<property name="pixmap">
|
|
<pixmap resource="owncloud_sync.qrc">:/images/owncloud.png</pixmap>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="0" column="1">
|
|
<widget class="QTableWidget" name="tableAccounts">
|
|
<property name="statusTip">
|
|
<string/>
|
|
</property>
|
|
<column>
|
|
<property name="text">
|
|
<string>Name</string>
|
|
</property>
|
|
</column>
|
|
<column>
|
|
<property name="text">
|
|
<string>Enabled</string>
|
|
</property>
|
|
</column>
|
|
<column>
|
|
<property name="text">
|
|
<string>Last Sync</string>
|
|
</property>
|
|
</column>
|
|
</widget>
|
|
</item>
|
|
<item row="5" column="1" colspan="2">
|
|
<widget class="QProgressBar" name="progressFile">
|
|
<property name="value">
|
|
<number>0</number>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="8" column="1">
|
|
<widget class="QPushButton" name="conflict">
|
|
<property name="enabled">
|
|
<bool>false</bool>
|
|
</property>
|
|
<property name="text">
|
|
<string>Conflicts exist, click to resolve.</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="8" column="0">
|
|
<widget class="QPushButton" name="buttonNewAccount">
|
|
<property name="text">
|
|
<string>New Account</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
</layout>
|
|
</widget>
|
|
<widget class="QWidget" name="page_2">
|
|
<layout class="QGridLayout" name="gridLayout_3">
|
|
<item row="3" column="0">
|
|
<widget class="QDialogButtonBox" name="buttonBox">
|
|
<property name="standardButtons">
|
|
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="2" column="0">
|
|
<widget class="QTableWidget" name="tableConflict">
|
|
<property name="columnCount">
|
|
<number>5</number>
|
|
</property>
|
|
<column>
|
|
<property name="text">
|
|
<string>New Column</string>
|
|
</property>
|
|
</column>
|
|
<column>
|
|
<property name="text">
|
|
<string>Name</string>
|
|
</property>
|
|
</column>
|
|
<column>
|
|
<property name="text">
|
|
<string>Account</string>
|
|
</property>
|
|
</column>
|
|
<column>
|
|
<property name="text">
|
|
<string>Local Modified</string>
|
|
</property>
|
|
</column>
|
|
<column>
|
|
<property name="text">
|
|
<string>Which to keep?</string>
|
|
</property>
|
|
</column>
|
|
</widget>
|
|
</item>
|
|
<item row="1" column="0">
|
|
<widget class="QLabel" name="label_9">
|
|
<property name="text">
|
|
<string>Select the one files that should be used, either the server version or local version:</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="0" column="0">
|
|
<widget class="QLabel" name="label_13">
|
|
<property name="font">
|
|
<font>
|
|
<pointsize>19</pointsize>
|
|
<weight>75</weight>
|
|
<italic>false</italic>
|
|
<bold>true</bold>
|
|
<underline>false</underline>
|
|
</font>
|
|
</property>
|
|
<property name="text">
|
|
<string>CONFLICT RESOLUTION</string>
|
|
</property>
|
|
<property name="alignment">
|
|
<set>Qt::AlignCenter</set>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
</layout>
|
|
</widget>
|
|
<widget class="QWidget" name="page_3">
|
|
<layout class="QGridLayout" name="gridLayout_4">
|
|
<property name="margin">
|
|
<number>0</number>
|
|
</property>
|
|
<item row="0" column="0">
|
|
<widget class="QSplitter" name="splitter">
|
|
<property name="orientation">
|
|
<enum>Qt::Horizontal</enum>
|
|
</property>
|
|
<widget class="QFrame" name="frame">
|
|
<property name="minimumSize">
|
|
<size>
|
|
<width>400</width>
|
|
<height>0</height>
|
|
</size>
|
|
</property>
|
|
<property name="frameShape">
|
|
<enum>QFrame::NoFrame</enum>
|
|
</property>
|
|
<property name="frameShadow">
|
|
<enum>QFrame::Plain</enum>
|
|
</property>
|
|
<property name="lineWidth">
|
|
<number>0</number>
|
|
</property>
|
|
<layout class="QGridLayout" name="gridLayout_6">
|
|
<item row="0" column="0">
|
|
<widget class="QLabel" name="labelImage_2">
|
|
<property name="text">
|
|
<string/>
|
|
</property>
|
|
<property name="pixmap">
|
|
<pixmap resource="owncloud_sync.qrc">:/images/owncloud.png</pixmap>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="0" column="1">
|
|
<widget class="QTextBrowser" name="textBrowser_2">
|
|
<property name="html">
|
|
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
|
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
|
p, li { white-space: pre-wrap; }
|
|
</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;">
|
|
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Enter your account details below. Leave off the /files/webdav.php on all remote references.</p>
|
|
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt; font-weight:600;">No spaces on the account name!!</span></p>
|
|
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Enter any filters for files that you want to exclude. Only wildcard supported is *</p>
|
|
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">To delete account enable the button from he pop up menu. Then click the delete account button.</p></body></html></string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="1" column="0">
|
|
<widget class="QLabel" name="label_10">
|
|
<property name="text">
|
|
<string>Account Name: </string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="1" column="1">
|
|
<widget class="QLineEdit" name="lineName">
|
|
<property name="statusTip">
|
|
<string/>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="2" column="0">
|
|
<widget class="QLabel" name="label_4">
|
|
<property name="text">
|
|
<string>Hostname: </string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="2" column="1">
|
|
<widget class="QLineEdit" name="lineHost"/>
|
|
</item>
|
|
<item row="3" column="0">
|
|
<widget class="QLabel" name="label_2">
|
|
<property name="text">
|
|
<string>Username: </string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="3" column="1">
|
|
<widget class="QLineEdit" name="lineUser">
|
|
<property name="echoMode">
|
|
<enum>QLineEdit::Normal</enum>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="4" column="0">
|
|
<widget class="QLabel" name="label_5">
|
|
<property name="text">
|
|
<string>Password: </string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="4" column="1">
|
|
<widget class="QLineEdit" name="linePassword">
|
|
<property name="echoMode">
|
|
<enum>QLineEdit::PasswordEchoOnEdit</enum>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="5" column="0">
|
|
<widget class="QLabel" name="label_11">
|
|
<property name="text">
|
|
<string>Remote Directory: </string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="5" column="1">
|
|
<widget class="QFrame" name="frame_2">
|
|
<property name="frameShape">
|
|
<enum>QFrame::NoFrame</enum>
|
|
</property>
|
|
<property name="frameShadow">
|
|
<enum>QFrame::Plain</enum>
|
|
</property>
|
|
<property name="lineWidth">
|
|
<number>0</number>
|
|
</property>
|
|
<layout class="QHBoxLayout" name="horizontalLayout_3">
|
|
<property name="leftMargin">
|
|
<number>0</number>
|
|
</property>
|
|
<property name="topMargin">
|
|
<number>0</number>
|
|
</property>
|
|
<property name="rightMargin">
|
|
<number>0</number>
|
|
</property>
|
|
<item>
|
|
<widget class="QLineEdit" name="lineRemoteDir"/>
|
|
</item>
|
|
<item>
|
|
<widget class="QToolButton" name="buttonRemoteDir">
|
|
<property name="text">
|
|
<string>...</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
</layout>
|
|
</widget>
|
|
</item>
|
|
<item row="6" column="0">
|
|
<widget class="QLabel" name="label_6">
|
|
<property name="text">
|
|
<string>Local Directory: </string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="6" column="1">
|
|
<widget class="QFrame" name="frame_3">
|
|
<property name="frameShape">
|
|
<enum>QFrame::NoFrame</enum>
|
|
</property>
|
|
<property name="frameShadow">
|
|
<enum>QFrame::Plain</enum>
|
|
</property>
|
|
<property name="lineWidth">
|
|
<number>0</number>
|
|
</property>
|
|
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
|
<property name="margin">
|
|
<number>0</number>
|
|
</property>
|
|
<item>
|
|
<widget class="QLineEdit" name="lineLocalDir"/>
|
|
</item>
|
|
<item>
|
|
<widget class="QToolButton" name="buttonSyncDir">
|
|
<property name="text">
|
|
<string>...</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
</layout>
|
|
</widget>
|
|
</item>
|
|
<item row="7" column="0">
|
|
<widget class="QLabel" name="label_7">
|
|
<property name="text">
|
|
<string>Update every: </string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="7" column="1">
|
|
<widget class="QFrame" name="frame_4">
|
|
<property name="frameShape">
|
|
<enum>QFrame::NoFrame</enum>
|
|
</property>
|
|
<property name="frameShadow">
|
|
<enum>QFrame::Plain</enum>
|
|
</property>
|
|
<property name="lineWidth">
|
|
<number>0</number>
|
|
</property>
|
|
<layout class="QHBoxLayout" name="horizontalLayout">
|
|
<property name="spacing">
|
|
<number>0</number>
|
|
</property>
|
|
<property name="leftMargin">
|
|
<number>0</number>
|
|
</property>
|
|
<property name="rightMargin">
|
|
<number>0</number>
|
|
</property>
|
|
<item>
|
|
<widget class="QSpinBox" name="time">
|
|
<property name="value">
|
|
<number>15</number>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item>
|
|
<widget class="QLabel" name="label_8">
|
|
<property name="text">
|
|
<string> seconds</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item>
|
|
<widget class="QPushButton" name="buttonSave">
|
|
<property name="enabled">
|
|
<bool>false</bool>
|
|
</property>
|
|
<property name="text">
|
|
<string>Save</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item>
|
|
<widget class="QPushButton" name="buttonCancel">
|
|
<property name="text">
|
|
<string>Cancel</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item>
|
|
<widget class="QPushButton" name="buttonDeleteAccount">
|
|
<property name="enabled">
|
|
<bool>false</bool>
|
|
</property>
|
|
<property name="text">
|
|
<string>Delete Account</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
</layout>
|
|
</widget>
|
|
</item>
|
|
</layout>
|
|
<zorder>label_10</zorder>
|
|
<zorder>labelImage_2</zorder>
|
|
<zorder>textBrowser_2</zorder>
|
|
<zorder>linePassword</zorder>
|
|
<zorder>lineName</zorder>
|
|
<zorder>label_11</zorder>
|
|
<zorder>label_5</zorder>
|
|
<zorder>label_7</zorder>
|
|
<zorder>label_4</zorder>
|
|
<zorder>label_2</zorder>
|
|
<zorder>lineUser</zorder>
|
|
<zorder>lineHost</zorder>
|
|
<zorder>label_6</zorder>
|
|
<zorder>frame_4</zorder>
|
|
<zorder>frame_2</zorder>
|
|
<zorder>frame_3</zorder>
|
|
</widget>
|
|
<widget class="QFrame" name="frameFilter">
|
|
<property name="sizePolicy">
|
|
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
|
|
<horstretch>0</horstretch>
|
|
<verstretch>0</verstretch>
|
|
</sizepolicy>
|
|
</property>
|
|
<property name="minimumSize">
|
|
<size>
|
|
<width>200</width>
|
|
<height>0</height>
|
|
</size>
|
|
</property>
|
|
<property name="maximumSize">
|
|
<size>
|
|
<width>200</width>
|
|
<height>16777215</height>
|
|
</size>
|
|
</property>
|
|
<property name="frameShape">
|
|
<enum>QFrame::NoFrame</enum>
|
|
</property>
|
|
<property name="frameShadow">
|
|
<enum>QFrame::Plain</enum>
|
|
</property>
|
|
<property name="lineWidth">
|
|
<number>0</number>
|
|
</property>
|
|
<layout class="QGridLayout" name="gridLayout_5">
|
|
<item row="3" column="0" colspan="2">
|
|
<widget class="QListView" name="listFilterView"/>
|
|
</item>
|
|
<item row="2" column="1">
|
|
<widget class="QPushButton" name="buttonFilterRemove">
|
|
<property name="enabled">
|
|
<bool>false</bool>
|
|
</property>
|
|
<property name="text">
|
|
<string>Remove</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="1" column="0" colspan="2">
|
|
<widget class="QLineEdit" name="lineFilter"/>
|
|
</item>
|
|
<item row="0" column="0" colspan="2">
|
|
<widget class="QLabel" name="label_12">
|
|
<property name="text">
|
|
<string>Add Filter:</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="2" column="0">
|
|
<widget class="QPushButton" name="buttonFilterInsert">
|
|
<property name="enabled">
|
|
<bool>false</bool>
|
|
</property>
|
|
<property name="text">
|
|
<string>Insert</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
</layout>
|
|
</widget>
|
|
</widget>
|
|
</item>
|
|
</layout>
|
|
</widget>
|
|
</widget>
|
|
</item>
|
|
</layout>
|
|
</widget>
|
|
<widget class="QMenuBar" name="menuBar">
|
|
<property name="geometry">
|
|
<rect>
|
|
<x>0</x>
|
|
<y>0</y>
|
|
<width>771</width>
|
|
<height>22</height>
|
|
</rect>
|
|
</property>
|
|
<widget class="QMenu" name="menuProgram">
|
|
<property name="title">
|
|
<string>Program</string>
|
|
</property>
|
|
<addaction name="actionConfigure_Global_Filters"/>
|
|
<addaction name="action_Quit"/>
|
|
<addaction name="actionHide_on_start"/>
|
|
<addaction name="actionClose_Button_Hides_Window"/>
|
|
<addaction name="actionEnable_Delete_Account"/>
|
|
</widget>
|
|
<widget class="QMenu" name="menuHelp">
|
|
<property name="title">
|
|
<string>Help</string>
|
|
</property>
|
|
<addaction name="action_Help"/>
|
|
</widget>
|
|
<addaction name="menuProgram"/>
|
|
<addaction name="menuHelp"/>
|
|
</widget>
|
|
<widget class="QToolBar" name="mainToolBar">
|
|
<attribute name="toolBarArea">
|
|
<enum>TopToolBarArea</enum>
|
|
</attribute>
|
|
<attribute name="toolBarBreak">
|
|
<bool>false</bool>
|
|
</attribute>
|
|
</widget>
|
|
<widget class="QStatusBar" name="statusBar"/>
|
|
<action name="action_Quit">
|
|
<property name="text">
|
|
<string>&Quit</string>
|
|
</property>
|
|
<property name="statusTip">
|
|
<string/>
|
|
</property>
|
|
</action>
|
|
<action name="action_Help">
|
|
<property name="text">
|
|
<string>&Help</string>
|
|
</property>
|
|
<property name="statusTip">
|
|
<string/>
|
|
</property>
|
|
</action>
|
|
<action name="actionConfigure_Global_Filters">
|
|
<property name="text">
|
|
<string>Global Filters</string>
|
|
</property>
|
|
<property name="statusTip">
|
|
<string/>
|
|
</property>
|
|
</action>
|
|
<action name="actionHide_on_start">
|
|
<property name="checkable">
|
|
<bool>true</bool>
|
|
</property>
|
|
<property name="checked">
|
|
<bool>true</bool>
|
|
</property>
|
|
<property name="text">
|
|
<string>Hide on start</string>
|
|
</property>
|
|
</action>
|
|
<action name="actionEnable_Delete_Account">
|
|
<property name="text">
|
|
<string>Enable Delete Account</string>
|
|
</property>
|
|
</action>
|
|
<action name="actionClose_Button_Hides_Window">
|
|
<property name="checkable">
|
|
<bool>true</bool>
|
|
</property>
|
|
<property name="checked">
|
|
<bool>true</bool>
|
|
</property>
|
|
<property name="text">
|
|
<string>Close Button Hides Window</string>
|
|
</property>
|
|
</action>
|
|
</widget>
|
|
<layoutdefault spacing="6" margin="11"/>
|
|
<tabstops>
|
|
<tabstop>lineName</tabstop>
|
|
<tabstop>lineHost</tabstop>
|
|
<tabstop>lineUser</tabstop>
|
|
<tabstop>linePassword</tabstop>
|
|
<tabstop>lineRemoteDir</tabstop>
|
|
<tabstop>buttonRemoteDir</tabstop>
|
|
<tabstop>lineLocalDir</tabstop>
|
|
<tabstop>buttonSyncDir</tabstop>
|
|
<tabstop>time</tabstop>
|
|
<tabstop>buttonSave</tabstop>
|
|
<tabstop>buttonCancel</tabstop>
|
|
<tabstop>textBrowser</tabstop>
|
|
<tabstop>conflict</tabstop>
|
|
<tabstop>tableAccounts</tabstop>
|
|
<tabstop>tableConflict</tabstop>
|
|
<tabstop>buttonBox</tabstop>
|
|
<tabstop>textBrowser_2</tabstop>
|
|
</tabstops>
|
|
<resources>
|
|
<include location="owncloud_sync.qrc"/>
|
|
</resources>
|
|
<connections/>
|
|
</ui>
|