Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
f651c3b2
Commit
f651c3b2
authored
Dec 16, 2007
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt4 - Don't compile and create the Teletext bar without ZBVI
parent
e4c890c4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
5 deletions
+13
-5
modules/gui/qt4/components/interface_widgets.cpp
modules/gui/qt4/components/interface_widgets.cpp
+4
-2
modules/gui/qt4/input_manager.cpp
modules/gui/qt4/input_manager.cpp
+5
-3
modules/gui/qt4/input_manager.hpp
modules/gui/qt4/input_manager.hpp
+4
-0
No files found.
modules/gui/qt4/components/interface_widgets.cpp
View file @
f651c3b2
...
...
@@ -457,10 +457,11 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
sectionNext
()
);
CONNECT
(
menuButton
,
clicked
(),
THEMIM
->
getIM
(),
sectionMenu
()
);
/**
TODO
/**
* Telextext QFrame
* Merge with upper menu in a StackLayout
*
TODO:
Merge with upper menu in a StackLayout
**/
#ifdef ZVBI_COMPILED
telexFrame
=
new
QWidget
(
this
);
QHBoxLayout
*
telexLayout
=
new
QHBoxLayout
(
telexFrame
);
telexLayout
->
setSpacing
(
0
);
...
...
@@ -493,6 +494,7 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
THEMIM
->
getIM
(),
telexSetTransparency
(
bool
)
);
CONNECT
(
THEMIM
->
getIM
(),
teletextEnabled
(
bool
),
telexFrame
,
setVisible
(
bool
)
);
#endif
/** Play Buttons **/
QSizePolicy
sizePolicy
(
QSizePolicy
::
Fixed
,
QSizePolicy
::
Fixed
);
...
...
modules/gui/qt4/input_manager.cpp
View file @
f651c3b2
...
...
@@ -138,10 +138,10 @@ void InputManager::update()
emit
navigationChanged
(
0
);
}
#ifdef ZVBI_COMPILED
/* Update teletext status*/
/* emit teletextEnabled( true|false ) */
emit
teletextEnabled
(
true
);
/* FIXME */
#endif
/* Update text */
QString
text
;
...
...
@@ -236,6 +236,7 @@ void InputManager::sectionMenu()
var_SetInteger
(
p_input
,
"title 0"
,
2
);
}
#ifdef ZVBI_COMPILED
void
InputManager
::
telexGotoPage
(
int
page
)
{
// TODO: this has only sense when telx codec is available
...
...
@@ -272,6 +273,7 @@ void InputManager::telexSetTransparency( bool b_transp )
}
}
}
#endif
void
InputManager
::
slower
()
{
...
...
modules/gui/qt4/input_manager.hpp
View file @
f651c3b2
...
...
@@ -59,9 +59,11 @@ public slots:
void
sectionNext
();
void
sectionPrev
();
void
sectionMenu
();
#ifdef ZVBI_COMPILED
void
telexGotoPage
(
int
);
void
telexToggle
(
bool
);
void
telexSetTransparency
(
bool
);
#endif
signals:
/// Send new position, new time and new length
void
positionUpdated
(
float
,
int
,
int
);
...
...
@@ -69,7 +71,9 @@ signals:
void
nameChanged
(
QString
);
/// Used to signal whether we should show navigation buttons
void
navigationChanged
(
int
);
#ifdef ZVBI_COMPILED
void
teletextEnabled
(
bool
);
#endif
/// Play/pause status
void
statusChanged
(
int
);
};
...
...
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