Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
5bdf4e18
Commit
5bdf4e18
authored
Mar 15, 2009
by
Jean-Baptiste Kempf
Browse files
Qt: various string fixes and consistencies in the ui
parent
0571ef72
Changes
8
Hide whitespace changes
Inline
Side-by-side
modules/gui/qt4/components/controller.hpp
View file @
5bdf4e18
...
...
@@ -21,8 +21,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifndef _CONTROLLER_H_
#define _CONTROLLER_H_
#ifndef
QVLC
_CONTROLLER_H_
#define
QVLC
_CONTROLLER_H_
#ifdef HAVE_CONFIG_H
# include "config.h"
...
...
@@ -33,14 +33,13 @@
#include <QFrame>
#include <QString>
#define I_PLAY_TOOLTIP N_("Play\nIf the playlist is empty, open a medium")
#define MAIN_TB1_DEFAULT "64;39;64;38;65"
#define MAIN_TB2_DEFAULT "0-2;64;3;1;4;64;7;10;9;64-4;37;65;35-4"
#define ADV_TB_DEFAULT "12;11;13;14"
#define INPT_TB_DEFAULT "5-1;15-1;33;6-1"
#define FSC_TB_DEFAULT "0-2;64;3;1;4;64;37;64;38;64;8;65;35-4;34"
#define I_PLAY_TOOLTIP N_("Play\nIf the playlist is empty, open a medium")
class
QPixmap
;
class
QLabel
;
...
...
modules/gui/qt4/components/controller_widget.cpp
View file @
5bdf4e18
...
...
@@ -26,6 +26,7 @@
#endif
#include "controller_widget.hpp"
#include "controller.hpp"
#include "input_manager.hpp"
/* Get notification of Volume Change */
#include "util/input_slider.hpp"
/* SoundSlider */
...
...
modules/gui/qt4/components/controller_widget.hpp
View file @
5bdf4e18
...
...
@@ -34,8 +34,6 @@
#include <QFrame>
#include <QToolButton>
#define I_PLAY_TOOLTIP N_("Play\nIf the playlist is empty, open a media")
class
QLabel
;
class
QSpinBox
;
class
QAbstractSlider
;
...
...
modules/gui/qt4/components/open_panels.cpp
View file @
5bdf4e18
...
...
@@ -996,8 +996,8 @@ void CaptureOpenPanel::initialize()
* Screen *
**********/
addModuleAndLayouts
(
SCREEN_DEVICE
,
screen
,
"Desktop"
);
QLabel
*
screenLabel
=
new
QLabel
(
"
This option will open your own
"
"
desktop
in order to s
ave or stream
it."
);
QLabel
*
screenLabel
=
new
QLabel
(
"
Your display will will be
"
"
opened and played
in order to s
tream or save
it."
);
screenLabel
->
setWordWrap
(
true
);
screenDevLayout
->
addWidget
(
screenLabel
,
0
,
0
);
...
...
modules/gui/qt4/dialogs/convert.cpp
View file @
5bdf4e18
...
...
@@ -54,7 +54,7 @@ ConvertDialog::ConvertDialog( QWidget *parent, intf_thread_t *_p_intf,
QGroupBox
*
destBox
=
new
QGroupBox
(
qtr
(
"Destination"
)
);
QGridLayout
*
destLayout
=
new
QGridLayout
(
destBox
);
QLabel
*
destLabel
=
new
QLabel
(
qtr
(
"
Target
file:"
)
);
QLabel
*
destLabel
=
new
QLabel
(
qtr
(
"
Destination
file:"
)
);
destLayout
->
addWidget
(
destLabel
,
0
,
0
);
fileLine
=
new
QLineEdit
;
...
...
modules/gui/qt4/menus.cpp
View file @
5bdf4e18
...
...
@@ -305,7 +305,7 @@ QMenu *QVLCMenu::FileMenu( intf_thread_t *p_intf, QWidget *parent )
":/folder-grey"
,
SLOT
(
PLOpenDir
()
),
"Ctrl+F"
);
addDPStaticEntry
(
menu
,
qtr
(
"Open &Disc..."
),
":/disc"
,
SLOT
(
openDiscDialog
()
),
"Ctrl+D"
);
addDPStaticEntry
(
menu
,
qtr
(
"Open &Network..."
),
addDPStaticEntry
(
menu
,
qtr
(
"Open &Network
Stream
..."
),
":/network"
,
SLOT
(
openNetDialog
()
),
"Ctrl+N"
);
addDPStaticEntry
(
menu
,
qtr
(
"Open &Capture Device..."
),
":/capture-card"
,
SLOT
(
openCaptureDialog
()
),
...
...
modules/gui/qt4/ui/open_capture.ui
View file @
5bdf4e18
<ui version="4.0" >
<?xml version="1.0" encoding="UTF-8"?>
<ui
version=
"4.0"
>
<author>
Jean-Baptiste Kempf
</author>
<class>
OpenCapture
</class>
<widget class="QWidget" name="OpenCapture"
>
<property name="geometry"
>
<widget
class=
"QWidget"
name=
"OpenCapture"
>
<property
name=
"geometry"
>
<rect>
<x>
0
</x>
<y>
0
</y>
...
...
@@ -10,57 +11,57 @@
<height>
134
</height>
</rect>
</property>
<layout class="QGridLayout"
>
<item row="0" column="0"
>
<widget class="QLabel" name="label"
>
<property name="text"
>
<string>_(
"
Capture mode
"
)</string>
<layout
class=
"QGridLayout"
>
<item
row=
"0"
column=
"0"
>
<widget
class=
"QLabel"
name=
"label"
>
<property
name=
"text"
>
<string>
_(
"
Capture mode
"
)
</string>
</property>
</widget>
</item>
<item row="0" column="2" colspan="2"
>
<widget class="QComboBox" name="deviceCombo"
>
<property name="sizePolicy"
>
<sizepolicy
vsizetype="Fixed"
hsizetype="MinimumExpanding" >
<item
row=
"0"
column=
"2"
colspan=
"2"
>
<widget
class=
"QComboBox"
name=
"deviceCombo"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"MinimumExpanding"
vsizetype=
"Fixed"
>
<horstretch>
0
</horstretch>
<verstretch>
0
</verstretch>
</sizepolicy>
</property>
<property name="toolTip"
>
<string>_(
"
Select the capture device type
"
)</string>
<property
name=
"toolTip"
>
<string>
_(
"
Select the capture device type
"
)
</string>
</property>
</widget>
</item>
<item row="1" column="0" colspan="4"
>
<widget class="Line" name="line"
>
<property name="orientation"
>
<item
row=
"1"
column=
"0"
colspan=
"4"
>
<widget
class=
"Line"
name=
"line"
>
<property
name=
"orientation"
>
<enum>
Qt::Horizontal
</enum>
</property>
</widget>
</item>
<item row="2" column="0" colspan="4"
>
<widget class="QGroupBox" name="cardBox"
>
<property name="title"
>
<string>_(
"Card
Selection
"
)</string>
<item
row=
"2"
column=
"0"
colspan=
"4"
>
<widget
class=
"QGroupBox"
name=
"cardBox"
>
<property
name=
"title"
>
<string>
_(
"
Device
Selection
"
)
</string>
</property>
</widget>
</item>
<item row="3" column="0" colspan="4"
>
<widget class="QGroupBox" name="optionsBox"
>
<property name="title"
>
<string>_(
"
Options
"
)</string>
<item
row=
"3"
column=
"0"
colspan=
"4"
>
<widget
class=
"QGroupBox"
name=
"optionsBox"
>
<property
name=
"title"
>
<string>
_(
"
Options
"
)
</string>
</property>
</widget>
</item>
<item row="5" column="0" colspan="4"
>
<item
row=
"5"
column=
"0"
colspan=
"4"
>
<spacer>
<property name="orientation"
>
<property
name=
"orientation"
>
<enum>
Qt::Vertical
</enum>
</property>
<property name="sizeType"
>
<property
name=
"sizeType"
>
<enum>
QSizePolicy::MinimumExpanding
</enum>
</property>
<property name="sizeHint" stdset="0"
>
<property
name=
"sizeHint"
stdset=
"0"
>
<size>
<width>
20
</width>
<height>
0
</height>
...
...
@@ -68,13 +69,13 @@
</property>
</spacer>
</item>
<item row="4" column="3"
>
<widget class="QPushButton" name="advancedButton"
>
<property name="toolTip"
>
<string>_(
"
Access advanced options to tweak the device
"
)</string>
<item
row=
"4"
column=
"3"
>
<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
name=
"text"
>
<string>
_(
"
Advanced options...
"
)
</string>
</property>
</widget>
</item>
...
...
modules/gui/qt4/ui/open_disk.ui
View file @
5bdf4e18
<ui version="4.0" >
<?xml version="1.0" encoding="UTF-8"?>
<ui
version=
"4.0"
>
<author>
Jean-Baptiste Kempf
</author>
<class>
OpenDisk
</class>
<widget class="QWidget" name="OpenDisk"
>
<property name="geometry"
>
<widget
class=
"QWidget"
name=
"OpenDisk"
>
<property
name=
"geometry"
>
<rect>
<x>
0
</x>
<y>
0
</y>
...
...
@@ -10,34 +11,34 @@
<height>
319
</height>
</rect>
</property>
<property name="minimumSize"
>
<property
name=
"minimumSize"
>
<size>
<width>
500
</width>
<height>
0
</height>
</size>
</property>
<property name="windowTitle"
>
<property
name=
"windowTitle"
>
<string>
Form
</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout"
>
<layout
class=
"QVBoxLayout"
name=
"verticalLayout"
>
<item>
<widget class="QGroupBox" name="diskGroupBox"
>
<property name="sizePolicy"
>
<sizepolicy
vsizetype="Minimum"
hsizetype="Preferred" >
<widget
class=
"QGroupBox"
name=
"diskGroupBox"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"Preferred"
vsizetype=
"Minimum"
>
<horstretch>
0
</horstretch>
<verstretch>
0
</verstretch>
</sizepolicy>
</property>
<property name="title"
>
<string>_(
"Disc Type
Selection
"
)</string>
<property
name=
"title"
>
<string>
_(
"
Disc
Selection
"
)
</string>
</property>
<layout class="QGridLayout" name="gridLayout"
>
<item row="0" column="0"
>
<layout
class=
"QGridLayout"
name=
"gridLayout"
>
<item
row=
"0"
column=
"0"
>
<spacer>
<property name="orientation"
>
<property
name=
"orientation"
>
<enum>
Qt::Horizontal
</enum>
</property>
<property name="sizeHint" stdset="0"
>
<property
name=
"sizeHint"
stdset=
"0"
>
<size>
<width>
16
</width>
<height>
25
</height>
...
...
@@ -45,25 +46,25 @@
</property>
</spacer>
</item>
<item row="0" column="1"
>
<widget class="QRadioButton" name="dvdRadioButton"
>
<property name="layoutDirection"
>
<item
row=
"0"
column=
"1"
>
<widget
class=
"QRadioButton"
name=
"dvdRadioButton"
>
<property
name=
"layoutDirection"
>
<enum>
Qt::LeftToRight
</enum>
</property>
<property name="text"
>
<property
name=
"text"
>
<string>
DVD
</string>
</property>
<property name="checked"
>
<property
name=
"checked"
>
<bool>
true
</bool>
</property>
</widget>
</item>
<item row="0" column="2"
>
<item
row=
"0"
column=
"2"
>
<spacer>
<property name="orientation"
>
<property
name=
"orientation"
>
<enum>
Qt::Horizontal
</enum>
</property>
<property name="sizeHint" stdset="0"
>
<property
name=
"sizeHint"
stdset=
"0"
>
<size>
<width>
20
</width>
<height>
20
</height>
...
...
@@ -71,19 +72,19 @@
</property>
</spacer>
</item>
<item row="0" column="3"
>
<widget class="QRadioButton" name="audioCDRadioButton"
>
<property name="text"
>
<string>_(
"
Audio CD
"
)</string>
<item
row=
"0"
column=
"3"
>
<widget
class=
"QRadioButton"
name=
"audioCDRadioButton"
>
<property
name=
"text"
>
<string>
_(
"
Audio CD
"
)
</string>
</property>
</widget>
</item>
<item row="0" column="4"
>
<item
row=
"0"
column=
"4"
>
<spacer>
<property name="orientation"
>
<property
name=
"orientation"
>
<enum>
Qt::Horizontal
</enum>
</property>
<property name="sizeHint" stdset="0"
>
<property
name=
"sizeHint"
stdset=
"0"
>
<size>
<width>
20
</width>
<height>
20
</height>
...
...
@@ -91,19 +92,19 @@
</property>
</spacer>
</item>
<item row="0" column="5"
>
<widget class="QRadioButton" name="vcdRadioButton"
>
<property name="text"
>
<item
row=
"0"
column=
"5"
>
<widget
class=
"QRadioButton"
name=
"vcdRadioButton"
>
<property
name=
"text"
>
<string>
SVCD/VCD
</string>
</property>
</widget>
</item>
<item row="0" column="6"
>
<item
row=
"0"
column=
"6"
>
<spacer>
<property name="orientation"
>
<property
name=
"orientation"
>
<enum>
Qt::Horizontal
</enum>
</property>
<property name="sizeHint" stdset="0"
>
<property
name=
"sizeHint"
stdset=
"0"
>
<size>
<width>
31
</width>
<height>
25
</height>
...
...
@@ -111,52 +112,52 @@
</property>
</spacer>
</item>
<item row="1" column="1" colspan="3"
>
<widget class="QCheckBox" name="dvdsimple"
>
<property name="toolTip"
>
<string>_(
"
Disable DVD Menus (for compatibility)
"
)</string>
<item
row=
"1"
column=
"1"
colspan=
"3"
>
<widget
class=
"QCheckBox"
name=
"dvdsimple"
>
<property
name=
"toolTip"
>
<string>
_(
"
Disable DVD Menus (for compatibility)
"
)
</string>
</property>
<property name="text"
>
<string>_(
"
No DVD menus
"
)</string>
<property
name=
"text"
>
<string>
_(
"
No DVD menus
"
)
</string>
</property>
</widget>
</item>
<item row="2" column="2" colspan="5"
>
<widget class="Line" name="line"
>
<property name="orientation"
>
<item
row=
"2"
column=
"2"
colspan=
"5"
>
<widget
class=
"Line"
name=
"line"
>
<property
name=
"orientation"
>
<enum>
Qt::Horizontal
</enum>
</property>
</widget>
</item>
<item row="3" column="0" colspan="7"
>
<layout class="QHBoxLayout" name="horizontalLayout_5"
>
<item
row=
"3"
column=
"0"
colspan=
"7"
>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout_5"
>
<item>
<widget class="QLabel" name="deviceLabel"
>
<property name="text"
>
<string>_(
"
Disc device
"
)</string>
<widget
class=
"QLabel"
name=
"deviceLabel"
>
<property
name=
"text"
>
<string>
_(
"
Disc device
"
)
</string>
</property>
<property name="buddy"
>
<property
name=
"buddy"
>
<cstring>
deviceCombo
</cstring>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="deviceCombo"
>
<property name="sizePolicy"
>
<sizepolicy
vsizetype="Fixed"
hsizetype="MinimumExpanding" >
<widget
class=
"QComboBox"
name=
"deviceCombo"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"MinimumExpanding"
vsizetype=
"Fixed"
>
<horstretch>
0
</horstretch>
<verstretch>
0
</verstretch>
</sizepolicy>
</property>
<property name="editable"
>
<property
name=
"editable"
>
<bool>
true
</bool>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="ejectButton"
>
<property name="sizePolicy"
>
<sizepolicy vsizetype="Minimum"
hsizetype="Fixed"
>
<widget
class=
"QToolButton"
name=
"ejectButton"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"Fixed"
vsizetype=
"Minimum"
>
<horstretch>
0
</horstretch>
<verstretch>
0
</verstretch>
</sizepolicy>
...
...
@@ -164,15 +165,15 @@
</widget>
</item>
<item>
<widget class="QPushButton" name="browseDiscButton"
>
<property name="sizePolicy"
>
<sizepolicy
vsizetype="Fixed"
hsizetype="Maximum" >
<widget
class=
"QPushButton"
name=
"browseDiscButton"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"Maximum"
vsizetype=
"Fixed"
>
<horstretch>
0
</horstretch>
<verstretch>
0
</verstretch>
</sizepolicy>
</property>
<property name="text"
>
<string>_(
"
Browse...
"
)</string>
<property
name=
"text"
>
<string>
_(
"
Browse...
"
)
</string>
</property>
</widget>
</item>
...
...
@@ -182,49 +183,49 @@
</widget>
</item>
<item>
<widget class="QGroupBox" name="diskOptionBox"
>
<property name="title"
>
<string>_(
"
Starting Position
"
)</string>
<widget
class=
"QGroupBox"
name=
"diskOptionBox"
>
<property
name=
"title"
>
<string>
_(
"
Starting Position
"
)
</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout"
>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout"
>
<item>
<widget class="QLabel" name="titleLabel"
>
<property name="text"
>
<string>_(
"Title"
)</string>
<widget
class=
"QLabel"
name=
"titleLabel"
>
<property
name=
"text"
>
<string>
_(
"
Title
"
)
</string>
</property>
<property name="buddy"
>
<property
name=
"buddy"
>
<cstring>
titleSpin
</cstring>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="titleSpin"
>
<property name="sizePolicy"
>
<sizepolicy
vsizetype="Fixed"
hsizetype="Maximum" >
<widget
class=
"QSpinBox"
name=
"titleSpin"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"Maximum"
vsizetype=
"Fixed"
>
<horstretch>
0
</horstretch>
<verstretch>
0
</verstretch>
</sizepolicy>
</property>
<property name="autoFillBackground"
>
<property
name=
"autoFillBackground"
>
<bool>
false
</bool>
</property>
<property name="alignment"
>
<property
name=
"alignment"
>
<set>
Qt::AlignRight
</set>
</property>
<property name="value"
>
<property
name=
"value"
>
<number>
0
</number>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer"
>
<property name="orientation"
>
<spacer
name=
"horizontalSpacer"
>
<property
name=
"orientation"
>
<enum>
Qt::Horizontal
</enum>
</property>
<property name="sizeType"
>
<property
name=
"sizeType"
>
<enum>
QSizePolicy::Fixed
</enum>
</property>
<property name="sizeHint" stdset="0"
>
<property
name=
"sizeHint"
stdset=
"0"
>
<size>
<width>
20
</width>
<height>
20
</height>
...
...
@@ -233,24 +234,24 @@
</spacer>
</item>
<item>
<widget class="QLabel" name="chapterLabel"
>
<property name="text"
>
<string>_(
"
Chapter
"
)</string>
<widget
class=
"QLabel"
name=
"chapterLabel"
>
<property
name=
"text"
>
<string>
_(
"
Chapter
"
)
</string>
</property>
<property name="buddy"
>
<property
name=
"buddy"
>
<cstring>
chapterSpin
</cstring>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="chapterSpin"
>
<property name="sizePolicy"
>
<sizepolicy
vsizetype="Fixed"
hsizetype="Maximum" >
<widget
class=
"QSpinBox"
name=
"chapterSpin"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"Maximum"
vsizetype=
"Fixed"
>
<horstretch>
0
</horstretch>
<verstretch>
0
</verstretch>
</sizepolicy>
</property>
<property name="alignment"
>
<property
name=
"alignment"
>
<set>
Qt::AlignRight
</set>
</property>
</widget>
...
...
@@ -259,58 +260,52 @@
</widget>
</item>
<item>
<widget class="QGroupBox" name="diskOptionBox_2"
>
<property name="title"
>
<string>_(
"
Audio and Subtitles
"
)</string>
<widget
class=
"QGroupBox"
name=
"diskOptionBox_2"
>
<property
name=
"title"
>
<string>
_(
"
Audio and Subtitles
"
)
</string>
</property>
<layout class="Q
HBox
Layout" name="
horizontal
Layout_2"
>
<item>
<widget class="QLabel" name="
subtitles
Label"
>
<property name="text"
>
<string>_(
"Subtitles track"
)</string>
<layout
class=
"Q
Grid
Layout"
name=
"
grid
Layout_2"
>
<item
row=
"0"
column=
"0"
>
<widget
class=
"QLabel"
name=
"
audio
Label"
>
<property
name=
"text"
>
<string>
_(
"
Audio track
"
)
</string>
</property>
<property name="buddy"
>
<cstring>
subtitles
Spin</cstring>
<property
name=
"buddy"
>
<cstring>
audio
Spin
</cstring>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="
subtitles
Spin"
>
<property name="sizePolicy"
>
<sizepolicy
vsizetype="Fixed"
hsizetype="Maximum" >
<item
row=
"0"
column=
"1"
>
<widget
class=
"QSpinBox"
name=
"
audio
Spin"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"Maximum"
vsizetype=
"Fixed"
>
<horstretch>
0
</horstretch>
<verstretch>
0
</verstretch>
</sizepolicy>
</property>
<property name="autoFillBackground" >
<bool>false</bool>
</property>
<property name="alignment" >
<property
name=
"alignment"
>
<set>
Qt::AlignRight
</set>
</property>
<property name="suffix" >
<string/>
</property>
<property name="minimum" >
<property
name=
"minimum"
>
<number>
-1
</number>
</property>
<property name="maximum"
>
<number>
3
1</number>
<property
name=
"maximum"
>
<number>
1
0
</number>
</property>
<property name="value"
>
<property
name=
"value"
>
<number>
-1
</number>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2"
>
<property name="orientation"
>
<item
row=
"0"
column=
"2"
>
<spacer
name=
"horizontalSpacer_2"
>
<property
name=
"orientation"
>
<enum>
Qt::Horizontal
</enum>
</property>
<property name="sizeType"
>
<property
name=
"sizeType"
>
<enum>
QSizePolicy::Fixed
</enum>
</property>
<property name="sizeHint" stdset="0"
>
<property
name=
"sizeHint"
stdset=
"0"
>
<size>
<width>
20
</width>
<height>
20
</height>
...
...
@@ -318,34 +313,40 @@
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="
audio
Label"
>
<property name="text"
>
<string>_(
"Audio track"
)</string>
<item
row=
"0"
column=
"3"
>
<widget
class=
"QLabel"
name=
"
subtitles
Label"
>