[pim/kdepim-runtime/release/26.08] /: Add google icons
Allen Winter <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit 5499bd90ba5c9a9b5b245b337d5038dc8ea0b0e8 by Allen Winter. Committed on 23/07/2026 at 12:07. Pushed by winterz into branch 'release/26.08'. Add google icons breeze has removed the google icon oxygen may still have a google icon to be safe, add our own: just like all the other providers this icon has a Free License CC-1.0 Universal (cherry picked from commit 1e1877e2c3eebdd0823a82e063703cf192a1d148) Co-authored-by: Allen Winter <[email protected]> A +- -- images/128-apps-account-google.png A +- -- images/16-apps-account-google.png A +- -- images/22-apps-account-google.png A +- -- images/32-apps-account-google.png A +- -- images/48-apps-account-google.png A +- -- images/64-apps-account-google.png M +1 -0 images/CMakeLists.txt A +- -- images/google-logo.png M +1 -1 resources/google-groupware/akonadi_google_resource.notifyrc M +2 -2 resources/google-groupware/googleresource.cpp M +1 -1 resources/google-groupware/googleresource.desktop M +1 -1 resources/google-groupware/org.kde.akonadi_google_resource.desktop https://invent.kde.org/pim/kdepim-runtime/-/commit/5499bd90ba5c9a9b5b245b337d5038dc8ea0b0e8 diff --git a/images/128-apps-account-google.png b/images/128-apps-account-google.png new file mode 100644 index 000000000..6ad45bfd6 Binary files /dev/null and b/images/128-apps-account-google.png differ diff --git a/images/16-apps-account-google.png b/images/16-apps-account-google.png new file mode 100644 index 000000000..7d0f37c16 Binary files /dev/null and b/images/16-apps-account-google.png differ diff --git a/images/22-apps-account-google.png b/images/22-apps-account-google.png new file mode 100644 index 000000000..c18e5281e Binary files /dev/null and b/images/22-apps-account-google.png differ diff --git a/images/32-apps-account-google.png b/images/32-apps-account-google.png new file mode 100644 index 000000000..9a76eaf2c Binary files /dev/null and b/images/32-apps-account-google.png differ diff --git a/images/48-apps-account-google.png b/images/48-apps-account-google.png new file mode 100644 index 000000000..087da4d21 Binary files /dev/null and b/images/48-apps-account-google.png differ diff --git a/images/64-apps-account-google.png b/images/64-apps-account-google.png new file mode 100644 index 000000000..bfb0d5ccc Binary files /dev/null and b/images/64-apps-account-google.png differ diff --git a/images/CMakeLists.txt b/images/CMakeLists.txt index f84ab3a7e..75ccf9cb1 100644 --- a/images/CMakeLists.txt +++ b/images/CMakeLists.txt @@ -4,6 +4,7 @@ foreach( "citadel" "davical" "egroupware" + "google" "fastmail" "kopano" "mailboxorg" diff --git a/images/google-logo.png b/images/google-logo.png new file mode 100644 index 000000000..7a951aea1 Binary files /dev/null and b/images/google-logo.png differ diff --git a/resources/google-groupware/akonadi_google_resource.notifyrc b/resources/google-groupware/akonadi_google_resource.notifyrc index 3f7fbf15c..704549877 100644 --- a/resources/google-groupware/akonadi_google_resource.notifyrc +++ b/resources/google-groupware/akonadi_google_resource.notifyrc @@ -1,5 +1,5 @@ [Global] -IconName=im-google +IconName=google Name=Google Groupware Name[ar]=البرمجيات التعاونية من غوغل Name[bg]=Google Groupware diff --git a/resources/google-groupware/googleresource.cpp b/resources/google-groupware/googleresource.cpp index b36946ff1..c338b716f 100644 --- a/resources/google-groupware/googleresource.cpp +++ b/resources/google-groupware/googleresource.cpp @@ -205,7 +205,7 @@ void GoogleResource::requestAuthenticationFromUser(const KGAPI2::AccountPtr &acc auto ntf = KNotification::event(QStringLiteral("authNeeded"), i18nc("@title", "%1 needs your attention.", agentName()), msg, - QStringLiteral("im-google"), + QStringLiteral("account-google"), KNotification::Persistent | KNotification::SkipGrouping); ntf->setComponentName(QStringLiteral("akonadi_google_resource")); auto loginAction = ntf->addAction(i18nc("@action", "Log in")); @@ -343,7 +343,7 @@ void GoogleResource::retrieveCollections() auto attr = m_rootCollection.attribute<EntityDisplayAttribute>(Collection::AddIfMissing); attr->setDisplayName(m_settings.accountPtr()->accountName()); - attr->setIconName(QStringLiteral("im-google")); + attr->setIconName(QStringLiteral("account-google")); collectionsRetrieved({m_rootCollection}); diff --git a/resources/google-groupware/googleresource.desktop b/resources/google-groupware/googleresource.desktop index 32bd574df..b6a69c2c7 100644 --- a/resources/google-groupware/googleresource.desktop +++ b/resources/google-groupware/googleresource.desktop @@ -80,4 +80,4 @@ X-Akonadi-MimeTypes=text/calendar,text/directory,application/x-vnd.akonadi.calen X-Akonadi-Capabilities=Resource,FreeBusyProvider X-Akonadi-Identifier=akonadi_google_resource X-Akonadi-Custom-KAccounts=google-contacts,google-calendar -Icon=im-google +Icon=account-google diff --git a/resources/google-groupware/org.kde.akonadi_google_resource.desktop b/resources/google-groupware/org.kde.akonadi_google_resource.desktop index cfe35c032..9fe8ce9c0 100644 --- a/resources/google-groupware/org.kde.akonadi_google_resource.desktop +++ b/resources/google-groupware/org.kde.akonadi_google_resource.desktop @@ -39,4 +39,4 @@ Name[zh_CN]=Google 协作套件 Name[zh_TW]=Google 協作工具 NoDisplay=true Exec=akonadi_google_resource -Icon=im-google +Icon=account-google