Merge branch '2309-0706' into 'yhkylin/v101'
修改桌面通知action字段顺序 fix bug 180643 180606 180250 See merge request kylinos-src/kylin-nm!205
This commit is contained in:
commit
4c05f18a78
|
@ -129,8 +129,8 @@ void SinglePage::showDesktopNotify(const QString &message, QString soundName)
|
|||
"org.freedesktop.Notifications",
|
||||
QDBusConnection::sessionBus());
|
||||
QStringList actions; //跳转动作
|
||||
actions.append("kylin-vpn");
|
||||
actions.append("default"); //默认动作:点击消息体时打开麒麟录音
|
||||
actions.append("default");
|
||||
actions.append("kylin-vpn"); //默认动作:点击消息体时打开麒麟录音
|
||||
QMap<QString, QVariant> hints;
|
||||
if (!soundName.isEmpty()) {
|
||||
hints.insert("sound-name",soundName); //添加声音
|
||||
|
|
|
@ -158,8 +158,8 @@ void ListItem::showDesktopNotify(const QString &message, QString soundName)
|
|||
"org.freedesktop.Notifications",
|
||||
QDBusConnection::sessionBus());
|
||||
QStringList actions; //跳转动作
|
||||
actions.append("kylin-nm");
|
||||
actions.append("default"); //默认动作:点击消息体时打开麒麟录音
|
||||
actions.append("default");
|
||||
actions.append("kylin-nm"); //默认动作:点击消息体时打开麒麟录音
|
||||
QMap<QString, QVariant> hints;
|
||||
if (!soundName.isEmpty()) {
|
||||
hints.insert("sound-name",soundName); //添加声音
|
||||
|
|
|
@ -65,8 +65,8 @@ void NetDetail::showDesktopNotify(const QString &message, QString soundName)
|
|||
"org.freedesktop.Notifications",
|
||||
QDBusConnection::sessionBus());
|
||||
QStringList actions; //跳转动作
|
||||
actions.append("kylin-nm");
|
||||
actions.append("default"); //默认动作:点击消息体时打开麒麟录音
|
||||
actions.append("default");
|
||||
actions.append("kylin-nm"); //默认动作:点击消息体时打开麒麟录音
|
||||
QMap<QString, QVariant> hints;
|
||||
if (!soundName.isEmpty()) {
|
||||
hints.insert("sound-name", soundName); //添加声音
|
||||
|
|
|
@ -315,8 +315,8 @@ void TabPage::showDesktopNotify(const QString &message, QString soundName)
|
|||
"org.freedesktop.Notifications",
|
||||
QDBusConnection::sessionBus());
|
||||
QStringList actions; //跳转动作
|
||||
actions.append("kylin-nm");
|
||||
actions.append("default"); //默认动作:点击消息体时打开麒麟录音
|
||||
actions.append("default");
|
||||
actions.append("kylin-nm"); //默认动作:点击消息体时打开麒麟录音
|
||||
QMap<QString, QVariant> hints;
|
||||
if (!soundName.isEmpty()) {
|
||||
hints.insert("sound-name",soundName); //添加声音
|
||||
|
|
Loading…
Reference in New Issue