[vlc-devel] [PATCH] 'Open files' UI fixes. Full usage of QT4 Qpushbutton's functionalities. Suppressed duplicate 'play' action button. Menu entries icons additions.
Francois Cartegnie
fcvlcdev at free.fr
Thu May 28 12:45:55 CEST 2009
---
modules/gui/qt4/dialogs/open.cpp | 48 ++--
modules/gui/qt4/dialogs/open.hpp | 14 +
modules/gui/qt4/pixmaps/menus/convert_16px.png | Bin 0 -> 373 bytes
modules/gui/qt4/pixmaps/menus/enqueue_16px.png | Bin 0 -> 505 bytes
modules/gui/qt4/ui/open.ui | 431 ++++++++++++------------
modules/gui/qt4/vlc.qrc | 187 +++++-----
6 files changed, 354 insertions(+), 326 deletions(-)
create mode 100644 modules/gui/qt4/pixmaps/menus/convert_16px.png
create mode 100644 modules/gui/qt4/pixmaps/menus/enqueue_16px.png
diff --git a/modules/gui/qt4/dialogs/open.cpp b/modules/gui/qt4/dialogs/open.cpp
index 372cb06..822d913 100644
--- a/modules/gui/qt4/dialogs/open.cpp
+++ b/modules/gui/qt4/dialogs/open.cpp
@@ -97,11 +97,14 @@ OpenDialog::OpenDialog( QWidget *parent,
captureOpenPanel = new CaptureOpenPanel( this, p_intf );
/* Insert the tabs */
- ui.Tab->insertTab( OPEN_FILE_TAB, fileOpenPanel, qtr( "&File" ) );
- ui.Tab->insertTab( OPEN_DISC_TAB, discOpenPanel, qtr( "&Disc" ) );
- ui.Tab->insertTab( OPEN_NETWORK_TAB, netOpenPanel, qtr( "&Network" ) );
+ ui.Tab->insertTab( OPEN_FILE_TAB, fileOpenPanel,
+ UI_ICON_MEDIA_FILE, qtr( "&File" ) );
+ ui.Tab->insertTab( OPEN_DISC_TAB, discOpenPanel,
+ UI_ICON_MEDIA_DVD, qtr( "&Disc" ) );
+ ui.Tab->insertTab( OPEN_NETWORK_TAB, netOpenPanel,
+ UI_ICON_MEDIA_NETWORK, qtr( "&Network" ) );
ui.Tab->insertTab( OPEN_CAPTURE_TAB, captureOpenPanel,
- qtr( "Capture &Device" ) );
+ UI_ICON_MEDIA_CAPTURE, qtr( "Capture &Device" ) );
/* Hide the Slave input widgets */
ui.slaveLabel->hide();
@@ -109,32 +112,26 @@ OpenDialog::OpenDialog( QWidget *parent,
ui.slaveBrowseButton->hide();
/* Buttons Creation */
- /* Play Button */
- playButton = ui.playButton;
-
- /* Cancel Button */
- cancelButton = new QPushButton( qtr( "&Cancel" ) );
/* Select Button */
selectButton = new QPushButton( qtr( "&Select" ) );
/* Menu for the Play button */
QMenu * openButtonMenu = new QMenu( "Open" );
- openButtonMenu->addAction( qtr( "&Enqueue" ), this, SLOT( enqueue() ),
+ openButtonMenu->addAction( UI_ICON_ENQUEUE, UI_TEXT_ENQUEUE, this, SLOT( enqueue() ),
QKeySequence( "Alt+E" ) );
- openButtonMenu->addAction( qtr( "&Play" ), this, SLOT( play() ),
+ openButtonMenu->addAction( UI_ICON_PLAY, UI_TEXT_PLAY, this, SLOT( play() ),
QKeySequence( "Alt+P" ) );
- openButtonMenu->addAction( qtr( "&Stream" ), this, SLOT( stream() ) ,
+ openButtonMenu->addAction( UI_ICON_STREAM, UI_TEXT_STREAM, this, SLOT( stream() ) ,
QKeySequence( "Alt+S" ) );
- openButtonMenu->addAction( qtr( "&Convert" ), this, SLOT( transcode() ) ,
+ openButtonMenu->addAction( UI_ICON_CONVERT, UI_TEXT_CONVERT, this, SLOT( transcode() ) ,
QKeySequence( "Alt+C" ) );
ui.menuButton->setMenu( openButtonMenu );
- ui.menuButton->setIcon( QIcon( ":/down_arrow" ) );
/* Add the three Buttons */
ui.buttonsBox->addButton( selectButton, QDialogButtonBox::AcceptRole );
- ui.buttonsBox->addButton( cancelButton, QDialogButtonBox::RejectRole );
+ cancelButton = ui.buttonsBox->addButton( QDialogButtonBox::Cancel );
/* At creation time, modify the default buttons */
setMenuAction();
@@ -168,8 +165,8 @@ OpenDialog::OpenDialog( QWidget *parent,
BUTTONACT( ui.advancedCheckBox, toggleAdvancedPanel() );
BUTTONACT( ui.slaveBrowseButton, browseInputSlave() );
- /* Buttons action */
- BUTTONACT( playButton, selectSlots() );
+ /* Buttons action */
+ BUTTONACT( ui.menuButton, selectSlots() );
BUTTONACT( selectButton, close() );
BUTTONACT( cancelButton, cancel() );
@@ -206,7 +203,7 @@ void OpenDialog::setMenuAction()
{
if( i_action_flag == SELECT )
{
- playButton->hide();
+ ui.menuButton->hide();
selectButton->show();
selectButton->setDefault( true );
}
@@ -215,21 +212,24 @@ void OpenDialog::setMenuAction()
switch ( i_action_flag )
{
case OPEN_AND_STREAM:
- playButton->setText( qtr( "&Stream" ) );
+ ui.menuButton->setText( UI_TEXT_STREAM );
+ ui.menuButton->setIcon( UI_ICON_STREAM );
break;
case OPEN_AND_SAVE:
- playButton->setText( qtr( "&Convert / Save" ) );
+ ui.menuButton->setText( UI_TEXT_CONVERT );
+ ui.menuButton->setIcon( UI_ICON_CONVERT );
break;
case OPEN_AND_ENQUEUE:
- playButton->setText( qtr( "&Enqueue" ) );
+ ui.menuButton->setText( UI_TEXT_ENQUEUE );
+ ui.menuButton->setIcon( UI_ICON_ENQUEUE );
break;
case OPEN_AND_PLAY:
default:
- playButton->setText( qtr( "&Play" ) );
+ ui.menuButton->setText( UI_TEXT_PLAY );
+ ui.menuButton->setIcon( UI_ICON_PLAY );
}
- playButton->show();
+ ui.menuButton->show();
selectButton->hide();
- playButton->setDefault( true );
}
}
diff --git a/modules/gui/qt4/dialogs/open.hpp b/modules/gui/qt4/dialogs/open.hpp
index 7ba13fc..ec0b820 100644
--- a/modules/gui/qt4/dialogs/open.hpp
+++ b/modules/gui/qt4/dialogs/open.hpp
@@ -34,6 +34,20 @@
#include "ui/open.h"
#include "components/open_panels.hpp"
+#define UI_ICON_PLAY QIcon( ":/play" )
+#define UI_ICON_ENQUEUE QIcon( ":/enqueue" )
+#define UI_ICON_STREAM QIcon( ":/stream" )
+#define UI_ICON_CONVERT QIcon( ":/convert" )
+#define UI_ICON_MEDIA_DVD QIcon( ":/disc" )
+#define UI_ICON_MEDIA_FILE QIcon( ":/folder-grey" )
+#define UI_ICON_MEDIA_NETWORK QIcon( ":/network" )
+#define UI_ICON_MEDIA_CAPTURE QIcon( ":/capture-card" )
+
+#define UI_TEXT_PLAY qtr( "&Play" )
+#define UI_TEXT_ENQUEUE qtr( "&Enqueue" )
+#define UI_TEXT_STREAM qtr( "&Stream" )
+#define UI_TEXT_CONVERT qtr( "&Convert" )
+
enum {
OPEN_FILE_TAB,
OPEN_DISC_TAB,
diff --git a/modules/gui/qt4/pixmaps/menus/convert_16px.png b/modules/gui/qt4/pixmaps/menus/convert_16px.png
new file mode 100644
index 0000000000000000000000000000000000000000..a240a17018999fdd22cc836e5df401366756b972
GIT binary patch
literal 373
zcmeAS at N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=f!eQwFr$;k><XYDdx at v7EBj4WX;F4<f8K3dfkIzBT^vI!PS3rx
z*UQ;apzY!J=%mSN0-}3Z>!mysGetLS6xP;FT6mJR(vO9E<K>vf*13z;wzhJ-^1bmc
zeKY$Z#l~3nWiu1!$+k_+bvkQhz{GZd_k)1Ci_s$CtguG;1+%k`9}qP-$H-J*W`5^L
z=8Bh3nVMO@>TQ_G9izWu|8dUsI}a!qaQ-nnyifM5iYEI3vu%M-=V`sasV2LD>B^Vs
zPd~B6Fa$5)=jm>2nZula;B>uN1Y=r5 at Vnc`F1ej#W3*t}*La at ACi>PXrl=bS#bu&4
zE!~}z at UAqvYudKc44E_9X7ABwofqY>Wy|H0zj77dFl8TbUtRo(y(_US>d_;=EMNdI
Nc)I$ztaD0e0st+NkJ11D
literal 0
HcmV?d00001
diff --git a/modules/gui/qt4/pixmaps/menus/enqueue_16px.png b/modules/gui/qt4/pixmaps/menus/enqueue_16px.png
new file mode 100644
index 0000000000000000000000000000000000000000..385adb7aa565ef427e9c5bd891baa3d99c55b412
GIT binary patch
literal 505
zcmV<V0S5kwP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01m?d01m?e$8V@)00007bV*G`2iXN1
z6$B*opZMnh00DVPL_t(I%axO{OIuMC#((#`8<U_meGRXXf`(FBP$;DZ|AGDs1zq0K
zxQGP at N4s9MOUJqtp<)~w=)X}1hYZEZp{8WbkRelYdpd+XeZCh=FMQnZaL at hD_i?#K
zRRQR9I^Ubk<_0sYIF4KOdVLcBRYg^C&Z+l47tT3tx7*4!$~Eeo)5$%1TX{4Z<xY&E
zh%gL6a}IAi7z_rvm`qOad%Vx=AhXO3mAe9Y=q>i>E%uT=*K}xI4Ul#4?%)D|AN%Vx
zKA%%586H2dEIlg1+pL+CgW+(P;s&sRV$5Fz<?Po_y0)7VNICG{bGG*~;a@(y&P?>)
zPZ#L-`|KS50pMtBg^#CKgk>dM5Nee<o>a at cc@a&I5ClPrivbZsArPz;3N}dfWE_YH
zU$>tn^{4l1_r7RGVC(1#fa9I#?0>tYI&X+7mfFK2%h3XBPpi`-h)9YDGLB$HD9u?4
vR#H8=4o-GgllrjnYW4_m9Jl`GJ5TsO$V|tgN1!i;00000NkvXXu0mjfB^lYO
literal 0
HcmV?d00001
diff --git a/modules/gui/qt4/ui/open.ui b/modules/gui/qt4/ui/open.ui
index a374868..8bfb5b7 100644
--- a/modules/gui/qt4/ui/open.ui
+++ b/modules/gui/qt4/ui/open.ui
@@ -10,7 +10,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>556</width>
+ <width>557</width>
<height>387</height>
</rect>
</property>
@@ -29,74 +29,212 @@
<property name="windowTitle">
<string>Dialog</string>
</property>
- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0" colspan="4">
- <widget class="QTabWidget" name="Tab"/>
- </item>
- <item row="1" column="0" colspan="4">
- <widget class="QCheckBox" name="advancedCheckBox">
- <property name="toolTip">
- <string>Show extended options</string>
- </property>
- <property name="text">
- <string>Show &more options</string>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QGroupBox" name="groupBox_2">
+ <property name="title">
+ <string>Media source</string>
</property>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <widget class="QTabWidget" name="Tab"/>
+ </item>
+ </layout>
</widget>
</item>
- <item row="2" column="0" colspan="4">
- <widget class="QGroupBox" name="advancedFrame">
- <layout class="QGridLayout" name="gridLayout_2">
+ <item>
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
+ <string>Additional options</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <property name="leftMargin">
+ <number>9</number>
+ </property>
+ <property name="horizontalSpacing">
+ <number>6</number>
+ </property>
<item row="0" column="0">
- <widget class="QLabel" name="cacheLabel">
- <property name="text">
- <string>Caching</string>
- </property>
- <property name="buddy">
- <cstring>cacheSpinBox</cstring>
- </property>
- </widget>
- </item>
- <item row="0" column="2">
- <widget class="QSpinBox" name="cacheSpinBox">
+ <widget class="QCheckBox" name="advancedCheckBox">
<property name="toolTip">
- <string>Change the caching for the media</string>
+ <string>Show extended options</string>
</property>
- <property name="alignment">
- <set>Qt::AlignRight</set>
- </property>
- <property name="suffix">
- <string> ms</string>
- </property>
- <property name="maximum">
- <number>65535</number>
+ <property name="text">
+ <string>Show &more options</string>
</property>
</widget>
</item>
- <item row="0" column="3">
- <spacer>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>16</width>
- <height>24</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="0" column="4">
- <widget class="QLabel" name="label_3">
- <property name="text">
- <string>Start Time</string>
- </property>
- <property name="buddy">
- <cstring>startTimeDoubleSpinBox</cstring>
- </property>
+ <item row="1" column="0">
+ <widget class="QGroupBox" name="advancedFrame">
+ <layout class="QGridLayout" name="gridLayout_2">
+ <property name="margin">
+ <number>0</number>
+ </property>
+ <property name="horizontalSpacing">
+ <number>6</number>
+ </property>
+ <item row="0" column="0">
+ <widget class="QLabel" name="cacheLabel">
+ <property name="layoutDirection">
+ <enum>Qt::RightToLeft</enum>
+ </property>
+ <property name="text">
+ <string>Caching</string>
+ </property>
+ <property name="buddy">
+ <cstring>cacheSpinBox</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <widget class="QSpinBox" name="cacheSpinBox">
+ <property name="toolTip">
+ <string>Change the caching for the media</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight</set>
+ </property>
+ <property name="suffix">
+ <string> ms</string>
+ </property>
+ <property name="maximum">
+ <number>65535</number>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="3">
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>16</width>
+ <height>24</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="0" column="4">
+ <widget class="QLabel" name="label_3">
+ <property name="layoutDirection">
+ <enum>Qt::RightToLeft</enum>
+ </property>
+ <property name="text">
+ <string>Start Time</string>
+ </property>
+ <property name="buddy">
+ <cstring>startTimeDoubleSpinBox</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="7">
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="1" column="2" colspan="6">
+ <widget class="Line" name="line"/>
+ </item>
+ <item row="2" column="0" colspan="8">
+ <widget class="QCheckBox" name="slaveCheckbox">
+ <property name="text">
+ <string>Play another media synchronously (extra audio file, ...)</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="slaveLabel">
+ <property name="text">
+ <string>Extra media</string>
+ </property>
+ <property name="buddy">
+ <cstring>slaveText</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="2" colspan="4">
+ <widget class="QLineEdit" name="slaveText"/>
+ </item>
+ <item row="3" column="6" colspan="2">
+ <widget class="QPushButton" name="slaveBrowseButton">
+ <property name="toolTip">
+ <string>Select the file</string>
+ </property>
+ <property name="text">
+ <string>Browse...</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="2" colspan="6">
+ <widget class="Line" name="line"/>
+ </item>
+ <item row="5" column="0">
+ <widget class="QLabel" name="advancedLabel">
+ <property name="text">
+ <string>MRL</string>
+ </property>
+ <property name="buddy">
+ <cstring>advancedLineInput</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="2" colspan="6">
+ <widget class="QLineEdit" name="mrlLine">
+ <property name="readOnly">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="2" colspan="6">
+ <widget class="QLineEdit" name="advancedLineInput">
+ <property name="toolTip">
+ <string>Complete MRL for VLC internal</string>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Edit Options</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="5" colspan="2">
+ <widget class="QDoubleSpinBox" name="startTimeDoubleSpinBox">
+ <property name="toolTip">
+ <string>Change the start time for the media</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight</set>
+ </property>
+ <property name="suffix">
+ <string>s</string>
+ </property>
+ <property name="decimals">
+ <number>1</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
</widget>
</item>
- <item row="0" column="7">
- <spacer>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QWidget" name="widget" native="true">
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
@@ -108,181 +246,56 @@
</property>
</spacer>
</item>
- <item row="1" column="2" colspan="6">
- <widget class="Line" name="line"/>
- </item>
- <item row="2" column="0" colspan="8">
- <widget class="QCheckBox" name="slaveCheckbox">
- <property name="text">
- <string>Play another media synchronously (extra audio file, ...)</string>
- </property>
- </widget>
- </item>
- <item row="3" column="0">
- <widget class="QLabel" name="slaveLabel">
- <property name="text">
- <string>Extra media</string>
- </property>
- <property name="buddy">
- <cstring>slaveText</cstring>
+ <item>
+ <widget class="QDialogButtonBox" name="buttonsBox">
+ <property name="standardButtons">
+ <set>QDialogButtonBox::NoButton</set>
</property>
</widget>
</item>
- <item row="3" column="2" colspan="4">
- <widget class="QLineEdit" name="slaveText"/>
- </item>
- <item row="3" column="6" colspan="2">
- <widget class="QPushButton" name="slaveBrowseButton">
- <property name="toolTip">
- <string>Select the file</string>
+ <item>
+ <widget class="QToolButton" name="menuButton">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
- <property name="text">
- <string>Browse...</string>
- </property>
- </widget>
- </item>
- <item row="4" column="2" colspan="6">
- <widget class="Line" name="line"/>
- </item>
- <item row="5" column="0">
- <widget class="QLabel" name="advancedLabel">
- <property name="text">
- <string>MRL</string>
- </property>
- <property name="buddy">
- <cstring>advancedLineInput</cstring>
- </property>
- </widget>
- </item>
- <item row="5" column="2" colspan="6">
- <widget class="QLineEdit" name="mrlLine">
- <property name="readOnly">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="6" column="2" colspan="6">
- <widget class="QLineEdit" name="advancedLineInput">
- <property name="toolTip">
- <string>Complete MRL for VLC internal</string>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>27</height>
+ </size>
</property>
- </widget>
- </item>
- <item row="6" column="0">
- <widget class="QLabel" name="label">
<property name="text">
- <string>Edit Options</string>
+ <string>&Play</string>
</property>
- </widget>
- </item>
- <item row="0" column="5" colspan="2">
- <widget class="QDoubleSpinBox" name="startTimeDoubleSpinBox">
- <property name="toolTip">
- <string>Change the start time for the media</string>
+ <property name="icon">
+ <iconset>
+ <normaloff>:/play</normaloff>:/play</iconset>
</property>
- <property name="alignment">
- <set>Qt::AlignRight</set>
+ <property name="popupMode">
+ <enum>QToolButton::MenuButtonPopup</enum>
</property>
- <property name="suffix">
- <string>s</string>
+ <property name="toolButtonStyle">
+ <enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
- <property name="decimals">
- <number>1</number>
+ <property name="arrowType">
+ <enum>Qt::NoArrow</enum>
</property>
</widget>
</item>
</layout>
</widget>
</item>
- <item row="3" column="0">
- <spacer>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="3" column="1">
- <widget class="QToolButton" name="menuButton">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maximumSize">
- <size>
- <width>16</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="focusPolicy">
- <enum>Qt::ClickFocus</enum>
- </property>
- <property name="toolTip">
- <string>Select play mode</string>
- </property>
- <property name="popupMode">
- <enum>QToolButton::InstantPopup</enum>
- </property>
- <property name="arrowType">
- <enum>Qt::NoArrow</enum>
- </property>
- </widget>
- </item>
- <item row="3" column="2">
- <widget class="QPushButton" name="playButton">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>0</height>
- </size>
- </property>
- <property name="text">
- <string>Play</string>
- </property>
- <property name="default">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="3" column="3">
- <widget class="QDialogButtonBox" name="buttonsBox">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="standardButtons">
- <set>QDialogButtonBox::NoButton</set>
- </property>
- </widget>
- </item>
</layout>
</widget>
<tabstops>
- <tabstop>Tab</tabstop>
- <tabstop>advancedCheckBox</tabstop>
<tabstop>cacheSpinBox</tabstop>
<tabstop>startTimeDoubleSpinBox</tabstop>
<tabstop>slaveCheckbox</tabstop>
<tabstop>slaveText</tabstop>
<tabstop>slaveBrowseButton</tabstop>
- <tabstop>playButton</tabstop>
- <tabstop>menuButton</tabstop>
- <tabstop>buttonsBox</tabstop>
</tabstops>
<resources/>
<connections>
diff --git a/modules/gui/qt4/vlc.qrc b/modules/gui/qt4/vlc.qrc
index e74f5bb..a055b71 100644
--- a/modules/gui/qt4/vlc.qrc
+++ b/modules/gui/qt4/vlc.qrc
@@ -1,94 +1,95 @@
-<!DOCTYPE RCC>
-<RCC version="1.0">
- <qresource>
- <file alias="vlc128.png">../../../share/vlc128x128.png</file>
- <file alias="vlc16.png">../../../share/vlc16x16.png</file>
- <file alias="vlc48.png">../../../share/vlc48x48.png</file>
- <file alias="vlc128-christmas.png">../../../share/vlc128x128-christmas.png</file>
- <file alias="vlc48-christmas.png">../../../share/vlc48x48-christmas.png</file>
- <file alias="advprefs_audio">pixmaps/prefs/advprefs_audio.png</file>
- <file alias="advprefs_codec">pixmaps/prefs/advprefs_codec.png</file>
- <file alias="advprefs_extended">pixmaps/prefs/advprefs_extended.png</file>
- <file alias="advprefs_intf">pixmaps/prefs/advprefs_intf.png</file>
- <file alias="advprefs_playlist">pixmaps/prefs/advprefs_playlist.png</file>
- <file alias="advprefs_sout">pixmaps/prefs/advprefs_sout.png</file>
- <file alias="advprefs_video">pixmaps/prefs/advprefs_video.png</file>
- <file>pixmaps/prefs/spref_cone_Audio_64.png</file>
- <file>pixmaps/prefs/spref_cone_Hotkeys_64.png</file>
- <file>pixmaps/prefs/spref_cone_Input_64.png</file>
- <file>pixmaps/prefs/spref_cone_Interface_64.png</file>
- <file>pixmaps/prefs/spref_cone_Subtitles_64.png</file>
- <file>pixmaps/prefs/spref_cone_Video_64.png</file>
- <file alias="capture-card">pixmaps/types/capture-card_16px.png</file>
- <file alias="cdda">pixmaps/types/cdda_16px.png</file>
- <file alias="disc">pixmaps/types/disc_16px.png</file>
- <file alias="file-asym">pixmaps/types/file-asym_16px.png</file>
- <file alias="file-wide">pixmaps/types/file-wide_16px.png</file>
- <file alias="folder-grey">pixmaps/types/folder-grey_16px.png</file>
- <file alias="network">pixmaps/types/network_16px.png</file>
- <file alias="help">pixmaps/menus/help_16px.png</file>
- <file alias="info">pixmaps/menus/info_16px.png</file>
- <file alias="messages">pixmaps/menus/messages_16px.png</file>
- <file alias="preferences">pixmaps/menus/preferences_16px.png</file>
- <file alias="quit">pixmaps/menus/quit_16px.png</file>
- <file alias="settings">pixmaps/menus/settings_16px.png</file>
- <file alias="stream">pixmaps/menus/stream_16px.png</file>
- <file alias="playlist_menu">pixmaps/menus/playlist_16px.png</file>
- <file alias="playlist_add">pixmaps/playlist/add.png</file>
- <file alias="playlist">pixmaps/playlist/playlist.png</file>
- <file alias="repeat_all">pixmaps/playlist/repeat_all.png</file>
- <file alias="repeat_off">pixmaps/playlist/repeat_off.png</file>
- <file alias="repeat_one">pixmaps/playlist/repeat_one.png</file>
- <file alias="shuffle_on">pixmaps/playlist/shuffle_on.png</file>
- <file alias="jump_to">pixmaps/playlist/jumpto.png</file>
- <file alias="type_directory">pixmaps/types/type_directory.png</file>
- <file alias="type_file">pixmaps/types/type_file.png</file>
- <file alias="type_net">pixmaps/types/type_net.png</file>
- <file alias="type_node">pixmaps/types/type_node.png</file>
- <file alias="type_playlist">pixmaps/types/type_playlist.png</file>
- <file alias="tv">pixmaps/toolbar/tv.png</file>
- <file alias="fullscreen">pixmaps/toolbar/fullscreen.png</file>
- <file alias="defullscreen">pixmaps/toolbar/defullscreen.png</file>
- <file alias="tvtelx">pixmaps/toolbar/tvtelx.png</file>
- <file alias="extended">pixmaps/toolbar/extended_16px.png</file>
- <file alias="record">pixmaps/toolbar/record_16px.png</file>
- <file alias="volume-high">pixmaps/toolbar/volume-high.png</file>
- <file alias="volume-medium">pixmaps/toolbar/volume-medium.png</file>
- <file alias="volume-low">pixmaps/toolbar/volume-low.png</file>
- <file alias="volume-muted">pixmaps/toolbar/volume-muted.png</file>
- <file alias="volslide-inside">pixmaps/toolbar/volume-slider-inside.png</file>
- <file alias="volslide-outside">pixmaps/toolbar/volume-slider-outside.png</file>
- <file alias="snapshot">pixmaps/toolbar/snapshot.png</file>
- <file alias="dvd_menu">pixmaps/toolbar/dvd_menu.png</file>
- <file alias="dvd_next">pixmaps/toolbar/dvd_next.png</file>
- <file alias="dvd_prev">pixmaps/toolbar/dvd_prev.png</file>
- <file alias="atob">pixmaps/toolbar/atob.png</file>
- <file alias="atob_noa">pixmaps/toolbar/atob_noa.png</file>
- <file alias="atob_nob">pixmaps/toolbar/atob_nob.png</file>
- <file alias="frame">pixmaps/toolbar/frame-by-frame.png</file>
- <file alias="skip_fw">pixmaps/toolbar/skip_for.png</file>
- <file alias="skip_back">pixmaps/toolbar/skip_back.png</file>
- <file alias="reverse">pixmaps/toolbar/play_reverse.png</file>
- <file alias="next">pixmaps/next_16px.png</file>
- <file alias="next_b">pixmaps/next.png</file>
- <file alias="down_arrow">pixmaps/arrow_down_dark.png</file>
- <file alias="pause">pixmaps/pause_16px.png</file>
- <file alias="pause_b">pixmaps/pause.png</file>
- <file alias="play">pixmaps/play_16px.png</file>
- <file alias="play_b">pixmaps/play.png</file>
- <file alias="faster">pixmaps/faster.png</file>
- <file alias="slower">pixmaps/slower.png</file>
- <file alias="previous">pixmaps/previous_16px.png</file>
- <file alias="previous_b">pixmaps/previous.png</file>
- <file alias="stop">pixmaps/stop_16px.png</file>
- <file alias="stop_b">pixmaps/stop.png</file>
- <file alias="eject">pixmaps/eject.png</file>
- <file alias="update">pixmaps/update.png</file>
- <file alias="clear">pixmaps/clear.png</file>
- <file alias="noart.png">pixmaps/noart.png</file>
- <file alias="space">pixmaps/space.png</file>
- <file>pixmaps/go-next.png</file>
- <file alias="new.png">pixmaps/profile_new.png</file>
- <file alias="lock">pixmaps/lock.png</file>
- </qresource>
+<RCC>
+ <qresource prefix="/" >
+ <file alias="vlc128.png" >../../../share/vlc128x128.png</file>
+ <file alias="vlc16.png" >../../../share/vlc16x16.png</file>
+ <file alias="vlc48.png" >../../../share/vlc48x48.png</file>
+ <file alias="vlc128-christmas.png" >../../../share/vlc128x128-christmas.png</file>
+ <file alias="vlc48-christmas.png" >../../../share/vlc48x48-christmas.png</file>
+ <file alias="advprefs_audio" >pixmaps/prefs/advprefs_audio.png</file>
+ <file alias="advprefs_codec" >pixmaps/prefs/advprefs_codec.png</file>
+ <file alias="advprefs_extended" >pixmaps/prefs/advprefs_extended.png</file>
+ <file alias="advprefs_intf" >pixmaps/prefs/advprefs_intf.png</file>
+ <file alias="advprefs_playlist" >pixmaps/prefs/advprefs_playlist.png</file>
+ <file alias="advprefs_sout" >pixmaps/prefs/advprefs_sout.png</file>
+ <file alias="advprefs_video" >pixmaps/prefs/advprefs_video.png</file>
+ <file>pixmaps/prefs/spref_cone_Audio_64.png</file>
+ <file>pixmaps/prefs/spref_cone_Hotkeys_64.png</file>
+ <file>pixmaps/prefs/spref_cone_Input_64.png</file>
+ <file>pixmaps/prefs/spref_cone_Interface_64.png</file>
+ <file>pixmaps/prefs/spref_cone_Subtitles_64.png</file>
+ <file>pixmaps/prefs/spref_cone_Video_64.png</file>
+ <file alias="capture-card" >pixmaps/types/capture-card_16px.png</file>
+ <file alias="cdda" >pixmaps/types/cdda_16px.png</file>
+ <file alias="disc" >pixmaps/types/disc_16px.png</file>
+ <file alias="file-asym" >pixmaps/types/file-asym_16px.png</file>
+ <file alias="file-wide" >pixmaps/types/file-wide_16px.png</file>
+ <file alias="folder-grey" >pixmaps/types/folder-grey_16px.png</file>
+ <file alias="network" >pixmaps/types/network_16px.png</file>
+ <file alias="help" >pixmaps/menus/help_16px.png</file>
+ <file alias="info" >pixmaps/menus/info_16px.png</file>
+ <file alias="messages" >pixmaps/menus/messages_16px.png</file>
+ <file alias="preferences" >pixmaps/menus/preferences_16px.png</file>
+ <file alias="quit" >pixmaps/menus/quit_16px.png</file>
+ <file alias="settings" >pixmaps/menus/settings_16px.png</file>
+ <file alias="stream" >pixmaps/menus/stream_16px.png</file>
+ <file alias="playlist_menu" >pixmaps/menus/playlist_16px.png</file>
+ <file alias="playlist_add" >pixmaps/playlist/add.png</file>
+ <file alias="playlist" >pixmaps/playlist/playlist.png</file>
+ <file alias="repeat_all" >pixmaps/playlist/repeat_all.png</file>
+ <file alias="repeat_off" >pixmaps/playlist/repeat_off.png</file>
+ <file alias="repeat_one" >pixmaps/playlist/repeat_one.png</file>
+ <file alias="shuffle_on" >pixmaps/playlist/shuffle_on.png</file>
+ <file alias="jump_to" >pixmaps/playlist/jumpto.png</file>
+ <file alias="type_directory" >pixmaps/types/type_directory.png</file>
+ <file alias="type_file" >pixmaps/types/type_file.png</file>
+ <file alias="type_net" >pixmaps/types/type_net.png</file>
+ <file alias="type_node" >pixmaps/types/type_node.png</file>
+ <file alias="type_playlist" >pixmaps/types/type_playlist.png</file>
+ <file alias="tv" >pixmaps/toolbar/tv.png</file>
+ <file alias="fullscreen" >pixmaps/toolbar/fullscreen.png</file>
+ <file alias="defullscreen" >pixmaps/toolbar/defullscreen.png</file>
+ <file alias="tvtelx" >pixmaps/toolbar/tvtelx.png</file>
+ <file alias="extended" >pixmaps/toolbar/extended_16px.png</file>
+ <file alias="record" >pixmaps/toolbar/record_16px.png</file>
+ <file alias="volume-high" >pixmaps/toolbar/volume-high.png</file>
+ <file alias="volume-medium" >pixmaps/toolbar/volume-medium.png</file>
+ <file alias="volume-low" >pixmaps/toolbar/volume-low.png</file>
+ <file alias="volume-muted" >pixmaps/toolbar/volume-muted.png</file>
+ <file alias="volslide-inside" >pixmaps/toolbar/volume-slider-inside.png</file>
+ <file alias="volslide-outside" >pixmaps/toolbar/volume-slider-outside.png</file>
+ <file alias="snapshot" >pixmaps/toolbar/snapshot.png</file>
+ <file alias="dvd_menu" >pixmaps/toolbar/dvd_menu.png</file>
+ <file alias="dvd_next" >pixmaps/toolbar/dvd_next.png</file>
+ <file alias="dvd_prev" >pixmaps/toolbar/dvd_prev.png</file>
+ <file alias="atob" >pixmaps/toolbar/atob.png</file>
+ <file alias="atob_noa" >pixmaps/toolbar/atob_noa.png</file>
+ <file alias="atob_nob" >pixmaps/toolbar/atob_nob.png</file>
+ <file alias="frame" >pixmaps/toolbar/frame-by-frame.png</file>
+ <file alias="skip_fw" >pixmaps/toolbar/skip_for.png</file>
+ <file alias="skip_back" >pixmaps/toolbar/skip_back.png</file>
+ <file alias="reverse" >pixmaps/toolbar/play_reverse.png</file>
+ <file alias="next" >pixmaps/next_16px.png</file>
+ <file alias="next_b" >pixmaps/next.png</file>
+ <file alias="down_arrow" >pixmaps/arrow_down_dark.png</file>
+ <file alias="pause" >pixmaps/pause_16px.png</file>
+ <file alias="pause_b" >pixmaps/pause.png</file>
+ <file alias="play" >pixmaps/play_16px.png</file>
+ <file alias="play_b" >pixmaps/play.png</file>
+ <file alias="faster" >pixmaps/faster.png</file>
+ <file alias="slower" >pixmaps/slower.png</file>
+ <file alias="previous" >pixmaps/previous_16px.png</file>
+ <file alias="previous_b" >pixmaps/previous.png</file>
+ <file alias="stop" >pixmaps/stop_16px.png</file>
+ <file alias="stop_b" >pixmaps/stop.png</file>
+ <file alias="eject" >pixmaps/eject.png</file>
+ <file alias="update" >pixmaps/update.png</file>
+ <file alias="clear" >pixmaps/clear.png</file>
+ <file alias="noart.png" >pixmaps/noart.png</file>
+ <file alias="space" >pixmaps/space.png</file>
+ <file>pixmaps/go-next.png</file>
+ <file alias="new.png" >pixmaps/profile_new.png</file>
+ <file alias="lock" >pixmaps/lock.png</file>
+ <file alias="convert" >pixmaps/menus/convert_16px.png</file>
+ <file alias="enqueue" >pixmaps/menus/enqueue_16px.png</file>
+ </qresource>
</RCC>
--
1.6.2.4
More information about the vlc-devel
mailing list