Compare commits
No commits in common. "6fa98bf86b6a08349ef113612ee70101bac8e3ba" and "fa0d37e06cfa32da8f34fa3ba7fcb7e8bfd78570" have entirely different histories.
6fa98bf86b
...
fa0d37e06c
@ -1,21 +0,0 @@
|
|||||||
From: liucong321 <liucong1@kylinos.cn>
|
|
||||||
Date: Wed, 24 May 2023 14:48:41 +0800
|
|
||||||
Subject: update changelog
|
|
||||||
|
|
||||||
---
|
|
||||||
src/mainwindow.cpp | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
|
|
||||||
index 5e4fbee..c803446 100644
|
|
||||||
--- a/src/mainwindow.cpp
|
|
||||||
+++ b/src/mainwindow.cpp
|
|
||||||
@@ -819,7 +819,7 @@ void MainWindow::slotChangeMaxState()
|
|
||||||
|
|
||||||
void MainWindow::slotChangeMiniState()
|
|
||||||
{
|
|
||||||
- showMinimized();
|
|
||||||
+ kdk::WindowManager::minimizeWindow(m_window_id);
|
|
||||||
}
|
|
||||||
|
|
||||||
void MainWindow::slotOpenHelpDoc()
|
|
||||||
91
0014-.patch
91
0014-.patch
@ -1,91 +0,0 @@
|
|||||||
From: liucong321 <liucong1@kylinos.cn>
|
|
||||||
Date: Mon, 29 May 2023 16:51:49 +0800
|
|
||||||
Subject: =?utf-8?b?5L+u5aSN57yW6K+R5LiN6YCa6L+H6Zeu6aKY?=
|
|
||||||
|
|
||||||
---
|
|
||||||
src/mainwindow.cpp | 19 +++++--------------
|
|
||||||
src/src.pro | 6 ------
|
|
||||||
2 files changed, 5 insertions(+), 20 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
|
|
||||||
index c803446..0412896 100644
|
|
||||||
--- a/src/mainwindow.cpp
|
|
||||||
+++ b/src/mainwindow.cpp
|
|
||||||
@@ -319,17 +319,6 @@ void MainWindow::initDBus()
|
|
||||||
KyInfo("init dbus error");
|
|
||||||
}
|
|
||||||
|
|
||||||
- QDBusMessage m = QDBusMessage::createMethodCall(QString("com.kylin.statusmanager.interface"),
|
|
||||||
- QString("/"),
|
|
||||||
- QString("com.kylin.statusmanager.interface"),
|
|
||||||
- QString("get_current_tabletmode"));
|
|
||||||
-
|
|
||||||
- QDBusMessage res = sessionBus.call(m);
|
|
||||||
- if (res.type() == 1 || res.type() == 2)
|
|
||||||
- m_is_tablet_mode = res.arguments().first().toBool();
|
|
||||||
- else
|
|
||||||
- m_is_tablet_mode = false;
|
|
||||||
-
|
|
||||||
//S3 S4策略
|
|
||||||
QDBusConnection::systemBus().connect(QString("org.freedesktop.login1"),
|
|
||||||
QString("/org/freedesktop/login1"),
|
|
||||||
@@ -463,7 +452,7 @@ void MainWindow::initTitleWidget()
|
|
||||||
connect(m_title_menu, &TitleMenu::sigQuit, this, &MainWindow::slotQuit);
|
|
||||||
|
|
||||||
m_title_widget = new TitleWidget(this);
|
|
||||||
- m_title_widget->setUIMode(m_is_tablet_mode);
|
|
||||||
+ m_title_widget->setUIMode(isTablet);
|
|
||||||
m_title_widget->raise();
|
|
||||||
m_title_widget->move(0, 0);
|
|
||||||
m_title_widget->setTitle(tr("Video Player"));
|
|
||||||
@@ -533,7 +522,7 @@ void MainWindow::initMiniModeShade()
|
|
||||||
void MainWindow::initContralBar()
|
|
||||||
{
|
|
||||||
m_contral_bar = new ContralBar(this);
|
|
||||||
- m_contral_bar->setUIMode(m_is_tablet_mode);
|
|
||||||
+ m_contral_bar->setUIMode(isTablet);
|
|
||||||
m_contral_bar->hide();
|
|
||||||
m_contral_bar->raise();
|
|
||||||
|
|
||||||
@@ -670,6 +659,7 @@ void MainWindow::Single(QStringList filelist)
|
|
||||||
|
|
||||||
void MainWindow::windowStateChange()
|
|
||||||
{
|
|
||||||
+#if 0
|
|
||||||
long compositor = (windowState() & Qt::WindowMaximized || windowState() & Qt::WindowFullScreen) ? 1 : 2;
|
|
||||||
QTimer::singleShot(500, this, [&, compositor](){
|
|
||||||
if (isWayland)
|
|
||||||
@@ -678,6 +668,7 @@ void MainWindow::windowStateChange()
|
|
||||||
XChangeProperty(QX11Info::display(), this->winId(), _NET_WM_BYPASS_COMPOSITOR, XA_CARDINAL,
|
|
||||||
32, XCB_PROP_MODE_REPLACE, (const unsigned char*)&compositor, 1);
|
|
||||||
});
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
if (windowState() & Qt::WindowMaximized)
|
|
||||||
m_title_widget->updateMaxButtonStatus(true);
|
|
||||||
@@ -812,7 +803,7 @@ void MainWindow::slotChangeMaxState()
|
|
||||||
m_is_maximized = false;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
- showMaximized();
|
|
||||||
+ kdk::WindowManager::maximizeWindow(m_window_id);
|
|
||||||
m_is_maximized = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
diff --git a/src/src.pro b/src/src.pro
|
|
||||||
index ad30a5e..699ee3f 100644
|
|
||||||
--- a/src/src.pro
|
|
||||||
+++ b/src/src.pro
|
|
||||||
@@ -46,12 +46,6 @@ include(widget/widget.pri)
|
|
||||||
|
|
||||||
LIBS += -lX11 \
|
|
||||||
-lKF5WindowSystem \
|
|
||||||
- -lavformat \
|
|
||||||
- -lavdevice \
|
|
||||||
- -lavcodec \
|
|
||||||
- -lavutil \
|
|
||||||
- -lswscale \
|
|
||||||
- -lswresample \
|
|
||||||
-lzen \
|
|
||||||
-lmediainfo \
|
|
||||||
-lukui-log4qt \
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -1,33 +0,0 @@
|
|||||||
From: liucong321 <liucong1@kylinos.cn>
|
|
||||||
Date: Wed, 9 Aug 2023 16:44:46 +0800
|
|
||||||
Subject: update changelog
|
|
||||||
|
|
||||||
---
|
|
||||||
kylin-video.desktop | 1 +
|
|
||||||
src/core/mpvcore.cpp | 1 +
|
|
||||||
2 files changed, 2 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/kylin-video.desktop b/kylin-video.desktop
|
|
||||||
index 4b218b3..c8bef67 100644
|
|
||||||
--- a/kylin-video.desktop
|
|
||||||
+++ b/kylin-video.desktop
|
|
||||||
@@ -11,6 +11,7 @@ Comment[zh_CN]=影音
|
|
||||||
GenericName=Video Player
|
|
||||||
GenericName[zh_CN]=影音
|
|
||||||
GenericName[bo_CN]=བརྙན་ཆས།
|
|
||||||
+GenericName[bo_CN]=ᠺᠢᠨᠤ᠋ ᠠᠪᠢᠶᠠ ᠵᠢᠨ ᠨᠡᠪᠳᠡᠷᠡᠬᠦᠯᠦᠭᠴᠢ
|
|
||||||
Exec=kylin-video %U
|
|
||||||
Icon=kylin-video
|
|
||||||
MimeType=audio/ac3;audio/mp4;audio/mpeg;audio/vnd.rn-realaudio;audio/vorbis;audio/x-adpcm;audio/x-matroska;audio/x-mp2;audio/x-mp3;audio/x-ms-wma;audio/x-vorbis;audio/x-wav;audio/mpegurl;audio/x-mpegurl;audio/x-pn-realaudio;audio/x-scpls;audio/aac;audio/flac;audio/ogg;audio/amr;audio/x-aiff;audio/basic;audio/midi;audio/amr-wb;audio/x-realaudio;audio/3gpp;audio/x-pn-realaudio-plugin;audio/x-gsm;audio/x-ms-wax;audio/prs.sid;audio/x-musepack;audio/x-ape;audio/x-m4a;audio/x-mod;audio/x-s3m;audio/x-flac;audio/x-vorbis+ogg;audio/x-wavpack;audio/mp2;audio/x-ms-asx;audio/x-tta;audio/x-mpeg;audio/m4a;audio/mp1;audio/mp3;audio/mpg;audio/scpls;audio/wav;audio/webm;audio/x-aac;audio/x-it;audio/x-mp1;audio/x-mpg;audio/x-ms-asf;audio/x-pn-au;audio/x-pn-wav;audio/x-shorten;audio/x-speex;audio/x-xm;audio/3gpp2;audio/dv;audio/eac3;audio/opus;audio/x-pn-aiff;audio/x-pn-windows-acm;audio/x-real-audio;audio/vnd.dolby.heaac.1;audio/vnd.dolby.heaac.2;audio/vnd.dts;audio/vnd.dts.hd;audio/x-m4b;audio/x-stm;audio/m3u;audio/rn-mpeg;audio/vnd.dolby.mlp;audio/x-pls;audio/x-pn-windows-pcm;audio/x-sbc;audio/x-voc;audio/aiff;audio/mpeg2;audio/mpeg3;audio/musepack;audio/x-flac+ogg;audio/x-m3u;audio/x-oggflac;audio/x-opus+ogg;video/avi;video/mp4;video/flv;video/mpeg;video/quicktime;video/vnd.rn-realvideo;video/x-matroska;video/x-ms-asf;video/x-msvideo;video/x-ms-wmv;video/x-ogm;video/x-theora;video/webm;video/x-flv;video/ogg;video/3gpp;video/x-mng;video/mp2t;video/dv;video/mp4v-es;video/x-ms-wmx;video/vnd.mpegurl;video/fli;video/x-ms-wm;video/x-ms-wvx;video/vnd.vivo;video/x-fli;video/x-flc;video/x-m4v;video/3gpp2;video/x-ogm+ogg;video/x-avi;video/msvideo;video/x-theora+ogg;video/x-flic;video/x-mpeg;video/x-mpeg2;video/x-nsv;video/x-anim;video/3gp;video/divx;video/vnd.divx;video/x-ms-asx;video/mpeg-system;video/x-ms-afs;video/x-ms-asf-plugin;video/x-ms-wvxvideo;video/vivo;video/x-mpeg-system;video/x-totem-stream;video/mediaplayer;video/mkv;video/x-mjpeg;video/x-mpeg3;video/x-ms-wmp;audio/AMR;audio/amr;audio/m4p;audio/x-m4p;audio/au;audio/x-au;audio/voc;audio/x-voc;application/x-shockwave-flash;application/vnd.smaf;application/vnd.rn-realmedia;
|
|
||||||
diff --git a/src/core/mpvcore.cpp b/src/core/mpvcore.cpp
|
|
||||||
index 36edfbc..4b5e94e 100644
|
|
||||||
--- a/src/core/mpvcore.cpp
|
|
||||||
+++ b/src/core/mpvcore.cpp
|
|
||||||
@@ -1270,6 +1270,7 @@ void MpvCore::initMpvHandle()
|
|
||||||
SetOption("vo", "opengl-cb");
|
|
||||||
dynamic_cast<PlayGLWidget*>(m_playWidget)->setMpvHandle(m_mpvHandle);
|
|
||||||
}
|
|
||||||
+ SetOption("vd", "h264_omx,h265_omx,");
|
|
||||||
|
|
||||||
m_volume = g_settings->value("General/volume").toInt();
|
|
||||||
m_brightness = g_settings->value("General/brightness").toInt();
|
|
||||||
@ -1,56 +0,0 @@
|
|||||||
From: =?utf-8?b?5byg56OK?= <zhanglei01@kylinos.cn>
|
|
||||||
Date: Mon, 13 Nov 2023 07:06:46 +0000
|
|
||||||
Subject: =?utf-8?b?ITE3IGZpeCBidWcgIyBJN0JMUTjjgJDlvbHpn7PjgJHlj7PplK7oj5w=?=
|
|
||||||
=?utf-8?b?5Y2V5pyq5rGJ5YyW5a6M5YWo77yM5a2Y5Zyob3BlbnVybO+8jOS4lOatpOeVjA==?=
|
|
||||||
=?utf-8?b?6Z2i5pi+56S65Z2H5pyq5rGJ5YyWIE1lcmdlIHB1bGwgcmVxdWVzdCAhMTcgZnJv?=
|
|
||||||
=?utf-8?b?bSB4dXhpbnJvbmcwMS9vcGVua3lsaW4veWFuZ3R6ZQ==?=
|
|
||||||
|
|
||||||
---
|
|
||||||
src/translations/kylin-video_zh_CN.ts | 10 +++++-----
|
|
||||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/translations/kylin-video_zh_CN.ts b/src/translations/kylin-video_zh_CN.ts
|
|
||||||
index 7bf564b..d7d4b2c 100644
|
|
||||||
--- a/src/translations/kylin-video_zh_CN.ts
|
|
||||||
+++ b/src/translations/kylin-video_zh_CN.ts
|
|
||||||
@@ -536,11 +536,11 @@ p, li { white-space: pre-wrap; }
|
|
||||||
</message>
|
|
||||||
<message>
|
|
||||||
<source>Open URL</source>
|
|
||||||
- <translation type="unfinished"></translation>
|
|
||||||
+ <translation type="unfinished">打开URL</translation>
|
|
||||||
</message>
|
|
||||||
<message>
|
|
||||||
<source>open url</source>
|
|
||||||
- <translation type="unfinished"></translation>
|
|
||||||
+ <translation type="unfinished">打开URL</translation>
|
|
||||||
</message>
|
|
||||||
</context>
|
|
||||||
<context>
|
|
||||||
@@ -1811,7 +1811,7 @@ The file being played will be stopped.</source>
|
|
||||||
</message>
|
|
||||||
<message>
|
|
||||||
<source>open url</source>
|
|
||||||
- <translation type="unfinished"></translation>
|
|
||||||
+ <translation type="unfinished">打开URL</translation>
|
|
||||||
</message>
|
|
||||||
</context>
|
|
||||||
<context>
|
|
||||||
@@ -1978,7 +1978,7 @@ The file being played will be stopped.</source>
|
|
||||||
<name>URLEditWidget</name>
|
|
||||||
<message>
|
|
||||||
<source>Open URL</source>
|
|
||||||
- <translation type="unfinished"></translation>
|
|
||||||
+ <translation type="unfinished">打开URL</translation>
|
|
||||||
</message>
|
|
||||||
<message>
|
|
||||||
<source>Close</source>
|
|
||||||
@@ -1986,7 +1986,7 @@ The file being played will be stopped.</source>
|
|
||||||
</message>
|
|
||||||
<message>
|
|
||||||
<source>Please input url link</source>
|
|
||||||
- <translation type="unfinished"></translation>
|
|
||||||
+ <translation type="unfinished">请输入url链接</translation>
|
|
||||||
</message>
|
|
||||||
<message>
|
|
||||||
<source>Cancel</source>
|
|
||||||
@ -1,6 +1,6 @@
|
|||||||
Name: kylin-video
|
Name: kylin-video
|
||||||
Version: 3.1.4
|
Version: 3.1.4
|
||||||
Release: 11
|
Release: 6
|
||||||
Summary: A powerful video player
|
Summary: A powerful video player
|
||||||
License: GPL-2.0+
|
License: GPL-2.0+
|
||||||
URL: https://gitee.com/openkylin/kylin-video
|
URL: https://gitee.com/openkylin/kylin-video
|
||||||
@ -9,12 +9,6 @@ Patch01: 0001-fix-compile-error-of-kylin-video.patch
|
|||||||
Patch03: fix-build-error-of-kylin-video-about-mpv-0.35.patch
|
Patch03: fix-build-error-of-kylin-video-about-mpv-0.35.patch
|
||||||
Patch04: 0011-15-kylin-video.patch
|
Patch04: 0011-15-kylin-video.patch
|
||||||
Patch05: 0012-update-changelog.patch
|
Patch05: 0012-update-changelog.patch
|
||||||
Patch06: 0013-update-changelog.patch
|
|
||||||
Patch07: 0014-.patch
|
|
||||||
Patch08: 0015-update-changelog.patch
|
|
||||||
Patch09: 0016-update-changelog.patch
|
|
||||||
Patch10: 0017-17-fix-bug-I7BLQ8-openurl.patch
|
|
||||||
|
|
||||||
BuildRequires: ffmpeg-devel
|
BuildRequires: ffmpeg-devel
|
||||||
BuildRequires: libcrystalhd-devel
|
BuildRequires: libcrystalhd-devel
|
||||||
BuildRequires: ffmpegthumbnailer-devel
|
BuildRequires: ffmpegthumbnailer-devel
|
||||||
@ -69,21 +63,6 @@ popd
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Jun 05 2024 peijiankang <peijiankang@kylinos.cn> - 3.1.4-11
|
|
||||||
- add 0017-17-fix-bug-I7BLQ8-openurl.patch
|
|
||||||
|
|
||||||
* Tue May 21 2024 peijiankang <peijiankang@kylinos.cn> - 3.1.4-10
|
|
||||||
- add 0016-update-changelog.patch
|
|
||||||
|
|
||||||
* Thu May 09 2024 peijiankang <peijiankang@kylinos.cn> - 3.1.4-9
|
|
||||||
- add 0015-update-changelog.patch
|
|
||||||
|
|
||||||
* Wed May 08 2024 peijiankang <peijiankang@kylinos.cn> - 3.1.4-8
|
|
||||||
- add 0014-.patch
|
|
||||||
|
|
||||||
* Wed May 08 2024 peijiankang <peijiankang@kylinos.cn> - 3.1.4-7
|
|
||||||
- add 0013-update-changelog.patch
|
|
||||||
|
|
||||||
* Mon Apr 29 2024 peijiankang <peijiankang@kylinos.cn> - 3.1.4-6
|
* Mon Apr 29 2024 peijiankang <peijiankang@kylinos.cn> - 3.1.4-6
|
||||||
- add 0012-update-changelog.patch
|
- add 0012-update-changelog.patch
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user