[Pkg-owncloud-commits] [owncloud-client] 340/484: SharedDialog: Fix the delete icon on windows and mac (#3737)
Sandro Knauß
hefee-guest at moszumanska.debian.org
Wed Dec 16 00:38:02 UTC 2015
This is an automated email from the git hooks/post-receive script.
hefee-guest pushed a commit to branch master
in repository owncloud-client.
commit ef915fb2e5b95424992bef070517d791fee1ae91
Author: Olivier Goffart <ogoffart at woboq.com>
Date: Tue Nov 17 10:40:45 2015 +0100
SharedDialog: Fix the delete icon on windows and mac (#3737)
---
client.qrc | 1 +
resources/delete.png | Bin 0 -> 243 bytes
src/gui/shareusergroupwidget.cpp | 3 +++
3 files changed, 4 insertions(+)
diff --git a/client.qrc b/client.qrc
index 3505f5c..5f65c91 100644
--- a/client.qrc
+++ b/client.qrc
@@ -21,5 +21,6 @@
<file>resources/lock-https at 2x.png</file>
<file>resources/account.png</file>
<file>resources/more.png</file>
+ <file>resources/delete.png</file>
</qresource>
</RCC>
diff --git a/resources/delete.png b/resources/delete.png
new file mode 100644
index 0000000..e891b37
Binary files /dev/null and b/resources/delete.png differ
diff --git a/src/gui/shareusergroupwidget.cpp b/src/gui/shareusergroupwidget.cpp
index 0613037..8ff7c76 100644
--- a/src/gui/shareusergroupwidget.cpp
+++ b/src/gui/shareusergroupwidget.cpp
@@ -205,6 +205,9 @@ ShareWidget::ShareWidget(QSharedPointer<Share> share,
connect(share.data(), SIGNAL(permissionsSet()), SLOT(slotPermissionsSet()));
connect(share.data(), SIGNAL(shareDeleted()), SLOT(slotShareDeleted()));
+
+ _ui->deleteShareButton->setIcon(QIcon::fromTheme(QLatin1String("user-trash"),
+ QIcon(QLatin1String(":/client/resources/delete.png"))));
}
void ShareWidget::on_deleteShareButton_clicked()
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list