Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 17:33:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: layout is empty

Browse Source 
Change-Id: I6a445afc97b226ebae48cc0c472bad8a5df39ea3
This commit is contained in:
石博文 2018-05-23 22:02:02 +08:00
parent 26ff05c56d
commit 59aaed5434
Notes: gerrit 2018-05-24 14:08:17 +08:00 
Verified+1: Anonymous Coward #1000004
Code-Review+2: sbwtw <sbw@sbw.so>
Submitted-by: sbwtw <sbw@sbw.so>
Submitted-at: Thu, 24 May 2018 14:08:17 +0800
Reviewed-on: https://cr.deepin.io/34980
Project: dde/dde-dock
Branch: refs/heads/master
3 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
plugins/keyboard-layout/dbusadaptors.cpp
View File

@ -26,10 +26,7 @@ DBusAdaptors::DBusAdaptors(QObject *parent)
"/com/deepin/daemon/InputDevice/Keyboard", "/com/deepin/daemon/InputDevice/Keyboard",
QDBusConnection::sessionBus(), this)) QDBusConnection::sessionBus(), this))
{ {
connect(m_keyboard, &Keyboard::CurrentLayoutChanged, this, connect(m_keyboard, &Keyboard::CurrentLayoutChanged, this, &DBusAdaptors::onLayoutChanged);
[=] {
emit layoutChanged(layout());
});
} }
DBusAdaptors::~DBusAdaptors() DBusAdaptors::~DBusAdaptors()
@ -38,5 +35,20 @@ DBusAdaptors::~DBusAdaptors()
QString DBusAdaptors::layout() const QString DBusAdaptors::layout() const
{ {
return QString(m_keyboard->currentLayout()).split(';').first(); const auto layouts = m_keyboard->currentLayout().split(';');
if (!layouts.isEmpty())
return layouts.first();
qWarning() << Q_FUNC_INFO << "layouts is Empty!!";
// re-fetch data.
QTimer::singleShot(1000, this, &DBusAdaptors::onLayoutChanged);
return QString();
}
void DBusAdaptors::onLayoutChanged()
{
emit layoutChanged(layout());
} }

3
plugins/keyboard-layout/dbusadaptors.h
View File

@ -46,6 +46,9 @@ public:
Q_PROPERTY(QString layout READ layout NOTIFY layoutChanged) Q_PROPERTY(QString layout READ layout NOTIFY layoutChanged)
QString layout() const; QString layout() const;
public slots:
void onLayoutChanged();
signals: signals:
void layoutChanged(QString text); void layoutChanged(QString text);

5
plugins/system-tray/indicatortraywidget.cpp
View File

@ -75,7 +75,6 @@ public:
auto propertyNameCStr = propertyName.toStdString(); auto propertyNameCStr = propertyName.toStdString();
propertyInterfaceNames.insert(key, dbusInterface); propertyInterfaceNames.insert(key, dbusInterface);
propertyNames.insert(key, QString::fromStdString(propertyNameCStr)); propertyNames.insert(key, QString::fromStdString(propertyNameCStr));
callback(interface.property(propertyNameCStr.c_str()));
QDBusConnection::sessionBus().connect(dbusService, QDBusConnection::sessionBus().connect(dbusService,
dbusPath, dbusPath,
"org.freedesktop.DBus.Properties", "org.freedesktop.DBus.Properties",
@ -93,6 +92,8 @@ public:
"s", "s",
q, q,
propertyChangedSlot); propertyChangedSlot);
callback(interface.property(propertyNameCStr.c_str()));
} }
} }
@ -177,7 +178,7 @@ void IndicatorTrayWidget::updateIcon()
const QImage IndicatorTrayWidget::trayImage() const QImage IndicatorTrayWidget::trayImage()
{ {
return grab().toImage(); return d_ptr->label->grab().toImage();
} }
void IndicatorTrayWidget::sendClick(uint8_t buttonIndex, int x, int y) void IndicatorTrayWidget::sendClick(uint8_t buttonIndex, int x, int y)