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

qt4 - Open: various fixes.

parent 737e3560
......@@ -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() )
......
......@@ -89,7 +89,9 @@ private:
public slots:
virtual void updateMRL();
private slots:
#if 0
void browseFile();
#endif
void browseFileSub();
void toggleSubtitleFrame();
};
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
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