<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class="">Hi Aleksei,<div class=""><br class=""></div><div class="">Thanks for already thinking about the UI and about adding the new preference to them.</div><div class="">But I think before doing that, it should be discussed what is actually needed or interesting for the normal user.</div><div class=""><br class=""></div><div class="">We already have a popup menu, where you can select the preferred charset encoding for your subtitle. Now, just adding another check box for an automatic option, might just confuse the user even more.</div><div class=""><br class=""></div><div class="">—> Is the new code reliable enough to maybe get rid of both in simple prefs already?</div><div class="">—> Should there be an „Automatic“ entry in the existing charset list, which is selected by default?</div><div class="">—> If we stick with the checkbox, should be at least grey out the popup menu to make clear its setting does not have an effect at all?</div><div class=""><br class=""></div><div class="">How to deal with the fact that VLC might not be compiled with the uchardetect library at all (probably mainly relevant for linux, if they do not package that lib)?</div><div class=""><br class=""></div><div class="">BR. David</div><div class=""><br class=""><div><br class=""><blockquote type="cite" class=""><div class="">Am 08.04.2019 um 09:43 schrieb Thomas Guillem <<a href="mailto:thomas@gllm.fr" class="">thomas@gllm.fr</a>>:</div><br class="Apple-interchange-newline"><div class=""><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">On Sun, Apr 7, 2019, at 20:39,<span class="Apple-converted-space"> </span></span><a href="mailto:pertuleha@gmail.com" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px;" class="">pertuleha@gmail.com</a><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class=""><span class="Apple-converted-space"> </span>wrote:</span><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><blockquote type="cite" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px; text-decoration: none;" class="">From: Aleksei Pertu <<a href="mailto:pertuleha@gmail.com" class="">pertuleha@gmail.com</a>><br class=""><br class="">---<br class="">modules/gui/macosx/UI/SimplePreferences.xib | 35 +++++++++++++------<br class="">.../preferences/VLCSimplePrefsController.h | 1 +<br class="">.../preferences/VLCSimplePrefsController.m | 2 ++<br class="">.../gui/qt/components/simple_preferences.cpp | 1 +<br class=""></blockquote><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">There sould be one commit for macOS and one commit for QT.</span><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><blockquote type="cite" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px; text-decoration: none;" class="">modules/gui/qt/ui/sprefs_subtitles.ui | 7 ++++<br class="">5 files changed, 35 insertions(+), 11 deletions(-)<br class=""><br class="">diff --git a/modules/gui/macosx/UI/SimplePreferences.xib<span class="Apple-converted-space"> </span><br class="">b/modules/gui/macosx/UI/SimplePreferences.xib<br class="">index 1366b78cc7..d8f4d94c00 100644<br class="">--- a/modules/gui/macosx/UI/SimplePreferences.xib<br class="">+++ b/modules/gui/macosx/UI/SimplePreferences.xib<br class="">@@ -84,6 +84,7 @@<br class=""> <outlet property="osdView" destination="2523"<span class="Apple-converted-space"> </span><br class="">id="d1o-FZ-hXa"/><br class=""> <outlet property="osd_encodingLabel"<span class="Apple-converted-space"> </span><br class="">destination="2531" id="yyW-qD-zJ0"/><br class=""> <outlet property="osd_encodingPopup"<span class="Apple-converted-space"> </span><br class="">destination="2532" id="mBO-m6-lIV"/><br class="">+ <outlet property="osd_encodingAutoDetectCheckbox"<span class="Apple-converted-space"> </span><br class="">destination="epz-hm-jAM" id="mAn-id-Mmz"/><br class=""> <outlet property="osd_fontBox" destination="2537"<span class="Apple-converted-space"> </span><br class="">id="OCf-KO-i4B"/><br class=""> <outlet property="osd_fontButton" destination="2543"<span class="Apple-converted-space"> </span><br class="">id="UOT-87-z16"/><br class=""> <outlet property="osd_fontLabel" destination="2542"<span class="Apple-converted-space"> </span><br class="">id="LD1-g4-6Ex"/><br class="">@@ -1532,7 +1533,7 @@ Gw<br class=""> <point key="canvasLocation" x="883" y="158"/><br class=""> </customView><br class=""> <customView translatesAutoresizingMaskIntoConstraints="NO"<span class="Apple-converted-space"> </span><br class="">id="2523" userLabel="Subtitles & OSD Settings"><br class="">- <rect key="frame" x="0.0" y="-1" width="571" height="402"/><br class="">+ <rect key="frame" x="0.0" y="-1" width="571" height="428"/><br class=""> <subviews><br class=""> <box title="Display Settings"<span class="Apple-converted-space"> </span><br class="">translatesAutoresizingMaskIntoConstraints="NO" id="2537"><br class=""> <rect key="frame" x="17" y="16" width="537"<span class="Apple-converted-space"> </span><br class="">height="214"/><br class="">@@ -1770,13 +1771,13 @@ Gw<br class=""> </view><br class=""> </box><br class=""> <box title="On Screen Display"<span class="Apple-converted-space"> </span><br class="">translatesAutoresizingMaskIntoConstraints="NO" id="2524"><br class="">- <rect key="frame" x="17" y="328" width="537"<span class="Apple-converted-space"> </span><br class="">height="54"/><br class="">+ <rect key="frame" x="17" y="352" width="537"<span class="Apple-converted-space"> </span><br class="">height="56"/><br class=""> <view key="contentView" id="GNq-vl-Idl"><br class="">- <rect key="frame" x="3" y="3" width="531"<span class="Apple-converted-space"> </span><br class="">height="36"/><br class="">+ <rect key="frame" x="3" y="3" width="531"<span class="Apple-converted-space"> </span><br class="">height="38"/><br class=""> <autoresizingMask key="autoresizingMask"<span class="Apple-converted-space"> </span><br class="">widthSizable="YES" heightSizable="YES"/><br class=""> <subviews><br class=""> <button<span class="Apple-converted-space"> </span><br class="">mirrorLayoutDirectionWhenInternationalizing="always"<span class="Apple-converted-space"> </span><br class="">translatesAutoresizingMaskIntoConstraints="NO" id="2526"><br class="">- <rect key="frame" x="14" y="9"<span class="Apple-converted-space"> </span><br class="">width="94" height="18"/><br class="">+ <rect key="frame" x="14" y="9"<span class="Apple-converted-space"> </span><br class="">width="94" height="20"/><br class=""> <buttonCell key="cell" type="check"<span class="Apple-converted-space"> </span><br class="">title="Enable OSD" bezelStyle="regularSquare" imagePosition="left"<span class="Apple-converted-space"> </span><br class="">alignment="left" inset="2" id="3494"><br class=""> <behavior key="behavior"<span class="Apple-converted-space"> </span><br class="">changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/><br class=""> <font key="font"<span class="Apple-converted-space"> </span><br class="">metaFont="system"/><br class="">@@ -1795,13 +1796,13 @@ Gw<br class=""> </view><br class=""> </box><br class=""> <box title="SPU language"<span class="Apple-converted-space"> </span><br class="">translatesAutoresizingMaskIntoConstraints="NO" id="1aw-Yd-yzY"><br class="">- <rect key="frame" x="17" y="235" width="537"<span class="Apple-converted-space"> </span><br class="">height="88"/><br class="">+ <rect key="frame" x="17" y="235" width="537"<span class="Apple-converted-space"> </span><br class="">height="112"/><br class=""> <view key="contentView" id="clp-fm-5xs"><br class="">- <rect key="frame" x="3" y="3" width="531"<span class="Apple-converted-space"> </span><br class="">height="70"/><br class="">+ <rect key="frame" x="3" y="3" width="531"<span class="Apple-converted-space"> </span><br class="">height="94"/><br class=""> <autoresizingMask key="autoresizingMask"<span class="Apple-converted-space"> </span><br class="">widthSizable="YES" heightSizable="YES"/><br class=""> <subviews><br class=""> <textField horizontalHuggingPriority="251"<span class="Apple-converted-space"> </span><br class="">verticalHuggingPriority="750"<span class="Apple-converted-space"> </span><br class="">translatesAutoresizingMaskIntoConstraints="NO" id="2529"><br class="">- <rect key="frame" x="16" y="43"<span class="Apple-converted-space"> </span><br class="">width="175" height="17"/><br class="">+ <rect key="frame" x="16" y="67"<span class="Apple-converted-space"> </span><br class="">width="175" height="17"/><br class=""> <textFieldCell key="cell"<span class="Apple-converted-space"> </span><br class="">lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES"<span class="Apple-converted-space"> </span><br class="">title="Preferred Subtitle Language" usesSingleLineMode="YES" id="3495"><br class=""> <font key="font"<span class="Apple-converted-space"> </span><br class="">metaFont="system"/><br class=""> <color key="textColor"<span class="Apple-converted-space"> </span><br class="">name="controlTextColor" catalog="System" colorSpace="catalog"/><br class="">@@ -1809,7 +1810,7 @@ Gw<br class=""> </textFieldCell><br class=""> </textField><br class=""> <textField verticalHuggingPriority="750"<span class="Apple-converted-space"> </span><br class="">translatesAutoresizingMaskIntoConstraints="NO" id="2530"><br class="">- <rect key="frame" x="206" y="41"<span class="Apple-converted-space"> </span><br class="">width="308" height="22"/><br class="">+ <rect key="frame" x="206" y="65"<span class="Apple-converted-space"> </span><br class="">width="308" height="22"/><br class=""> <textFieldCell key="cell"<span class="Apple-converted-space"> </span><br class="">scrollable="YES" lineBreakMode="clipping" selectable="YES"<span class="Apple-converted-space"> </span><br class="">editable="YES" continuous="YES" sendsActionOnEndEditing="YES"<span class="Apple-converted-space"> </span><br class="">state="on" borderStyle="bezel" drawsBackground="YES" id="3496"><br class=""> <font key="font"<span class="Apple-converted-space"> </span><br class="">metaFont="system"/><br class=""> <color key="textColor"<span class="Apple-converted-space"> </span><br class="">name="controlTextColor" catalog="System" colorSpace="catalog"/><br class="">@@ -1821,7 +1822,7 @@ Gw<br class=""> </connections><br class=""> </textField><br class=""> <textField horizontalHuggingPriority="251"<span class="Apple-converted-space"> </span><br class="">verticalHuggingPriority="750"<span class="Apple-converted-space"> </span><br class="">translatesAutoresizingMaskIntoConstraints="NO" id="2531"><br class="">- <rect key="frame" x="16" y="14"<span class="Apple-converted-space"> </span><br class="">width="175" height="17"/><br class="">+ <rect key="frame" x="16" y="38"<span class="Apple-converted-space"> </span><br class="">width="175" height="17"/><br class=""> <textFieldCell key="cell"<span class="Apple-converted-space"> </span><br class="">lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES"<span class="Apple-converted-space"> </span><br class="">title="Default Encoding" usesSingleLineMode="YES" id="3497"><br class=""> <font key="font"<span class="Apple-converted-space"> </span><br class="">metaFont="system"/><br class=""> <color key="textColor"<span class="Apple-converted-space"> </span><br class="">name="controlTextColor" catalog="System" colorSpace="catalog"/><br class="">@@ -1829,7 +1830,7 @@ Gw<br class=""> </textFieldCell><br class=""> </textField><br class=""> <popUpButton verticalHuggingPriority="750"<span class="Apple-converted-space"> </span><br class="">translatesAutoresizingMaskIntoConstraints="NO" id="2532"><br class="">- <rect key="frame" x="204" y="9"<span class="Apple-converted-space"> </span><br class="">width="313" height="25"/><br class="">+ <rect key="frame" x="204" y="33"<span class="Apple-converted-space"> </span><br class="">width="313" height="25"/><br class=""> <popUpButtonCell key="cell"<span class="Apple-converted-space"> </span><br class="">type="push" bezelStyle="rounded" lineBreakMode="truncatingTail"<span class="Apple-converted-space"> </span><br class="">state="on" borderStyle="borderAndBezel" inset="2"<span class="Apple-converted-space"> </span><br class="">arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="2665"<span class="Apple-converted-space"> </span><br class="">id="3498"><br class=""> <behavior key="behavior"<span class="Apple-converted-space"> </span><br class="">lightByBackground="YES" lightByGray="YES"/><br class=""> <font key="font" metaFont="menu"/><br class="">@@ -1848,15 +1849,27 @@ Gw<br class=""> <action<span class="Apple-converted-space"> </span><br class="">selector="osdSettingChanged:" target="-2" id="xeg-0v-Ab2"/><br class=""> </connections><br class=""> </popUpButton><br class="">+ <button verticalHuggingPriority="750"<span class="Apple-converted-space"> </span><br class="">translatesAutoresizingMaskIntoConstraints="NO" id="epz-hm-jAM"><br class="">+ <rect key="frame" x="16" y="10"<span class="Apple-converted-space"> </span><br class="">width="193" height="18"/><br class="">+ <buttonCell key="cell" type="check"<span class="Apple-converted-space"> </span><br class="">title="Try to auto-detect encoding" bezelStyle="regularSquare"<span class="Apple-converted-space"> </span><br class="">imagePosition="left" state="on" inset="2" id="7Mx-so-6d6"><br class="">+ <behavior key="behavior"<span class="Apple-converted-space"> </span><br class="">changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/><br class="">+ <font key="font"<span class="Apple-converted-space"> </span><br class="">metaFont="system"/><br class="">+ </buttonCell><br class="">+ <connections><br class="">+ <action<span class="Apple-converted-space"> </span><br class="">selector="osdSettingChanged:" target="-2" id="mAn-id-Yn1"/><br class="">+ </connections><br class="">+ </button><br class=""> </subviews><br class=""> <constraints><br class=""> <constraint firstItem="2529"<span class="Apple-converted-space"> </span><br class="">firstAttribute="centerY" secondItem="2530" secondAttribute="centerY"<span class="Apple-converted-space"> </span><br class="">id="HsK-i9-n2z"/><br class="">- <constraint firstAttribute="bottom"<span class="Apple-converted-space"> </span><br class="">secondItem="2532" secondAttribute="bottom" constant="12"<span class="Apple-converted-space"> </span><br class="">id="LX5-YD-7vT"/><br class="">+ <constraint firstAttribute="bottom"<span class="Apple-converted-space"> </span><br class="">secondItem="epz-hm-jAM" secondAttribute="bottom" constant="12"<span class="Apple-converted-space"> </span><br class="">id="LX5-YD-7vT"/><br class=""> <constraint firstAttribute="trailing"<span class="Apple-converted-space"> </span><br class="">secondItem="2530" secondAttribute="trailing" constant="17"<span class="Apple-converted-space"> </span><br class="">id="NTc-Wd-fKW"/><br class=""> <constraint firstItem="2529"<span class="Apple-converted-space"> </span><br class="">firstAttribute="leading" secondItem="clp-fm-5xs"<span class="Apple-converted-space"> </span><br class="">secondAttribute="leading" constant="18" id="Q4r-4X-sJQ"/><br class=""> <constraint firstItem="2530"<span class="Apple-converted-space"> </span><br class="">firstAttribute="leading" secondItem="2532" secondAttribute="leading"<span class="Apple-converted-space"> </span><br class="">id="R1y-rp-flP"/><br class=""> <constraint firstItem="2532"<span class="Apple-converted-space"> </span><br class="">firstAttribute="leading" secondItem="2531" secondAttribute="trailing"<span class="Apple-converted-space"> </span><br class="">constant="17" id="Upg-N7-CHN"/><br class=""> <constraint firstItem="2530"<span class="Apple-converted-space"> </span><br class="">firstAttribute="width" secondItem="2532" secondAttribute="width"<span class="Apple-converted-space"> </span><br class="">id="VfS-JB-gci"/><br class="">+ <constraint firstItem="epz-hm-jAM"<span class="Apple-converted-space"> </span><br class="">firstAttribute="top" secondItem="2531" secondAttribute="bottom"<span class="Apple-converted-space"> </span><br class="">constant="12" id="aws-1g-8oU"/><br class="">+ <constraint firstItem="epz-hm-jAM"<span class="Apple-converted-space"> </span><br class="">firstAttribute="leading" secondItem="2531" secondAttribute="leading"<span class="Apple-converted-space"> </span><br class="">id="dZ3-mh-SN1"/><br class=""> <constraint firstItem="2531"<span class="Apple-converted-space"> </span><br class="">firstAttribute="centerY" secondItem="2532" secondAttribute="centerY"<span class="Apple-converted-space"> </span><br class="">id="lPF-fI-ol6"/><br class=""> <constraint firstItem="2529"<span class="Apple-converted-space"> </span><br class="">firstAttribute="leading" secondItem="2531" secondAttribute="leading"<span class="Apple-converted-space"> </span><br class="">id="vCh-Cd-x9H"/><br class=""> <constraint firstItem="2529"<span class="Apple-converted-space"> </span><br class="">firstAttribute="top" secondItem="clp-fm-5xs" secondAttribute="top"<span class="Apple-converted-space"> </span><br class="">constant="10" id="vT7-e0-BpD"/><br class="">diff --git a/modules/gui/macosx/preferences/VLCSimplePrefsController.h<span class="Apple-converted-space"> </span><br class="">b/modules/gui/macosx/preferences/VLCSimplePrefsController.h<br class="">index b7d0b49141..1dc0e73fb0 100644<br class="">--- a/modules/gui/macosx/preferences/VLCSimplePrefsController.h<br class="">+++ b/modules/gui/macosx/preferences/VLCSimplePrefsController.h<br class="">@@ -157,6 +157,7 @@<br class="">@property (readwrite, weak) IBOutlet NSButton *osd_forceboldCheckbox;<br class="">@property (readwrite, weak) IBOutlet NSBox *osd_osdBox;<br class="">@property (readwrite, weak) IBOutlet NSButton *osd_osdCheckbox;<br class="">+@property (readwrite, weak) IBOutlet NSButton<span class="Apple-converted-space"> </span><br class="">*osd_encodingAutoDetectCheckbox;<br class=""><br class="">// video pane<br class="">@property (readwrite, strong) IBOutlet NSView *videoView;<br class="">diff --git a/modules/gui/macosx/preferences/VLCSimplePrefsController.m<span class="Apple-converted-space"> </span><br class="">b/modules/gui/macosx/preferences/VLCSimplePrefsController.m<br class="">index 26d9589022..24295f1854 100644<br class="">--- a/modules/gui/macosx/preferences/VLCSimplePrefsController.m<br class="">+++ b/modules/gui/macosx/preferences/VLCSimplePrefsController.m<br class="">@@ -714,6 +714,7 @@ static inline const char *<span class="Apple-converted-space"> </span><br class="">__config_GetLabel(vlc_object_t *p_this, const char *p<br class=""><br class=""> [self setupButton:_osd_encodingPopup forStringList:<span class="Apple-converted-space"> </span><br class="">"subsdec-encoding"];<br class=""> [self setupField:_osd_langTextField forOption: "sub-language" ];<br class="">+ [self setupButton:_osd_encodingAutoDetectCheckbox forBoolValue:<span class="Apple-converted-space"> </span><br class="">"sub-autodetect-charset"];<br class=""><br class=""> [self setupField:_osd_fontTextField forOption: "freetype-font"];<br class=""> [self setupButton:_osd_font_colorPopup forIntList:<span class="Apple-converted-space"> </span><br class="">"freetype-color"];<br class="">@@ -1009,6 +1010,7 @@ static inline void save_string_list(intf_thread_t<span class="Apple-converted-space"> </span><br class="">* p_intf, id object, const cha<br class=""> config_PutPsz("subsdec-encoding", "");<br class=""><br class=""> config_PutPsz("sub-language", [[_osd_langTextField<span class="Apple-converted-space"> </span><br class="">stringValue] UTF8String]);<br class="">+ config_PutInt("sub-autodetect-charset",<span class="Apple-converted-space"> </span><br class="">[_osd_encodingAutoDetectCheckbox state]);<br class=""><br class=""> config_PutPsz("freetype-font", [[_osd_fontTextField<span class="Apple-converted-space"> </span><br class="">stringValue] UTF8String]);<br class=""> SaveIntList(_osd_font_colorPopup, "freetype-color");<br class="">diff --git a/modules/gui/qt/components/simple_preferences.cpp<span class="Apple-converted-space"> </span><br class="">b/modules/gui/qt/components/simple_preferences.cpp<br class="">index 914b92f07d..11556f38f9 100644<br class="">--- a/modules/gui/qt/components/simple_preferences.cpp<br class="">+++ b/modules/gui/qt/components/simple_preferences.cpp<br class="">@@ -851,6 +851,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf,<span class="Apple-converted-space"> </span><br class="">QWidget *_parent,<br class=""> encoding );<br class=""> CONFIG_GENERIC( "sub-language", String, ui.subLangLabel,<br class=""> preferredLanguage );<br class="">+ CONFIG_BOOL( "sub-autodetect-charset", subDetectCharset );<br class=""><br class=""> CONFIG_GENERIC( "freetype-rel-fontsize", IntegerList,<br class=""> ui.fontSizeLabel, fontSize );<br class="">diff --git a/modules/gui/qt/ui/sprefs_subtitles.ui<span class="Apple-converted-space"> </span><br class="">b/modules/gui/qt/ui/sprefs_subtitles.ui<br class="">index b9e851dc9d..12ab2d56d5 100644<br class="">--- a/modules/gui/qt/ui/sprefs_subtitles.ui<br class="">+++ b/modules/gui/qt/ui/sprefs_subtitles.ui<br class="">@@ -136,6 +136,13 @@<br class=""> </property><br class=""> </widget><br class=""> </item><br class="">+ <item row="2" column="0"><br class="">+ <widget class="QCheckBox" name="subDetectCharset"><br class="">+ <property name="text"><br class="">+ <string>Try to auto-detect encoding</string><br class="">+ </property><br class="">+ </widget><br class="">+ </item><br class=""> </layout><br class=""> </widget><br class=""> </item><br class="">--<span class="Apple-converted-space"> </span><br class="">2.20.1<br class=""><br class="">_______________________________________________<br class="">vlc-devel mailing list<br class="">To unsubscribe or modify your subscription options:<br class=""><a href="https://mailman.videolan.org/listinfo/vlc-devel" class="">https://mailman.videolan.org/listinfo/vlc-devel</a><br class=""></blockquote><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">_______________________________________________</span><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">vlc-devel mailing list</span><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">To unsubscribe or modify your subscription options:</span><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><a href="https://mailman.videolan.org/listinfo/vlc-devel" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px;" class="">https://mailman.videolan.org/listinfo/vlc-devel</a></div></blockquote></div><br class=""></div></body></html>