From ca9117d9098ee52e0d150c4a5eaf3c4b2c5a9f67 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 24 Aug 2023 16:50:34 +0300 Subject: [PATCH] generic: add X-KDE-HasTrayOption to .desktop files for applications that do not create main window (e.g. create dialog window instead) the tray feature is not enabled Signed-off-by: Ivailo Monev --- dolphin/src/dolphin.desktop | 2 +- kate/src/app/katemain.cpp | 1 - kate/src/data/kate.desktop | 2 +- keditbookmarks/keditbookmarks.desktop | 1 + kfind/kfind.desktop | 1 - kinfocenter/kinfocenter.desktop | 1 + kinfocenter/main.cpp | 40 ++++++++++---------- kmail/main.cpp | 7 +--- kmediaplayer/kmediaplayer.desktop | 1 + kmediaplayer/main.cpp | 16 ++++---- kmenuedit/basictab.cpp | 2 +- knetattach/main.cpp | 24 ++++++------ konsole/desktop/konsole.desktop | 1 + ksysguard/gui/ksysguard.desktop | 1 + systemsettings/app/kdesystemsettings.desktop | 1 + systemsettings/app/main.cpp | 2 +- systemsettings/app/systemsettings.desktop | 1 + 17 files changed, 52 insertions(+), 52 deletions(-) diff --git a/dolphin/src/dolphin.desktop b/dolphin/src/dolphin.desktop index e395b37b..5890e068 100755 --- a/dolphin/src/dolphin.desktop +++ b/dolphin/src/dolphin.desktop @@ -188,4 +188,4 @@ MimeType=inode/directory; InitialPreference=10 StartupNotify=true X-KDE-MediaPlayer=informationpanel -X-KDE-SysTray=true +X-KDE-HasTrayOption=true diff --git a/kate/src/app/katemain.cpp b/kate/src/app/katemain.cpp index d8469573..acda9ea0 100644 --- a/kate/src/app/katemain.cpp +++ b/kate/src/app/katemain.cpp @@ -82,7 +82,6 @@ int main( int argc, char **argv ) KAboutData aboutData ("kate", 0, ki18n("Kate"), kateVersion, ki18n( "Kate - Advanced Text Editor" ), KAboutData::License_LGPL_V2, ki18n( "(c) 2000-2013 The Kate Authors" )); - aboutData.setOrganizationDomain("kde.org"); aboutData.addAuthor (ki18n("Christoph Cullmann"), ki18n("Maintainer"), "cullmann@kde.org", "http://www.cullmann.io"); aboutData.addAuthor (ki18n("Anders Lund"), ki18n("Core Developer"), "anders@alweb.dk", "http://www.alweb.dk"); aboutData.addAuthor (ki18n("Joseph Wenninger"), ki18n("Core Developer"), "jowenn@kde.org", "http://stud3.tuwien.ac.at/~e9925371"); diff --git a/kate/src/data/kate.desktop b/kate/src/data/kate.desktop index 51c8d6c5..62f7f187 100755 --- a/kate/src/data/kate.desktop +++ b/kate/src/data/kate.desktop @@ -121,7 +121,7 @@ MimeType=text/plain; Exec=kate --icon '%i' --caption '%c' -b %U StartupNotify=true X-KDE-HasTempFileOption=true -X-KDE-SysTray=true +X-KDE-HasTrayOption=true Icon=kate X-DocPath=kate/index.html Type=Application diff --git a/keditbookmarks/keditbookmarks.desktop b/keditbookmarks/keditbookmarks.desktop index b0594127..15876128 100755 --- a/keditbookmarks/keditbookmarks.desktop +++ b/keditbookmarks/keditbookmarks.desktop @@ -135,3 +135,4 @@ Comment[zh_CN]=书签组织和编辑器 Comment[zh_TW]=書籤組織編輯器 X-DocPath=konqueror/index.html#bookmarks Categories=Qt;KDE;Network;WebBrowser; +X-KDE-HasTrayOption=true diff --git a/kfind/kfind.desktop b/kfind/kfind.desktop index 371f1dcb..0125809f 100755 --- a/kfind/kfind.desktop +++ b/kfind/kfind.desktop @@ -97,4 +97,3 @@ Name[zh_TW]=尋找檔案/資料夾 StartupNotify=true OnlyShowIn=KDE; Categories=Qt;KDE;Core; -X-KDE-SysTray=true diff --git a/kinfocenter/kinfocenter.desktop b/kinfocenter/kinfocenter.desktop index 2e3d1ec1..ea0b5318 100755 --- a/kinfocenter/kinfocenter.desktop +++ b/kinfocenter/kinfocenter.desktop @@ -5,6 +5,7 @@ Type=Application X-DocPath=kinfocenter/index.html StartupNotify=true OnlyShowIn=KDE; +X-KDE-HasTrayOption=true Name=KInfoCenter Name[af]=Inligting Sentrum diff --git a/kinfocenter/main.cpp b/kinfocenter/main.cpp index f084994d..9298cc0f 100644 --- a/kinfocenter/main.cpp +++ b/kinfocenter/main.cpp @@ -30,32 +30,32 @@ KicApp::KicApp() : KApplication() { - display = new KInfoCenter(); - display->show(); + display = new KInfoCenter(); + display->show(); } int main(int argc, char *argv[]) { - KAboutData aboutKInfoCenter( "kinfocenter", 0, ki18n("KDE Info Center"), - KDE_VERSION_STRING, ki18n("The KDE Info Center"), KAboutData::License_GPL, - ki18n("(c) 2009-2010, The KDE SC KInfocenter Development Team")); + KAboutData aboutData( + "kinfocenter", 0, ki18n("KDE Info Center"), + KDE_VERSION_STRING, ki18n("The KDE Info Center"), KAboutData::License_GPL, + ki18n("(c) 2009-2010, The KDE SC KInfocenter Development Team") + ); + aboutData.setProgramIconName("hwinfo"); - QByteArray argv_0 = argv[0]; - KAboutData *aboutData = &aboutKInfoCenter; + aboutData.addAuthor(ki18n("David Hubner"),ki18n("Current Maintainer"), "hubnerd@ntlworld.com"); + aboutData.addAuthor(ki18n("Helge Deller"), ki18n("Previous Maintainer"), "deller@kde.org"); + aboutData.addAuthor(ki18n("Matthias Hoelzer-Kluepfel"),KLocalizedString(), "hoelzer@kde.org"); + aboutData.addAuthor(ki18n("Matthias Elter"),KLocalizedString(), "elter@kde.org"); + aboutData.addAuthor(ki18n("Matthias Ettrich"),KLocalizedString(), "ettrich@kde.org"); + aboutData.addAuthor(ki18n("Waldo Bastian"),KLocalizedString(), "bastian@kde.org"); + aboutData.addAuthor(ki18n("Nicolas Ternisien"), KLocalizedString(), "nicolas.ternisien@gmail.com"); - aboutData->addAuthor(ki18n("David Hubner"),ki18n("Current Maintainer"), "hubnerd@ntlworld.com"); - aboutData->addAuthor(ki18n("Helge Deller"), ki18n("Previous Maintainer"), "deller@kde.org"); - aboutData->addAuthor(ki18n("Matthias Hoelzer-Kluepfel"),KLocalizedString(), "hoelzer@kde.org"); - aboutData->addAuthor(ki18n("Matthias Elter"),KLocalizedString(), "elter@kde.org"); - aboutData->addAuthor(ki18n("Matthias Ettrich"),KLocalizedString(), "ettrich@kde.org"); - aboutData->addAuthor(ki18n("Waldo Bastian"),KLocalizedString(), "bastian@kde.org"); - aboutData->addAuthor(ki18n("Nicolas Ternisien"), KLocalizedString(), "nicolas.ternisien@gmail.com"); + KCmdLineOptions options; + KCmdLineArgs::addCmdLineOptions( options ); - KCmdLineOptions options; - KCmdLineArgs::addCmdLineOptions( options ); + KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::init( argc, argv, aboutData ); - - KicApp Kic; - return Kic.exec(); + KicApp Kic; + return Kic.exec(); } diff --git a/kmail/main.cpp b/kmail/main.cpp index c77de252..8d458961 100644 --- a/kmail/main.cpp +++ b/kmail/main.cpp @@ -59,13 +59,8 @@ int main(int argc, char **argv) { ki18n("(c) 2022 Ivailo Monev") ); - aboutData.addAuthor( - ki18n("Ivailo Monev"), - ki18n("Maintainer"), - "xakepa10@gmail.com" - ); + aboutData.addAuthor(ki18n("Ivailo Monev"), ki18n("Maintainer"), "xakepa10@gmail.com"); aboutData.setProgramIconName(QLatin1String("internet-mail")); - aboutData.setOrganizationDomain("kde.org"); KCmdLineArgs::init(argc, argv, &aboutData); KCmdLineOptions option; diff --git a/kmediaplayer/kmediaplayer.desktop b/kmediaplayer/kmediaplayer.desktop index 9c9e675d..ddf7aa60 100644 --- a/kmediaplayer/kmediaplayer.desktop +++ b/kmediaplayer/kmediaplayer.desktop @@ -10,3 +10,4 @@ Categories=Qt;KDE;AudioVideo;Audio;Video;Player;TV; MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/ogg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;video/mp4;video/msvideo;video/x-msvideo;video/ogg;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/x-fli;video/x-flv;video/x-theora;video/x-matroska;video/webm;audio/x-flac;audio/x-vorbis+ogg;video/x-ogm+ogg;audio/x-shorten;audio/x-ape;audio/x-wavpack;audio/x-tta;audio/AMR;audio/ac3;video/mp2t;audio/flac;audio/mp4; StartupNotify=true X-KDE-MediaPlayer=kmediaplayer +X-KDE-HasTrayOption=true diff --git a/kmediaplayer/main.cpp b/kmediaplayer/main.cpp index 7305c798..19c61150 100644 --- a/kmediaplayer/main.cpp +++ b/kmediaplayer/main.cpp @@ -29,17 +29,15 @@ #include "kmediawindow.h" int main(int argc, char **argv) { - KAboutData aboutData("kmediaplayer", 0, ki18n("KMediaPlayer"), - "1.1.0", ki18n("Simple media player for KDE."), - KAboutData::License_GPL_V2, - ki18n("(c) 2016 Ivailo Monev") - ); + KAboutData aboutData( + "kmediaplayer", 0, ki18n("KMediaPlayer"), + "1.1.0", ki18n("Simple media player for KDE."), + KAboutData::License_GPL_V2, + ki18n("(c) 2016 Ivailo Monev") + ); - aboutData.addAuthor(ki18n("Ivailo Monev"), - ki18n("Maintainer"), - "xakepa10@gmail.com"); + aboutData.addAuthor(ki18n("Ivailo Monev"), ki18n("Maintainer"), "xakepa10@gmail.com"); aboutData.setProgramIconName(QLatin1String("applications-multimedia")); - aboutData.setOrganizationDomain("kde.org"); KCmdLineArgs::init(argc, argv, &aboutData); KCmdLineOptions option; diff --git a/kmenuedit/basictab.cpp b/kmenuedit/basictab.cpp index 3f60c2fc..9e4b71ff 100644 --- a/kmenuedit/basictab.cpp +++ b/kmenuedit/basictab.cpp @@ -382,7 +382,7 @@ void BasicTab::setEntryInfo(MenuEntryInfo *entryInfo) _execEdit->lineEdit()->setText(temp); _systrayCB->setChecked(false); } - _systrayCB->setEnabled(df->desktopGroup().readEntry("X-KDE-SysTray", false)); + _systrayCB->setEnabled(df->desktopGroup().readEntry("X-KDE-HasTrayOption", false)); _pathEdit->lineEdit()->setText(df->readPath()); _termOptEdit->setText(df->desktopGroup().readEntry("TerminalOptions")); diff --git a/knetattach/main.cpp b/knetattach/main.cpp index 6a7ba32b..adba59e4 100644 --- a/knetattach/main.cpp +++ b/knetattach/main.cpp @@ -25,20 +25,22 @@ #include "knetattach.h" int main(int argc, char **argv) { - KAboutData about("knetattach", 0, ki18n("KDE Network Wizard"), "1.0", - ki18n("KDE Network Wizard"), - KAboutData::License_GPL, - ki18n("(c) 2004 George Staikos")); + KAboutData about( + "knetattach", 0, ki18n("KDE Network Wizard"), "1.0", + ki18n("KDE Network Wizard"), + KAboutData::License_GPL, + ki18n("(c) 2004 George Staikos") + ); - about.addAuthor(ki18n("George Staikos"), ki18n("Primary author and maintainer"), "staikos@kde.org"); + about.addAuthor(ki18n("George Staikos"), ki18n("Primary author and maintainer"), "staikos@kde.org"); - KCmdLineArgs::init(argc, argv, &about); - KApplication a; + KCmdLineArgs::init(argc, argv, &about); + KApplication a; - KNetAttach na; - a.connect( &a, SIGNAL(lastWindowClosed()), &a, SLOT(quit()) ); - na.show(); + KNetAttach na; + a.connect( &a, SIGNAL(lastWindowClosed()), &a, SLOT(quit()) ); + na.show(); - return a.exec(); + return a.exec(); } diff --git a/konsole/desktop/konsole.desktop b/konsole/desktop/konsole.desktop index c9faabc6..a453ae24 100755 --- a/konsole/desktop/konsole.desktop +++ b/konsole/desktop/konsole.desktop @@ -8,6 +8,7 @@ Categories=Qt;KDE;System;TerminalEmulator; Actions=NewWindow; X-DocPath=konsole/index.html StartupNotify=true +X-KDE-HasTrayOption=true Name=Konsole Name[af]=Konsole diff --git a/ksysguard/gui/ksysguard.desktop b/ksysguard/gui/ksysguard.desktop index 98e5efd8..1e6bd110 100755 --- a/ksysguard/gui/ksysguard.desktop +++ b/ksysguard/gui/ksysguard.desktop @@ -175,3 +175,4 @@ X-DocPath=ksysguard/index.html Terminal=false StartupNotify=true Categories=Qt;KDE;System; +X-KDE-HasTrayOption=true diff --git a/systemsettings/app/kdesystemsettings.desktop b/systemsettings/app/kdesystemsettings.desktop index 80bf9452..e4b6b69d 100755 --- a/systemsettings/app/kdesystemsettings.desktop +++ b/systemsettings/app/kdesystemsettings.desktop @@ -6,6 +6,7 @@ StartupNotify=true Implements=org.kde.systemsettings SingleMainWindow=true NotShowIn=KDE; +X-KDE-HasTrayOption=true GenericName=KDE System Settings GenericName[ar]=إعدادات نظام كدي diff --git a/systemsettings/app/main.cpp b/systemsettings/app/main.cpp index 6b943bdf..30da68fc 100644 --- a/systemsettings/app/main.cpp +++ b/systemsettings/app/main.cpp @@ -31,7 +31,7 @@ #include "SystemSettingsApp.h" #include "SettingsBase.h" -int main( int argc, char *argv[] ) +int main(int argc, char *argv[]) { // About data KAboutData aboutData("systemsettings", 0, ki18n("System Settings"), KDE_VERSION_STRING, ki18n("Central configuration center for KDE."), KAboutData::License_GPL, ki18n("(c) 2009, Ben Cooksley")); diff --git a/systemsettings/app/systemsettings.desktop b/systemsettings/app/systemsettings.desktop index d6c6c9fe..300bca47 100755 --- a/systemsettings/app/systemsettings.desktop +++ b/systemsettings/app/systemsettings.desktop @@ -7,6 +7,7 @@ StartupNotify=true Implements=org.kde.systemsettings SingleMainWindow=true OnlyShowIn=KDE; +X-KDE-HasTrayOption=true GenericName=System Settings GenericName[ar]=إعدادات النظام