[vlc-commits] [Git][videolan/vlc][master] 8 commits: qt: fix margin in simple prefs
Hugo Beauzée-Luyssen (@chouquette)
gitlab at videolan.org
Thu Mar 10 09:59:07 UTC 2022
Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC
Commits:
60bbad27 by Lyndon Brown at 2022-03-10T09:06:23+00:00
qt: fix margin in simple prefs
Regression from 46d15dbafc4a2a95553b3a7b81d5b6fef880512d.
It seems that margins applied to a `QStackLayout` are ignored and must
instead be applied to the `QStackWidget` directly.
- - - - -
8c02064a by Lyndon Brown at 2022-03-10T09:06:23+00:00
qt: move simple prefs input property to ui file
Such that the effect is thus visible in Qt Creator/Designer.
The compatibility note is obviously obsolete now, but presumably we still
want this style anyway since its read-only.
- - - - -
cdee88e9 by Lyndon Brown at 2022-03-10T09:06:23+00:00
qt: fix excessive base heights in simple prefs ui files
Viewing the ui files in Qt creator revealed excess empty space at the
bottom of some, a huge amount in the case of media-library. This ultimately
has no impact upon the final result, but I thought I'd fix it for neatness.
Note that these numbers were the product of simply dragging the canvas size
until it snapped into place.
- - - - -
0ceaf061 by Lyndon Brown at 2022-03-10T09:06:23+00:00
qt: remove unnecessary layout wrapping simple prefs widget
Makes no difference at all to have this.
- - - - -
97e1731b by Lyndon Brown at 2022-03-10T09:06:23+00:00
qt: remove useless simple prefs layout spacer
This was placed into the same grid row+column as a spinbox and thus
achieved absolutely nothing. Presumably it was intended for the adjacent
column, however since it achieves nothing either way let's just drop it.
- - - - -
1c52be7a by Lyndon Brown at 2022-03-10T09:06:23+00:00
qt: fix tab ordering
One widget missing from ordering.
- - - - -
eab82acc by Lyndon Brown at 2022-03-10T09:06:23+00:00
qt: set sensible media library interface tabstops
Unspecified order was: add-button, ban-add-button, ban-list, list.
- - - - -
5fe96d3d by Lyndon Brown at 2022-03-10T09:06:23+00:00
qt: add missing tooltips to add-folder media library interface buttons
- - - - -
7 changed files:
- modules/gui/qt/dialogs/preferences/preferences.cpp
- modules/gui/qt/dialogs/preferences/simple_preferences.cpp
- modules/gui/qt/dialogs/preferences/sprefs_audio.ui
- modules/gui/qt/dialogs/preferences/sprefs_input.ui
- modules/gui/qt/dialogs/preferences/sprefs_interface.ui
- modules/gui/qt/dialogs/preferences/sprefs_medialibrary.ui
- modules/gui/qt/dialogs/preferences/sprefs_video.ui
Changes:
=====================================
modules/gui/qt/dialogs/preferences/preferences.cpp
=====================================
@@ -111,7 +111,7 @@ PrefsDialog::PrefsDialog( QWindow *parent, qt_intf_t *_p_intf )
simple_split_widget->layout()->addWidget( simple_panels_stack );
simple_tree_panel->layout()->setMargin( 1 );
- simple_panels_stack->layout()->setContentsMargins( 6, 0, 0, 3 );
+ simple_panels_stack->setContentsMargins( 6, 0, 0, 3 );
simple_split_widget->layout()->setMargin( 0 );
stack->insertWidget( SIMPLE, simple_split_widget );
=====================================
modules/gui/qt/dialogs/preferences/simple_preferences.cpp
=====================================
@@ -590,8 +590,6 @@ SPrefsPanel::SPrefsPanel( qt_intf_t *_p_intf, QWidget *_parent,
optionWidgets["fileW"] = ui.fileControl;
optionWidgets["audioOutCoB"] = ui.outputModule;
optionWidgets["normalizerChB"] = ui.volNormBox;
- /*Little modification of ui.volumeValue to compile with Qt < 4.3 */
- ui.volumeValue->setButtonSymbols(QAbstractSpinBox::NoButtons);
optionWidgets["volLW"] = ui.volumeValue;
optionWidgets["spdifChB"] = ui.spdifBox;
optionWidgets["defaultVolume"] = ui.defaultVolume;
=====================================
modules/gui/qt/dialogs/preferences/sprefs_audio.ui
=====================================
@@ -8,7 +8,7 @@
<x>0</x>
<y>0</y>
<width>707</width>
- <height>626</height>
+ <height>572</height>
</rect>
</property>
<property name="sizePolicy">
@@ -121,6 +121,9 @@
<property name="readOnly">
<bool>true</bool>
</property>
+ <property name="buttonSymbols">
+ <enum>QAbstractSpinBox::NoButtons</enum>
+ </property>
<property name="suffix">
<string> %</string>
</property>
=====================================
modules/gui/qt/dialogs/preferences/sprefs_input.ui
=====================================
@@ -8,7 +8,7 @@
<x>0</x>
<y>0</y>
<width>737</width>
- <height>631</height>
+ <height>580</height>
</rect>
</property>
<property name="windowTitle">
@@ -37,19 +37,6 @@
</property>
</widget>
</item>
- <item row="6" column="1">
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
<item row="4" column="0">
<widget class="QLabel" name="hwAccelLabel">
<property name="text">
=====================================
modules/gui/qt/dialogs/preferences/sprefs_interface.ui
=====================================
@@ -8,7 +8,7 @@
<x>0</x>
<y>0</y>
<width>700</width>
- <height>1069</height>
+ <height>808</height>
</rect>
</property>
<property name="sizePolicy">
@@ -590,15 +590,11 @@
</widget>
</item>
<item row="1" column="0">
- <layout class="QHBoxLayout" name="horizontalLayout_3">
- <item>
- <widget class="QCheckBox" name="saveRecentlyPlayed">
- <property name="text">
- <string>Save recently played items</string>
- </property>
- </widget>
- </item>
- </layout>
+ <widget class="QCheckBox" name="saveRecentlyPlayed">
+ <property name="text">
+ <string>Save recently played items</string>
+ </property>
+ </widget>
</item>
<item row="0" column="2">
<widget class="QSpinBox" name="updatesDays">
@@ -758,6 +754,7 @@
<tabstop>updatesBox</tabstop>
<tabstop>updatesDays</tabstop>
<tabstop>saveRecentlyPlayed</tabstop>
+ <tabstop>clearRecent</tabstop>
<tabstop>MetadataNetworkAccessMode</tabstop>
<tabstop>assoButton</tabstop>
</tabstops>
=====================================
modules/gui/qt/dialogs/preferences/sprefs_medialibrary.ui
=====================================
@@ -8,7 +8,7 @@
<x>0</x>
<y>0</y>
<width>700</width>
- <height>1069</height>
+ <height>507</height>
</rect>
</property>
<property name="sizePolicy">
@@ -48,6 +48,9 @@
<height>16</height>
</size>
</property>
+ <property name="toolTip">
+ <string>Add scanned folder</string>
+ </property>
<property name="text">
<string>+</string>
</property>
@@ -61,6 +64,9 @@
<height>16</height>
</size>
</property>
+ <property name="toolTip">
+ <string>Add banned folder</string>
+ </property>
<property name="text">
<string>+</string>
</property>
@@ -158,6 +164,12 @@
<header>widgets/native/mlfolderseditor.hpp</header>
</customwidget>
</customwidgets>
+ <tabstops>
+ <tabstop>entryPoints</tabstop>
+ <tabstop>addButton</tabstop>
+ <tabstop>bannedEntryPoints</tabstop>
+ <tabstop>banButton</tabstop>
+ </tabstops>
<resources/>
<connections/>
</ui>
=====================================
modules/gui/qt/dialogs/preferences/sprefs_video.ui
=====================================
@@ -8,7 +8,7 @@
<x>0</x>
<y>0</y>
<width>682</width>
- <height>679</height>
+ <height>595</height>
</rect>
</property>
<property name="windowTitle">
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/2c2b187127f0a721c6c77e12ba1ccd58c0b0a659...5fe96d3de1abd88b04a442f7b5314b37da1d3df2
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/2c2b187127f0a721c6c77e12ba1ccd58c0b0a659...5fe96d3de1abd88b04a442f7b5314b37da1d3df2
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list