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
91fcc5f7
Commit
91fcc5f7
authored
Apr 22, 2011
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt, methods and slots renaming for consistency
parent
3dcf9aca
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
10 deletions
+10
-10
modules/gui/qt4/components/controller.cpp
modules/gui/qt4/components/controller.cpp
+4
-4
modules/gui/qt4/components/controller_widget.cpp
modules/gui/qt4/components/controller_widget.cpp
+3
-3
modules/gui/qt4/components/controller_widget.hpp
modules/gui/qt4/components/controller_widget.hpp
+3
-3
No files found.
modules/gui/qt4/components/controller.cpp
View file @
91fcc5f7
...
...
@@ -237,7 +237,7 @@ QWidget *AbstractController::createWidget( buttonType_e button, int options )
BUTTON_SET_BAR
(
playButton
);
CONNECT_MAP_SET
(
playButton
,
PLAY_ACTION
);
CONNECT
(
this
,
inputPlaying
(
bool
),
playButton
,
updateButton
(
bool
));
playButton
,
updateButton
Icons
(
bool
));
widget
=
playButton
;
}
break
;
...
...
@@ -330,7 +330,7 @@ QWidget *AbstractController::createWidget( buttonType_e button, int options )
ENABLE_ON_INPUT
(
ABButton
);
CONNECT_MAP_SET
(
ABButton
,
ATOB_ACTION
);
CONNECT
(
THEMIM
->
getIM
(),
AtoBchanged
(
bool
,
bool
),
ABButton
,
set
Icons
(
bool
,
bool
)
);
ABButton
,
updateButton
Icons
(
bool
,
bool
)
);
widget
=
ABButton
;
}
break
;
...
...
@@ -424,8 +424,8 @@ QWidget *AbstractController::createWidget( buttonType_e button, int options )
setupButton
(
loopButton
);
loopButton
->
setToolTip
(
qtr
(
"Click to toggle between loop one, loop all"
)
);
loopButton
->
setCheckable
(
true
);
loopButton
->
updateIcons
(
NORMAL
);
CONNECT
(
THEMIM
,
repeatLoopChanged
(
int
),
loopButton
,
updateIcons
(
int
)
);
loopButton
->
update
Button
Icons
(
NORMAL
);
CONNECT
(
THEMIM
,
repeatLoopChanged
(
int
),
loopButton
,
update
Button
Icons
(
int
)
);
CONNECT
(
loopButton
,
clicked
(),
THEMIM
,
loopRepeatLoopStatus
()
);
widget
=
loopButton
;
}
...
...
modules/gui/qt4/components/controller_widget.cpp
View file @
91fcc5f7
...
...
@@ -232,14 +232,14 @@ bool SoundWidget::eventFilter( QObject *obj, QEvent *e )
/**
* Play Button
**/
void
PlayButton
::
updateButton
(
bool
b_playing
)
void
PlayButton
::
updateButton
Icons
(
bool
b_playing
)
{
setIcon
(
b_playing
?
QIcon
(
":/toolbar/pause_b"
)
:
QIcon
(
":/toolbar/play_b"
)
);
setToolTip
(
b_playing
?
qtr
(
"Pause the playback"
)
:
qtr
(
I_PLAY_TOOLTIP
)
);
}
void
AtoB_Button
::
set
Icons
(
bool
timeA
,
bool
timeB
)
void
AtoB_Button
::
updateButton
Icons
(
bool
timeA
,
bool
timeB
)
{
if
(
!
timeA
&&
!
timeB
)
{
...
...
@@ -259,7 +259,7 @@ void AtoB_Button::setIcons( bool timeA, bool timeB )
}
}
void
LoopButton
::
updateIcons
(
int
value
)
void
LoopButton
::
update
Button
Icons
(
int
value
)
{
setChecked
(
value
!=
NORMAL
);
setIcon
(
(
value
==
REPEAT_ONE
)
?
QIcon
(
":/buttons/playlist/repeat_one"
)
...
...
modules/gui/qt4/components/controller_widget.hpp
View file @
91fcc5f7
...
...
@@ -50,21 +50,21 @@ class PlayButton : public QToolButton
{
Q_OBJECT
private
slots
:
void
updateButton
(
bool
);
void
updateButton
Icons
(
bool
);
};
class
LoopButton
:
public
QToolButton
{
Q_OBJECT
public
slots
:
void
updateIcons
(
int
);
void
update
Button
Icons
(
int
);
};
class
AtoB_Button
:
public
QToolButton
{
Q_OBJECT
private
slots
:
void
set
Icons
(
bool
,
bool
);
void
updateButton
Icons
(
bool
,
bool
);
};
#define VOLUME_MAX 200
...
...
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