Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
98c06d9e
Commit
98c06d9e
authored
Feb 07, 2009
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: integrate the new volume to the customize dialog.
parent
24481664
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
4 deletions
+17
-4
modules/gui/qt4/components/controller.cpp
modules/gui/qt4/components/controller.cpp
+4
-1
modules/gui/qt4/components/controller.hpp
modules/gui/qt4/components/controller.hpp
+4
-3
modules/gui/qt4/dialogs/toolbar.cpp
modules/gui/qt4/dialogs/toolbar.cpp
+9
-0
No files found.
modules/gui/qt4/components/controller.cpp
View file @
98c06d9e
...
...
@@ -184,6 +184,7 @@ QWidget *AbstractController::createWidget( buttonType_e button, int options )
bool
b_flat
=
options
&
WIDGET_FLAT
;
bool
b_big
=
options
&
WIDGET_BIG
;
bool
b_shiny
=
options
&
WIDGET_SHINY
;
bool
b_special
=
false
;
QWidget
*
widget
=
NULL
;
switch
(
button
)
...
...
@@ -344,9 +345,11 @@ QWidget *AbstractController::createWidget( buttonType_e button, int options )
widget
=
telexFrame
();
widget
->
hide
();
break
;
case
VOLUME_SPECIAL
:
b_special
=
true
;
case
VOLUME
:
{
SoundWidget
*
snd
=
new
SoundWidget
(
this
,
p_intf
,
b_shiny
);
SoundWidget
*
snd
=
new
SoundWidget
(
this
,
p_intf
,
b_shiny
,
b_special
);
widget
=
snd
;
}
break
;
...
...
modules/gui/qt4/components/controller.hpp
View file @
98c06d9e
...
...
@@ -35,11 +35,11 @@
#define I_PLAY_TOOLTIP N_("Play\nIf the playlist is empty, open a media")
#define MAIN_TB1_DEFAULT "64;3
8;64;37-4
;65"
#define MAIN_TB2_DEFAULT "0-2;64;3;1;4;64;7;10;9;64-4;3
6-4
;65;35-4"
#define MAIN_TB1_DEFAULT "64;3
9;64;38
;65"
#define MAIN_TB2_DEFAULT "0-2;64;3;1;4;64;7;10;9;64-4;3
7
;65;35-4"
#define ADV_TB_DEFAULT "12;11;13;14"
#define INPT_TB_DEFAULT "5-1;33;6-1"
#define FSC_TB_DEFAULT "0-2;64;3;1;4;64;3
6;64;37
;64;8;65;35-4;34"
#define FSC_TB_DEFAULT "0-2;64;3;1;4;64;3
7;64;38
;64;8;65;35-4;34"
class
QPixmap
;
...
...
@@ -86,6 +86,7 @@ typedef enum buttonType_e
INPUT_SLIDER
,
TIME_LABEL
,
VOLUME
,
VOLUME_SPECIAL
,
MENU_BUTTONS
,
TELETEXT_BUTTONS
,
ADVANCED_CONTROLLER
,
...
...
modules/gui/qt4/dialogs/toolbar.cpp
View file @
98c06d9e
...
...
@@ -248,6 +248,15 @@ WidgetListing::WidgetListing( intf_thread_t *p_intf, QWidget *_parent )
}
widgetItem
->
setText
(
qtr
(
"Volume"
)
);
break
;
case
VOLUME_SPECIAL
:
{
QListWidgetItem
*
widgetItem
=
new
QListWidgetItem
(
this
);
widgetItem
->
setText
(
"Small Volume"
);
widgetItem
->
setIcon
(
QIcon
(
":/volume-medium"
)
);
widgetItem
->
setData
(
Qt
::
UserRole
,
QVariant
(
i
)
);
addItem
(
widgetItem
);
}
continue
;
case
TIME_LABEL
:
{
QLabel
*
timeLabel
=
new
QLabel
(
"12:42/2:12:42"
,
this
);
...
...
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