From b3c8bdcc0d1e4b2ab298847a7902b6d60410a5bc Mon Sep 17 00:00:00 2001
From: Thomas Preud'homme <robotux@celest.fr>
Date: Fri, 24 Nov 2017 23:24:09 +0000
Subject: New upstream version 1.2.3.6

---
 OptionDialog.ui | 193 ++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 119 insertions(+), 74 deletions(-)

(limited to 'OptionDialog.ui')

diff --git a/OptionDialog.ui b/OptionDialog.ui
index 61f134d..5ed7b52 100644
--- a/OptionDialog.ui
+++ b/OptionDialog.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>717</width>
+    <width>779</width>
     <height>455</height>
    </rect>
   </property>
@@ -14,7 +14,7 @@
    <string>Options</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="resources/resources.qrc">
+   <iconset resource="resources/ultracopier-resources.qrc">
     <normaloff>:/options.png</normaloff>:/options.png</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
@@ -70,9 +70,6 @@
         <property name="text">
          <string>Listener</string>
         </property>
-        <property name="flags">
-         <set>ItemIsDragEnabled|ItemIsUserCheckable|ItemIsEnabled</set>
-        </property>
        </item>
        <item>
         <property name="text">
@@ -105,16 +102,19 @@
      <item>
       <widget class="QStackedWidget" name="stackedWidget">
        <property name="currentIndex">
-        <number>8</number>
+        <number>0</number>
        </property>
        <widget class="QWidget" name="stackedWidgetGeneral">
-        <layout class="QVBoxLayout" name="verticalLayout_10">
+        <layout class="QVBoxLayout" name="verticalLayout_9">
          <item>
           <layout class="QFormLayout" name="formLayout_2">
+           <property name="fieldGrowthPolicy">
+            <enum>QFormLayout::ExpandingFieldsGrow</enum>
+           </property>
            <item row="0" column="0">
-            <widget class="QLabel" name="labelLanguage">
+            <widget class="QCheckBox" name="Language_force">
              <property name="text">
-              <string>Language:</string>
+              <string>Force the language</string>
              </property>
             </widget>
            </item>
@@ -122,55 +122,41 @@
             <widget class="QComboBox" name="Language"/>
            </item>
            <item row="1" column="0">
-            <widget class="QLabel" name="labelLanguageAutodetect">
-             <property name="text">
-              <string>Autodetect the system language:</string>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="1">
-            <widget class="QCheckBox" name="Language_autodetect">
-             <property name="text">
-              <string/>
-             </property>
-            </widget>
-           </item>
-           <item row="2" column="0">
             <widget class="QLabel" name="labelCatchCopyDefault">
              <property name="text">
-              <string>Catch the copy/move as default:</string>
+              <string>Replace the default copy and move system</string>
              </property>
             </widget>
            </item>
-           <item row="2" column="1">
+           <item row="1" column="1">
             <widget class="QCheckBox" name="CatchCopyAsDefault">
              <property name="text">
               <string/>
              </property>
             </widget>
            </item>
-           <item row="3" column="0">
+           <item row="2" column="0">
             <widget class="QLabel" name="labelLoadAtSession">
              <property name="text">
-              <string>Load at the session loading:</string>
+              <string>Load at the session loading</string>
              </property>
             </widget>
            </item>
-           <item row="3" column="1">
+           <item row="2" column="1">
             <widget class="QCheckBox" name="LoadAtSessionStarting">
              <property name="text">
               <string/>
              </property>
             </widget>
            </item>
-           <item row="4" column="0">
+           <item row="3" column="0">
             <widget class="QLabel" name="label_8">
              <property name="text">
-              <string>When manual open:</string>
+              <string>When manual open</string>
              </property>
             </widget>
            </item>
-           <item row="4" column="1">
+           <item row="3" column="1">
             <widget class="QComboBox" name="ActionOnManualOpen">
              <item>
               <property name="text">
@@ -189,7 +175,14 @@
              </item>
             </widget>
            </item>
-           <item row="5" column="1">
+           <item row="4" column="0">
+            <widget class="QLabel" name="label_9">
+             <property name="text">
+              <string>Group the windows when</string>
+             </property>
+            </widget>
+           </item>
+           <item row="4" column="1">
             <widget class="QComboBox" name="GroupWindowWhen">
              <item>
               <property name="text">
@@ -224,12 +217,66 @@
             </widget>
            </item>
            <item row="5" column="0">
-            <widget class="QLabel" name="label_9">
+            <widget class="QLabel" name="label_7">
+             <property name="text">
+              <string>Confirm to group the windows</string>
+             </property>
+            </widget>
+           </item>
+           <item row="6" column="0">
+            <widget class="QLabel" name="label_11">
+             <property name="text">
+              <string>Display the OS warning</string>
+             </property>
+            </widget>
+           </item>
+           <item row="6" column="1">
+            <widget class="QCheckBox" name="DisplayOSWarning"/>
+           </item>
+           <item row="5" column="1">
+            <widget class="QCheckBox" name="confirmToGroupWindows"/>
+           </item>
+           <item row="7" column="1">
+            <widget class="QCheckBox" name="checkTheUpdate"/>
+           </item>
+           <item row="7" column="0">
+            <widget class="QLabel" name="label_checkTheUpdate">
+             <property name="text">
+              <string>Check for updates</string>
+             </property>
+            </widget>
+           </item>
+           <item row="8" column="1">
+            <widget class="QCheckBox" name="giveGPUTime"/>
+           </item>
+           <item row="8" column="0">
+            <widget class="QLabel" name="label_gpu_time">
+             <property name="text">
+              <string>Give GPU time to fund the development</string>
+             </property>
+            </widget>
+           </item>
+           <item row="9" column="0">
+            <widget class="QLabel" name="label_10">
              <property name="text">
-              <string>Group the windows when:</string>
+              <string>Remaining time algorithm</string>
              </property>
             </widget>
            </item>
+           <item row="9" column="1">
+            <widget class="QComboBox" name="remainingTimeAlgorithm">
+             <item>
+              <property name="text">
+               <string>Traditional</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>Logarithmic</string>
+              </property>
+             </item>
+            </widget>
+           </item>
           </layout>
          </item>
          <item>
@@ -401,7 +448,7 @@
                 <bool>false</bool>
                </property>
                <property name="icon">
-                <iconset resource="resources/resources.qrc">
+                <iconset resource="resources/ultracopier-resources.qrc">
                  <normaloff>:/moveUp.png</normaloff>:/moveUp.png</iconset>
                </property>
               </widget>
@@ -412,7 +459,7 @@
                 <bool>false</bool>
                </property>
                <property name="icon">
-                <iconset resource="resources/resources.qrc">
+                <iconset resource="resources/ultracopier-resources.qrc">
                  <normaloff>:/moveDown.png</normaloff>:/moveDown.png</iconset>
                </property>
               </widget>
@@ -436,7 +483,7 @@
          </item>
         </layout>
        </widget>
-       <widget class="QWidget" name="stackedWidgetCopyEngine_2">
+       <widget class="QWidget" name="stackedWidgetCopyEngineOptions">
         <layout class="QHBoxLayout" name="horizontalLayout_5">
          <item>
           <widget class="QStackedWidget" name="stackedOptionsCopyEngine"/>
@@ -444,27 +491,41 @@
         </layout>
        </widget>
        <widget class="QWidget" name="stackedWidgetListener">
+        <layout class="QVBoxLayout" name="verticalLayout_10">
+         <item>
+          <widget class="QLabel" name="label_6">
+           <property name="text">
+            <string>Client connected</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QListWidget" name="clientConnected"/>
+         </item>
+        </layout>
+       </widget>
+       <widget class="QWidget" name="stackedWidgetListenerOptions">
         <layout class="QVBoxLayout" name="verticalLayout_11">
          <item>
           <widget class="QStackedWidget" name="stackedOptionsListener"/>
          </item>
         </layout>
        </widget>
-       <widget class="QWidget" name="stackedWidgetPluginLoader">
+       <widget class="QWidget" name="stackedWidgetPluginLoaderOptions">
         <layout class="QVBoxLayout" name="verticalLayout_12">
          <item>
           <widget class="QStackedWidget" name="stackedOptionsPluginLoader"/>
          </item>
         </layout>
        </widget>
-       <widget class="QWidget" name="stackedWidgetSessionLoader">
+       <widget class="QWidget" name="stackedWidgetSessionLoaderOptions">
         <layout class="QVBoxLayout" name="verticalLayout_13">
          <item>
           <widget class="QStackedWidget" name="stackedOptionsSessionLoader"/>
          </item>
         </layout>
        </widget>
-       <widget class="QWidget" name="stackedWidgetThemes_2">
+       <widget class="QWidget" name="stackedWidgetThemes">
         <layout class="QVBoxLayout" name="verticalLayout_6">
          <item>
           <layout class="QHBoxLayout" name="horizontalLayout_2">
@@ -513,11 +574,11 @@
           </layout>
          </item>
          <item>
-          <widget class="QStackedWidget" name="stackedWidgetThemes">
+          <widget class="QStackedWidget" name="stackedWidgetThemesOptions">
            <property name="currentIndex">
             <number>1</number>
            </property>
-           <widget class="QWidget" name="page_2">
+           <widget class="QWidget" name="pageUnableToLoadThemePlugin">
             <layout class="QVBoxLayout" name="verticalLayout_7">
              <item>
               <spacer name="verticalSpacer_2">
@@ -535,7 +596,7 @@
              <item>
               <widget class="QLabel" name="label_3">
                <property name="pixmap">
-                <pixmap resource="resources/resources.qrc">:/bug-128x128.png</pixmap>
+                <pixmap resource="resources/ultracopier-resources.qrc">:/bug-128x128.png</pixmap>
                </property>
                <property name="alignment">
                 <set>Qt::AlignCenter</set>
@@ -574,7 +635,7 @@
              </item>
             </layout>
            </widget>
-           <widget class="QWidget" name="page_3">
+           <widget class="QWidget" name="pageThemeNoOptions">
             <layout class="QVBoxLayout" name="verticalLayout_8">
              <item>
               <spacer name="verticalSpacer_4">
@@ -592,7 +653,7 @@
              <item>
               <widget class="QLabel" name="label_4">
                <property name="pixmap">
-                <pixmap resource="resources/resources.qrc">:/none-128x128.png</pixmap>
+                <pixmap resource="resources/ultracopier-resources.qrc">:/none-128x128.png</pixmap>
                </property>
                <property name="alignment">
                 <set>Qt::AlignCenter</set>
@@ -647,7 +708,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QPushButton" name="pushButton">
+            <widget class="QPushButton" name="logBrowse">
              <property name="enabled">
               <bool>false</bool>
              </property>
@@ -664,7 +725,7 @@
             <bool>false</bool>
            </property>
            <property name="toolTip">
-            <string>This write directly the file when it receive the new entry, but it can produce 50% of lost of performance</string>
+            <string>Write directly to the file when it receive a new entry (can produce 50% of lost of performance)</string>
            </property>
            <property name="text">
             <string>Synchronized log</string>
@@ -677,7 +738,7 @@
             <bool>false</bool>
            </property>
            <property name="text">
-            <string>Write the transfers:</string>
+            <string>Write the transfers</string>
            </property>
           </widget>
          </item>
@@ -692,12 +753,12 @@
           </widget>
          </item>
          <item>
-          <widget class="QLabel" name="label_6">
+          <widget class="QLabel" name="labelLogTransfer">
            <property name="enabled">
             <bool>false</bool>
            </property>
            <property name="text">
-            <string extracomment="%time%, %source%, %size%, %destination% should not be translated">The variables are %time%, %source%, %size%, %destination%</string>
+            <string notr="true" extracomment="%time%, %source%, %size%, %destination% should not be translated">The variables are %time%, %source%, %size%, %destination%</string>
            </property>
           </widget>
          </item>
@@ -707,7 +768,7 @@
             <bool>false</bool>
            </property>
            <property name="text">
-            <string>Write the errors:</string>
+            <string>Write the errors</string>
            </property>
           </widget>
          </item>
@@ -722,12 +783,12 @@
           </widget>
          </item>
          <item>
-          <widget class="QLabel" name="label_7">
+          <widget class="QLabel" name="labelLogError">
            <property name="enabled">
             <bool>false</bool>
            </property>
            <property name="text">
-            <string extracomment="%time%, %path%, %size%, %mtime%, %error% should not be translated">The variables are %time%, %path%, %size%, %mtime%, %error%</string>
+            <string notr="true" extracomment="%time%, %path%, %size%, %mtime%, %error% should not be translated">The variables are %time%, %path%, %size%, %mtime%, %error%</string>
            </property>
           </widget>
          </item>
@@ -737,7 +798,7 @@
             <bool>false</bool>
            </property>
            <property name="text">
-            <string>Write the folder operations:</string>
+            <string>Write the folder operations</string>
            </property>
           </widget>
          </item>
@@ -755,12 +816,12 @@
           </widget>
          </item>
          <item>
-          <widget class="QLabel" name="label_10">
+          <widget class="QLabel" name="labelLogFolder">
            <property name="enabled">
             <bool>false</bool>
            </property>
            <property name="text">
-            <string extracomment="%path%, %operation% should not be translated">The variables are %path%, %operation%</string>
+            <string notr="true" extracomment="%path%, %operation% should not be translated">The variables are %path%, %operation%</string>
            </property>
           </widget>
          </item>
@@ -793,25 +854,9 @@
   </layout>
  </widget>
  <resources>
-  <include location="resources/resources.qrc"/>
+  <include location="resources/ultracopier-resources.qrc"/>
  </resources>
  <connections>
-  <connection>
-   <sender>Language_autodetect</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>Language</receiver>
-   <slot>setDisabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>449</x>
-     <y>42</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>502</x>
-     <y>10</y>
-    </hint>
-   </hints>
-  </connection>
   <connection>
    <sender>checkBox_Log</sender>
    <signal>toggled(bool)</signal>
@@ -831,7 +876,7 @@
   <connection>
    <sender>checkBox_Log</sender>
    <signal>toggled(bool)</signal>
-   <receiver>pushButton</receiver>
+   <receiver>logBrowse</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-- 
cgit v1.2.3