X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fui%2Fsprefs_interface.ui;h=359858086868f71d1a787cdea20822d2f2404fd3;hb=223419069363b3eab712cff2d0ac671a94d8fc65;hp=b6ffb5999706ddef913f2374e7b5c743fa7400ba;hpb=2ddcaac3ada8329d80af74f1c1301c9a12cb9635;p=vlc

diff --git a/modules/gui/qt4/ui/sprefs_interface.ui b/modules/gui/qt4/ui/sprefs_interface.ui
index b6ffb59997..3598580868 100644
--- a/modules/gui/qt4/ui/sprefs_interface.ui
+++ b/modules/gui/qt4/ui/sprefs_interface.ui
@@ -5,45 +5,110 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>444</width>
-    <height>362</height>
+    <width>519</width>
+    <height>633</height>
    </rect>
   </property>
+  <property name="sizePolicy" >
+   <sizepolicy vsizetype="Minimum" hsizetype="Preferred" >
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
   <property name="windowTitle" >
    <string>Form</string>
   </property>
   <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
+   <item row="0" column="0" >
+    <widget class="QLabel" name="languageLabel" >
+     <property name="text" >
+      <string>_("Language")</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" >
+    <widget class="QComboBox" name="language" />
+   </item>
    <item row="1" column="0" colspan="2" >
     <widget class="QGroupBox" name="groupBox" >
      <property name="title" >
-      <string>Default Interface</string>
+      <string>_("Interface Type")</string>
      </property>
      <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item row="2" column="0" colspan="3" >
+      <item row="0" column="0" >
+       <widget class="QRadioButton" name="qt4" >
+        <property name="text" >
+         <string>_("Native")</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" colspan="3" >
+       <widget class="QLabel" name="defaultLabel" >
+        <property name="frameShape" >
+         <enum>QFrame::NoFrame</enum>
+        </property>
+        <property name="text" >
+         <string>_("This is VLC's default interface, with a native look and feel.")</string>
+        </property>
+        <property name="textFormat" >
+         <enum>Qt::RichText</enum>
+        </property>
+        <property name="wordWrap" >
+         <bool>true</bool>
+        </property>
+        <property name="margin" >
+         <number>10</number>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QLabel" name="label" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>_("Display mode")</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2" colspan="2" >
+       <widget class="QComboBox" name="displayModeBox" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" colspan="3" >
+       <widget class="QCheckBox" name="embedVideo" >
+        <property name="text" >
+         <string>_("Integrate video in interface")</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" colspan="4" >
        <widget class="Line" name="line" >
         <property name="orientation" >
          <enum>Qt::Horizontal</enum>
         </property>
        </widget>
       </item>
-      <item row="3" column="1" colspan="2" >
-       <widget class="QLabel" name="label_3" >
+      <item row="4" column="0" >
+       <widget class="QRadioButton" name="skins" >
+        <property name="text" >
+         <string>_("Skins")</string>
+        </property>
+       </widget>
+      </item>
+      <item rowspan="2" row="4" column="1" colspan="3" >
+       <widget class="QLabel" name="skinsLabel" >
         <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>5</hsizetype>
-          <vsizetype>3</vsizetype>
+         <sizepolicy vsizetype="Minimum" hsizetype="Preferred" >
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
@@ -52,118 +117,144 @@
          <enum>QFrame::NoFrame</enum>
         </property>
         <property name="text" >
-         <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
-p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-style:italic;">This is VLC's skinnable interface. You can download skins on &lt;/span>&lt;a href="http://www.videolan.org/">&lt;span style=" font-style:italic; text-decoration: underline; color:#0000ff;">http://www.videolan.org/vlc/skins.php&lt;/span>&lt;/a>&lt;span style=" font-style:italic;"> to customize your player.&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
+         <string>_("This is VLC's skinnable interface. You can download skins at &lt;a href="http://www.videolan.org/vlc/skins.php">http://www.videolan.org/vlc/skins.php&lt;/a> to customize your player.")</string>
+        </property>
+        <property name="textFormat" >
+         <enum>Qt::RichText</enum>
+        </property>
+        <property name="scaledContents" >
+         <bool>true</bool>
         </property>
         <property name="alignment" >
-         <set>Qt::AlignBottom|Qt::AlignJustify</set>
+         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
         </property>
         <property name="wordWrap" >
          <bool>true</bool>
         </property>
         <property name="margin" >
-         <number>10</number>
+         <number>0</number>
         </property>
         <property name="openExternalLinks" >
          <bool>true</bool>
         </property>
        </widget>
       </item>
-      <item row="4" column="2" >
-       <widget class="QPushButton" name="skinBrowse" >
-        <property name="text" >
-         <string>Browse...</string>
+      <item row="5" column="0" >
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Vertical</enum>
         </property>
-       </widget>
+        <property name="sizeHint" stdset="0" >
+         <size>
+          <width>20</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
       </item>
-      <item row="4" column="0" >
+      <item row="6" column="0" >
        <widget class="QLabel" name="label_4" >
         <property name="text" >
-         <string>Skin File</string>
+         <string>_("Skin file")</string>
+        </property>
+        <property name="buddy" >
+         <cstring>fileSkin</cstring>
         </property>
        </widget>
       </item>
-      <item row="4" column="1" >
+      <item row="6" column="1" colspan="2" >
        <widget class="QLineEdit" name="fileSkin" />
       </item>
-      <item row="0" column="1" colspan="2" >
-       <widget class="QLabel" name="label_2" >
-        <property name="frameShape" >
-         <enum>QFrame::NoFrame</enum>
-        </property>
+      <item row="6" column="3" >
+       <widget class="QPushButton" name="skinBrowse" >
         <property name="text" >
-         <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
-p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-style:italic;">VLC's default interface, with native look and feel&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
-        </property>
-        <property name="wordWrap" >
-         <bool>true</bool>
+         <string>_("Browse...")</string>
         </property>
-        <property name="margin" >
-         <number>10</number>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="2" >
+    <widget class="QGroupBox" name="OneInterfaceBox" >
+     <property name="title" >
+      <string>_("Instances")</string>
+     </property>
+     <layout class="QGridLayout" >
+      <item row="0" column="0" colspan="2" >
+       <widget class="QCheckBox" name="OneInterfaceMode" >
+        <property name="text" >
+         <string>_("Allow only one instance")</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="0" >
-       <widget class="QRadioButton" name="qt4" >
+      <item row="1" column="0" colspan="2" >
+       <widget class="QCheckBox" name="EnqueueOneInterfaceMode" >
         <property name="text" >
-         <string>Default</string>
+         <string>_("Enqueue files in playlist when in one instance mode")</string>
         </property>
        </widget>
       </item>
-      <item row="3" column="0" >
-       <widget class="QRadioButton" name="skins" >
+      <item row="2" column="0" >
+       <widget class="QLabel" name="assoName" >
         <property name="text" >
-         <string>Skins</string>
+         <string>_("File associations:")</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="1" colspan="2" >
-       <widget class="QCheckBox" name="qtAlwaysVideo" >
+      <item row="2" column="1" >
+       <widget class="QPushButton" name="assoButton" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
         <property name="text" >
-         <string>Always display the video</string>
+         <string>_("Association Setup")</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item row="0" column="1" >
-    <widget class="QComboBox" name="language" />
-   </item>
-   <item row="0" column="0" >
-    <widget class="QLabel" name="label" >
-     <property name="text" >
-      <string>Language</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0" colspan="2" >
-    <widget class="QGroupBox" name="OneInterfaceBox" >
+   <item row="3" column="0" colspan="2" >
+    <widget class="QGroupBox" name="groupBox_2" >
      <property name="title" >
-      <string>Instances</string>
+      <string>_("Privacy / Network Interaction")</string>
      </property>
-     <layout class="QVBoxLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item>
-       <widget class="QCheckBox" name="OneInterfaceMode" >
+     <layout class="QGridLayout" >
+      <item row="0" column="0" >
+       <widget class="QLabel" name="artFetchLabel" >
         <property name="text" >
-         <string>Allow only one instance</string>
+         <string>_("Album art download policy")</string>
         </property>
        </widget>
       </item>
-      <item>
-       <widget class="QCheckBox" name="EnqueueOneInterfaceMode" >
+      <item row="0" column="1" colspan="2" >
+       <widget class="QComboBox" name="artFetcher" />
+      </item>
+      <item row="1" column="0" colspan="2" >
+       <widget class="QCheckBox" name="metaFetcher" >
         <property name="text" >
-         <string>Enqueue files in playlist when in one interface mode</string>
+         <string>_("Fetch the metadata from the Internet")</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QCheckBox" name="updatesBox" >
+        <property name="text" >
+         <string>_("Activate update notifier")</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2" >
+       <widget class="QSpinBox" name="updatesDays" >
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+        <property name="suffix" >
+         <string> days</string>
         </property>
        </widget>
       </item>
@@ -172,6 +263,22 @@ p, li { white-space: pre-wrap; }
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>language</tabstop>
+  <tabstop>qt4</tabstop>
+  <tabstop>displayModeBox</tabstop>
+  <tabstop>embedVideo</tabstop>
+  <tabstop>skins</tabstop>
+  <tabstop>fileSkin</tabstop>
+  <tabstop>skinBrowse</tabstop>
+  <tabstop>OneInterfaceMode</tabstop>
+  <tabstop>EnqueueOneInterfaceMode</tabstop>
+  <tabstop>assoButton</tabstop>
+  <tabstop>artFetcher</tabstop>
+  <tabstop>metaFetcher</tabstop>
+  <tabstop>updatesBox</tabstop>
+  <tabstop>updatesDays</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>