From 947607c4974bdc5a53bdf8dd5b5bbd04c9a72266 Mon Sep 17 00:00:00 2001 From: pengfeixx <63588879+pengfeixx@users.noreply.github.com> Date: Wed, 17 Apr 2024 16:56:59 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E9=A1=B9=E4=BF=9D=E5=AD=98=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20(#448)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复从自定义切制软硬解码后保存失败问题 Log: 修复部分已知问题 --- src/common/mainwindow.cpp | 3 +- src/common/platform/platform_mainwindow.cpp | 3 +- translations/deepin-movie_bo.ts | 40 +++++++++++---------- translations/deepin-movie_ug.ts | 23 ++++++------ translations/deepin-movie_zh_CN.ts | 8 ++--- translations/deepin-movie_zh_HK.ts | 8 ++--- translations/deepin-movie_zh_TW.ts | 8 ++--- 7 files changed, 47 insertions(+), 46 deletions(-) diff --git a/src/common/mainwindow.cpp b/src/common/mainwindow.cpp index c622ad99..f5be37ce 100644 --- a/src/common/mainwindow.cpp +++ b/src/common/mainwindow.cpp @@ -2849,8 +2849,7 @@ void MainWindow::handleSettings(DSettingsDialog *dsd) msgBox.addButton(tr("Restart"), true, DDialog::ButtonType::ButtonWarning); msgBox.setOnButtonClickedClose(true); if (msgBox.exec() == 1) { - if (Settings::get().settings()->getOption(QString("base.decode.select")).toInt() == 3) - Settings::get().settings()->setOption("set.start.crash", "2"); + Settings::get().settings()->setOption("set.start.crash", "2"); qApp->exit(); QProcess::startDetached(qApp->applicationFilePath(), QStringList() << "--restart"); } else { diff --git a/src/common/platform/platform_mainwindow.cpp b/src/common/platform/platform_mainwindow.cpp index 0ef7b138..163b0485 100644 --- a/src/common/platform/platform_mainwindow.cpp +++ b/src/common/platform/platform_mainwindow.cpp @@ -2874,8 +2874,7 @@ void Platform_MainWindow::handleSettings(DSettingsDialog *dsd) msgBox.addButton(tr("Restart"), true, DDialog::ButtonType::ButtonWarning); msgBox.setOnButtonClickedClose(true); if (msgBox.exec() == 1) { - if (Settings::get().settings()->getOption(QString("base.decode.select")).toInt() == 3) - Settings::get().settings()->setOption("set.start.crash", "2"); + Settings::get().settings()->setOption("set.start.crash", "2"); qApp->exit(); QProcess::startDetached(qApp->applicationFilePath(), QStringList() << "--restart"); } else { diff --git a/translations/deepin-movie_bo.ts b/translations/deepin-movie_bo.ts index 0d721753..b94f7509 100644 --- a/translations/deepin-movie_bo.ts +++ b/translations/deepin-movie_bo.ts @@ -6,18 +6,19 @@ Exit Miracast - + ཕྱིར་འཐེན་ཡོལ་བ། Projecting... Please do not exit the Movie app during the process. - + གྲིབ་གཟུགས་འཕེན་པ། +བརྒྱུད་རིམ་འདིའི་ཁྲོད་དུ་གློག་བརྙན་བཀོལ་སྤྱོད་ཀྱི་གོ་རིམ་ལས་ཕྱིར་འབུད་མི་རུང།。 Display device - + སྒྲིག་ཆས་མངོན་པ། @@ -25,17 +26,17 @@ Please do not exit the Movie app during the process. Project to - + རྣམ་གྲངས་ཐོན་པ། Searching for devices... - + འཚོལ་ཞིབ་སྒྲིག་ཆས་འཚོལ་ཞིབ་བྱེད་བཞིན་ཡོད།... No Miracast display devices were found. Please connect the device and your computer to the same WLAN network. - + Mirrasttstst སྒྲིག་ཆས་དང་རྩིས་འཁོར་གཉིས་WLANདྲ་རྒྱ་གཅིག་ཏུ་སྦྲེལ་རོགས། @@ -324,22 +325,22 @@ Please do not exit the Movie app during the process. Customize - + རང་ཉིད་མཚན་ཉིད་འཇོག་པ། Decode mode - + མ་དཔེ་འགྲེལ་སྟངས། Video out - + བརྙན་ལམ་ཕྱིར་གཏོང་། Rendering engine - + སྒུལ་བྱེད་འཕྲུལ་འཁོར་ལ་ཚོས་རྒྱག་དགོས། @@ -372,7 +373,8 @@ Please do not exit the Movie app during the process. The custom decoding method needs to be restarted before it can take effect, and whether to restart it? - + མཚན་ཉིད་འཇོག་པའི་ཨང་སྒྲིག་བྱེད་ཐབས་ལ་བསྐྱར་དུ་སྒོ་འབྱེད་དགོས་ན་གཞི་ནས་ནུས་པ་འཐོན་ +དེ་བཞིན་བསྐྱར་དུ་འགོ་ཚུགས་པ་ཡིན་ནམ། @@ -837,13 +839,13 @@ and whether to restart it? Cancel - འདོར་བ། + མེད་པར་བཟོ་དགོས། Restart - + བསྐྱར་དུ་འགོ་འཛུགས་དགོས། @@ -1272,13 +1274,13 @@ and whether to restart it? Cancel - འདོར་བ། + མེད་པར་བཟོ་དགོས། Restart - + བསྐྱར་དུ་འགོ་འཛུགས་དགོས། @@ -1470,7 +1472,7 @@ and whether to restart it? Miracast - + སྨི་ལ་ཁ་སི་ཐེ། @@ -1605,7 +1607,7 @@ and whether to restart it? Miracast - + སྨི་ལ་ཁ་སི་ཐེ། @@ -1629,7 +1631,7 @@ and whether to restart it? Volume - + རྒྱུགས་ཤོག @@ -1637,7 +1639,7 @@ and whether to restart it? Volume - + རྒྱུགས་ཤོག diff --git a/translations/deepin-movie_ug.ts b/translations/deepin-movie_ug.ts index 0084b672..35a731cb 100644 --- a/translations/deepin-movie_ug.ts +++ b/translations/deepin-movie_ug.ts @@ -319,27 +319,27 @@ Please do not exit the Movie app during the process. Software decoding - يۇمشال دېتال ئارقىلىق كود يېيىش + يۇمشال دېتال ئارقىلىق كود يېيىشيۇمشاق دېتاللارنى سىزىش Customize - + خاسلاشتۇرۇش Decode mode - + كودنى يوقىتىش ھالىتى Video out - + ۋىدېئو چىقىرىش Rendering engine - + يوقىتىش ماتورى @@ -372,7 +372,8 @@ Please do not exit the Movie app during the process. The custom decoding method needs to be restarted before it can take effect, and whether to restart it? - + ئۆزى بەلگىلەش ئۇسۇلىنى قوللىنىشتىن بۇرۇن قايتا قوزغىتىشقا توغرا كېلىدۇ ، +يەنە قايتا قوزغىتىش كېرەكمۇ يوق؟ @@ -837,13 +838,13 @@ and whether to restart it? Cancel - بىكار قىلىش + بىكار قىلىشئەمەلدىن قالدۇرۇش Restart - + قايتا قوزغىتىش @@ -1272,13 +1273,13 @@ and whether to restart it? Cancel - بىكار قىلىش + ئەمەلدىن قالدۇرۇش Restart - + قايتا قوزغىتىش @@ -1629,7 +1630,7 @@ and whether to restart it? Volume - ئاۋاز + ئاۋازئاۋاز چوڭلۇقى diff --git a/translations/deepin-movie_zh_CN.ts b/translations/deepin-movie_zh_CN.ts index 118076bb..9789927a 100644 --- a/translations/deepin-movie_zh_CN.ts +++ b/translations/deepin-movie_zh_CN.ts @@ -838,13 +838,13 @@ and whether to restart it? Cancel - + 取消 Restart - + 重启 @@ -1273,13 +1273,13 @@ and whether to restart it? Cancel - 取消 + 取消 Restart - + 重启 diff --git a/translations/deepin-movie_zh_HK.ts b/translations/deepin-movie_zh_HK.ts index 030ce100..e5ab3172 100644 --- a/translations/deepin-movie_zh_HK.ts +++ b/translations/deepin-movie_zh_HK.ts @@ -838,13 +838,13 @@ and whether to restart it? Cancel - 取消 + 取消 Restart - + 取消 @@ -1273,13 +1273,13 @@ and whether to restart it? Cancel - 取消 + 取消 Restart - + 重啓 diff --git a/translations/deepin-movie_zh_TW.ts b/translations/deepin-movie_zh_TW.ts index 90dbf97b..dafeddf7 100644 --- a/translations/deepin-movie_zh_TW.ts +++ b/translations/deepin-movie_zh_TW.ts @@ -838,13 +838,13 @@ and whether to restart it? Cancel - 取消 + 取消 Restart - + 重啓 @@ -1273,13 +1273,13 @@ and whether to restart it? Cancel - 取消 + 取消 Restart - + 重啓