vlc | branch: master | Prince Gupta <guptaprince8...@gmail.com> | Tue Feb 23 15:53:56 2021 +0530| [ef188aa31c6253f5f0cb0ff110341d3971b6478d] | committer: Pierre Lamot
qt: add option to change csd settings in preferences Signed-off-by: Pierre Lamot <pie...@videolabs.io> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ef188aa31c6253f5f0cb0ff110341d3971b6478d --- .../qt/dialogs/preferences/simple_preferences.cpp | 6 ++++++ .../gui/qt/dialogs/preferences/sprefs_interface.ui | 23 ++++++++++++++-------- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/modules/gui/qt/dialogs/preferences/simple_preferences.cpp b/modules/gui/qt/dialogs/preferences/simple_preferences.cpp index c7280a7b9e..a505e86902 100644 --- a/modules/gui/qt/dialogs/preferences/simple_preferences.cpp +++ b/modules/gui/qt/dialogs/preferences/simple_preferences.cpp @@ -812,6 +812,12 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ui.colorSchemeComboBox->insertItems(0, p_intf->p_sys->p_mi->getColorScheme()->stringList()); QObject::connect( ui.colorSchemeComboBox, &QComboBox::currentTextChanged, p_intf->p_sys->p_mi->getColorScheme(), &ColorSchemeModel::setCurrent ); +#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) + CONFIG_BOOL( "qt-titlebar", titleBarCheckBox ); +#else + ui.titleBarCheckBox->hide(); +#endif + /* UPDATE options */ #ifdef UPDATE_CHECK CONFIG_BOOL( "qt-updates-notif", updatesBox ); diff --git a/modules/gui/qt/dialogs/preferences/sprefs_interface.ui b/modules/gui/qt/dialogs/preferences/sprefs_interface.ui index 3d061946ec..b14aacf247 100644 --- a/modules/gui/qt/dialogs/preferences/sprefs_interface.ui +++ b/modules/gui/qt/dialogs/preferences/sprefs_interface.ui @@ -178,10 +178,10 @@ </property> </widget> </item> - <item row="5" column="2" colspan="2"> + <item row="6" column="2" colspan="2"> <widget class="QComboBox" name="notificationCombo"/> </item> - <item row="9" column="2" colspan="2"> + <item row="10" column="2" colspan="2"> <widget class="QComboBox" name="stylesCombo"/> </item> <item row="0" column="0" colspan="5"> @@ -198,7 +198,7 @@ </property> </widget> </item> - <item row="5" column="0"> + <item row="6" column="0"> <widget class="QLabel" name="notificationComboLabel"> <property name="text"> <string>Show media change popup:</string> @@ -215,7 +215,7 @@ </property> </widget> </item> - <item row="9" column="0"> + <item row="10" column="0"> <widget class="QLabel" name="stylesLabel"> <property name="sizePolicy"> <sizepolicy hsizetype="Maximum" vsizetype="Preferred"> @@ -271,7 +271,7 @@ </property> </widget> </item> - <item row="11" column="0"> + <item row="12" column="0"> <widget class="QLabel" name="autoRaiseLabel"> <property name="text"> <string>Auto raising the interface:</string> @@ -281,10 +281,10 @@ </property> </widget> </item> - <item row="11" column="2" colspan="2"> + <item row="12" column="2" colspan="2"> <widget class="QComboBox" name="autoRaiseComboBox"/> </item> - <item row="12" column="0"> + <item row="13" column="0"> <widget class="QLabel" name="colorSchemeLabel"> <property name="text"> <string>Color Scheme:</string> @@ -294,7 +294,7 @@ </property> </widget> </item> - <item row="12" column="2" colspan="2"> + <item row="13" column="2" colspan="2"> <widget class="QComboBox" name="colorSchemeComboBox"/> </item> <item row="4" column="2"> @@ -304,6 +304,13 @@ </property> </widget> </item> + <item row="5" column="0"> + <widget class="QCheckBox" name="titleBarCheckBox"> + <property name="text"> + <string>Enable window titlebar</string> + </property> + </widget> + </item> </layout> </widget> </item> _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits