Merge pull request #20 from yaser01/develop

Update 2.1
yaser01 · Oct 21, 2021 · a64c8a3 · a64c8a3
2 parents 5c8802f + ec78f08
commit a64c8a3
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 11 deletions.
diff --git a/Readme.md b/Readme.md
@@ -68,10 +68,10 @@ https://user-images.githubusercontent.com/52576632/136703937-ee0e7eb5-c6f2-456e-
 [AVI, MKV, MP4, M4V, MOV, MPEG, OGG, OGM, H264, H265, WEBM, WMV]
 
 **Subtitle**:
-[ASS, SRT, SSA, SUP, PGS]
+[ASS, SRT, SSA, SUP, PGS, MKS]
 
 **Audio**:
-[AAC, AC3, FLAC, MKA, M4A, MP3, WAV, OGG]
+[AAC, AC3, FLAC, EAC3, MKA, M4A, MP3, DTS, DTSMA, THD, WAV, OGG]
 
 **Chapter**:
 [XML]

diff --git a/Resources/Tools/mkvmerge.exe b/Resources/Tools/mkvmerge.exe
diff --git a/Resources/Tools/mkvpropedit.exe b/Resources/Tools/mkvpropedit.exe
diff --git a/packages/Startup/PreDefined.py b/packages/Startup/PreDefined.py
@@ -29,8 +29,8 @@ def generate_languages_tracks():
 generate_languages_tracks()
 ISO_639_2_SYMBOLS = {v: k for k, v in ISO_639_2_LANGUAGES.items()}
 AllVideosExtensions = ['AVI', 'MKV', 'MP4', 'M4V', 'MOV', 'MPEG', 'OGG', 'OGM', 'H264', 'H265', "WEBM", 'WMV']
-AllSubtitlesExtensions = ['ASS', 'SRT', 'SSA', 'SUP', 'PGS']
-AllAudiosExtensions = ['AAC', 'AC3', 'FLAC', 'MKA', 'M4A', 'MP3', 'WAV', 'OGG']
+AllSubtitlesExtensions = ['ASS', 'SRT', 'SSA', 'SUP', 'PGS', 'MKS']
+AllAudiosExtensions = ['AAC', 'AC3', 'FLAC', 'EAC3', 'MKA', 'M4A', 'MP3', 'DTS', 'DTSMA', 'THD', 'WAV', 'OGG']
 AllSubtitlesLanguages = list(ISO_639_2_LANGUAGES.keys())
 AllAudiosLanguages = list(ISO_639_2_LANGUAGES.keys())
 AllChapterExtensions = ['XML']

diff --git a/packages/Startup/Version.py b/packages/Startup/Version.py
@@ -1 +1 @@
-Version = 2.0
+Version = 2.1
diff --git a/packages/Tabs/AudioTab/AudioSelection.py b/packages/Tabs/AudioTab/AudioSelection.py
@@ -117,10 +117,10 @@ def setup_audio_check_default_forced_layout(self):
         self.audio_set_default_forced_layout.addWidget(self.audio_mux_at_top_checkBox)
 
     def setup_audio_options_layout(self):
-        self.audio_options_layout.addWidget(self.audio_extensions_comboBox)
+        self.audio_options_layout.addWidget(self.audio_extensions_comboBox, 2)
         self.audio_options_layout.addWidget(self.audio_language_label)
-        self.audio_options_layout.addWidget(self.audio_language_comboBox)
-        self.audio_options_layout.addWidget(self.audio_track_name_lineEdit)
+        self.audio_options_layout.addWidget(self.audio_language_comboBox, 4)
+        self.audio_options_layout.addWidget(self.audio_track_name_lineEdit, 2)
         self.audio_options_layout.addWidget(self.audio_delay_label)
         self.audio_options_layout.addWidget(self.audio_delay_spin)
         self.audio_options_layout.addSpacing(10)

diff --git a/packages/Tabs/AudioTab/Widgets/AudioExtensionsCheckableComboBox.py b/packages/Tabs/AudioTab/Widgets/AudioExtensionsCheckableComboBox.py
@@ -50,6 +50,7 @@ def setup_ui(self):
         self.lineEdit().setContextMenuPolicy(Qt.PreventContextMenu)
         self.lineEdit().installEventFilter(self)
         self.setMinimumWidth(screen_size.width() // 14)
+        self.setMaxVisibleItems(6)
         self.addItems(AllAudiosExtensions)
         self.make_default_extensions_checked()
 

diff --git a/packages/Tabs/MuxSetting/Widgets/GetJsonForMkvmergeJob.py b/packages/Tabs/MuxSetting/Widgets/GetJsonForMkvmergeJob.py
@@ -160,11 +160,17 @@ def setup_subtitle_options(self):
                         subtitle_command_list.append(add_json_line("--default-track"))
                         subtitle_command_list.append(add_json_line("0:yes"))
                         self.make_other_subtitle_not_default()
+                    else:
+                        subtitle_command_list.append(add_json_line("--default-track"))
+                        subtitle_command_list.append(add_json_line("0:no"))
                     # add subtitle set forced
                     if self.job.subtitle_set_forced[i]:
                         subtitle_command_list.append(add_json_line("--forced-track"))
                         subtitle_command_list.append(add_json_line("0:yes"))
                         self.make_other_subtitle_not_forced()
+                    else:
+                        subtitle_command_list.append(add_json_line("--forced-track"))
+                        subtitle_command_list.append(add_json_line("0:no"))
                     # add subtitle delay
                     subtitle_delay_in_millisecond = int(1000 * float(self.job.subtitle_delay[i]))
                     subtitle_command_list.append(add_json_line("--sync"))
@@ -206,11 +212,17 @@ def setup_audio_options(self):
                         audio_command_list.append(add_json_line("--default-track"))
                         audio_command_list.append(add_json_line("0:yes"))
                         self.make_other_audio_not_default()
+                    else:
+                        audio_command_list.append(add_json_line("--default-track"))
+                        audio_command_list.append(add_json_line("0:no"))
                     # add audio set forced
                     if self.job.audio_set_forced[i]:
                         audio_command_list.append(add_json_line("--forced-track"))
                         audio_command_list.append(add_json_line("0:yes"))
                         self.make_other_audio_not_forced()
+                    else:
+                        audio_command_list.append(add_json_line("--forced-track"))
+                        audio_command_list.append(add_json_line("0:no"))
                     # add audio delay
                     audio_delay_in_millisecond = int(1000 * float(self.job.audio_delay[i]))
                     audio_command_list.append(add_json_line("--sync"))

diff --git a/packages/Tabs/SubtitleTab/SubtitleSelection.py b/packages/Tabs/SubtitleTab/SubtitleSelection.py
@@ -116,10 +116,10 @@ def setup_subtitle_check_default_forced_layout(self):
         self.subtitle_set_default_forced_layout.addWidget(self.subtitle_mux_at_top_checkBox)
 
     def setup_subtitle_options_layout(self):
-        self.subtitle_options_layout.addWidget(self.subtitle_extensions_comboBox)
+        self.subtitle_options_layout.addWidget(self.subtitle_extensions_comboBox, 2)
         self.subtitle_options_layout.addWidget(self.subtitle_language_label)
-        self.subtitle_options_layout.addWidget(self.subtitle_language_comboBox)
-        self.subtitle_options_layout.addWidget(self.subtitle_track_name_lineEdit)
+        self.subtitle_options_layout.addWidget(self.subtitle_language_comboBox, 4)
+        self.subtitle_options_layout.addWidget(self.subtitle_track_name_lineEdit, 2)
         self.subtitle_options_layout.addWidget(self.subtitle_delay_label)
         self.subtitle_options_layout.addWidget(self.subtitle_delay_spin)
         self.subtitle_options_layout.addSpacing(10)