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
9ccfbb63
Commit
9ccfbb63
authored
Oct 12, 2011
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: main interface cleaning
parent
ff167352
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
11 deletions
+9
-11
modules/gui/qt4/main_interface.cpp
modules/gui/qt4/main_interface.cpp
+9
-11
No files found.
modules/gui/qt4/main_interface.cpp
View file @
9ccfbb63
...
@@ -93,6 +93,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
...
@@ -93,6 +93,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
playlistVisible
=
false
;
playlistVisible
=
false
;
input_name
=
""
;
input_name
=
""
;
b_interfaceFullScreen
=
false
;
b_interfaceFullScreen
=
false
;
b_hasPausedWhenMinimized
=
false
;
/* Ask for Privacy */
/* Ask for Privacy */
...
@@ -239,19 +240,18 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
...
@@ -239,19 +240,18 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
/* Register callback for the intf-popupmenu variable */
/* Register callback for the intf-popupmenu variable */
var_AddCallback
(
p_intf
->
p_libvlc
,
"intf-popupmenu"
,
PopupMenuCB
,
p_intf
);
var_AddCallback
(
p_intf
->
p_libvlc
,
"intf-popupmenu"
,
PopupMenuCB
,
p_intf
);
/* Playlist */
int
i_plVis
=
settings
->
value
(
"MainWindow/playlist-visible"
,
false
).
toBool
();
if
(
i_plVis
)
togglePlaylist
();
/*
*** FINAL SIZING and placement of
interface */
/*
Final Sizing, restoration and placement of the
interface */
settings
->
beginGroup
(
"MainWindow"
);
settings
->
beginGroup
(
"MainWindow"
);
if
(
settings
->
value
(
"playlist-visible"
,
false
).
toBool
()
)
togglePlaylist
();
QVLCTools
::
restoreWidgetPosition
(
settings
,
this
,
QSize
(
600
,
420
)
);
QVLCTools
::
restoreWidgetPosition
(
settings
,
this
,
QSize
(
600
,
420
)
);
settings
->
endGroup
();
settings
->
endGroup
();
b_interfaceFullScreen
=
isFullScreen
();
b_interfaceFullScreen
=
isFullScreen
();
/* Final sizing and showing */
setVisible
(
!
b_hideAfterCreation
);
setVisible
(
!
b_hideAfterCreation
);
computeMinimumSize
();
computeMinimumSize
();
...
@@ -259,8 +259,6 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
...
@@ -259,8 +259,6 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
/* Switch to minimal view if needed, must be called after the show() */
/* Switch to minimal view if needed, must be called after the show() */
if
(
b_minimalView
)
if
(
b_minimalView
)
toggleMinimalView
(
true
);
toggleMinimalView
(
true
);
b_hasPausedWhenMinimized
=
false
;
}
}
MainInterface
::~
MainInterface
()
MainInterface
::~
MainInterface
()
...
@@ -349,6 +347,9 @@ void MainInterface::recreateToolbars()
...
@@ -349,6 +347,9 @@ void MainInterface::recreateToolbars()
controls
=
new
ControlsWidget
(
p_intf
,
b_adv
,
this
);
controls
=
new
ControlsWidget
(
p_intf
,
b_adv
,
this
);
inputC
=
new
InputControlsWidget
(
p_intf
,
this
);
inputC
=
new
InputControlsWidget
(
p_intf
,
this
);
mainLayout
->
insertWidget
(
2
,
inputC
);
mainLayout
->
insertWidget
(
settings
->
value
(
"ToolbarPos"
,
0
).
toInt
()
?
0
:
3
,
controls
);
if
(
fullscreenControls
)
if
(
fullscreenControls
)
{
{
...
@@ -357,9 +358,6 @@ void MainInterface::recreateToolbars()
...
@@ -357,9 +358,6 @@ void MainInterface::recreateToolbars()
CONNECT
(
fullscreenControls
,
keyPressed
(
QKeyEvent
*
),
CONNECT
(
fullscreenControls
,
keyPressed
(
QKeyEvent
*
),
this
,
handleKeyPress
(
QKeyEvent
*
)
);
this
,
handleKeyPress
(
QKeyEvent
*
)
);
}
}
mainLayout
->
insertWidget
(
2
,
inputC
);
mainLayout
->
insertWidget
(
settings
->
value
(
"ToolbarPos"
,
0
).
toInt
()
?
0
:
3
,
controls
);
settings
->
endGroup
();
settings
->
endGroup
();
}
}
...
...
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