Commit c2608efd authored by Boudewijn Rempt's avatar Boudewijn Rempt

Remove "calligra" from the name of our app icon

parent 7fee359c
......@@ -15,16 +15,16 @@ set(krita_SRCS main.cc)
# Set the application icon on the application
if (NOT APPLE)
file(GLOB ICON_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/pics/app/*-apps-calligrakrita.png")
file(GLOB ICON_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/pics/app/*-apps-krita.png")
else()
set(ICON_SRCS
"${CMAKE_CURRENT_SOURCE_DIR}/pics/app/16-apps-calligrakrita.png"
"${CMAKE_CURRENT_SOURCE_DIR}/pics/app/32-apps-calligrakrita.png"
"${CMAKE_CURRENT_SOURCE_DIR}/pics/app/48-apps-calligrakrita.png"
"${CMAKE_CURRENT_SOURCE_DIR}/pics/app/128-apps-calligrakrita.png"
"${CMAKE_CURRENT_SOURCE_DIR}/pics/app/256-apps-calligrakrita.png"
"${CMAKE_CURRENT_SOURCE_DIR}/pics/app/512-apps-calligrakrita.png"
"${CMAKE_CURRENT_SOURCE_DIR}/pics/app/1024-apps-calligrakrita.png"
"${CMAKE_CURRENT_SOURCE_DIR}/pics/app/16-apps-krita.png"
"${CMAKE_CURRENT_SOURCE_DIR}/pics/app/32-apps-krita.png"
"${CMAKE_CURRENT_SOURCE_DIR}/pics/app/48-apps-krita.png"
"${CMAKE_CURRENT_SOURCE_DIR}/pics/app/128-apps-krita.png"
"${CMAKE_CURRENT_SOURCE_DIR}/pics/app/256-apps-krita.png"
"${CMAKE_CURRENT_SOURCE_DIR}/pics/app/512-apps-krita.png"
"${CMAKE_CURRENT_SOURCE_DIR}/pics/app/1024-apps-krita.png"
)
endif()
ecm_add_app_icon(krita_SRCS ICONS ${ICON_SRCS})
......
......@@ -1703,7 +1703,7 @@
<statusTip></statusTip>
</Action>
<Action name="help_about_app">
<icon>calligrakrita</icon>
<icon>krita</icon>
<text>&amp;About Krita</text>
<whatsThis></whatsThis>
<toolTip>About Krita</toolTip>
......
......@@ -148,7 +148,7 @@ Comment[x-test]=xxDigital Paintingxx
Comment[zh_CN]=数字绘画
Comment[zh_TW]=數位繪畫
Type=Application
Icon=calligrakrita
Icon=krita
Categories=Qt;KDE;Graphics;2DGraphics;RasterGraphics;
X-KDE-NativeMimeType=application/x-krita
X-KDE-ExtraNativeMimeTypes=
......
ecm_install_icons(
ICONS
1024-apps-calligrakrita.png
128-apps-calligrakrita.png
16-apps-calligrakrita.png
22-apps-calligrakrita.png
256-apps-calligrakrita.png
32-apps-calligrakrita.png
48-apps-calligrakrita.png
512-apps-calligrakrita.png
64-apps-calligrakrita.png
sc-apps-calligrakrita.svgz
1024-apps-krita.png
128-apps-krita.png
16-apps-krita.png
22-apps-krita.png
256-apps-krita.png
32-apps-krita.png
48-apps-krita.png
512-apps-krita.png
64-apps-krita.png
sc-apps-krita.svgz
DESTINATION
${ICON_INSTALL_DIR} )
......@@ -152,7 +152,7 @@ KisApplication::KisApplication(const QString &key, int &argc, char **argv)
QString version = KritaVersionWrapper::versionString(true);
setApplicationVersion(version);
setWindowIcon(KisIconUtils::loadIcon("calligrakrita"));
setWindowIcon(KisIconUtils::loadIcon("krita"));
if (qgetenv("KRITA_NO_STYLE_OVERRIDE").isEmpty()) {
QStringList styles = QStringList() /*<< "breeze"*/ << "fusion" << "plastique";
......
......@@ -48,7 +48,7 @@ KisSplashScreen::KisSplashScreen(const QString &version, const QPixmap &pixmap,
{
setupUi(this);
setWindowIcon(KisIconUtils::loadIcon("calligrakrita"));
setWindowIcon(KisIconUtils::loadIcon("krita"));
QImage img = pixmap.toImage();
if (devicePixelRatioF() > 1.01) {
......
......@@ -129,7 +129,7 @@ KisFloatingMessage::KisFloatingMessage(const QString &message, QWidget *parent,
, m_priority(priority)
, m_alignment(alignment)
{
m_icon = KisIconUtils::loadIcon("calligrakrita").pixmap(256, 256).toImage();
m_icon = KisIconUtils::loadIcon("krita").pixmap(256, 256).toImage();
setWindowFlags(Qt::FramelessWindowHint | Qt::ToolTip);
setFocusPolicy(Qt::NoFocus);
......
......@@ -5,7 +5,7 @@
"runtime-version": "5.9",
"sdk": "org.kde.Sdk",
"command": "krita",
"rename-icon": "calligrakrita",
"rename-icon": "krita",
"tags": [
"nightly"
],
......
......@@ -4,7 +4,7 @@ runtime: org.kde.Platform
runtime-version: '5.12'
sdk: org.kde.Sdk
command: krita
rename-icon: calligrakrita
rename-icon: krita
rename-desktop-file: org.kde.krita.desktop
desktop-file-name-suffix: nightly
finish-args:
......
......@@ -3,7 +3,7 @@ runtime: org.kde.Platform
runtime-version: '5.12'
sdk: org.kde.Sdk
command: krita
rename-icon: calligrakrita
rename-icon: krita
rename-desktop-file: org.kde.krita.desktop
desktop-file-name-suffix: stable
finish-args:
......
......@@ -135,7 +135,7 @@ Comment[x-test]=xxPixel-based image manipulation program for the Calligra Suitex
Comment[zh_CN]=Calligra 套件的像素图像处理程序
Comment[zh_TW]=Calligra 套件中基於像素的影像處理程式
Type=Application
Icon=${SNAP}/meta/gui/calligrakrita.png
Icon=${SNAP}/meta/gui/krita.png
Categories=Qt;KDE;Graphics;2DGraphics;RasterGraphics;
X-KDE-NativeMimeType=application/x-krita
X-KDE-ExtraNativeMimeTypes=
......
......@@ -8,7 +8,7 @@ application-x-krita
application-x-wmf
artistictext-detach-path
artistictext-tool
calligrakrita
krita
character-set
draw-arrow-back
draw-arrow-down
......
......@@ -52,7 +52,7 @@
<file>22_light_application-x-wmf.svg</file>
<file>32_light_application-x-wmf.svg</file>
<file>64_light_application-x-wmf.svg</file>
<file>calligrakrita.png</file>
<file>krita.png</file>
<file>16_dark_character-set.svg</file>
<file>22_dark_character-set.svg</file>
<file>24_dark_character-set.svg</file>
......
......@@ -66,7 +66,7 @@ Name[zh_TW]=Krita
Exec=krita %F
MimeType=image/x-gimp-brush;
Type=Application
Icon=calligrakrita
Icon=krita
Categories=Qt;KDE;Office;Graphics;
StartupNotify=true
X-DBUS-StartupType=Multi
......
......@@ -66,7 +66,7 @@ Name[zh_TW]=Krita
Exec=krita %F
MimeType=text/csv;
Type=Application
Icon=calligrakrita
Icon=krita
Categories=Qt;KDE;Office;Graphics;
StartupNotify=true
NoDisplay=true
......@@ -52,7 +52,7 @@ GenericName[wa]=Programe po dessiner et apougnî des imådjes
GenericName[x-test]=xxApplication for Drawing and Handling of Imagesxx
GenericName[zh_CN]=用于绘制和处理图像的应用程序
GenericName[zh_TW]=繪圖與影像處理的應用程式
Icon=calligrakrita
Icon=krita
MimeType=image/exr;
Name=Krita
Name[af]=Krita
......
......@@ -66,7 +66,7 @@ Name[zh_TW]=Krita
Exec=krita %F
MimeType=image/gif;
Type=Application
Icon=calligrakrita
Icon=krita
Categories=Qt;KDE;Office;Graphics;
StartupNotify=true
NoDisplay=true
......@@ -52,7 +52,7 @@ GenericName[wa]=Programe po dessiner et apougnî des imådjes
GenericName[x-test]=xxApplication for Drawing and Handling of Imagesxx
GenericName[zh_CN]=用于绘制和处理图像的应用程序
GenericName[zh_TW]=繪圖與影像處理的應用程式
Icon=calligrakrita
Icon=krita
MimeType=image/heic;
Name=Krita
Name[af]=Krita
......
......@@ -2,7 +2,7 @@
Categories=Qt;KDE;Office;Graphics;
Exec=krita %F
GenericName=
Icon=calligrakrita
Icon=krita
MimeType=image/x-r16;
Name=Krita
Name[af]=Krita
......
[Desktop Entry]
Categories=Qt;KDE;Office;Graphics;
Exec=krita %F
Icon=calligrakrita
Icon=krita
MimeType=image/jpeg;
Name=Krita
Name[af]=Krita
......
......@@ -2,7 +2,7 @@
Categories=Qt;KDE;Office;Graphics;
Comment=
Exec=krita %F
Icon=calligrakrita
Icon=krita
MimeType=application/x-krita;
Name=Krita
Name[af]=Krita
......
......@@ -2,7 +2,7 @@
Categories=Qt;KDE;Office;Graphics;
Comment=
Exec=krita %F
Icon=calligrakrita
Icon=krita
MimeType=image/openraster;
Name=Krita
Name[af]=Krita
......
[Desktop Entry]
Categories=Qt;KDE;Office;Graphics;
Exec=krita %F
Icon=calligrakrita
Icon=krita
MimeType=application/pdf;
Name=Krita
Name[af]=Krita
......
......@@ -66,7 +66,7 @@ Name[zh_TW]=Krita
Exec=krita %F
MimeType=image/png;
Type=Application
Icon=calligrakrita
Icon=krita
Categories=Qt;KDE;Office;Graphics;
StartupNotify=true
NoDisplay=true
[Desktop Entry]
Categories=Qt;KDE;Office;Graphics;
Exec=krita %F
Icon=calligrakrita
Icon=krita
MimeType=image/x-psd;image/photoshop;image/x-photoshop;image/vnd.adobe.photoshop;
Name=Krita
Name[af]=Krita
......
......@@ -66,7 +66,7 @@ Name[zh_TW]=Krita
Exec=krita %F
MimeType=image/bmp;image/x-xpixmap;image/x-xbitmap;image/webp;image/vnd.microsoft.icon;image/x-portable-pixmap;image/x-portable-graymap;image/x-portable-bitmap;
Type=Application
Icon=calligrakrita
Icon=krita
Categories=Qt;KDE;Office;Graphics;
StartupNotify=true
NoDisplay=true
......@@ -65,7 +65,7 @@ Name[zh_CN]=Krita
Name[zh_TW]=Krita
Exec=krita %F
MimeType=image/x-nikon-nef;image/x-canon-cr2;image/x-sony-sr2;image/x-canon-crw;image/x-pentax-pef;image/x-sigma-x3f;image/x-kodak-kdc;image/x-minolta-mrw;image/x-sony-arw;image/x-kodak-k25;image/x-kodak-dcr;image/x-olympus-orf;image/x-panasonic-raw;image/x-panasonic-raw2;image/x-fuji-raf;image/x-sony-srf;image/x-adobe-dng;
Icon=calligrakrita
Icon=krita
Categories=Qt;KDE;Office;Graphics;
StartupNotify=true
NoDisplay=true
......
......@@ -66,7 +66,7 @@ Name[zh_TW]=Krita
Exec=krita %F
MimeType=image/x-scml;
Type=Application
Icon=calligrakrita
Icon=krita
Categories=Qt;KDE;Office;Graphics;
StartupNotify=true
NoDisplay=true
......@@ -66,7 +66,7 @@ Name[zh_TW]=Krita
Exec=krita %F
MimeType=image/svg+xml;
Type=Application
Icon=calligrakrita
Icon=krita
Categories=Qt;KDE;Office;Graphics;
StartupNotify=true
NoDisplay=true
......@@ -66,7 +66,7 @@ Name[zh_TW]=Krita
Exec=krita %F
MimeType=image/x-tga;
Type=Application
Icon=calligrakrita
Icon=krita
Categories=Qt;KDE;Office;Graphics;
StartupNotify=true
NoDisplay=true
[Desktop Entry]
Categories=Qt;KDE;Office;Graphics;
Exec=krita %F
Icon=calligrakrita
Icon=krita
MimeType=image/tiff;
Name=Krita
Name[af]=Krita
......
[Desktop Entry]
Categories=Qt;KDE;Office;Graphics;
Exec=krita %F
Icon=calligrakrita
Icon=krita
MimeType=image/x-xcf;
Name=Krita
Name[af]=Krita
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment