[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [akonadi-google-applets] contacts/src: Avoid to icon conflicts
From: Jan Grulich <jgrulich () redhat ! com>
Date: 2013-05-31 21:04:38
Message-ID: 20130531210438.C5D9DA6067 () git ! kde ! org
[Download RAW message or body]
Git commit 7b50f9bafa76925d0d45d4a376fb6ba23b567024 by Jan Grulich.
Committed on 31/05/2013 at 23:03.
Pushed by grulich into branch 'master'.
Avoid to icon conflicts
M +12 -12 contacts/src/contactwidgetitem.cpp
R +- -- contacts/src/im-icons/hi32-app-contact-aim.png [from: \
contacts/src/im-icons/hi32-app-aim.png - 100% similarity] R +- -- \
contacts/src/im-icons/hi32-app-contact-cell-phone.png [from: \
contacts/src/im-icons/hi32-app-cell-phone.png - 100% similarity] R +- -- \
contacts/src/im-icons/hi32-app-contact-email.png [from: \
contacts/src/im-icons/hi32-app-email.png - 100% similarity] R +- -- \
contacts/src/im-icons/hi32-app-contact-gadu.png [from: \
contacts/src/im-icons/hi32-app-gadu.png - 100% similarity] R +- -- \
contacts/src/im-icons/hi32-app-contact-home-phone.png [from: \
contacts/src/im-icons/hi32-app-home-phone.png - 100% similarity] R +- -- \
contacts/src/im-icons/hi32-app-contact-homepage.png [from: \
contacts/src/im-icons/hi32-app-homepage.png - 100% similarity] R +- -- \
contacts/src/im-icons/hi32-app-contact-icq.png [from: \
contacts/src/im-icons/hi32-app-icq.png - 100% similarity] R +- -- \
contacts/src/im-icons/hi32-app-contact-irc.png [from: \
contacts/src/im-icons/hi32-app-irc.png - 100% similarity] R +- -- \
contacts/src/im-icons/hi32-app-contact-jabber.png [from: \
contacts/src/im-icons/hi32-app-jabber.png - 100% similarity] R +- -- \
contacts/src/im-icons/hi32-app-contact-msn.png [from: \
contacts/src/im-icons/hi32-app-msn.png - 100% similarity] R +- -- \
contacts/src/im-icons/hi32-app-contact-skype.png [from: \
contacts/src/im-icons/hi32-app-skype.png - 100% similarity] R +- -- \
contacts/src/im-icons/hi32-app-contact-work-phone.png [from: \
contacts/src/im-icons/hi32-app-work-phone.png - 100% similarity]
http://commits.kde.org/akonadi-google-applets/7b50f9bafa76925d0d45d4a376fb6ba23b567024
diff --git a/contacts/src/contactwidgetitem.cpp b/contacts/src/contactwidgetitem.cpp
index 4712cf7..e902e69 100644
--- a/contacts/src/contactwidgetitem.cpp
+++ b/contacts/src/contactwidgetitem.cpp
@@ -103,7 +103,7 @@ void ContactWidgetItem::setContactInfo()
if (!m_addressee->phoneNumber(KABC::PhoneNumber::Home).isEmpty()) {
label = new ContactWidgetItemInfoLabel(m_contactInfo);
label->setText(m_addressee->phoneNumber(KABC::PhoneNumber::Home).number());
- label->setIcon("home-phone");
+ label->setIcon("contact-home-phone");
m_contactInfo->addInfo(label);
}
@@ -111,7 +111,7 @@ void ContactWidgetItem::setContactInfo()
if (!m_addressee->phoneNumber(KABC::PhoneNumber::Work).isEmpty()) {
label = new ContactWidgetItemInfoLabel(m_contactInfo);
label->setText(m_addressee->phoneNumber(KABC::PhoneNumber::Work).number());
- label->setIcon("work-phone");
+ label->setIcon("contact-work-phone");
m_contactInfo->addInfo(label);
}
@@ -119,7 +119,7 @@ void ContactWidgetItem::setContactInfo()
if (!m_addressee->phoneNumber(KABC::PhoneNumber::Cell).isEmpty()) {
label = new ContactWidgetItemInfoLabel(m_contactInfo);
label->setText(m_addressee->phoneNumber(KABC::PhoneNumber::Cell).number());
- label->setIcon("cell-phone");
+ label->setIcon("contact-cell-phone");
m_contactInfo->addInfo(label);
}
@@ -127,7 +127,7 @@ void ContactWidgetItem::setContactInfo()
foreach(const QString email, m_addressee->emails()) {
label = new ContactWidgetItemInfoLabel(m_contactInfo);
label->setText(email);
- label->setIcon("email");
+ label->setIcon("contact-email");
m_contactInfo->addInfo(label);
@@ -137,7 +137,7 @@ void ContactWidgetItem::setContactInfo()
if (!m_addressee->url().pathOrUrl().isEmpty()) {
label = new ContactWidgetItemInfoLabel(m_contactInfo);
label->setText(m_addressee->url().pathOrUrl());
- label->setIcon("homepage");
+ label->setIcon("contact-homepage");
m_contactInfo->addInfo(label);
@@ -148,49 +148,49 @@ void ContactWidgetItem::setContactInfo()
if (im.contains("messaging/aim")) {
label = new ContactWidgetItemInfoLabel(m_contactInfo);
label->setText(m_addressee->custom("messaging/aim", "All"));
- label->setIcon("aim");
+ label->setIcon("contact-aim");
m_contactInfo->addInfo(label);
} else if (im.contains("messaging/gadu")) {
label = new ContactWidgetItemInfoLabel(m_contactInfo);
label->setText(m_addressee->custom("messaging/gadu", "All"));
- label->setIcon("gadu");
+ label->setIcon("contact-gadu");
m_contactInfo->addInfo(label);
} else if (im.contains("messaging/icq")) {
label = new ContactWidgetItemInfoLabel(m_contactInfo);
label->setText(m_addressee->custom("messaging/icq", "All"));
- label->setIcon("icq");
+ label->setIcon("contact-icq");
m_contactInfo->addInfo(label);
} else if (im.contains("messaging/irc")) {
label = new ContactWidgetItemInfoLabel(m_contactInfo);
label->setText(m_addressee->custom("messaging/irc", "All"));
- label->setIcon("irc");
+ label->setIcon("contact-irc");
m_contactInfo->addInfo(label);
} else if (im.contains("messaging/msn")) {
label = new ContactWidgetItemInfoLabel(m_contactInfo);
label->setText(m_addressee->custom("messaging/msn", "All"));
- label->setIcon("msn");
+ label->setIcon("contact-msn");
m_contactInfo->addInfo(label);
} else if (im.contains("messaging/skype")) {
label = new ContactWidgetItemInfoLabel(m_contactInfo);
label->setText(m_addressee->custom("messaging/skype", "All"));
- label->setIcon("skype");
+ label->setIcon("contact-skype");
m_contactInfo->addInfo(label);
} else if (im.contains("messaging/xmpp")) {
label = new ContactWidgetItemInfoLabel(m_contactInfo);
label->setText(m_addressee->custom("messaging/xmpp", "All"));
- label->setIcon("jabber");
+ label->setIcon("contact-jabber");
m_contactInfo->addInfo(label);
}
diff --git a/contacts/src/im-icons/hi32-app-aim.png \
b/contacts/src/im-icons/hi32-app-contact-aim.png similarity index 100%
rename from contacts/src/im-icons/hi32-app-aim.png
rename to contacts/src/im-icons/hi32-app-contact-aim.png
diff --git a/contacts/src/im-icons/hi32-app-cell-phone.png \
b/contacts/src/im-icons/hi32-app-contact-cell-phone.png similarity index 100%
rename from contacts/src/im-icons/hi32-app-cell-phone.png
rename to contacts/src/im-icons/hi32-app-contact-cell-phone.png
diff --git a/contacts/src/im-icons/hi32-app-email.png \
b/contacts/src/im-icons/hi32-app-contact-email.png similarity index 100%
rename from contacts/src/im-icons/hi32-app-email.png
rename to contacts/src/im-icons/hi32-app-contact-email.png
diff --git a/contacts/src/im-icons/hi32-app-gadu.png \
b/contacts/src/im-icons/hi32-app-contact-gadu.png similarity index 100%
rename from contacts/src/im-icons/hi32-app-gadu.png
rename to contacts/src/im-icons/hi32-app-contact-gadu.png
diff --git a/contacts/src/im-icons/hi32-app-home-phone.png \
b/contacts/src/im-icons/hi32-app-contact-home-phone.png similarity index 100%
rename from contacts/src/im-icons/hi32-app-home-phone.png
rename to contacts/src/im-icons/hi32-app-contact-home-phone.png
diff --git a/contacts/src/im-icons/hi32-app-homepage.png \
b/contacts/src/im-icons/hi32-app-contact-homepage.png similarity index 100%
rename from contacts/src/im-icons/hi32-app-homepage.png
rename to contacts/src/im-icons/hi32-app-contact-homepage.png
diff --git a/contacts/src/im-icons/hi32-app-icq.png \
b/contacts/src/im-icons/hi32-app-contact-icq.png similarity index 100%
rename from contacts/src/im-icons/hi32-app-icq.png
rename to contacts/src/im-icons/hi32-app-contact-icq.png
diff --git a/contacts/src/im-icons/hi32-app-irc.png \
b/contacts/src/im-icons/hi32-app-contact-irc.png similarity index 100%
rename from contacts/src/im-icons/hi32-app-irc.png
rename to contacts/src/im-icons/hi32-app-contact-irc.png
diff --git a/contacts/src/im-icons/hi32-app-jabber.png \
b/contacts/src/im-icons/hi32-app-contact-jabber.png similarity index 100%
rename from contacts/src/im-icons/hi32-app-jabber.png
rename to contacts/src/im-icons/hi32-app-contact-jabber.png
diff --git a/contacts/src/im-icons/hi32-app-msn.png \
b/contacts/src/im-icons/hi32-app-contact-msn.png similarity index 100%
rename from contacts/src/im-icons/hi32-app-msn.png
rename to contacts/src/im-icons/hi32-app-contact-msn.png
diff --git a/contacts/src/im-icons/hi32-app-skype.png \
b/contacts/src/im-icons/hi32-app-contact-skype.png similarity index 100%
rename from contacts/src/im-icons/hi32-app-skype.png
rename to contacts/src/im-icons/hi32-app-contact-skype.png
diff --git a/contacts/src/im-icons/hi32-app-work-phone.png \
b/contacts/src/im-icons/hi32-app-contact-work-phone.png similarity index 100%
rename from contacts/src/im-icons/hi32-app-work-phone.png
rename to contacts/src/im-icons/hi32-app-contact-work-phone.png
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic