openkylin
/
ukui-bluetooth
mirror of https://gitee.com/openkylin/ukui-bluetooth.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

!75 fix some bugs and edit changelog 

Merge pull request !75 from 李享/openkylin/nile
This commit is contained in:
邓托 2024-02-23 08:20:53 +00:00 committed by Gitee
parent 0d1e50977b 93af1c4979
commit f526b69939
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
debian/changelog vendored
View File

@ -1,3 +1,16 @@
ukui-bluetooth (4.10.1.0-ok2.3) nile; urgency=medium
* Bug号码:#I8WMEC【次要】【蓝牙】侧边栏蓝牙发送成功通知存在英文，鼠标悬浮关闭按钮无提示
* #I8WL1S【wayland】【次要】蓝牙部分弹窗缺少标题栏图标、标题栏和关闭按钮
* ##I8WN86 【wayland】【wlcom】【次要】【蓝牙】蓝牙发送文件时，点击任务栏蓝牙图标，打开的任务栏蓝牙界面位置错误
* #I8WXSF 【wayland】【wlcom】【次要】【蓝牙】打开任务栏蓝牙界面，任务栏有蓝牙图标
* #I8XVIN 【次要】【蓝牙】【需求26954】任务栏蓝牙窗口未适配“窗口圆角”设置
* 需求号:无
* 其他改动说明:无
* 其他改动影响域:无
-- lixiang1 <lixiang1@kylinos.cn> Fri, 23 Feb 2024 16:12:22 +0800
ukui-bluetooth (4.10.1.0-ok2.2) nile; urgency=medium ukui-bluetooth (4.10.1.0-ok2.2) nile; urgency=medium
* Bug号码:#I8WMEC【次要】【蓝牙】侧边栏蓝牙发送成功通知存在英文，鼠标悬浮关闭按钮无提示 * Bug号码:#I8WMEC【次要】【蓝牙】侧边栏蓝牙发送成功通知存在英文，鼠标悬浮关闭按钮无提示

37
ukui-bluetooth/main/mainprogram.cpp
View File

@ -34,6 +34,7 @@ MainProgram::MainProgram(bool env, QObject *parent) :
initGSettingInfo(); initGSettingInfo();
UI = TrayWidget::self(_sessionDbus, _mIntel); UI = TrayWidget::self(_sessionDbus, _mIntel);
kdk::UkuiStyleHelper::self()->removeHeader(UI);
replyTimer = new QTimer(this); replyTimer = new QTimer(this);
if (!_mIntel) if (!_mIntel)
@ -226,9 +227,9 @@ void MainProgram::sendTransferDeviceMesgSlot(QString address)
connect(_sessionDbus,&BluetoothDbus::powerChangedSignal,fileSendWidget,&BluetoothFileTransferWidget::powerChanged); connect(_sessionDbus,&BluetoothDbus::powerChangedSignal,fileSendWidget,&BluetoothFileTransferWidget::powerChanged);
connect(_sessionDbus,&BluetoothDbus::devAttrChanged, fileSendWidget, &BluetoothFileTransferWidget::devattrChanged); connect(_sessionDbus,&BluetoothDbus::devAttrChanged, fileSendWidget, &BluetoothFileTransferWidget::devattrChanged);
if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"),Qt::CaseInsensitive)) { // if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"),Qt::CaseInsensitive)) {
kdk::UkuiStyleHelper::self()->removeHeader(fileSendWidget); // kdk::UkuiStyleHelper::self()->removeHeader(fileSendWidget);
} // }
fileSendWidget->show(); fileSendWidget->show();
Config::setKdkGeometry(fileSendWidget->windowHandle(), fileSendWidget->width(), fileSendWidget->height(), true); Config::setKdkGeometry(fileSendWidget->windowHandle(), fileSendWidget->width(), fileSendWidget->height(), true);
} }
@ -249,9 +250,9 @@ void MainProgram::sendTransferDeviceMesgSlot(QString address)
connect(_sessionDbus,&BluetoothDbus::devAttrChanged, fileSendWidget, &BluetoothFileTransferWidget::devattrChanged); connect(_sessionDbus,&BluetoothDbus::devAttrChanged, fileSendWidget, &BluetoothFileTransferWidget::devattrChanged);
connect(_sessionDbus,&BluetoothDbus::powerChangedSignal,fileSendWidget,&BluetoothFileTransferWidget::powerChanged); connect(_sessionDbus,&BluetoothDbus::powerChangedSignal,fileSendWidget,&BluetoothFileTransferWidget::powerChanged);
if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"),Qt::CaseInsensitive)) { // if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"),Qt::CaseInsensitive)) {
kdk::UkuiStyleHelper::self()->removeHeader(fileSendWidget); // kdk::UkuiStyleHelper::self()->removeHeader(fileSendWidget);
} // }
fileSendWidget->show(); fileSendWidget->show();
Config::setKdkGeometry(fileSendWidget->windowHandle(), fileSendWidget->width(), fileSendWidget->height(), true); Config::setKdkGeometry(fileSendWidget->windowHandle(), fileSendWidget->width(), fileSendWidget->height(), true);
} else { } else {
@ -286,9 +287,9 @@ void MainProgram::sendTransferFilesMesgSlot(QStringList targetList)
connect(_sessionDbus,&BluetoothDbus::devAttrChanged, fileSendWidget, &BluetoothFileTransferWidget::devattrChanged); connect(_sessionDbus,&BluetoothDbus::devAttrChanged, fileSendWidget, &BluetoothFileTransferWidget::devattrChanged);
connect(_sessionDbus,&BluetoothDbus::powerChangedSignal,fileSendWidget,&BluetoothFileTransferWidget::powerChanged); connect(_sessionDbus,&BluetoothDbus::powerChangedSignal,fileSendWidget,&BluetoothFileTransferWidget::powerChanged);
if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"),Qt::CaseInsensitive)) { // if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"),Qt::CaseInsensitive)) {
kdk::UkuiStyleHelper::self()->removeHeader(fileSendWidget); // kdk::UkuiStyleHelper::self()->removeHeader(fileSendWidget);
} // }
fileSendWidget->show(); fileSendWidget->show();
Config::setKdkGeometry(fileSendWidget->windowHandle(), fileSendWidget->width(), fileSendWidget->height(), true); Config::setKdkGeometry(fileSendWidget->windowHandle(), fileSendWidget->width(), fileSendWidget->height(), true);
} }
@ -308,9 +309,9 @@ void MainProgram::sendTransferFilesMesgSlot(QStringList targetList)
connect(_sessionDbus,&BluetoothDbus::devAttrChanged, fileSendWidget, &BluetoothFileTransferWidget::devattrChanged); connect(_sessionDbus,&BluetoothDbus::devAttrChanged, fileSendWidget, &BluetoothFileTransferWidget::devattrChanged);
connect(_sessionDbus,&BluetoothDbus::powerChangedSignal,fileSendWidget,&BluetoothFileTransferWidget::powerChanged); connect(_sessionDbus,&BluetoothDbus::powerChangedSignal,fileSendWidget,&BluetoothFileTransferWidget::powerChanged);
if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"),Qt::CaseInsensitive)) { // if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"),Qt::CaseInsensitive)) {
kdk::UkuiStyleHelper::self()->removeHeader(fileSendWidget); // kdk::UkuiStyleHelper::self()->removeHeader(fileSendWidget);
} // }
fileSendWidget->show(); fileSendWidget->show();
Config::setKdkGeometry(fileSendWidget->windowHandle(), fileSendWidget->width(), fileSendWidget->height(), true); Config::setKdkGeometry(fileSendWidget->windowHandle(), fileSendWidget->width(), fileSendWidget->height(), true);
} else { } else {
@ -354,9 +355,9 @@ void MainProgram::displayPasskeySlot(QString dev, QString name, QString passkey)
const KWindowInfo info(Keypincodewidget->winId(), NET::WMState); const KWindowInfo info(Keypincodewidget->winId(), NET::WMState);
if (!info.hasState(NET::SkipTaskbar) || !info.hasState(NET::SkipPager)) if (!info.hasState(NET::SkipTaskbar) || !info.hasState(NET::SkipPager))
KWindowSystem::setState(Keypincodewidget->winId(), NET::SkipTaskbar | NET::SkipPager); KWindowSystem::setState(Keypincodewidget->winId(), NET::SkipTaskbar | NET::SkipPager);
if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"),Qt::CaseInsensitive)) { // if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"),Qt::CaseInsensitive)) {
kdk::UkuiStyleHelper::self()->removeHeader(Keypincodewidget); // kdk::UkuiStyleHelper::self()->removeHeader(Keypincodewidget);
} // }
Keypincodewidget->show(); Keypincodewidget->show();
Keypincodewidget->activateWindow(); Keypincodewidget->activateWindow();
Config::setKdkGeometry(Keypincodewidget->windowHandle(), Config::setKdkGeometry(Keypincodewidget->windowHandle(),
@ -413,9 +414,9 @@ void MainProgram::requestConfirmationSlot(QString dev, QString name, QString pas
const KWindowInfo info(pincodewidget->winId(), NET::WMState); const KWindowInfo info(pincodewidget->winId(), NET::WMState);
if (!info.hasState(NET::SkipTaskbar) || !info.hasState(NET::SkipPager)) if (!info.hasState(NET::SkipTaskbar) || !info.hasState(NET::SkipPager))
KWindowSystem::setState(pincodewidget->winId(), NET::SkipTaskbar | NET::SkipPager); KWindowSystem::setState(pincodewidget->winId(), NET::SkipTaskbar | NET::SkipPager);
if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"),Qt::CaseInsensitive)) { // if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"),Qt::CaseInsensitive)) {
kdk::UkuiStyleHelper::self()->removeHeader(pincodewidget); // kdk::UkuiStyleHelper::self()->removeHeader(pincodewidget);
} // }
pincodewidget->show(); pincodewidget->show();
pincodewidget->activateWindow(); pincodewidget->activateWindow();
Config::setKdkGeometry(pincodewidget->windowHandle(), Config::setKdkGeometry(pincodewidget->windowHandle(),

2
ukui-bluetooth/popwidget/bluetoothfiletransferwidget.cpp
View File

@ -152,7 +152,6 @@ BluetoothFileTransferWidget::BluetoothFileTransferWidget(QStringList files, QMap
selectedDev->setIcon(0, QIcon(Config::loadSvg(selectedDev->icon(0).pixmap(64,64), Config::PixmapColor::WHITE))); selectedDev->setIcon(0, QIcon(Config::loadSvg(selectedDev->icon(0).pixmap(64,64), Config::PixmapColor::WHITE)));
} }
selectedDev = toolbutton_list.value(cnt); selectedDev = toolbutton_list.value(cnt);
selectedDev->setIcon(0, QIcon(Config::loadSvg(selectedDev->icon(0).pixmap(64,64), Config::PixmapColor::WHITE)));
if (!ok_btn->isEnabled()) if (!ok_btn->isEnabled())
ok_btn->setEnabled(true); ok_btn->setEnabled(true);
}); });
@ -165,7 +164,6 @@ BluetoothFileTransferWidget::BluetoothFileTransferWidget(QStringList files, QMap
selectedDev->setIcon(0, QIcon(Config::loadSvg(selectedDev->icon(0).pixmap(64,64), Config::PixmapColor::WHITE))); selectedDev->setIcon(0, QIcon(Config::loadSvg(selectedDev->icon(0).pixmap(64,64), Config::PixmapColor::WHITE)));
} }
selectedDev = item; selectedDev = item;
selectedDev->setIcon(0, QIcon(Config::loadSvg(selectedDev->icon(0).pixmap(64,64), Config::PixmapColor::WHITE)));
if (!ok_btn->isEnabled()) if (!ok_btn->isEnabled())
ok_btn->setEnabled(true); ok_btn->setEnabled(true);
}); });