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
85606541
Commit
85606541
authored
Jan 22, 2009
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: Teletext handling simplifications and change of the icons to more clear ones.
parent
b737bf8b
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
3 additions
and
11 deletions
+3
-11
modules/gui/qt4/Modules.am
modules/gui/qt4/Modules.am
+0
-1
modules/gui/qt4/components/controller.cpp
modules/gui/qt4/components/controller.cpp
+2
-1
modules/gui/qt4/components/controller_widget.cpp
modules/gui/qt4/components/controller_widget.cpp
+0
-6
modules/gui/qt4/components/controller_widget.hpp
modules/gui/qt4/components/controller_widget.hpp
+0
-1
modules/gui/qt4/dialogs/toolbar.cpp
modules/gui/qt4/dialogs/toolbar.cpp
+1
-1
modules/gui/qt4/pixmaps/toolbar/tv.png
modules/gui/qt4/pixmaps/toolbar/tv.png
+0
-0
modules/gui/qt4/pixmaps/toolbar/tvtelx-transparent.png
modules/gui/qt4/pixmaps/toolbar/tvtelx-transparent.png
+0
-0
modules/gui/qt4/pixmaps/toolbar/tvtelx.png
modules/gui/qt4/pixmaps/toolbar/tvtelx.png
+0
-0
modules/gui/qt4/vlc.qrc
modules/gui/qt4/vlc.qrc
+0
-1
No files found.
modules/gui/qt4/Modules.am
View file @
85606541
...
...
@@ -137,7 +137,6 @@ DEPS_res = \
pixmaps/toolbar/skip_for.png \
pixmaps/toolbar/skip_back.png \
pixmaps/toolbar/tv.png \
pixmaps/toolbar/tvtelx-transparent.png \
pixmaps/toolbar/tvtelx.png \
pixmaps/toolbar/visu.png \
pixmaps/toolbar/volume-high.png \
...
...
modules/gui/qt4/components/controller.cpp
View file @
85606541
...
...
@@ -504,13 +504,14 @@ QFrame *AbstractController::telexFrame()
BUTTON_SET_BAR2
(
telexTransparent
,
tvtelx
,
qtr
(
"Toggle Transparency "
)
);
telexTransparent
->
setEnabled
(
false
);
telexTransparent
->
setCheckable
(
true
);
telexLayout
->
addWidget
(
telexTransparent
);
/* Transparency change and set */
CONNECT
(
telexTransparent
,
clicked
(
bool
),
THEMIM
->
getIM
(),
telexSetTransparency
(
bool
)
);
CONNECT
(
THEMIM
->
getIM
(),
teletextTransparencyActivated
(
bool
),
telexFrame
,
toggleTeletextTransparency
(
bool
)
);
telexTransparent
,
setChecked
(
bool
)
);
/* Page setting */
...
...
modules/gui/qt4/components/controller_widget.cpp
View file @
85606541
...
...
@@ -119,12 +119,6 @@ void SoundWidget::updateVolume()
}
}
void
TeletextController
::
toggleTeletextTransparency
(
bool
b_transparent
)
{
telexTransparent
->
setIcon
(
b_transparent
?
QIcon
(
":/tvtelx"
)
:
QIcon
(
":/tvtelx-trans"
)
);
}
void
TeletextController
::
enableTeletextButtons
(
bool
b_enabled
)
{
telexOn
->
setChecked
(
b_enabled
);
...
...
modules/gui/qt4/components/controller_widget.hpp
View file @
85606541
...
...
@@ -72,7 +72,6 @@ private:
private
slots
:
void
enableTeletextButtons
(
bool
);
void
toggleTeletextTransparency
(
bool
);
};
#define VOLUME_MAX 200
...
...
modules/gui/qt4/dialogs/toolbar.cpp
View file @
85606541
...
...
@@ -289,7 +289,7 @@ WidgetListing::WidgetListing( intf_thread_t *p_intf, QWidget *_parent )
telexLayout
->
addWidget
(
telexOn
);
QToolButton
*
telexTransparent
=
new
QToolButton
;
telexOn
->
setIcon
(
QIcon
(
":/tvtelx
-trans
"
)
);
telexOn
->
setIcon
(
QIcon
(
":/tvtelx"
)
);
telexLayout
->
addWidget
(
telexTransparent
);
QSpinBox
*
telexPage
=
new
QSpinBox
;
...
...
modules/gui/qt4/pixmaps/toolbar/tv.png
View replaced file @
b737bf8b
View file @
85606541
257 Bytes
|
W:
|
H:
317 Bytes
|
W:
|
H:
2-up
Swipe
Onion skin
modules/gui/qt4/pixmaps/toolbar/tvtelx-transparent.png
deleted
100644 → 0
View file @
b737bf8b
336 Bytes
modules/gui/qt4/pixmaps/toolbar/tvtelx.png
View replaced file @
b737bf8b
View file @
85606541
325 Bytes
|
W:
|
H:
353 Bytes
|
W:
|
H:
2-up
Swipe
Onion skin
modules/gui/qt4/vlc.qrc
View file @
85606541
...
...
@@ -50,7 +50,6 @@
<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-trans"
>
pixmaps/toolbar/tvtelx-transparent.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>
...
...
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