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
eff056b1
Commit
eff056b1
authored
Sep 26, 2011
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: reload some preferences live
Close #3148
parent
bc195211
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
0 deletions
+21
-0
modules/gui/qt4/dialogs/preferences.cpp
modules/gui/qt4/dialogs/preferences.cpp
+4
-0
modules/gui/qt4/main_interface.cpp
modules/gui/qt4/main_interface.cpp
+15
-0
modules/gui/qt4/main_interface.hpp
modules/gui/qt4/main_interface.hpp
+2
-0
No files found.
modules/gui/qt4/dialogs/preferences.cpp
View file @
eff056b1
...
@@ -33,6 +33,7 @@
...
@@ -33,6 +33,7 @@
#include "components/complete_preferences.hpp"
#include "components/complete_preferences.hpp"
#include "components/simple_preferences.hpp"
#include "components/simple_preferences.hpp"
#include "util/searchlineedit.hpp"
#include "util/searchlineedit.hpp"
#include "main_interface.hpp"
#include <QHBoxLayout>
#include <QHBoxLayout>
#include <QGroupBox>
#include <QGroupBox>
...
@@ -318,6 +319,9 @@ void PrefsDialog::save()
...
@@ -318,6 +319,9 @@ void PrefsDialog::save()
ErrorsDialog
::
getInstance
(
p_intf
)
->
addError
(
qtr
(
"Cannot save Configuration"
),
ErrorsDialog
::
getInstance
(
p_intf
)
->
addError
(
qtr
(
"Cannot save Configuration"
),
qtr
(
"Preferences file could not be saved"
)
);
qtr
(
"Preferences file could not be saved"
)
);
}
}
if
(
p_intf
->
p_sys
->
p_mi
)
p_intf
->
p_sys
->
p_mi
->
reloadPrefs
();
accept
();
accept
();
}
}
...
...
modules/gui/qt4/main_interface.cpp
View file @
eff056b1
...
@@ -121,6 +121,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
...
@@ -121,6 +121,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
/* Do we want anoying popups or not */
/* Do we want anoying popups or not */
b_notificationEnabled
=
var_InheritBool
(
p_intf
,
"qt-notification"
);
b_notificationEnabled
=
var_InheritBool
(
p_intf
,
"qt-notification"
);
/* */
b_pauseOnMinimize
=
var_InheritBool
(
p_intf
,
"qt-pause-minimized"
);
b_pauseOnMinimize
=
var_InheritBool
(
p_intf
,
"qt-pause-minimized"
);
/* Set the other interface settings */
/* Set the other interface settings */
...
@@ -376,6 +377,20 @@ void MainInterface::recreateToolbars()
...
@@ -376,6 +377,20 @@ void MainInterface::recreateToolbars()
settings
->
endGroup
();
settings
->
endGroup
();
}
}
void
MainInterface
::
reloadPrefs
()
{
b_notificationEnabled
=
var_InheritBool
(
p_intf
,
"qt-notification"
);
b_pauseOnMinimize
=
var_InheritBool
(
p_intf
,
"qt-pause-minimized"
);
#ifdef WIN32
p_intf
->
p_sys
->
disable_volume_keys
=
var_InheritBool
(
p_intf
,
"qt-disable-volume-keys"
);
#endif
if
(
!
var_InheritBool
(
p_intf
,
"qt-fs-controller"
)
&&
fullscreenControls
)
{
delete
fullscreenControls
;
fullscreenControls
=
NULL
;
}
}
void
MainInterface
::
createMainWidget
(
QSettings
*
settings
)
void
MainInterface
::
createMainWidget
(
QSettings
*
settings
)
{
{
/* Create the main Widget and the mainLayout */
/* Create the main Widget and the mainLayout */
...
...
modules/gui/qt4/main_interface.hpp
View file @
eff056b1
...
@@ -206,6 +206,8 @@ public slots:
...
@@ -206,6 +206,8 @@ public slots:
void
emitBoss
();
void
emitBoss
();
void
reloadPrefs
();
private
slots
:
private
slots
:
void
debug
();
void
debug
();
void
destroyPopupMenu
();
void
destroyPopupMenu
();
...
...
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