Merge branch 'master' of https://vcs.maemo.org/git/vlc-remote

[vlc-remote] / playermainwindow.ui

diff --git a/playermainwindow.ui b/playermainwindow.ui
index 06765a4..4f91409 100644 (file)
--- a/playermainwindow.ui
+++ b/playermainwindow.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>800</width>
-    <height>600</height>
+    <width>798</width>
+    <height>598</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -26,17 +26,37 @@
       <property name="text">
        <string>Information</string>
       </property>
+      <property name="alignment">
+       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+      </property>
      </widget>
     </item>
     <item>
-     <widget class="QLabel" name="timeLabel">
-      <property name="styleSheet">
-       <string notr="true">color: rgb(201, 201, 201);</string>
-      </property>
-      <property name="text">
-       <string/>
-      </property>
-     </widget>
+     <layout class="QHBoxLayout" name="horizontalLayoutTime">
+      <item>
+       <widget class="QLabel" name="timeLabel">
+        <property name="styleSheet">
+         <string notr="true">color: rgb(201, 201, 201);</string>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="durationLabel">
+        <property name="styleSheet">
+         <string notr="true">color: rgb(201, 201, 201);</string>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+     </layout>
     </item>
     <item>
      <widget class="QSlider" name="slider">
@@ -74,9 +94,9 @@
        </widget>
       </item>
       <item>
-       <widget class="QToolButton" name="playButton">
+       <widget class="QToolButton" name="playpauseButton">
         <property name="text">
-         <string>play</string>
+         <string>play/pause</string>
         </property>
        </widget>
       </item>
@@ -88,18 +108,24 @@
        </widget>
       </item>
       <item>
-       <widget class="QToolButton" name="pauseButton">
+       <widget class="QToolButton" name="stopButton">
         <property name="text">
-         <string>Pause</string>
+         <string>Stop</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QToolButton" name="stopButton">
-        <property name="text">
-         <string>Stop</string>
+       <spacer name="horizontalSpacer1">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
         </property>
-       </widget>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
       </item>
       <item>
        <widget class="QToolButton" name="fullscreenButton">
@@ -109,7 +135,7 @@
        </widget>
       </item>
       <item>
-       <spacer name="horizontalSpacer">
+       <spacer name="horizontalSpacer2">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
@@ -169,8 +195,8 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>800</width>
-     <height>24</height>
+     <width>798</width>
+     <height>20</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuMenu">
@@ -182,7 +208,6 @@
    </widget>
    <addaction name="menuMenu"/>
   </widget>
-  <widget class="QStatusBar" name="statusbar"/>
   <action name="actionConfiguration">
    <property name="text">
     <string>Configuration</string>