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
9b8667a8
Commit
9b8667a8
authored
Nov 18, 2011
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: Extendedpanel: move to a Dialog
Close #5335
parent
586de2de
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
12 deletions
+16
-12
modules/gui/qt4/dialogs/extended.cpp
modules/gui/qt4/dialogs/extended.cpp
+3
-2
modules/gui/qt4/dialogs/extended.hpp
modules/gui/qt4/dialogs/extended.hpp
+1
-1
modules/gui/qt4/dialogs_provider.cpp
modules/gui/qt4/dialogs_provider.cpp
+12
-9
No files found.
modules/gui/qt4/dialogs/extended.cpp
View file @
9b8667a8
...
@@ -36,7 +36,8 @@
...
@@ -36,7 +36,8 @@
#include <QPushButton>
#include <QPushButton>
#include <vlc_modules.h>
#include <vlc_modules.h>
ExtendedDialog
::
ExtendedDialog
(
intf_thread_t
*
_p_intf
)
:
QVLCFrame
(
_p_intf
)
ExtendedDialog
::
ExtendedDialog
(
intf_thread_t
*
_p_intf
)
:
QVLCDialog
(
(
QWidget
*
)
_p_intf
->
p_sys
->
p_mi
,
_p_intf
)
{
{
#ifdef __APPLE__
#ifdef __APPLE__
setWindowFlags
(
Qt
::
Drawer
);
setWindowFlags
(
Qt
::
Drawer
);
...
@@ -116,7 +117,7 @@ ExtendedDialog::ExtendedDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf )
...
@@ -116,7 +117,7 @@ ExtendedDialog::ExtendedDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf )
ExtendedDialog
::~
ExtendedDialog
()
ExtendedDialog
::~
ExtendedDialog
()
{
{
writeSettings
(
"EPanel"
);
getSettings
()
->
setValue
(
"Epanel/geometry"
,
saveGeometry
()
);
}
}
void
ExtendedDialog
::
showTab
(
int
i
)
void
ExtendedDialog
::
showTab
(
int
i
)
...
...
modules/gui/qt4/dialogs/extended.hpp
View file @
9b8667a8
...
@@ -31,7 +31,7 @@
...
@@ -31,7 +31,7 @@
class
QTabWidget
;
class
QTabWidget
;
class
ExtendedDialog
:
public
QVLC
Frame
,
public
Singleton
<
ExtendedDialog
>
class
ExtendedDialog
:
public
QVLC
Dialog
,
public
Singleton
<
ExtendedDialog
>
{
{
Q_OBJECT
Q_OBJECT
public:
public:
...
...
modules/gui/qt4/dialogs_provider.cpp
View file @
9b8667a8
...
@@ -91,7 +91,6 @@ DialogsProvider::~DialogsProvider()
...
@@ -91,7 +91,6 @@ DialogsProvider::~DialogsProvider()
PlaylistDialog
::
killInstance
();
PlaylistDialog
::
killInstance
();
MediaInfoDialog
::
killInstance
();
MediaInfoDialog
::
killInstance
();
MessagesDialog
::
killInstance
();
MessagesDialog
::
killInstance
();
ExtendedDialog
::
killInstance
();
BookmarksDialog
::
killInstance
();
BookmarksDialog
::
killInstance
();
HelpDialog
::
killInstance
();
HelpDialog
::
killInstance
();
#ifdef UPDATE_CHECK
#ifdef UPDATE_CHECK
...
@@ -191,20 +190,24 @@ void DialogsProvider::prefsDialog()
...
@@ -191,20 +190,24 @@ void DialogsProvider::prefsDialog()
void
DialogsProvider
::
extendedDialog
()
void
DialogsProvider
::
extendedDialog
()
{
{
if
(
!
ExtendedDialog
::
getInstance
(
p_intf
)
->
isVisible
()
||
/* Hidden */
ExtendedDialog
*
extDialog
=
ExtendedDialog
::
getInstance
(
p_intf
);
ExtendedDialog
::
getInstance
(
p_intf
)
->
currentTab
()
!=
0
)
/* wrong tab */
ExtendedDialog
::
getInstance
(
p_intf
)
->
showTab
(
0
);
if
(
!
extDialog
->
isVisible
()
||
/* Hidden */
extDialog
->
currentTab
()
!=
0
)
/* wrong tab */
extDialog
->
showTab
(
0
);
else
else
ExtendedDialog
::
getInstance
(
p_intf
)
->
hide
();
extDialog
->
hide
();
}
}
void
DialogsProvider
::
synchroDialog
()
void
DialogsProvider
::
synchroDialog
()
{
{
if
(
!
ExtendedDialog
::
getInstance
(
p_intf
)
->
isVisible
()
||
/* Hidden */
ExtendedDialog
*
extDialog
=
ExtendedDialog
::
getInstance
(
p_intf
);
ExtendedDialog
::
getInstance
(
p_intf
)
->
currentTab
()
!=
2
)
/* wrong tab */
ExtendedDialog
::
getInstance
(
p_intf
)
->
showTab
(
2
);
if
(
!
extDialog
->
isVisible
()
||
/* Hidden */
extDialog
->
currentTab
()
!=
2
)
/* wrong tab */
extDialog
->
showTab
(
2
);
else
else
ExtendedDialog
::
getInstance
(
p_intf
)
->
hide
();
extDialog
->
hide
();
}
}
void
DialogsProvider
::
messagesDialog
()
void
DialogsProvider
::
messagesDialog
()
...
...
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