Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
6b67205f
Commit
6b67205f
authored
Sep 29, 2008
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt4: Playlist fixes.
parent
de0edf3d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
12 deletions
+8
-12
modules/gui/qt4/components/playlist/playlist.cpp
modules/gui/qt4/components/playlist/playlist.cpp
+2
-4
modules/gui/qt4/components/playlist/playlist.hpp
modules/gui/qt4/components/playlist/playlist.hpp
+1
-2
modules/gui/qt4/dialogs/playlist.cpp
modules/gui/qt4/dialogs/playlist.cpp
+1
-1
modules/gui/qt4/main_interface.cpp
modules/gui/qt4/main_interface.cpp
+4
-5
No files found.
modules/gui/qt4/components/playlist/playlist.cpp
View file @
6b67205f
...
@@ -42,9 +42,7 @@
...
@@ -42,9 +42,7 @@
* Playlist Widget. The embedded playlist
* Playlist Widget. The embedded playlist
**********************************************************************/
**********************************************************************/
PlaylistWidget
::
PlaylistWidget
(
intf_thread_t
*
_p_i
,
PlaylistWidget
::
PlaylistWidget
(
intf_thread_t
*
_p_i
)
:
p_intf
(
_p_i
)
QWidget
*
_parent
)
:
p_intf
(
_p_i
),
parent
(
_parent
)
{
{
setContentsMargins
(
3
,
3
,
3
,
3
);
setContentsMargins
(
3
,
3
,
3
,
3
);
...
@@ -130,8 +128,8 @@ PlaylistWidget::~PlaylistWidget()
...
@@ -130,8 +128,8 @@ PlaylistWidget::~PlaylistWidget()
{
{
getSettings
()
->
beginGroup
(
"Playlist"
);
getSettings
()
->
beginGroup
(
"Playlist"
);
getSettings
()
->
setValue
(
"splitterSizes"
,
saveState
()
);
getSettings
()
->
setValue
(
"splitterSizes"
,
saveState
()
);
getSettings
()
->
setValue
(
"GlobalPos"
,
mapToGlobal
(
pos
()
)
);
getSettings
()
->
endGroup
();
getSettings
()
->
endGroup
();
msg_Dbg
(
p_intf
,
"Playlist Destroyed"
);
}
}
#include "main_interface.hpp"
#include "main_interface.hpp"
...
...
modules/gui/qt4/components/playlist/playlist.hpp
View file @
6b67205f
...
@@ -48,14 +48,13 @@ class PlaylistWidget : public QSplitter
...
@@ -48,14 +48,13 @@ class PlaylistWidget : public QSplitter
{
{
Q_OBJECT
;
Q_OBJECT
;
public:
public:
PlaylistWidget
(
intf_thread_t
*
_p_i
,
QWidget
*
parent
)
;
PlaylistWidget
(
intf_thread_t
*
_p_i
)
;
virtual
~
PlaylistWidget
();
virtual
~
PlaylistWidget
();
private:
private:
PLSelector
*
selector
;
PLSelector
*
selector
;
PLPanel
*
rightPanel
;
PLPanel
*
rightPanel
;
QPushButton
*
addButton
;
QPushButton
*
addButton
;
ArtLabel
*
art
;
ArtLabel
*
art
;
QWidget
*
parent
;
protected:
protected:
intf_thread_t
*
p_intf
;
intf_thread_t
*
p_intf
;
virtual
void
dropEvent
(
QDropEvent
*
);
virtual
void
dropEvent
(
QDropEvent
*
);
...
...
modules/gui/qt4/dialogs/playlist.cpp
View file @
6b67205f
...
@@ -52,7 +52,7 @@ PlaylistDialog::PlaylistDialog( intf_thread_t *_p_intf )
...
@@ -52,7 +52,7 @@ PlaylistDialog::PlaylistDialog( intf_thread_t *_p_intf )
getSettings
()
->
beginGroup
(
"playlistdialog"
);
getSettings
()
->
beginGroup
(
"playlistdialog"
);
playlistWidget
=
new
PlaylistWidget
(
p_intf
,
this
);
playlistWidget
=
new
PlaylistWidget
(
p_intf
);
l
->
addWidget
(
playlistWidget
);
l
->
addWidget
(
playlistWidget
);
readSettings
(
getSettings
(),
QSize
(
600
,
700
)
);
readSettings
(
getSettings
(),
QSize
(
600
,
700
)
);
...
...
modules/gui/qt4/main_interface.cpp
View file @
6b67205f
...
@@ -262,6 +262,8 @@ MainInterface::~MainInterface()
...
@@ -262,6 +262,8 @@ MainInterface::~MainInterface()
{
{
if
(
!
isDocked
()
)
if
(
!
isDocked
()
)
QVLCTools
::
saveWidgetPosition
(
p_intf
,
"Playlist"
,
playlistWidget
);
QVLCTools
::
saveWidgetPosition
(
p_intf
,
"Playlist"
,
playlistWidget
);
delete
playlistWidget
;
}
}
settings
->
beginGroup
(
"MainWindow"
);
settings
->
beginGroup
(
"MainWindow"
);
...
@@ -734,7 +736,7 @@ void MainInterface::togglePlaylist()
...
@@ -734,7 +736,7 @@ void MainInterface::togglePlaylist()
If no playlist exist, then create one and attach it to the DockPL*/
If no playlist exist, then create one and attach it to the DockPL*/
if
(
!
playlistWidget
)
if
(
!
playlistWidget
)
{
{
playlistWidget
=
new
PlaylistWidget
(
p_intf
,
this
);
playlistWidget
=
new
PlaylistWidget
(
p_intf
);
i_pl_dock
=
PL_UNDOCKED
;
i_pl_dock
=
PL_UNDOCKED
;
/* i_pl_dock = (pl_dock_e)getSettings()
/* i_pl_dock = (pl_dock_e)getSettings()
...
@@ -742,15 +744,12 @@ void MainInterface::togglePlaylist()
...
@@ -742,15 +744,12 @@ void MainInterface::togglePlaylist()
if
(
i_pl_dock
==
PL_UNDOCKED
)
if
(
i_pl_dock
==
PL_UNDOCKED
)
{
{
playlistWidget
->
set
Parent
(
this
,
Qt
::
Window
);
playlistWidget
->
set
WindowFlags
(
Qt
::
Window
);
/* This will restore the geometry but will not work for position,
/* This will restore the geometry but will not work for position,
because of parenting */
because of parenting */
QVLCTools
::
restoreWidgetPosition
(
p_intf
,
"Playlist"
,
QVLCTools
::
restoreWidgetPosition
(
p_intf
,
"Playlist"
,
playlistWidget
,
QSize
(
600
,
300
)
);
playlistWidget
,
QSize
(
600
,
300
)
);
/* Move it correctly then */
playlistWidget
->
move
(
getSettings
()
->
value
(
"Playlist/GlobalPos"
).
toPoint
()
);
}
}
else
else
{
{
...
...
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