!16 close-cd: #I7CTM2, 解决选项下拉框退出按钮翻译未汉化，显示Exit问题 close-cd: #I72K2J, 解决应用打开文件添加音频文件，没有弹出添加成功弹窗问题
Merge pull request !16 from yusq77/openkylin/yangtze
This commit is contained in:
yusq77
Gitee
commit
057aa8c914
|
|
@ -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()
|
||||
|
|
|
|||
|
|
@ -138,6 +138,7 @@ private:
|
|||
//下一首
|
||||
QPushButton *nextBtn = nullptr;
|
||||
//音量
|
||||
QPoint volumePos = QPoint(0, 0);
|
||||
QPushButton *volumeBtn = nullptr;
|
||||
//我喜欢
|
||||
QPushButton *favBtn = nullptr;
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -1,3 +1,13 @@
|
|||
kylin-music (1.1.0.47-ok6~0726) yangtze; urgency=medium
|
||||
|
||||
* [BUG]
|
||||
- close-cd: #I7CTM2, 解决选项下拉框退出按钮翻译未汉化，显示Exit问题
|
||||
- close-cd: #I72K2J, 解决应用打开文件添加音频文件，没有弹出添加成功弹窗问题
|
||||
|
||||
* 其他： 无
|
||||
|
||||
-- yushuoqi <yushuoqi@kylinos.cn> Wed, 28 Jun 2023 15:44:59 +0800
|
||||
|
||||
kylin-music (1.1.0.47-ok6~0725) yangtze; urgency=medium
|
||||
|
||||
* [BUG]
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -247,49 +247,49 @@
|
|||
<translation>音量</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../UI/player/playsongarea.cpp" line="104"/>
|
||||
<location filename="../UI/player/playsongarea.cpp" line="106"/>
|
||||
<source>Favourite</source>
|
||||
<translation>收藏</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../UI/player/playsongarea.cpp" line="131"/>
|
||||
<location filename="../UI/player/playsongarea.cpp" line="147"/>
|
||||
<location filename="../UI/player/playsongarea.cpp" line="466"/>
|
||||
<location filename="../UI/player/playsongarea.cpp" line="512"/>
|
||||
<location filename="../UI/player/playsongarea.cpp" line="133"/>
|
||||
<location filename="../UI/player/playsongarea.cpp" line="149"/>
|
||||
<location filename="../UI/player/playsongarea.cpp" line="473"/>
|
||||
<location filename="../UI/player/playsongarea.cpp" line="519"/>
|
||||
<source>Loop</source>
|
||||
<translation>列表循环</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../UI/player/playsongarea.cpp" line="166"/>
|
||||
<location filename="../UI/player/playsongarea.cpp" line="168"/>
|
||||
<source>Play List</source>
|
||||
<translation>播放历史</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../UI/player/playsongarea.cpp" line="186"/>
|
||||
<location filename="../UI/player/playsongarea.cpp" line="538"/>
|
||||
<location filename="../UI/player/playsongarea.cpp" line="540"/>
|
||||
<location filename="../UI/player/playsongarea.cpp" line="635"/>
|
||||
<location filename="../UI/player/playsongarea.cpp" line="867"/>
|
||||
<location filename="../UI/player/playsongarea.cpp" line="895"/>
|
||||
<location filename="../UI/player/playsongarea.cpp" line="188"/>
|
||||
<location filename="../UI/player/playsongarea.cpp" line="545"/>
|
||||
<location filename="../UI/player/playsongarea.cpp" line="547"/>
|
||||
<location filename="../UI/player/playsongarea.cpp" line="642"/>
|
||||
<location filename="../UI/player/playsongarea.cpp" line="875"/>
|
||||
<location filename="../UI/player/playsongarea.cpp" line="903"/>
|
||||
<source>Music Player</source>
|
||||
<translation>音乐</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../UI/player/playsongarea.cpp" line="187"/>
|
||||
<location filename="../UI/player/playsongarea.cpp" line="189"/>
|
||||
<source>00:00/00:00</source>
|
||||
<translation>00:00/00:00</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../UI/player/playsongarea.cpp" line="409"/>
|
||||
<location filename="../UI/player/playsongarea.cpp" line="426"/>
|
||||
<location filename="../UI/player/playsongarea.cpp" line="416"/>
|
||||
<location filename="../UI/player/playsongarea.cpp" line="433"/>
|
||||
<source>I Love</source>
|
||||
<translation>我喜欢</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../UI/player/playsongarea.cpp" line="139"/>
|
||||
<location filename="../UI/player/playsongarea.cpp" line="149"/>
|
||||
<location filename="../UI/player/playsongarea.cpp" line="475"/>
|
||||
<location filename="../UI/player/playsongarea.cpp" line="517"/>
|
||||
<location filename="../UI/player/playsongarea.cpp" line="141"/>
|
||||
<location filename="../UI/player/playsongarea.cpp" line="151"/>
|
||||
<location filename="../UI/player/playsongarea.cpp" line="482"/>
|
||||
<location filename="../UI/player/playsongarea.cpp" line="524"/>
|
||||
<source>Random</source>
|
||||
<translation>随机播放</translation>
|
||||
</message>
|
||||
|
|
@ -298,10 +298,10 @@
|
|||
<translation type="vanished">顺序播放</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../UI/player/playsongarea.cpp" line="123"/>
|
||||
<location filename="../UI/player/playsongarea.cpp" line="151"/>
|
||||
<location filename="../UI/player/playsongarea.cpp" line="492"/>
|
||||
<location filename="../UI/player/playsongarea.cpp" line="502"/>
|
||||
<location filename="../UI/player/playsongarea.cpp" line="125"/>
|
||||
<location filename="../UI/player/playsongarea.cpp" line="153"/>
|
||||
<location filename="../UI/player/playsongarea.cpp" line="499"/>
|
||||
<location filename="../UI/player/playsongarea.cpp" line="509"/>
|
||||
<source>CurrentItemInLoop</source>
|
||||
<translation>单曲循环</translation>
|
||||
</message>
|
||||
|
|
@ -343,50 +343,50 @@
|
|||
<context>
|
||||
<name>SideBarWidget</name>
|
||||
<message>
|
||||
<location filename="../UI/sidebar/sidebarwidget.cpp" line="32"/>
|
||||
<location filename="../UI/sidebar/sidebarwidget.cpp" line="55"/>
|
||||
<source>Music Player</source>
|
||||
<translation>音乐</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../UI/sidebar/sidebarwidget.cpp" line="50"/>
|
||||
<location filename="../UI/sidebar/sidebarwidget.cpp" line="73"/>
|
||||
<source>Library</source>
|
||||
<translation>音乐库</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../UI/sidebar/sidebarwidget.cpp" line="59"/>
|
||||
<location filename="../UI/sidebar/sidebarwidget.cpp" line="82"/>
|
||||
<source>Song List</source>
|
||||
<translation>歌曲列表</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../UI/sidebar/sidebarwidget.cpp" line="71"/>
|
||||
<location filename="../UI/sidebar/sidebarwidget.cpp" line="94"/>
|
||||
<source>My PlayList</source>
|
||||
<translation>我的歌单</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../UI/sidebar/sidebarwidget.cpp" line="115"/>
|
||||
<location filename="../UI/sidebar/sidebarwidget.cpp" line="321"/>
|
||||
<location filename="../UI/sidebar/sidebarwidget.cpp" line="139"/>
|
||||
<location filename="../UI/sidebar/sidebarwidget.cpp" line="345"/>
|
||||
<source>New Playlist</source>
|
||||
<translation>新建歌单</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../UI/sidebar/sidebarwidget.cpp" line="119"/>
|
||||
<location filename="../UI/sidebar/sidebarwidget.cpp" line="143"/>
|
||||
<source>Rename</source>
|
||||
<translation>重命名</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../UI/sidebar/sidebarwidget.cpp" line="229"/>
|
||||
<location filename="../UI/sidebar/sidebarwidget.cpp" line="253"/>
|
||||
<source>I Love</source>
|
||||
<translation>我喜欢</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../UI/sidebar/sidebarwidget.cpp" line="280"/>
|
||||
<location filename="../UI/sidebar/sidebarwidget.cpp" line="368"/>
|
||||
<location filename="../UI/sidebar/sidebarwidget.cpp" line="304"/>
|
||||
<location filename="../UI/sidebar/sidebarwidget.cpp" line="392"/>
|
||||
<source>Prompt information</source>
|
||||
<translation>提示信息</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../UI/sidebar/sidebarwidget.cpp" line="280"/>
|
||||
<location filename="../UI/sidebar/sidebarwidget.cpp" line="368"/>
|
||||
<location filename="../UI/sidebar/sidebarwidget.cpp" line="304"/>
|
||||
<location filename="../UI/sidebar/sidebarwidget.cpp" line="392"/>
|
||||
<source>Single song name already exists!!!</source>
|
||||
<translation>歌单名已存在！</translation>
|
||||
</message>
|
||||
|
|
@ -790,7 +790,7 @@
|
|||
<location filename="../UI/titlebar/menumodule.cpp" line="50"/>
|
||||
<location filename="../UI/titlebar/menumodule.cpp" line="146"/>
|
||||
<source>Exit</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>退出</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../UI/titlebar/menumodule.cpp" line="57"/>
|
||||
|
|
|
|||
Loading…
Reference in New Issue