Commit 5cc69890 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

qt4 - Open: various fixes.

parent 737e3560
...@@ -79,7 +79,7 @@ FileOpenPanel::FileOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) : ...@@ -79,7 +79,7 @@ FileOpenPanel::FileOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
dialogBox->setSizeGripEnabled( false ); dialogBox->setSizeGripEnabled( false );
/* Add a tooltip */ /* 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 // Add it to the layout
ui.gridLayout->addWidget( dialogBox, 0, 0, 1, 3 ); ui.gridLayout->addWidget( dialogBox, 0, 0, 1, 3 );
...@@ -145,6 +145,7 @@ QStringList FileOpenPanel::browse( QString help ) ...@@ -145,6 +145,7 @@ QStringList FileOpenPanel::browse( QString help )
return THEDP->showSimpleOpen( help ); return THEDP->showSimpleOpen( help );
} }
#if 0
/* Unused. FIXME ? */ /* Unused. FIXME ? */
void FileOpenPanel::browseFile() void FileOpenPanel::browseFile()
{ {
...@@ -155,6 +156,7 @@ void FileOpenPanel::browseFile() ...@@ -155,6 +156,7 @@ void FileOpenPanel::browseFile()
ui.fileInput->setEditText( fileString ); ui.fileInput->setEditText( fileString );
updateMRL(); updateMRL();
} }
#endif
void FileOpenPanel::browseFileSub() void FileOpenPanel::browseFileSub()
{ {
...@@ -183,11 +185,11 @@ void FileOpenPanel::updateMRL() ...@@ -183,11 +185,11 @@ void FileOpenPanel::updateMRL()
const char *psz_filepath = config_GetPsz( p_intf, "qt-filedialog-path" ); const char *psz_filepath = config_GetPsz( p_intf, "qt-filedialog-path" );
if( ( NULL == psz_filepath ) 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 */ /* set dialog box current directory as last known path */
config_PutPsz( p_intf, "qt-filedialog-path", config_PutPsz( p_intf, "qt-filedialog-path",
dialogBox->directory().absolutePath().toUtf8() ); qtu( dialogBox->directory().absolutePath() ) );
} }
delete psz_filepath; delete psz_filepath;
...@@ -240,6 +242,8 @@ DiscOpenPanel::DiscOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) : ...@@ -240,6 +242,8 @@ DiscOpenPanel::DiscOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
{ {
ui.setupUi( this ); ui.setupUi( this );
/*Win 32 Probe as in WX ? */
/* CONNECTs */ /* CONNECTs */
BUTTONACT( ui.dvdRadioButton, updateButtons()); BUTTONACT( ui.dvdRadioButton, updateButtons());
BUTTONACT( ui.vcdRadioButton, updateButtons()); BUTTONACT( ui.vcdRadioButton, updateButtons());
...@@ -293,6 +297,8 @@ void DiscOpenPanel::updateButtons() ...@@ -293,6 +297,8 @@ void DiscOpenPanel::updateButtons()
void DiscOpenPanel::updateMRL() void DiscOpenPanel::updateMRL()
{ {
QString mrl = ""; QString mrl = "";
/* CDDAX and VCDX not implemented. FIXME ? */
/* DVD */ /* DVD */
if( ui.dvdRadioButton->isChecked() ) { if( ui.dvdRadioButton->isChecked() ) {
if( !ui.dvdsimple->isChecked() ) if( !ui.dvdsimple->isChecked() )
......
...@@ -89,7 +89,9 @@ private: ...@@ -89,7 +89,9 @@ private:
public slots: public slots:
virtual void updateMRL(); virtual void updateMRL();
private slots: private slots:
#if 0
void browseFile(); void browseFile();
#endif
void browseFileSub(); void browseFileSub();
void toggleSubtitleFrame(); void toggleSubtitleFrame();
}; };
......
...@@ -93,6 +93,9 @@ ...@@ -93,6 +93,9 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="toolTip" >
<string>Change the start time for the media</string>
</property>
<property name="alignment" > <property name="alignment" >
<set>Qt::AlignRight</set> <set>Qt::AlignRight</set>
</property> </property>
...@@ -120,7 +123,11 @@ ...@@ -120,7 +123,11 @@
</widget> </widget>
</item> </item>
<item row="5" column="1" colspan="4" > <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>
<item row="2" column="0" colspan="5" > <item row="2" column="0" colspan="5" >
<widget class="QCheckBox" name="slaveCheckbox" > <widget class="QCheckBox" name="slaveCheckbox" >
...@@ -155,6 +162,9 @@ ...@@ -155,6 +162,9 @@
</item> </item>
<item row="3" column="4" > <item row="3" column="4" >
<widget class="QToolButton" name="slaveBrowseButton" > <widget class="QToolButton" name="slaveBrowseButton" >
<property name="toolTip" >
<string>Select the file</string>
</property>
<property name="text" > <property name="text" >
<string>Browse...</string> <string>Browse...</string>
</property> </property>
...@@ -177,6 +187,9 @@ ...@@ -177,6 +187,9 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="toolTip" >
<string>Change the caching for the media</string>
</property>
<property name="alignment" > <property name="alignment" >
<set>Qt::AlignRight</set> <set>Qt::AlignRight</set>
</property> </property>
......
...@@ -46,6 +46,9 @@ ...@@ -46,6 +46,9 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="toolTip" >
<string>Select the capture device type</string>
</property>
</widget> </widget>
</item> </item>
<item row="0" column="0" > <item row="0" column="0" >
...@@ -87,6 +90,9 @@ ...@@ -87,6 +90,9 @@
</item> </item>
<item row="3" column="0" > <item row="3" column="0" >
<widget class="QPushButton" name="advancedButton" > <widget class="QPushButton" name="advancedButton" >
<property name="toolTip" >
<string>Access advanced options to tweak the device</string>
</property>
<property name="text" > <property name="text" >
<string>Advanced options...</string> <string>Advanced options...</string>
</property> </property>
......
...@@ -67,6 +67,9 @@ ...@@ -67,6 +67,9 @@
</item> </item>
<item row="3" column="7" > <item row="3" column="7" >
<widget class="QToolButton" name="toolButton" > <widget class="QToolButton" name="toolButton" >
<property name="toolTip" >
<string>Select the device</string>
</property>
<property name="text" > <property name="text" >
<string>Browse...</string> <string>Browse...</string>
</property> </property>
......
...@@ -146,9 +146,6 @@ ...@@ -146,9 +146,6 @@
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="toolTip" >
<string>Set subtitle alignement</string>
</property>
<property name="currentIndex" > <property name="currentIndex" >
<number>-1</number> <number>-1</number>
</property> </property>
...@@ -191,9 +188,6 @@ ...@@ -191,9 +188,6 @@
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="toolTip" >
<string>Set default subtitle size</string>
</property>
</widget> </widget>
</item> </item>
<item row="1" column="1" > <item row="1" column="1" >
...@@ -220,6 +214,9 @@ ...@@ -220,6 +214,9 @@
</item> </item>
<item row="0" column="6" colspan="2" > <item row="0" column="6" colspan="2" >
<widget class="QPushButton" name="subBrowseButton" > <widget class="QPushButton" name="subBrowseButton" >
<property name="toolTip" >
<string>Select the subtitle file</string>
</property>
<property name="text" > <property name="text" >
<string>Browse...</string> <string>Browse...</string>
</property> </property>
......
...@@ -48,6 +48,9 @@ ...@@ -48,6 +48,9 @@
</item> </item>
<item row="1" column="2" > <item row="1" column="2" >
<widget class="QSpinBox" name="portSpin" > <widget class="QSpinBox" name="portSpin" >
<property name="toolTip" >
<string>Set the port used</string>
</property>
<property name="maximum" > <property name="maximum" >
<number>65535</number> <number>65535</number>
</property> </property>
...@@ -110,6 +113,9 @@ ...@@ -110,6 +113,9 @@
</property> </property>
<item> <item>
<widget class="QCheckBox" name="timeShift" > <widget class="QCheckBox" name="timeShift" >
<property name="toolTip" >
<string/>
</property>
<property name="text" > <property name="text" >
<string>Allow timeshifting</string> <string>Allow timeshifting</string>
</property> </property>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment