From 4a74be08e810560aa8531dda4d3380ef9f098ed3 Mon Sep 17 00:00:00 2001 From: yushuoqi Date: Wed, 28 Jun 2023 16:00:31 +0800 Subject: [PATCH] =?UTF-8?q?close-cd:=20#I7CTM2,=20=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E9=80=89=E9=A1=B9=E4=B8=8B=E6=8B=89=E6=A1=86=E9=80=80=E5=87=BA?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=BF=BB=E8=AF=91=E6=9C=AA=E6=B1=89=E5=8C=96?= =?UTF-8?q?=EF=BC=8C=E6=98=BE=E7=A4=BAExit=E9=97=AE=E9=A2=98=20close-cd:?= =?UTF-8?q?=20#I72K2J,=20=E8=A7=A3=E5=86=B3=E5=BA=94=E7=94=A8=E6=89=93?= =?UTF-8?q?=E5=BC=80=E6=96=87=E4=BB=B6=E6=B7=BB=E5=8A=A0=E9=9F=B3=E9=A2=91?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=8C=E6=B2=A1=E6=9C=89=E5=BC=B9=E5=87=BA?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=88=90=E5=8A=9F=E5=BC=B9=E7=AA=97=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- UI/player/playsongarea.cpp | 14 ++++-- UI/player/playsongarea.h | 1 + UI/player/sliderwidget.cpp | 2 +- debian/changelog | 10 +++++ translations/kylin-music_zh_CN.qm | Bin 7995 -> 8042 bytes translations/kylin-music_zh_CN.ts | 72 +++++++++++++++--------------- 6 files changed, 59 insertions(+), 40 deletions(-) diff --git a/UI/player/playsongarea.cpp b/UI/player/playsongarea.cpp index 8153ed7..d485666 100644 --- a/UI/player/playsongarea.cpp +++ b/UI/player/playsongarea.cpp @@ -82,8 +82,10 @@ void PlaySongArea::initWidget() hint.decorations = MWM_DECOR_BORDER; XAtomHelper::getInstance()->setWindowMotifHint(m_volSliderWid->winId(), hint); } - moveVolSliderWid(); + kdk::UkuiStyleHelper::self()->removeHeader((QWidget *)m_volSliderWid); m_volSliderWid->hide(); + moveVolSliderWid(); + kdk::WindowManager::setGeometry(m_volSliderWid->windowHandle(), QRect(volumePos, m_volSliderWid->size())); m_playBackModeWid = new PlayBackModeWidget(this); if (! WidgetStyle::isWayland) { @@ -359,13 +361,18 @@ void PlaySongArea::slotVolSliderWidget() { if(m_volSliderWid->isVisible()) { + kdk::UkuiStyleHelper::self()->removeHeader((QWidget *)m_volSliderWid); m_volSliderWid->hide(); + moveVolSliderWid(); + kdk::WindowManager::setGeometry(m_volSliderWid->windowHandle(), QRect(volumePos, m_volSliderWid->size())); } else { + kdk::UkuiStyleHelper::self()->removeHeader((QWidget *)m_volSliderWid); m_volSliderWid->show(); m_volSliderWid->raise(); moveVolSliderWid(); + kdk::WindowManager::setGeometry(m_volSliderWid->windowHandle(), QRect(volumePos, m_volSliderWid->size())); } } @@ -678,7 +685,7 @@ void PlaySongArea::resizeEvent(QResizeEvent *event) void PlaySongArea::moveVolSliderWid() { - QPoint volumePos = volumeBtn->mapToGlobal(volumeBtn->rect().center()); + volumePos = volumeBtn->mapToGlobal(volumeBtn->rect().center()); qDebug() << "volumePos: " << volumePos; m_volSliderWid->adjustSize(); @@ -691,7 +698,8 @@ void PlaySongArea::moveVolSliderWid() m_volSliderWid->changeVolumePos(newPosX, newPosY, volumSize.width(), volumSize.height()); - m_volSliderWid->move(volumePos); + +// m_volSliderWid->move(volumePos); } void PlaySongArea::movePlayModeWid() diff --git a/UI/player/playsongarea.h b/UI/player/playsongarea.h index 5fabb52..64261e5 100644 --- a/UI/player/playsongarea.h +++ b/UI/player/playsongarea.h @@ -138,6 +138,7 @@ private: //下一首 QPushButton *nextBtn = nullptr; //音量 + QPoint volumePos = QPoint(0, 0); QPushButton *volumeBtn = nullptr; //我喜欢 QPushButton *favBtn = nullptr; diff --git a/UI/player/sliderwidget.cpp b/UI/player/sliderwidget.cpp index 30845b9..238c439 100644 --- a/UI/player/sliderwidget.cpp +++ b/UI/player/sliderwidget.cpp @@ -7,7 +7,7 @@ SliderWidget::SliderWidget(QWidget *parent) : QDialog(parent) { installEventFilter(this); - setWindowFlags(Qt::Popup | Qt::FramelessWindowHint | Qt::NoDropShadowWindowHint); + setWindowFlags(Qt::Popup | Qt::FramelessWindowHint | Qt::NoDropShadowWindowHint | Qt::BypassWindowManagerHint); setAttribute(Qt::WA_StyledBackground,true); // setAttribute(Qt::WA_TranslucentBackground, true); // this->setAttribute(Qt::WA_DeleteOnClose); diff --git a/debian/changelog b/debian/changelog index 7e3182e..1c520fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +kylin-music (1.1.0.47-ok6~0726) yangtze; urgency=medium + + * [BUG] + - close-cd: #I7CTM2, 解决选项下拉框退出按钮翻译未汉化，显示Exit问题 + - close-cd: #I72K2J, 解决应用打开文件添加音频文件，没有弹出添加成功弹窗问题 + + * 其他： 无 + + -- yushuoqi Wed, 28 Jun 2023 15:44:59 +0800 + kylin-music (1.1.0.47-ok6~0725) yangtze; urgency=medium * [BUG] diff --git a/translations/kylin-music_zh_CN.qm b/translations/kylin-music_zh_CN.qm index 6830d7b72302ba08602a50d5cf006eb73440837f..d3f2347a59f1dc36e91291c416b2cfcb3aa28918 100644 GIT binary patch delta 152 zcmdmO_sVX92qVWtQ6;|fEDQ|drx{q@7y#){6K%yg4>GXYgfcKlI8Kbs=geTR6PU!n zAoXVARW&9F$%%i(8Ba_WW$a^;lAFAgF`seTWKkwFCTZ!(zD(te(DxEG{&GA@COmP@aJeh*?}KGD{{i%86`#DILTN E0IC!zdjJ3c delta 155 zcmaE5x7%)l2qVKpQ6;rE1`G`1rx{qy5*QfR?I1MAHV7>>i-FZ9lz~A)YGP_Wrz3-% zz$69+siPC`s!54|VhB0;nSp_;has$IDgy(X4@1-&Qw9dfg_C6&`dWL%rgFxD$!D3&IpaAO$T9%cot(_ee4NpI@>OOZM#araEEmK#OUeW?0|4id BDJK8` diff --git a/translations/kylin-music_zh_CN.ts b/translations/kylin-music_zh_CN.ts index d841da1..77dbcef 100644 --- a/translations/kylin-music_zh_CN.ts +++ b/translations/kylin-music_zh_CN.ts @@ -247,49 +247,49 @@ 音量 - + Favourite 收藏 - - - - + + + + Loop 列表循环 - + Play List 播放历史 - - - - - - + + + + + + Music Player 音乐 - + 00:00/00:00 00:00/00:00 - - + + I Love 我喜欢 - - - - + + + + Random 随机播放 @@ -298,10 +298,10 @@ 顺序播放 - - - - + + + + CurrentItemInLoop 单曲循环 @@ -343,50 +343,50 @@ SideBarWidget - + Music Player 音乐 - + Library 音乐库 - + Song List 歌曲列表 - + My PlayList 我的歌单 - - + + New Playlist 新建歌单 - + Rename 重命名 - + I Love 我喜欢 - - + + Prompt information 提示信息 - - + + Single song name already exists!!! 歌单名已存在！ @@ -790,7 +790,7 @@ Exit - + 退出