Skip to content

V
vlc-1.1
Commit 169870dc authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Compile fix for Open in Qt4

parent b57de680
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 18 deletions
modules/gui/qt4/components/open.cpp
View file @ 169870dc
...@@ -47,7 +47,7 @@ void FileOpenPanel::sendUpdate() ...@@ -47,7 +47,7 @@ void FileOpenPanel::sendUpdate()
QString FileOpenPanel::getUpdatedMRL() QString FileOpenPanel::getUpdatedMRL()
{ {
return ui.fileInput->text(); return ui.fileInput->currentText();
} }
/************************************************************************** /**************************************************************************
......
modules/gui/qt4/ui/file_open.ui
View file @ 169870dc
<ui version="4.0" > <ui version="4.0" >
<class>Dialog</class> <class>FileOpen</class>
<widget class="QDialog" name="Dialog" > <widget class="QWidget" name="FileOpen" >
<property name="geometry" > <property name="geometry" >
<rect> <rect>
<x>0</x> <x>0</x>
...@@ -238,7 +238,7 @@ p, li { white-space: pre-wrap; } ...@@ -238,7 +238,7 @@ p, li { white-space: pre-wrap; }
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QComboBox" name="lineEdit" > <widget class="QComboBox" name="fileInput" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy> <sizepolicy>
<hsizetype>7</hsizetype> <hsizetype>7</hsizetype>
...@@ -294,19 +294,6 @@ p, li { white-space: pre-wrap; } ...@@ -294,19 +294,6 @@ p, li { white-space: pre-wrap; }
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
</widget> </widget>
<widget class="Line" name="line_2" >
<property name="geometry" >
<rect>
<x>150</x>
<y>230</y>
<width>320</width>
<height>16</height>
</rect>
</property>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
<widget class="QGroupBox" name="groupBox_2" > <widget class="QGroupBox" name="groupBox_2" >
<property name="geometry" > <property name="geometry" >
<rect> <rect>
...@@ -678,6 +665,19 @@ p, li { white-space: pre-wrap; } ...@@ -678,6 +665,19 @@ p, li { white-space: pre-wrap; }
<string>Extra Audio</string> <string>Extra Audio</string>
</property> </property>
</widget> </widget>
<widget class="Line" name="line_2" >
<property name="geometry" >
<rect>
<x>150</x>
<y>230</y>
<width>320</width>
<height>16</height>
</rect>
</property>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</widget> </widget>
<widget class="QWidget" name="tab_Disk" > <widget class="QWidget" name="tab_Disk" >
<attribute name="title" > <attribute name="title" >
...@@ -885,7 +885,7 @@ p, li { white-space: pre-wrap; } ...@@ -885,7 +885,7 @@ p, li { white-space: pre-wrap; }
</widget> </widget>
</widget> </widget>
<tabstops> <tabstops>
<tabstop>lineEdit</tabstop> <tabstop>fileInput</tabstop>
<tabstop>pushButton_3</tabstop> <tabstop>pushButton_3</tabstop>
<tabstop>lineEdit_2</tabstop> <tabstop>lineEdit_2</tabstop>
<tabstop>pushButton_4</tabstop> <tabstop>pushButton_4</tabstop>
......
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