Martchus
/
syncthingtray
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use Syncthing icon from ForkAwesome for buttons/menus 

This should look more consistent than abusing the state-specific "idling"
icon.
This commit is contained in:
Martchus 2021-10-10 20:44:22 +02:00
parent 77f0a8d5ae
commit 3bf50fb414
7 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fileitemactionplugin/cmake/templates/syncthingfileitemaction.desktop.in
View File

@ -10,6 +10,6 @@ X-KDE-PluginInfo-Version=@META_VERSION_MAJOR@.@META_VERSION_MINOR@.@META_VERSION
X-KDE-Library=@META_TARGET_NAME@
X-KDE-Submenu=Syncthing
Icon=syncthingtray
Icon=syncthing.fa
ServiceTypes=KFileItemAction/Plugin
MimeType=application/octet-stream;inode/directory

2
fileitemactionplugin/syncthingmenuaction.cpp
View File

@ -66,7 +66,7 @@ void SyncthingMenuAction::updateActionStatus()
// handle case when already connected
if (connection.isConnected()) {
setText(tr("Syncthing"));
setIcon(statusIcons().idling);
setIcon(QIcon(QStringLiteral("syncthing.fa")));
return;
}

5
plasmoid/lib/syncthingapplet.cpp
View File

@ -140,11 +140,6 @@ QIcon SyncthingApplet::statusIcon() const
return m_statusInfo.statusIcon();
}
QIcon SyncthingApplet::syncthingIcon() const
{
return statusIcons().idling;
}
QString SyncthingApplet::incomingTraffic() const
{
return trafficString(m_connection.totalIncomingTraffic(), m_connection.totalIncomingRate());

1
plasmoid/lib/syncthingapplet.h
View File

@ -54,7 +54,6 @@ class SyncthingApplet : public Plasma::Applet {
Q_PROPERTY(QString statusText READ statusText NOTIFY connectionStatusChanged)
Q_PROPERTY(QString additionalStatusText READ additionalStatusText NOTIFY connectionStatusChanged)
Q_PROPERTY(QIcon statusIcon READ statusIcon NOTIFY connectionStatusChanged)
Q_PROPERTY(QIcon syncthingIcon READ syncthingIcon NOTIFY settingsChanged)
Q_PROPERTY(QString incomingTraffic READ incomingTraffic NOTIFY trafficChanged)
Q_PROPERTY(bool hasIncomingTraffic READ hasIncomingTraffic NOTIFY trafficChanged)
Q_PROPERTY(QString outgoingTraffic READ outgoingTraffic NOTIFY trafficChanged)

2
plasmoid/package/contents/ui/FullRepresentation.qml
View File

@ -422,7 +422,7 @@ ColumnLayout {
id: webUIButton
// use PlasmaCore.IconItem for the icon because I wouldn't know how to show the QIcon otherwise
contentItem: PlasmaCore.IconItem {
source: plasmoid.nativeInterface.syncthingIcon
source: plasmoid.nativeInterface.loadForkAwesomeIcon("syncthing")
}
// set preferred size so the tool button is displayed consistently with the previous one despite using PlasmaCore.IconItem
Layout.preferredWidth: settingsButton.width

1
tray/gui/traywidget.cpp
View File

@ -517,7 +517,6 @@ void TrayWidget::applySettings(const QString &connectionConfig)
m_dlModel.setBrightColors(brightColors);
m_recentChangesModel.setBrightColors(brightColors);
IconManager::instance().applySettings(&settings.icons.status, settings.icons.distinguishTrayIcons ? &settings.icons.tray : nullptr);
m_ui->webUiPushButton->setIcon(statusIcons().idling);
// update status icon and text of tray icon because reconnect interval might have changed
if (m_menu && m_menu->icon()) {

3
tray/gui/traywidget.ui
View File

@ -129,6 +129,9 @@
<property name="flat">
<bool>true</bool>
</property>
<property name="icon">
<iconset>syncthing.fa</iconset>
</property>
</widget>
</item>
<item>