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

Merge branch 'maintain/5.0' into uos

Browse Source 
# Conflicts:
#	frame/util/docksettings.cpp
#	frame/util/docksettings.h
#	frame/window/mainwindow.cpp
#	frame/window/mainwindow.h
#	plugins/power/power.qrc
This commit is contained in:
范朋程 2020-07-06 14:07:56 +08:00
commit 3fa69b4201
30 changed files with 146 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frame/util/abstractpluginscontroller.cpp
View File

@ -165,7 +165,7 @@ void AbstractPluginsController::loadPlugin(const QString &pluginFile)
const QString &pluginApi = meta.value("api").toString();
bool pluginIsValid = true;
if (pluginApi.isEmpty() || !CompatiblePluginApiList.contains(pluginApi)) {
qWarning() << objectName()
qDebug() << objectName()
<< "plugin api version not matched! expect versions:" << CompatiblePluginApiList
<< ", got version:" << pluginApi
<< ", the plugin file is:" << pluginFile;
@ -175,7 +175,7 @@ void AbstractPluginsController::loadPlugin(const QString &pluginFile)
PluginsItemInterface *interface = qobject_cast<PluginsItemInterface *>(pluginLoader->instance());
if (!interface) {
qWarning() << objectName() << "load plugin failed!!!" << pluginLoader->errorString() << pluginFile;
qDebug() << objectName() << "load plugin failed!!!" << pluginLoader->errorString() << pluginFile;
pluginLoader->unload();
pluginLoader->deleteLater();

2
frame/util/dockpopupwindow.cpp
View File

@ -42,7 +42,7 @@ DockPopupWindow::DockPopupWindow(QWidget *parent)
compositeChanged();
setWindowFlags(Qt::X11BypassWindowManagerHint | Qt::WindowStaysOnTopHint | Qt::WindowDoesNotAcceptFocus);
setWindowFlags(Qt::X11BypassWindowManagerHint | Qt::WindowStaysOnTopHint);
setAttribute(Qt::WA_InputMethodEnabled, false);
connect(m_acceptDelayTimer, &QTimer::timeout, this, &DockPopupWindow::accept);

3
frame/window/mainwindow.cpp
View File

@ -492,7 +492,8 @@ void MainWindow::initConnections()
connect(m_wmHelper, &DWindowManagerHelper::hasCompositeChanged, this, &MainWindow::compositeChanged, Qt::QueuedConnection);
connect(&m_platformWindowHandle, &DPlatformWindowHandle::frameMarginsChanged, m_shadowMaskOptimizeTimer, static_cast<void (QTimer::*)()>(&QTimer::start));
connect(m_dbusDaemonInterface, &QDBusConnectionInterface::serviceOwnerChanged, this, &MainWindow::onDbusNameOwnerChanged);
if (m_dbusDaemonInterface && m_dbusDaemonInterface->isValid())
connect(m_dbusDaemonInterface, &QDBusConnectionInterface::serviceOwnerChanged, this, &MainWindow::onDbusNameOwnerChanged);
connect(DockItemManager::instance(), &DockItemManager::itemInserted, m_mainPanel, &MainPanelControl::insertItem, Qt::DirectConnection);
connect(DockItemManager::instance(), &DockItemManager::itemRemoved, m_mainPanel, &MainPanelControl::removeItem, Qt::DirectConnection);

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

@ -55,7 +55,7 @@ QString DBusAdaptors::layout() const
if (m_currentLayout.isEmpty()) {
// refetch data
QTimer::singleShot(1000, m_keyboard, &Keyboard::currentLayout);
qWarning() << Q_FUNC_INFO << "currentLayout is Empty!!";
qDebug() << Q_FUNC_INFO << "currentLayout is Empty!!";
}
return m_currentLayout;
@ -103,7 +103,7 @@ void DBusAdaptors::initAllLayoutList()
QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(call, this);
connect(watcher, &QDBusPendingCallWatcher::finished, this, [=] {
if (call.isError()) {
qWarning() << "failed to get all keyboard list: " << call.error().message();
qDebug() << "failed to get all keyboard list: " << call.error().message();
} else {
QDBusReply<KeyboardLayoutList> reply = call.reply();
m_allLayoutList = reply.value();

7
plugins/power/actions/battery-010-plugged-symbolic-dark_20px.svg Normal file
View File

@ -0,0 +1,7 @@
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
<g fill="none" fill-rule="evenodd" transform="translate(0 2)">
<path fill="#FF001F" d="M1,-1.70530257e-13 L1,8 C0.44771525,8 6.76353751e-17,7.55228475 0,7 L0,1 C-6.28042769e-17,0.487164161 0.38604019,0.0644928393 0.883378875,0.00672773133 L1,-1.70530257e-13 Z" transform="translate(2 4)"/>
<path fill="#000" d="M7.523,2 L7.193,2.999 L3,3 C1.8954305,3 1,3.8954305 1,5 L1,11 C1,12.1045695 1.8954305,13 3,13 L8,12.999 L8,13.999 L3,14 C1.34314575,14 0,12.6568542 0,11 L0,5 C0,3.34314575 1.34314575,2 3,2 L7.523,2 Z M15,2 C16.6568542,2 18,3.34314575 18,5 L18,11 C18,12.6568542 16.6568542,14 15,14 L10.477,13.999 L10.806,12.999 L15,13 C16.1045695,13 17,12.1045695 17,11 L17,5 C17,3.8954305 16.1045695,3 15,3 L10,2.999 L10,2 L15,2 Z M20,5 L20,11 L19,11 L19,5 L20,5 Z"/>
<polygon fill="#000" points="12 6 9 16 9 10 6 10 9 0 9 6"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 935 B

7
plugins/power/actions/battery-010-plugged-symbolic_20px.svg Normal file
View File

@ -0,0 +1,7 @@
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
<g fill="none" fill-rule="evenodd" transform="translate(0 2)">
<path fill="#FF001F" d="M1,-1.70530257e-13 L1,8 C0.44771525,8 6.76353751e-17,7.55228475 0,7 L0,1 C-6.28042769e-17,0.487164161 0.38604019,0.0644928393 0.883378875,0.00672773133 L1,-1.70530257e-13 Z" transform="translate(2 4)"/>
<path fill="#FFF" d="M7.523,2 L7.193,2.999 L3,3 C1.8954305,3 1,3.8954305 1,5 L1,11 C1,12.1045695 1.8954305,13 3,13 L8,12.999 L8,13.999 L3,14 C1.34314575,14 0,12.6568542 0,11 L0,5 C0,3.34314575 1.34314575,2 3,2 L7.523,2 Z M15,2 C16.6568542,2 18,3.34314575 18,5 L18,11 C18,12.6568542 16.6568542,14 15,14 L10.477,13.999 L10.806,12.999 L15,13 C16.1045695,13 17,12.1045695 17,11 L17,5 C17,3.8954305 16.1045695,3 15,3 L10,2.999 L10,2 L15,2 Z M20,5 L20,11 L19,11 L19,5 L20,5 Z"/>
<polygon fill="#FFF" points="12 6 9 16 9 10 6 10 9 0 9 6"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 935 B

6
plugins/power/actions/battery-010-symbolic-dark_20px.svg Normal file
View File

@ -0,0 +1,6 @@
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
<g fill="none" fill-rule="evenodd" transform="translate(0 4)">
<path fill="#FF001F" d="M1,-3.41060513e-13 L1,-3.41060513e-13 L1,-3.41060513e-13 L1,8 C0.44771525,8 6.76353751e-17,7.55228475 0,7 L0,1 C-6.76353751e-17,0.44771525 0.44771525,-3.4095906e-13 1,-3.41060513e-13 Z" transform="translate(2 2)"/>
<path fill="#000" d="M15,-4.61852778e-14 C16.6568542,-4.61852778e-14 18,1.34314575 18,3 L18,9 C18,10.6568542 16.6568542,12 15,12 L3,12 C1.34314575,12 0,10.6568542 0,9 L0,3 C0,1.34314575 1.34314575,-4.61852778e-14 3,-4.61852778e-14 L15,-4.61852778e-14 Z M15,1 L3,1 C1.8954305,1 1,1.8954305 1,3 L1,9 C1,10.1045695 1.8954305,11 3,11 L15,11 C16.1045695,11 17,10.1045695 17,9 L17,3 C17,1.8954305 16.1045695,1 15,1 Z M20,3 L20,9 L19,9 L19,3 L20,3 Z"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 856 B

6
plugins/power/actions/battery-010-symbolic_20px.svg Normal file
View File

@ -0,0 +1,6 @@
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
<g fill="none" fill-rule="evenodd" transform="translate(0 4)">
<path fill="#FF001F" d="M1,-3.41060513e-13 L1,-3.41060513e-13 L1,-3.41060513e-13 L1,8 C0.44771525,8 6.76353751e-17,7.55228475 0,7 L0,1 C-6.76353751e-17,0.44771525 0.44771525,-3.4095906e-13 1,-3.41060513e-13 Z" transform="translate(2 2)"/>
<path fill="#FFF" d="M15,-4.61852778e-14 C16.6568542,-4.61852778e-14 18,1.34314575 18,3 L18,9 C18,10.6568542 16.6568542,12 15,12 L3,12 C1.34314575,12 0,10.6568542 0,9 L0,3 C0,1.34314575 1.34314575,-4.61852778e-14 3,-4.61852778e-14 L15,-4.61852778e-14 Z M15,1 L3,1 C1.8954305,1 1,1.8954305 1,3 L1,9 C1,10.1045695 1.8954305,11 3,11 L15,11 C16.1045695,11 17,10.1045695 17,9 L17,3 C17,1.8954305 16.1045695,1 15,1 Z M20,3 L20,9 L19,9 L19,3 L20,3 Z"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 856 B

7
plugins/power/actions/battery-030-plugged-symbolic-dark_20px.svg Normal file
View File

@ -0,0 +1,7 @@
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
<g fill="none" fill-rule="evenodd" transform="translate(0 2)">
<path fill="#3ACB00" d="M4.863,-1.70530257e-13 L2.55699953,7 L5,6.999 L5,8 L1,8 C0.44771525,8 6.76353751e-17,7.55228475 0,7 L0,1 C-6.76353751e-17,0.44771525 0.44771525,-1.70428804e-13 1,-1.70530257e-13 L4.863,-1.70530257e-13 Z" transform="translate(2 4)"/>
<path fill="#000" d="M7.523,2 L7.193,2.999 L3,3 C1.8954305,3 1,3.8954305 1,5 L1,11 C1,12.1045695 1.8954305,13 3,13 L8,12.999 L8,13.999 L3,14 C1.34314575,14 0,12.6568542 0,11 L0,5 C0,3.34314575 1.34314575,2 3,2 L7.523,2 Z M15,2 C16.6568542,2 18,3.34314575 18,5 L18,11 C18,12.6568542 16.6568542,14 15,14 L10.477,13.999 L10.806,12.999 L15,13 C16.1045695,13 17,12.1045695 17,11 L17,5 C17,3.8954305 16.1045695,3 15,3 L10,2.999 L10,2 L15,2 Z M20,5 L20,11 L19,11 L19,5 L20,5 Z"/>
<polygon fill="#000" points="12 6 9 16 9 10 6 10 9 0 9 6"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 965 B

7
plugins/power/actions/battery-030-plugged-symbolic_20px.svg Normal file
View File

@ -0,0 +1,7 @@
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
<g fill="none" fill-rule="evenodd" transform="translate(0 2)">
<path fill="#3ACB00" d="M4.863,-1.70530257e-13 L2.55699953,7 L5,6.999 L5,8 L1,8 C0.44771525,8 6.76353751e-17,7.55228475 0,7 L0,1 C-6.76353751e-17,0.44771525 0.44771525,-1.70428804e-13 1,-1.70530257e-13 L4.863,-1.70530257e-13 Z" transform="translate(2 4)"/>
<path fill="#FFF" d="M7.523,2 L7.193,2.999 L3,3 C1.8954305,3 1,3.8954305 1,5 L1,11 C1,12.1045695 1.8954305,13 3,13 L8,12.999 L8,13.999 L3,14 C1.34314575,14 0,12.6568542 0,11 L0,5 C0,3.34314575 1.34314575,2 3,2 L7.523,2 Z M15,2 C16.6568542,2 18,3.34314575 18,5 L18,11 C18,12.6568542 16.6568542,14 15,14 L10.477,13.999 L10.806,12.999 L15,13 C16.1045695,13 17,12.1045695 17,11 L17,5 C17,3.8954305 16.1045695,3 15,3 L10,2.999 L10,2 L15,2 Z M20,5 L20,11 L19,11 L19,5 L20,5 Z"/>
<polygon fill="#FFF" points="12 6 9 16 9 10 6 10 9 0 9 6"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 965 B

6
plugins/power/actions/battery-030-symbolic-dark_20px.svg Normal file
View File

@ -0,0 +1,6 @@
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
<g fill="none" fill-rule="evenodd" transform="translate(0 4)">
<path fill="#FED027" d="M1,-6.82121026e-13 L4,-6.82121026e-13 L4,-6.82121026e-13 L4,8 L1,8 C0.44771525,8 6.76353751e-17,7.55228475 0,7 L0,1 C-6.76353751e-17,0.44771525 0.44771525,-6.82019573e-13 1,-6.82121026e-13 Z" transform="translate(2 2)"/>
<path fill="#000" d="M15,-4.61852778e-14 C16.6568542,-4.61852778e-14 18,1.34314575 18,3 L18,9 C18,10.6568542 16.6568542,12 15,12 L3,12 C1.34314575,12 0,10.6568542 0,9 L0,3 C0,1.34314575 1.34314575,-4.61852778e-14 3,-4.61852778e-14 L15,-4.61852778e-14 Z M15,1 L3,1 C1.8954305,1 1,1.8954305 1,3 L1,9 C1,10.1045695 1.8954305,11 3,11 L15,11 C16.1045695,11 17,10.1045695 17,9 L17,3 C17,1.8954305 16.1045695,1 15,1 Z M20,3 L20,9 L19,9 L19,3 L20,3 Z"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 862 B

6
plugins/power/actions/battery-030-symbolic_20px.svg Normal file
View File

@ -0,0 +1,6 @@
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
<g fill="none" fill-rule="evenodd" transform="translate(0 4)">
<path fill="#FED027" d="M1,-6.82121026e-13 L4,-6.82121026e-13 L4,-6.82121026e-13 L4,8 L1,8 C0.44771525,8 6.76353751e-17,7.55228475 0,7 L0,1 C-6.76353751e-17,0.44771525 0.44771525,-6.82019573e-13 1,-6.82121026e-13 Z" transform="translate(2 2)"/>
<path fill="#FFF" d="M15,-4.61852778e-14 C16.6568542,-4.61852778e-14 18,1.34314575 18,3 L18,9 C18,10.6568542 16.6568542,12 15,12 L3,12 C1.34314575,12 0,10.6568542 0,9 L0,3 C0,1.34314575 1.34314575,-4.61852778e-14 3,-4.61852778e-14 L15,-4.61852778e-14 Z M15,1 L3,1 C1.8954305,1 1,1.8954305 1,3 L1,9 C1,10.1045695 1.8954305,11 3,11 L15,11 C16.1045695,11 17,10.1045695 17,9 L17,3 C17,1.8954305 16.1045695,1 15,1 Z M20,3 L20,9 L19,9 L19,3 L20,3 Z"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 862 B

7
plugins/power/actions/battery-050-plugged-symbolic-dark_20px.svg Normal file
View File

@ -0,0 +1,7 @@
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
<g fill="none" fill-rule="evenodd" transform="translate(0 2)">
<path fill="#3ACB00" d="M4.863,0 L2.55699953,7 L6,7 L6,8 L6,8 L1,8 C0.44771525,8 6.76353751e-17,7.55228475 0,7 L0,1 C-6.76353751e-17,0.44771525 0.44771525,-1.70428804e-13 1,-1.70530257e-13 L4.863,0 Z" transform="translate(2 4)"/>
<path fill="#000" d="M7.523,2 L7.193,2.999 L3,3 C1.8954305,3 1,3.8954305 1,5 L1,11 C1,12.1045695 1.8954305,13 3,13 L8,12.999 L8,13.999 L3,14 C1.34314575,14 0,12.6568542 0,11 L0,5 C0,3.34314575 1.34314575,2 3,2 L7.523,2 Z M15,2 C16.6568542,2 18,3.34314575 18,5 L18,11 C18,12.6568542 16.6568542,14 15,14 L10.477,13.999 L10.806,12.999 L15,13 C16.1045695,13 17,12.1045695 17,11 L17,5 C17,3.8954305 16.1045695,3 15,3 L10,2.999 L10,2 L15,2 Z M20,5 L20,11 L19,11 L19,5 L20,5 Z"/>
<polygon fill="#000" points="12 6 9 16 9 10 6 10 9 0 9 6"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 938 B

7
plugins/power/actions/battery-050-plugged-symbolic_20px.svg Normal file
View File

@ -0,0 +1,7 @@
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
<g fill="none" fill-rule="evenodd" transform="translate(0 2)">
<path fill="#3ACB00" d="M4.863,0 L2.55699953,7 L6,7 L6,8 L6,8 L1,8 C0.44771525,8 6.76353751e-17,7.55228475 0,7 L0,1 C-6.76353751e-17,0.44771525 0.44771525,-1.70428804e-13 1,-1.70530257e-13 L4.863,0 Z" transform="translate(2 4)"/>
<path fill="#FFF" d="M7.523,2 L7.193,2.999 L3,3 C1.8954305,3 1,3.8954305 1,5 L1,11 C1,12.1045695 1.8954305,13 3,13 L8,12.999 L8,13.999 L3,14 C1.34314575,14 0,12.6568542 0,11 L0,5 C0,3.34314575 1.34314575,2 3,2 L7.523,2 Z M15,2 C16.6568542,2 18,3.34314575 18,5 L18,11 C18,12.6568542 16.6568542,14 15,14 L10.477,13.999 L10.806,12.999 L15,13 C16.1045695,13 17,12.1045695 17,11 L17,5 C17,3.8954305 16.1045695,3 15,3 L10,2.999 L10,2 L15,2 Z M20,5 L20,11 L19,11 L19,5 L20,5 Z"/>
<polygon fill="#FFF" points="12 6 9 16 9 10 6 10 9 0 9 6"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 938 B

6
plugins/power/actions/battery-050-symbolic-dark_20px.svg Normal file
View File

@ -0,0 +1,6 @@
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
<g fill="none" fill-rule="evenodd" transform="translate(0 4)">
<path fill="#3ACB00" d="M1,0 L7,0 L7,0 L7,8 L1,8 C0.44771525,8 6.76353751e-17,7.55228475 0,7 L0,1 C-6.76353751e-17,0.44771525 0.44771525,1.01453063e-16 1,0 Z" transform="translate(2 2)"/>
<path fill="#000" d="M15,-4.61852778e-14 C16.6568542,-4.61852778e-14 18,1.34314575 18,3 L18,9 C18,10.6568542 16.6568542,12 15,12 L3,12 C1.34314575,12 0,10.6568542 0,9 L0,3 C0,1.34314575 1.34314575,-4.61852778e-14 3,-4.61852778e-14 L15,-4.61852778e-14 Z M15,1 L3,1 C1.8954305,1 1,1.8954305 1,3 L1,9 C1,10.1045695 1.8954305,11 3,11 L15,11 C16.1045695,11 17,10.1045695 17,9 L17,3 C17,1.8954305 16.1045695,1 15,1 Z M20,3 L20,9 L19,9 L19,3 L20,3 Z"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 805 B

6
plugins/power/actions/battery-050-symbolic_20px.svg Normal file
View File

@ -0,0 +1,6 @@
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
<g fill="none" fill-rule="evenodd" transform="translate(0 4)">
<path fill="#3ACB00" d="M1,0 L7,0 L7,0 L7,8 L1,8 C0.44771525,8 6.76353751e-17,7.55228475 0,7 L0,1 C-6.76353751e-17,0.44771525 0.44771525,1.01453063e-16 1,0 Z" transform="translate(2 2)"/>
<path fill="#FFF" d="M15,-4.61852778e-14 C16.6568542,-4.61852778e-14 18,1.34314575 18,3 L18,9 C18,10.6568542 16.6568542,12 15,12 L3,12 C1.34314575,12 0,10.6568542 0,9 L0,3 C0,1.34314575 1.34314575,-4.61852778e-14 3,-4.61852778e-14 L15,-4.61852778e-14 Z M15,1 L3,1 C1.8954305,1 1,1.8954305 1,3 L1,9 C1,10.1045695 1.8954305,11 3,11 L15,11 C16.1045695,11 17,10.1045695 17,9 L17,3 C17,1.8954305 16.1045695,1 15,1 Z M20,3 L20,9 L19,9 L19,3 L20,3 Z"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 805 B

7
plugins/power/actions/battery-070-plugged-symbolic-dark_20px.svg Normal file
View File

@ -0,0 +1,7 @@
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
<g fill="none" fill-rule="evenodd" transform="translate(0 2)">
<path fill="#3ACB00" d="M4.863,-3.41060513e-13 L2.55699953,7 L6,7 L6,7.999 L1,8 C0.44771525,8 6.76353751e-17,7.55228475 0,7 L0,1 C-6.76353751e-17,0.44771525 0.44771525,-5.11489317e-13 1,-5.1159077e-13 L4.863,-3.41060513e-13 Z M9,0.999 L8,1 L8,-3.41060513e-13 L9,-5.1159077e-13 L9,0.999 Z" transform="translate(2 4)"/>
<path fill="#000" d="M7.523,2 L7.193,2.999 L3,3 C1.8954305,3 1,3.8954305 1,5 L1,11 C1,12.1045695 1.8954305,13 3,13 L8,12.999 L8,13.999 L3,14 C1.34314575,14 0,12.6568542 0,11 L0,5 C0,3.34314575 1.34314575,2 3,2 L7.523,2 Z M15,2 C16.6568542,2 18,3.34314575 18,5 L18,11 C18,12.6568542 16.6568542,14 15,14 L10.477,13.999 L10.806,12.999 L15,13 C16.1045695,13 17,12.1045695 17,11 L17,5 C17,3.8954305 16.1045695,3 15,3 L10,2.999 L10,2 L15,2 Z M20,5 L20,11 L19,11 L19,5 L20,5 Z"/>
<polygon fill="#000" points="12 6 9 16 9 10 6 10 9 0 9 6"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

7
plugins/power/actions/battery-070-plugged-symbolic_20px.svg Normal file
View File

@ -0,0 +1,7 @@
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
<g fill="none" fill-rule="evenodd" transform="translate(0 2)">
<path fill="#3ACB00" d="M4.863,-3.41060513e-13 L2.55699953,7 L6,7 L6,7.999 L1,8 C0.44771525,8 6.76353751e-17,7.55228475 0,7 L0,1 C-6.76353751e-17,0.44771525 0.44771525,-5.11489317e-13 1,-5.1159077e-13 L4.863,-3.41060513e-13 Z M9,0.999 L8,1 L8,-3.41060513e-13 L9,-5.1159077e-13 L9,0.999 Z" transform="translate(2 4)"/>
<path fill="#FFF" d="M7.523,2 L7.193,2.999 L3,3 C1.8954305,3 1,3.8954305 1,5 L1,11 C1,12.1045695 1.8954305,13 3,13 L8,12.999 L8,13.999 L3,14 C1.34314575,14 0,12.6568542 0,11 L0,5 C0,3.34314575 1.34314575,2 3,2 L7.523,2 Z M15,2 C16.6568542,2 18,3.34314575 18,5 L18,11 C18,12.6568542 16.6568542,14 15,14 L10.477,13.999 L10.806,12.999 L15,13 C16.1045695,13 17,12.1045695 17,11 L17,5 C17,3.8954305 16.1045695,3 15,3 L10,2.999 L10,2 L15,2 Z M20,5 L20,11 L19,11 L19,5 L20,5 Z"/>
<polygon fill="#FFF" points="12 6 9 16 9 10 6 10 9 0 9 6"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

6
plugins/power/actions/battery-070-symbolic-dark_20px.svg Normal file
View File

@ -0,0 +1,6 @@
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
<g fill="none" fill-rule="evenodd" transform="translate(0 4)">
<path fill="#3ACB00" d="M1,0 L9,0 L9,0 L9,8 L1,8 C0.44771525,8 6.76353751e-17,7.55228475 0,7 L0,1 C-6.76353751e-17,0.44771525 0.44771525,1.01453063e-16 1,0 Z" transform="translate(2 2)"/>
<path fill="#000" d="M15,-4.61852778e-14 C16.6568542,-4.61852778e-14 18,1.34314575 18,3 L18,9 C18,10.6568542 16.6568542,12 15,12 L3,12 C1.34314575,12 0,10.6568542 0,9 L0,3 C0,1.34314575 1.34314575,-4.61852778e-14 3,-4.61852778e-14 L15,-4.61852778e-14 Z M15,1 L3,1 C1.8954305,1 1,1.8954305 1,3 L1,9 C1,10.1045695 1.8954305,11 3,11 L15,11 C16.1045695,11 17,10.1045695 17,9 L17,3 C17,1.8954305 16.1045695,1 15,1 Z M20,3 L20,9 L19,9 L19,3 L20,3 Z"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 805 B

6
plugins/power/actions/battery-070-symbolic_20px.svg Normal file
View File

@ -0,0 +1,6 @@
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
<g fill="none" fill-rule="evenodd" transform="translate(0 4)">
<path fill="#3ACB00" d="M1,0 L9,0 L9,0 L9,8 L1,8 C0.44771525,8 6.76353751e-17,7.55228475 0,7 L0,1 C-6.76353751e-17,0.44771525 0.44771525,1.01453063e-16 1,0 Z" transform="translate(2 2)"/>
<path fill="#FFF" d="M15,-4.61852778e-14 C16.6568542,-4.61852778e-14 18,1.34314575 18,3 L18,9 C18,10.6568542 16.6568542,12 15,12 L3,12 C1.34314575,12 0,10.6568542 0,9 L0,3 C0,1.34314575 1.34314575,-4.61852778e-14 3,-4.61852778e-14 L15,-4.61852778e-14 Z M15,1 L3,1 C1.8954305,1 1,1.8954305 1,3 L1,9 C1,10.1045695 1.8954305,11 3,11 L15,11 C16.1045695,11 17,10.1045695 17,9 L17,3 C17,1.8954305 16.1045695,1 15,1 Z M20,3 L20,9 L19,9 L19,3 L20,3 Z"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 805 B

7
plugins/power/actions/battery-090-plugged-symbolic-dark_20px.svg Normal file
View File

@ -0,0 +1,7 @@
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
<g fill="none" fill-rule="evenodd" transform="translate(0 2)">
<path fill="#3ACB00" d="M4.863,-3.41060513e-13 L2.55699953,7 L6,7 L6,7.999 L1,8 C0.44771525,8 6.76353751e-17,7.55228475 0,7 L0,1 C-6.76353751e-17,0.44771525 0.44771525,-5.11489317e-13 1,-5.1159077e-13 L4.863,-3.41060513e-13 Z M13,-5.1159077e-13 L13,8 L9.136,7.999 L11.4430005,1 L8,1 L8,-3.41060513e-13 L13,-5.1159077e-13 Z" transform="translate(2 4)"/>
<path fill="#000" d="M7.523,2 L7.193,2.999 L3,3 C1.8954305,3 1,3.8954305 1,5 L1,11 C1,12.1045695 1.8954305,13 3,13 L8,12.999 L8,13.999 L3,14 C1.34314575,14 0,12.6568542 0,11 L0,5 C0,3.34314575 1.34314575,2 3,2 L7.523,2 Z M15,2 C16.6568542,2 18,3.34314575 18,5 L18,11 C18,12.6568542 16.6568542,14 15,14 L10.477,13.999 L10.806,12.999 L15,13 C16.1045695,13 17,12.1045695 17,11 L17,5 C17,3.8954305 16.1045695,3 15,3 L10,2.999 L10,2 L15,2 Z M20,5 L20,11 L19,11 L19,5 L20,5 Z"/>
<polygon fill="#000" points="12 6 9 16 9 10 6 10 9 0 9 6"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

7
plugins/power/actions/battery-090-plugged-symbolic_20px.svg Normal file
View File

@ -0,0 +1,7 @@
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
<g fill="none" fill-rule="evenodd" transform="translate(0 2)">
<path fill="#3ACB00" d="M4.863,-3.41060513e-13 L2.55699953,7 L6,7 L6,7.999 L1,8 C0.44771525,8 6.76353751e-17,7.55228475 0,7 L0,1 C-6.76353751e-17,0.44771525 0.44771525,-5.11489317e-13 1,-5.1159077e-13 L4.863,-3.41060513e-13 Z M13,-5.1159077e-13 L13,8 L9.136,7.999 L11.4430005,1 L8,1 L8,-3.41060513e-13 L13,-5.1159077e-13 Z" transform="translate(2 4)"/>
<path fill="#FFF" d="M7.523,2 L7.193,2.999 L3,3 C1.8954305,3 1,3.8954305 1,5 L1,11 C1,12.1045695 1.8954305,13 3,13 L8,12.999 L8,13.999 L3,14 C1.34314575,14 0,12.6568542 0,11 L0,5 C0,3.34314575 1.34314575,2 3,2 L7.523,2 Z M15,2 C16.6568542,2 18,3.34314575 18,5 L18,11 C18,12.6568542 16.6568542,14 15,14 L10.477,13.999 L10.806,12.999 L15,13 C16.1045695,13 17,12.1045695 17,11 L17,5 C17,3.8954305 16.1045695,3 15,3 L10,2.999 L10,2 L15,2 Z M20,5 L20,11 L19,11 L19,5 L20,5 Z"/>
<polygon fill="#FFF" points="12 6 9 16 9 10 6 10 9 0 9 6"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

6
plugins/power/actions/battery-090-symbolic-dark_20px.svg Normal file
View File

@ -0,0 +1,6 @@
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
<g fill="none" fill-rule="evenodd" transform="translate(0 4)">
<path fill="#3ACB00" d="M1,-3.73034936e-13 L13,-3.73034936e-13 L13,-3.73034936e-13 L13,8 L1,8 C0.44771525,8 6.76353751e-17,7.55228475 0,7 L0,1 C-6.76353751e-17,0.44771525 0.44771525,-3.72933483e-13 1,-3.73034936e-13 Z" transform="translate(2 2)"/>
<path fill="#000" d="M15,-4.61852778e-14 C16.6568542,-4.61852778e-14 18,1.34314575 18,3 L18,9 C18,10.6568542 16.6568542,12 15,12 L3,12 C1.34314575,12 0,10.6568542 0,9 L0,3 C0,1.34314575 1.34314575,-4.61852778e-14 3,-4.61852778e-14 L15,-4.61852778e-14 Z M15,1 L3,1 C1.8954305,1 1,1.8954305 1,3 L1,9 C1,10.1045695 1.8954305,11 3,11 L15,11 C16.1045695,11 17,10.1045695 17,9 L17,3 C17,1.8954305 16.1045695,1 15,1 Z M20,3 L20,9 L19,9 L19,3 L20,3 Z"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 865 B

6
plugins/power/actions/battery-090-symbolic_20px.svg Normal file
View File

@ -0,0 +1,6 @@
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
<g fill="none" fill-rule="evenodd" transform="translate(0 4)">
<path fill="#3ACB00" d="M1,-3.73034936e-13 L13,-3.73034936e-13 L13,-3.73034936e-13 L13,8 L1,8 C0.44771525,8 6.76353751e-17,7.55228475 0,7 L0,1 C-6.76353751e-17,0.44771525 0.44771525,-3.72933483e-13 1,-3.73034936e-13 Z" transform="translate(2 2)"/>
<path fill="#FFF" d="M15,-4.61852778e-14 C16.6568542,-4.61852778e-14 18,1.34314575 18,3 L18,9 C18,10.6568542 16.6568542,12 15,12 L3,12 C1.34314575,12 0,10.6568542 0,9 L0,3 C0,1.34314575 1.34314575,-4.61852778e-14 3,-4.61852778e-14 L15,-4.61852778e-14 Z M15,1 L3,1 C1.8954305,1 1,1.8954305 1,3 L1,9 C1,10.1045695 1.8954305,11 3,11 L15,11 C16.1045695,11 17,10.1045695 17,9 L17,3 C17,1.8954305 16.1045695,1 15,1 Z M20,3 L20,9 L19,9 L19,3 L20,3 Z"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 865 B

2
plugins/shutdown/shutdownplugin.cpp
View File

@ -302,7 +302,7 @@ bool ShutdownPlugin::checkSwap()
file.close();
} else {
qWarning() << "open /proc/swaps failed! please check permission!!!";
qDebug() << "open /proc/swaps failed! please check permission!!!";
}
return hasSwap;

2
plugins/trash/popupcontrolwidget.cpp
View File

@ -126,7 +126,7 @@ void PopupControlWidget::clearTrashFloder()
if (DTrashManager::instance()->cleanTrash()) {
DDesktopServices::playSystemSoundEffect(DDesktopServices::SSE_EmptyTrash);
} else {
qWarning() << "Clear trash failed";
qDebug() << "Clear trash failed";
}
}

4
plugins/tray/fashiontray/containers/holdcontainer.cpp
View File

@ -3,14 +3,14 @@
HoldContainer::HoldContainer(TrayPlugin *trayPlugin, QWidget *parent)
: AbstractContainer(trayPlugin, parent)
, m_mainBoxLayout(new QBoxLayout(QBoxLayout::Direction::LeftToRight, this))
, m_mainBoxLayout(new QBoxLayout(QBoxLayout::Direction::LeftToRight))
{
m_mainBoxLayout->setMargin(0);
m_mainBoxLayout->setContentsMargins(0, 0, 0, 0);
m_mainBoxLayout->setSpacing(TraySpace);
QBoxLayout *preLayout = wrapperLayout();
QBoxLayout *newLayout = new QBoxLayout(QBoxLayout::Direction::LeftToRight, this);
QBoxLayout *newLayout = new QBoxLayout(QBoxLayout::Direction::LeftToRight);
for (int i = 0; i < preLayout->count(); ++i) {
newLayout->addItem(preLayout->takeAt(i));
}

6
plugins/tray/indicatortray.cpp
View File

@ -84,13 +84,13 @@ public:
callback(v);
return;
} else if (3 != arguments.count()) {
qWarning() << "arguments count must be 3";
qDebug() << "arguments count must be 3";
return;
}
QString interfaceName = msg.arguments().at(0).toString();
if (interfaceName != propertyInterfaceNames.value(key)) {
qWarning() << "interfaceName mismatch" << interfaceName << propertyInterfaceNames.value(key) << key;
qDebug() << "interfaceName mismatch" << interfaceName << propertyInterfaceNames.value(key) << key;
return;
}
QVariantMap changedProps = qdbus_cast<QVariantMap>(arguments.at(1).value<QDBusArgument>());
@ -175,7 +175,7 @@ void IndicatorTrayPrivate::initDBus(const QString &indicatorName)
}
const QJsonObject action = config.value("action").toObject();
if (!action.isEmpty())
if (!action.isEmpty() && indicatorTrayWidget)
q->connect(indicatorTrayWidget, &IndicatorTrayWidget::clicked, q, [ = ](uint8_t button_index, int x, int y) {
std::thread t([=]() -> void {
auto triggerConfig = action.value("trigger").toObject();

2
plugins/tray/snitraywidget.cpp
View File

@ -589,7 +589,7 @@ void SNITrayWidget::showHoverTips()
QProcess p;
p.start("qdbus", {m_dbusService});
if (!p.waitForFinished(1000)) {
qWarning() << "sni dbus service error : " << m_dbusService;
qDebug() << "sni dbus service error : " << m_dbusService;
return;
}

2
plugins/tray/trayplugin.cpp
View File

@ -417,7 +417,7 @@ void TrayPlugin::traySNIAdded(const QString &itemKey, const QString &sniServiceP
QProcess p;
p.start("qdbus", {nsiServerName});
if (!p.waitForFinished(1000)) {
qWarning() << "sni dbus service error : " << nsiServerName;
qDebug() << "sni dbus service error : " << nsiServerName;
return;
}