Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
9d390b3a
Commit
9d390b3a
authored
Apr 22, 2011
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: reinstore the resizeGrip in all cases
And fix a statusBar bug
parent
d0206dc4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
8 deletions
+19
-8
modules/gui/qt4/components/controller.cpp
modules/gui/qt4/components/controller.cpp
+4
-1
modules/gui/qt4/components/controller.hpp
modules/gui/qt4/components/controller.hpp
+7
-0
modules/gui/qt4/main_interface.cpp
modules/gui/qt4/main_interface.cpp
+8
-7
No files found.
modules/gui/qt4/components/controller.cpp
View file @
9d390b3a
...
...
@@ -604,7 +604,7 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
setAttribute
(
Qt
::
WA_MacBrushedMetal
);
QVBoxLayout
*
controlLayout
=
new
QVBoxLayout
(
this
);
controlLayout
->
setContentsMargins
(
4
,
1
,
4
,
0
);
controlLayout
->
setContentsMargins
(
4
,
1
,
0
,
0
);
controlLayout
->
setSpacing
(
0
);
QHBoxLayout
*
controlLayout1
=
new
QHBoxLayout
;
controlLayout1
->
setSpacing
(
0
);
controlLayout1
->
setMargin
(
0
);
...
...
@@ -619,6 +619,9 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
.
toString
();
parseAndCreate
(
line2
,
controlLayout2
);
grip
=
new
QSizeGrip
(
this
);
controlLayout2
->
addWidget
(
grip
,
0
,
Qt
::
AlignBottom
|
Qt
::
AlignRight
);
if
(
!
b_advancedVisible
&&
advControls
)
advControls
->
hide
();
controlLayout
->
addLayout
(
controlLayout1
);
...
...
modules/gui/qt4/components/controller.hpp
View file @
9d390b3a
...
...
@@ -32,6 +32,7 @@
#include <QFrame>
#include <QString>
#include <QSizeGrip>
#define MAIN_TB1_DEFAULT "64;39;64;38;65"
#define MAIN_TB2_DEFAULT "0-2;64;3;1;4;64;7;9;64;10;20;19;64-4;37;65;35-4"
...
...
@@ -204,11 +205,17 @@ public:
ControlsWidget
(
intf_thread_t
*
_p_i
,
bool
b_advControls
,
QWidget
*
_parent
=
0
);
void
setGripVisible
(
bool
b_visible
)
{
grip
->
setVisible
(
b_visible
);
}
protected:
friend
class
MainInterface
;
bool
b_advancedVisible
;
private:
QSizeGrip
*
grip
;
protected
slots
:
void
toggleAdvanced
();
...
...
modules/gui/qt4/main_interface.cpp
View file @
9d390b3a
...
...
@@ -132,13 +132,6 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
settings
->
endGroup
(
);
/**************
* Status Bar *
**************/
createStatusBar
();
b_statusbarVisible
=
getSettings
()
->
value
(
"status-bar-visible"
,
false
).
toBool
();
statusBar
()
->
setVisible
(
b_statusbarVisible
);
/**************************
* UI and Widgets design
**************************/
...
...
@@ -152,6 +145,13 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
this
,
destroyPopupMenu
()
);
createMainWidget
(
settings
);
/**************
* Status Bar *
**************/
createStatusBar
();
setStatusBarVisibility
(
getSettings
()
->
value
(
"MainWindow/status-bar-visible"
,
false
).
toBool
()
);
/*********************************
* Create the Systray Management *
*********************************/
...
...
@@ -874,6 +874,7 @@ void MainInterface::setStatusBarVisibility( bool b_visible )
{
statusBar
()
->
setVisible
(
b_visible
);
b_statusbarVisible
=
b_visible
;
if
(
controls
)
controls
->
setGripVisible
(
!
b_statusbarVisible
);
}
#if 0
...
...
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