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
c340ebcb
Commit
c340ebcb
authored
Sep 19, 2006
by
Clément Stenac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Layout for album art
parent
811bd4f7
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
295 additions
and
3 deletions
+295
-3
modules/gui/qt4/components/interface_widgets.cpp
modules/gui/qt4/components/interface_widgets.cpp
+24
-2
modules/gui/qt4/main_interface.cpp
modules/gui/qt4/main_interface.cpp
+4
-1
modules/gui/qt4/pixmaps/art.xpm
modules/gui/qt4/pixmaps/art.xpm
+267
-0
No files found.
modules/gui/qt4/components/interface_widgets.cpp
View file @
c340ebcb
...
@@ -27,8 +27,10 @@
...
@@ -27,8 +27,10 @@
#include "main_interface.hpp"
#include "main_interface.hpp"
#include "input_manager.hpp"
#include "input_manager.hpp"
#include "pixmaps/art.xpm"
#include <vlc/vout.h>
#include <vlc/vout.h>
#include <QPushButton>
#include <QHBoxLayout>
#include <QHBoxLayout>
#define ICON_SIZE 128
#define ICON_SIZE 128
...
@@ -160,9 +162,29 @@ void BackgroundWidget::resizeEvent( QResizeEvent *e )
...
@@ -160,9 +162,29 @@ void BackgroundWidget::resizeEvent( QResizeEvent *e )
PlaylistWidget
::
PlaylistWidget
(
intf_thread_t
*
_p_intf
)
:
QFrame
(
NULL
),
PlaylistWidget
::
PlaylistWidget
(
intf_thread_t
*
_p_intf
)
:
QFrame
(
NULL
),
p_intf
(
_p_intf
)
p_intf
(
_p_intf
)
{
{
QVBoxLayout
*
left
=
new
QVBoxLayout
(
);
QHBoxLayout
*
middle
=
new
QHBoxLayout
;
setFrameStyle
(
QFrame
::
StyledPanel
|
QFrame
::
Sunken
);
setFrameStyle
(
QFrame
::
StyledPanel
|
QFrame
::
Sunken
);
selector
=
new
PLSelector
(
this
,
p_intf
,
THEPL
);
selector
=
new
PLSelector
(
this
,
p_intf
,
THEPL
);
selector
->
setMaximumWidth
(
130
);
selector
->
setMaximumWidth
(
130
);
left
->
addWidget
(
selector
);
QPushButton
*
undockButton
=
new
QPushButton
(
"UN"
,
this
);
undockButton
->
setMaximumWidth
(
25
);
undockButton
->
setToolTip
(
qtr
(
"Undock playlist for main interface"
)
);
QPushButton
*
sourcesButton
=
new
QPushButton
(
"Sources"
,
this
);
sourcesButton
->
setToolTip
(
qtr
(
"Select additional stream sources"
)
);
middle
->
addWidget
(
undockButton
);
middle
->
addWidget
(
sourcesButton
);
left
->
addLayout
(
middle
);
QLabel
*
art
=
new
QLabel
(
""
);
art
->
setMaximumHeight
(
128
);
art
->
setMaximumWidth
(
128
);
art
->
setScaledContents
(
true
);
art
->
setPixmap
(
QPixmap
(
art_xpm
)
);
//":/vlc128.png" ) );
left
->
addWidget
(
art
);
playlist_item_t
*
p_root
=
playlist_GetPreferredNode
(
THEPL
,
playlist_item_t
*
p_root
=
playlist_GetPreferredNode
(
THEPL
,
THEPL
->
p_local_category
);
THEPL
->
p_local_category
);
...
@@ -172,8 +194,8 @@ PlaylistWidget::PlaylistWidget( intf_thread_t *_p_intf ) : QFrame(NULL),
...
@@ -172,8 +194,8 @@ PlaylistWidget::PlaylistWidget( intf_thread_t *_p_intf ) : QFrame(NULL),
CONNECT
(
selector
,
activated
(
int
),
rightPanel
,
setRoot
(
int
)
);
CONNECT
(
selector
,
activated
(
int
),
rightPanel
,
setRoot
(
int
)
);
QHBoxLayout
*
layout
=
new
QHBoxLayout
();
QHBoxLayout
*
layout
=
new
QHBoxLayout
(
this
);
layout
->
add
Widget
(
selector
,
0
);
layout
->
add
Layout
(
left
,
0
);
layout
->
addWidget
(
rightPanel
,
10
);
layout
->
addWidget
(
rightPanel
,
10
);
setLayout
(
layout
);
setLayout
(
layout
);
}
}
...
...
modules/gui/qt4/main_interface.cpp
View file @
c340ebcb
...
@@ -351,9 +351,10 @@ void MainInterface::playlist()
...
@@ -351,9 +351,10 @@ void MainInterface::playlist()
PlaylistDialog
::
killInstance
();
PlaylistDialog
::
killInstance
();
playlistWidget
=
new
PlaylistWidget
(
p_intf
);
playlistWidget
=
new
PlaylistWidget
(
p_intf
);
ui
.
vboxLayout
->
insertWidget
(
0
,
playlistWidget
);
ui
.
vboxLayout
->
insertWidget
(
0
,
playlistWidget
);
fprintf
(
stderr
,
"BUG ! Do not set size if it has already been changed
\n
"
);
fprintf
(
stderr
,
"BUG ! Do not set size if it has already been changed
\n
"
);
playlistWidget
->
widgetSize
=
settings
->
value
(
"playlistSize"
,
playlistWidget
->
widgetSize
=
settings
->
value
(
"playlistSize"
,
QSize
(
6
00
,
30
0
)
).
toSize
();
QSize
(
6
50
,
31
0
)
).
toSize
();
playlistWidget
->
hide
();
playlistWidget
->
hide
();
}
}
/// Todo, reset its size ?
/// Todo, reset its size ?
...
@@ -378,6 +379,8 @@ void MainInterface::playlist()
...
@@ -378,6 +379,8 @@ void MainInterface::playlist()
resize
(
mainSize
);
resize
(
mainSize
);
}
}
/* Video widget cannot do this synchronously as it runs in another thread */
/* Well, could it, actually ? Probably dangerous ... */
void
MainInterface
::
doComponentsUpdate
()
void
MainInterface
::
doComponentsUpdate
()
{
{
calculateInterfaceSize
();
calculateInterfaceSize
();
...
...
modules/gui/qt4/pixmaps/art.xpm
0 → 100644
View file @
c340ebcb
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