Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-gpu
Commits
5bdf4e18
Commit
5bdf4e18
authored
Mar 15, 2009
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: various string fixes and consistencies in the ui
parent
0571ef72
Changes
8
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
182 additions
and
182 deletions
+182
-182
modules/gui/qt4/components/controller.hpp
modules/gui/qt4/components/controller.hpp
+3
-4
modules/gui/qt4/components/controller_widget.cpp
modules/gui/qt4/components/controller_widget.cpp
+1
-0
modules/gui/qt4/components/controller_widget.hpp
modules/gui/qt4/components/controller_widget.hpp
+0
-2
modules/gui/qt4/components/open_panels.cpp
modules/gui/qt4/components/open_panels.cpp
+2
-2
modules/gui/qt4/dialogs/convert.cpp
modules/gui/qt4/dialogs/convert.cpp
+1
-1
modules/gui/qt4/menus.cpp
modules/gui/qt4/menus.cpp
+1
-1
modules/gui/qt4/ui/open_capture.ui
modules/gui/qt4/ui/open_capture.ui
+36
-35
modules/gui/qt4/ui/open_disk.ui
modules/gui/qt4/ui/open_disk.ui
+138
-137
No files found.
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 save or stream it."
);
QLabel
*
screenLabel
=
new
QLabel
(
"
Your display will will be
"
"
opened and played in order to stream 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
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment