From 28771943f7c5cbdb17754a962c668f6b61013d04 Mon Sep 17 00:00:00 2001 From: Roman Savochenko Date: Fri, 31 Jan 2020 21:37:30 +0900 Subject: [PATCH] tdeprint: autostart of KJobViewer is now controlled by a .desktop file. Taken from patch proposed in https://bugs.trinitydesktop.org/show_bug.cgi?id=1362. Signed-off-by: Roman Savochenko Signed-off-by: Michele Calgaro --- tdeprint/kjobviewer/CMakeLists.txt | 1 + .../kjobviewer/kjobviewer-autostart.desktop | 96 +++++++++++++++++++ tdeprint/kjobviewer/kjobviewer.cpp | 3 + 3 files changed, 100 insertions(+) create mode 100644 tdeprint/kjobviewer/kjobviewer-autostart.desktop diff --git a/tdeprint/kjobviewer/CMakeLists.txt b/tdeprint/kjobviewer/CMakeLists.txt index 14ba1dfd4..12c0b2551 100644 --- a/tdeprint/kjobviewer/CMakeLists.txt +++ b/tdeprint/kjobviewer/CMakeLists.txt @@ -26,6 +26,7 @@ link_directories( tde_install_icons( kjobviewer ) install( FILES kjobviewer.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install( FILES kjobviewer-autostart.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} ) install( FILES kjobviewerui.rc DESTINATION ${DATA_INSTALL_DIR}/kjobviewer ) diff --git a/tdeprint/kjobviewer/kjobviewer-autostart.desktop b/tdeprint/kjobviewer/kjobviewer-autostart.desktop new file mode 100644 index 000000000..4213729a1 --- /dev/null +++ b/tdeprint/kjobviewer/kjobviewer-autostart.desktop @@ -0,0 +1,96 @@ +[Desktop Entry] +Exec=kjobviewer --all --noshow %i %m +Icon=kjobviewer +Terminal=false +Type=Application + +Name=KJobViewer +Name[bn]=কে-জব-ভিউয়ার +Name[csb]=Przezérnik pòlétów drëkera +Name[cy]=KGwelyddSwyddi +Name[ja]=K ジョブビューア +Name[nds]=Opgavenkieker +Name[ne]=KJob दर्शक +Name[pl]=Przeglądarka zadań drukowania +Name[pt_BR]=Trabalhos de Impressão +Name[ro]=Vizualizor lucrări de tipărit +Name[rw]=K-IkigaragazaUmurimo +Name[sk]=Prehliadač úloh +Name[sv]=K-jobbvisare +Name[ta]=கேபணி காட்சியாளன் +Name[tg]=Намоишгари корҳо +Name[vi]=Trình theo dõi Tác vụ In ấn +GenericName=Print Jobs +GenericName[af]=Drukker Werke +GenericName[be]=Заданні друку +GenericName[bg]=Задания за печат +GenericName[bn]=মুদ্রণ তালিকা +GenericName[bs]=Zadaci štampe +GenericName[ca]=Treballs d'impressió +GenericName[cs]=Tiskové úlohy +GenericName[csb]=Pòlétë drëkera +GenericName[cy]=Swyddi Argraffu +GenericName[da]=Udskriv job +GenericName[de]=Druckaufträge +GenericName[el]=Εργασίες εκτύπωσης +GenericName[eo]=Printtaskoj +GenericName[es]=Trabajos de impresión +GenericName[et]=Printeri tööd +GenericName[eu]=Inprimaketa lanak +GenericName[fa]=چاپ کارها +GenericName[fi]=Tulostustyöt +GenericName[fr]=Tâches d'impressions +GenericName[fy]=printtaken +GenericName[ga]=Jabanna Priontála +GenericName[gl]=Traballos de Impresión +GenericName[he]=עבודות הדפסה +GenericName[hr]=Zadaci ispisivanja +GenericName[hu]=Nyomtatási feladatok +GenericName[is]=Prentverk +GenericName[it]=Lavori di stampa +GenericName[ja]=印刷ジョブ +GenericName[ka]=ბეჭდვის დავალება +GenericName[kk]=Басып шығару тапсырмалары +GenericName[km]=ការងារ​បោះពុម្ព +GenericName[lt]=Spausdinimo užduotys +GenericName[mk]=Задачи за печатење +GenericName[ms]=Cetak Kerja +GenericName[nb]=Utskriftsjobber +GenericName[nds]=Druckopgaven +GenericName[ne]=मुद्रण कार्य +GenericName[nl]=Afdruktaken +GenericName[nn]=Utskriftsjobbar +GenericName[pa]=ਛਪਾਈ ਕੰਮ +GenericName[pl]=Zadania drukowania +GenericName[pt]=Tarefas de Impressão +GenericName[pt_BR]=Tarefas de Impressão +GenericName[ro]=Lucrări de tipărit +GenericName[ru]=Задания печати +GenericName[rw]=Gucapa Imirimo +GenericName[se]=Čálihanbarggut +GenericName[sk]=Tlačové úlohy +GenericName[sl]=Tiskalniška opravila +GenericName[sr]=Послови штампе +GenericName[sr@Latn]=Poslovi štampe +GenericName[sv]=Skrivarjobb +GenericName[ta]=அச்சுப் பணிகள் +GenericName[te]=ప్రచురణ పనులు +GenericName[tg]=Корҳои чопгар +GenericName[th]=งานพิมพ์ +GenericName[tr]=Yazdırma Görevleri +GenericName[tt]=Bastıru Eşläre +GenericName[uk]=Задачі друку +GenericName[uz]=Bosib chiqarish vazifalari +GenericName[uz@cyrillic]=Босиб чиқариш вазифалари +GenericName[vi]=Tác vụ In ấn +GenericName[wa]=Bouyes d' imprimaedje +GenericName[zh_CN]=打印任务 +GenericName[zh_TW]=列印工作 + +X-DCOP-ServiceType=Unique +X-TDE-autostart-after=panel +X-TDE-autostart-condition=tdeprintrc:Jobs:KeepWindow:true +X-TDE-autostart-phase=1 +X-TDE-StartupNotify=false +Categories=Qt;TDE;Utility;Printing;HardwareSettings;TrayIcon; +ShowOnlyIn=TDE; diff --git a/tdeprint/kjobviewer/kjobviewer.cpp b/tdeprint/kjobviewer/kjobviewer.cpp index 393cd1c95..cdf1fc225 100644 --- a/tdeprint/kjobviewer/kjobviewer.cpp +++ b/tdeprint/kjobviewer/kjobviewer.cpp @@ -94,6 +94,9 @@ KJobViewerApp::KJobViewerApp() : KUniqueApplication() m_views.setAutoDelete(true); m_tray = 0; m_timer = 0; + + // We handle autostart via standard autostart-enabled .desktop file instead of the session manager + disableSessionManagement(); } KJobViewerApp::~KJobViewerApp()