qt4 - Open: various fixes.

diff --git a/modules/gui/qt4/components/open.cpp b/modules/gui/qt4/components/open.cpp
index 9e7f015c71869c38d9bfee8a64e4db5dd9c44da7..8894772e9661c7f9a48c7c31299c1af78e19f753 100644 (file)
--- a/modules/gui/qt4/components/open.cpp
+++ b/modules/gui/qt4/components/open.cpp
@@ -79,7 +79,7 @@ FileOpenPanel::FileOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
     dialogBox->setSizeGripEnabled( false );
 
     /* Add a tooltip */
-    dialogBox->setToolTip( qtr( "Select one or multiple files, or a folder" ));
+    dialogBox->setToolTip( qtr( "Select one or multiple files, or a folder" ) );
 
     // Add it to the layout
     ui.gridLayout->addWidget( dialogBox, 0, 0, 1, 3 );
@@ -119,7 +119,7 @@ FileOpenPanel::FileOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
 
     /* Build the subs size combo box */
     setfillVLCConfigCombo( "freetype-rel-fontsize" , p_intf,
-             ui.sizeSubComboBox );
+                            ui.sizeSubComboBox );
 
     /* Build the subs align combo box */
     setfillVLCConfigCombo( "subsdec-align", p_intf, ui.alignSubComboBox );
@@ -145,6 +145,7 @@ QStringList FileOpenPanel::browse( QString help )
     return THEDP->showSimpleOpen( help );
 }
 
+#if 0
 /* Unused. FIXME ? */
 void FileOpenPanel::browseFile()
 {
@@ -155,6 +156,7 @@ void FileOpenPanel::browseFile()
     ui.fileInput->setEditText( fileString );
     updateMRL();
 }
+#endif
 
 void FileOpenPanel::browseFileSub()
 {
@@ -183,11 +185,11 @@ void FileOpenPanel::updateMRL()
 
     const char *psz_filepath = config_GetPsz( p_intf, "qt-filedialog-path" );
     if( ( NULL == psz_filepath )
-      || strcmp( psz_filepath,dialogBox->directory().absolutePath().toUtf8()) )
+      || strcmp( psz_filepath, qtu( dialogBox->directory().absolutePath() )) )
     {
         /* set dialog box current directory as last known path */
         config_PutPsz( p_intf, "qt-filedialog-path",
-                       dialogBox->directory().absolutePath().toUtf8() );
+                       qtu( dialogBox->directory().absolutePath() ) );
     }
     delete psz_filepath;
 
@@ -240,6 +242,8 @@ DiscOpenPanel::DiscOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
 {
     ui.setupUi( this );
 
+    /*Win 32 Probe  as in WX ? */
+
     /* CONNECTs */
     BUTTONACT( ui.dvdRadioButton, updateButtons());
     BUTTONACT( ui.vcdRadioButton, updateButtons());
@@ -293,6 +297,8 @@ void DiscOpenPanel::updateButtons()
 void DiscOpenPanel::updateMRL()
 {
     QString mrl = "";
+
+    /* CDDAX and VCDX not implemented. FIXME ? */
     /* DVD */
     if( ui.dvdRadioButton->isChecked() ) {
         if( !ui.dvdsimple->isChecked() )

diff --git a/modules/gui/qt4/components/open.hpp b/modules/gui/qt4/components/open.hpp
index 59f8584da33f6b53353e88bad9590f3208872102..1bdc4c34257de3d3a7363e41cb4c55030a7121c7 100644 (file)
--- a/modules/gui/qt4/components/open.hpp
+++ b/modules/gui/qt4/components/open.hpp
@@ -89,7 +89,9 @@ private:
 public slots:
     virtual void updateMRL();
 private slots:
+#if 0
     void browseFile();
+#endif
     void browseFileSub();
     void toggleSubtitleFrame();
 };

diff --git a/modules/gui/qt4/ui/open.ui b/modules/gui/qt4/ui/open.ui
index 7373335a08bbdad7719a338e50aa94f203782232..111b61361a9330dafcc8b5b863e140a25a58de2d 100644 (file)
--- a/modules/gui/qt4/ui/open.ui
+++ b/modules/gui/qt4/ui/open.ui
@@ -93,6 +93,9 @@
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
+        <property name="toolTip" >
+         <string>Change the start time for the media</string>
+        </property>
         <property name="alignment" >
          <set>Qt::AlignRight</set>
         </property>
@@ -120,7 +123,11 @@
        </widget>
       </item>
       <item row="5" column="1" colspan="4" >
-       <widget class="QLineEdit" name="advancedLineInput" />
+       <widget class="QLineEdit" name="advancedLineInput" >
+        <property name="toolTip" >
+         <string>Complete MRL for VLC internal</string>
+        </property>
+       </widget>
       </item>
       <item row="2" column="0" colspan="5" >
        <widget class="QCheckBox" name="slaveCheckbox" >
@@ -155,6 +162,9 @@
       </item>
       <item row="3" column="4" >
        <widget class="QToolButton" name="slaveBrowseButton" >
+        <property name="toolTip" >
+         <string>Select the file</string>
+        </property>
         <property name="text" >
          <string>Browse...</string>
         </property>
@@ -177,6 +187,9 @@
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
+        <property name="toolTip" >
+         <string>Change the caching for the media</string>
+        </property>
         <property name="alignment" >
          <set>Qt::AlignRight</set>
         </property>

diff --git a/modules/gui/qt4/ui/open_capture.ui b/modules/gui/qt4/ui/open_capture.ui
index 52ff451a45a2b441ff7a1f9735d8ece7ac6e023f..7a618819aaab8f8d3aeb8c06839eb5b0257407b6 100644 (file)
--- a/modules/gui/qt4/ui/open_capture.ui
+++ b/modules/gui/qt4/ui/open_capture.ui
@@ -46,6 +46,9 @@
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
+     <property name="toolTip" >
+      <string>Select the capture device type</string>
+     </property>
     </widget>
    </item>
    <item row="0" column="0" >
@@ -87,6 +90,9 @@
    </item>
    <item row="3" column="0" >
     <widget class="QPushButton" name="advancedButton" >
+     <property name="toolTip" >
+      <string>Access advanced options to tweak the device</string>
+     </property>
      <property name="text" >
       <string>Advanced options...</string>
      </property>

diff --git a/modules/gui/qt4/ui/open_disk.ui b/modules/gui/qt4/ui/open_disk.ui
index 5b61f341b8b6d23ac0aebf469deab4b841f3bd58..10be8f747cc09ed4080b84d3778f682cf34f0d85 100644 (file)
--- a/modules/gui/qt4/ui/open_disk.ui
+++ b/modules/gui/qt4/ui/open_disk.ui
@@ -67,6 +67,9 @@
       </item>
       <item row="3" column="7" >
        <widget class="QToolButton" name="toolButton" >
+        <property name="toolTip" >
+         <string>Select the device</string>
+        </property>
         <property name="text" >
          <string>Browse...</string>
         </property>

diff --git a/modules/gui/qt4/ui/open_file.ui b/modules/gui/qt4/ui/open_file.ui
index 78efbe44f8b88cc9f11eb01136edc39e30c4ef9b..3c06e30e9625c24ca066772ee7face2491b2580f 100644 (file)
--- a/modules/gui/qt4/ui/open_file.ui
+++ b/modules/gui/qt4/ui/open_file.ui
@@ -146,9 +146,6 @@
           <height>0</height>
          </size>
         </property>
-        <property name="toolTip" >
-         <string>Set subtitle alignement</string>
-        </property>
         <property name="currentIndex" >
          <number>-1</number>
         </property>
@@ -191,9 +188,6 @@
           <height>0</height>
          </size>
         </property>
-        <property name="toolTip" >
-         <string>Set default subtitle size</string>
-        </property>
        </widget>
       </item>
       <item row="1" column="1" >
@@ -220,6 +214,9 @@
       </item>
       <item row="0" column="6" colspan="2" >
        <widget class="QPushButton" name="subBrowseButton" >
+        <property name="toolTip" >
+         <string>Select the subtitle file</string>
+        </property>
         <property name="text" >
          <string>Browse...</string>
         </property>

diff --git a/modules/gui/qt4/ui/open_net.ui b/modules/gui/qt4/ui/open_net.ui
index 0f1c793b636b327d7498107aede211fa8106e139..9fb87a703de4ead35d6dd3e74acddfcdeab9269e 100644 (file)
--- a/modules/gui/qt4/ui/open_net.ui
+++ b/modules/gui/qt4/ui/open_net.ui
@@ -48,6 +48,9 @@
       </item>
       <item row="1" column="2" >
        <widget class="QSpinBox" name="portSpin" >
+        <property name="toolTip" >
+         <string>Set the port used</string>
+        </property>
         <property name="maximum" >
          <number>65535</number>
         </property>
@@ -110,6 +113,9 @@
       </property>
       <item>
        <widget class="QCheckBox" name="timeShift" >
+        <property name="toolTip" >
+         <string/>
+        </property>
         <property name="text" >
          <string>Allow timeshifting</string>
         </property>