From 6960221d2c0d539b5f34bedfd004051313c1984e Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 11 Sep 2016 18:31:00 +0900 Subject: Fixed khotkeys.desktop handling. This resolve bug 2685. Signed-off-by: Michele Calgaro --- khotkeys/CMakeLists.txt | 2 - khotkeys/Makefile.am | 5 - khotkeys/app/CMakeLists.txt | 5 - khotkeys/app/Makefile.am | 3 - khotkeys/app/khotkeys.desktop | 206 ------------------------------------------ khotkeys/khotkeys.desktop | 2 - 6 files changed, 223 deletions(-) delete mode 100644 khotkeys/app/khotkeys.desktop delete mode 100644 khotkeys/khotkeys.desktop diff --git a/khotkeys/CMakeLists.txt b/khotkeys/CMakeLists.txt index 39c84111e..4eda615a3 100644 --- a/khotkeys/CMakeLists.txt +++ b/khotkeys/CMakeLists.txt @@ -37,5 +37,3 @@ add_subdirectory( app ) add_subdirectory( data ) add_subdirectory( update ) tde_conditional_add_subdirectory( WITH_ARTS arts ) - -install( FILES khotkeys.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} ) diff --git a/khotkeys/Makefile.am b/khotkeys/Makefile.am index 981a8a9b6..924686af4 100644 --- a/khotkeys/Makefile.am +++ b/khotkeys/Makefile.am @@ -1,10 +1,5 @@ SUBDIRS = shared kcontrol app data update $(KHOTKEYS_ARTS_SUBDIR) -khotkeys_autostart_DATA = khotkeys.desktop -khotkeys_autostartdir = $(datadir)/autostart - -EXTRA_DIST = $(khotkeys_autostart_DATA) COPYING AUTHORS - messages: rc.cpp $(EXTRACTRC) kcontrol/ui/*.ui data/*.khotkeys >> rc.cpp $(XGETTEXT) rc.cpp app/*.cpp shared/*.cpp shared/*.h kcontrol/*.cpp -o $(podir)/khotkeys.pot diff --git a/khotkeys/app/CMakeLists.txt b/khotkeys/app/CMakeLists.txt index 789d4ea7f..df2bd70db 100644 --- a/khotkeys/app/CMakeLists.txt +++ b/khotkeys/app/CMakeLists.txt @@ -22,11 +22,6 @@ link_directories( ) -##### other data ################################ - -install( FILES khotkeys.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded ) - - ##### kded_khotkeys (module) #################### tde_add_kpart( kded_khotkeys AUTOMOC diff --git a/khotkeys/app/Makefile.am b/khotkeys/app/Makefile.am index e003ad0c2..0ff95b46e 100644 --- a/khotkeys/app/Makefile.am +++ b/khotkeys/app/Makefile.am @@ -16,6 +16,3 @@ noinst_HEADERS = app.h kded.h INCLUDES = -I$(srcdir)/../shared $(all_includes) METASOURCES = AUTO - -servicesdir = $(kde_servicesdir)/kded -services_DATA = khotkeys.desktop diff --git a/khotkeys/app/khotkeys.desktop b/khotkeys/app/khotkeys.desktop deleted file mode 100644 index 036e3b462..000000000 --- a/khotkeys/app/khotkeys.desktop +++ /dev/null @@ -1,206 +0,0 @@ -[Desktop Entry] -Exec=khotkeys -Type=Service -X-TDE-ServiceTypes=KDEDModule -X-TDE-ModuleType=Library -X-TDE-Library=khotkeys -X-TDE-FactoryName=khotkeys -X-TDE-Kded-autoload=false -X-DocPath=kcontrol/khotkeys/index.html - -Name=Input Actions -Name[af]=Inset Aksies -Name[ar]=نشاطات الإدخال -Name[be]=Дзеянні -Name[bg]=Действия -Name[br]=Oberoù enkas -Name[bs]=Akcije unosa -Name[ca]=Accions d'entrada -Name[cs]=Vstupní činnosti -Name[csb]=Klawiszowé dzéjania -Name[da]=Indgiv handlinger -Name[de]=Tastenkombinationen -Name[el]=Ενέργειες εισόδου -Name[eo]=Enir-agadoj -Name[es]=Introducir acciones -Name[et]=Sisestustoimingud -Name[eu]=Sarrerako ekintzak -Name[fa]=کنشهای ورودی -Name[fi]=Syöttötoiminnot -Name[fr]=Actions d'entrées -Name[fy]=Ynfieraksjes -Name[ga]=Gníomhartha Ionchurtha -Name[gl]=Accións de Entrada -Name[he]=פעולות קלט -Name[hr]=Aktivnosti unosa -Name[hu]=Beviteli műveletek -Name[is]=Inntaksaðgerðir -Name[it]=Azioni di immissione -Name[ja]=入力アクション -Name[ka]=შეტანის ქმედებები -Name[kk]=Енгізу әрекеттері -Name[km]=អំពើបញ្ចូល -Name[ko]=입력 동작 -Name[lt]=Įvesties veiksmai -Name[mk]=Влезни дејства -Name[ms]=Tindakan Input -Name[nb]=Input-handlinger -Name[nds]=Ingaavakschonen -Name[ne]=आगत कार्य -Name[nl]=Invoeracties -Name[nn]=Innhandlingar -Name[pa]=ਇੰਪੁੱਟ ਕਾਰਵਾਈਆਂ -Name[pl]=Akcje klawiszowe -Name[pt]=Acções de Entrada -Name[pt_BR]=Ações de Entrada -Name[ro]=Acțiuni de intrare -Name[ru]=Действия -Name[rw]=Kwinjiza Ibikorwa -Name[sk]=Vstupné akcie -Name[sl]=Vhodna dejanja -Name[sr]=Акције улаза -Name[sr@Latn]=Akcije ulaza -Name[sv]=Inmatningsåtgärder -Name[ta]=உள்ளீட்டு செயல்கள் -Name[te]=ములాంశ చర్యలు -Name[tg]=Амалҳо -Name[th]=การกระทำเพื่อใส่ข้อมูล -Name[tr]=Girdi Eylemleri -Name[tt]=Kertü Ğämälläre -Name[uk]=Ввід -Name[uz]=Kiritish amallari -Name[uz@cyrillic]=Киритиш амаллари -Name[vi]=Gõ Phím nóng -Name[wa]=Accions en intrêye -Name[zh_CN]=输入动作 -Name[zh_TW]=輸入動作 - -Comment=Configure Hotkey settings -Comment[af]=Stel kortpad sleutels op -Comment[be]=Настаўленні клавішных скаротаў -Comment[bg]=Настройване на жестове с мишката -Comment[bn]=হট-কী সেটিংস কনফিগার করুন -Comment[br]=Kefluniañ dibarzhoù Hotkey -Comment[bs]=Podesite opcije kratica tastature -Comment[ca]=Configura l'arranjament de les tecles ràpides -Comment[cs]=Nastavení horkých kláves -Comment[csb]=Kònfigùracëjô klawiszowëch skrodzënów -Comment[cy]=Ffurfweddu gosodiadau BysyllBrys -Comment[da]=Opsætning af genvejstast -Comment[de]=Tastenkombinationen festlegen -Comment[el]=Ρυθμίσεις HotKeys -Comment[eo]=Agordo de klavkomando -Comment[es]=Configuración de las preferencias de Hotkey -Comment[et]=Kiirklahvide seadistused -Comment[eu]=Konfiguratu Hotkey-ren ezarpenak -Comment[fa]=پیکربندی تنظیمات کلید میان‌بر -Comment[fi]=Muokkaa pikanäppäinten asetuksia -Comment[fr]=Configurer les réglages des raccourcis clavier -Comment[fy]=Fluchtoetsen ynstelle -Comment[gl]=Configurar opcións de HotKeys -Comment[he]=שינוי הגדרות מקשי הקיצור -Comment[hi]=हॉट-की विन्यास कॉन्फ़िगर करें -Comment[hr]=Konfiguriranje postavki prečaca -Comment[hu]=A használható parancsok beállítása -Comment[is]=Stillingar flýtilykla -Comment[it]=Configura impostazioni di Hotkey -Comment[ja]=ホットキーの設定 -Comment[ka]=კლავიშთა კომბინაციის კონფიგურირება -Comment[kk]=Пернелер тіркесімдерді баптау -Comment[km]=កំណត់​រចនាសម្ព័ន្ធ​ការ​កំណត់​គ្រាប់ចុច​បន្ទាន់ -Comment[ko]=단축키 설정 -Comment[lt]=Konfigūruoti klavišų kombinacijų nustatymus -Comment[lv]=Konfigurē karsto taustiņu parametrus -Comment[mk]=Конфигурирајте ги поставувањата за брзите копчиња -Comment[ms]=Konfigur seting Kekunci Panas -Comment[mt]=Konfigurazzjoni tal-hotkeys -Comment[nb]=Sett opp hurtigtaster -Comment[nds]=Akschonen för besünner Ingaven instellen -Comment[ne]=हटकुञ्जी सेटिङ कन्फिगर गर्नुहोस् -Comment[nl]=Sneltoetsen instellen -Comment[nn]=Set opp snøggtastar -Comment[pa]=ਹਾਟਕੀ ਸੈਟਿੰਗ ਸੰਰਚਨਾ -Comment[pl]=Konfiguracja skrótów klawiszowych -Comment[pt]=Configurar as opções de teclas -Comment[pt_BR]=Configura definições de teclas de atalho -Comment[ro]=Configurează setările Hotkey -Comment[ru]=Настройка действий по комбинациям клавиш и росчеркам мышью -Comment[rw]=Kuboneza amagenamiterere Butozihuta -Comment[se]=Heivet jođánisboaluid -Comment[sk]=Nastavenia klávesových skratiek -Comment[sl]=Nastavitve vročih tipk -Comment[sr]=Подешавање поставки пречица -Comment[sr@Latn]=Podešavanje postavki prečica -Comment[sv]=Anpassa Hotkey-inställningar -Comment[ta]=ÍÕìÌÅ¢¨º «¨ÁôÒ¸¨Ç ¯ûǨÁ -Comment[th]=ตั้งค่าปุ่มลัด -Comment[tr]=Kısayol ayarlarını yapılandır -Comment[tt]=Qaynar töymälärne caylaw -Comment[uk]=Налаштування швидких клавіш -Comment[vi]=Cấu hình các thiết lập về phím nóng -Comment[wa]=Apontiaedjes des tchuzes Hotkeys -Comment[zh_CN]=配置热键设置 -Comment[zh_TW]=設定熱鍵設定值 - -Keywords=Keys;Global key bindings;Key bindings;Gestures;Mouse gestures; -Keywords[af]=Keys;Globale sleutel bindings;sleutel scheme;sleutel bindings;kortpaaie;application kortpaaie; -Keywords[ar]=مفايتح، مفاتيح الاختصارات العامّة، خريطة المفاتيح، مفاتيح الاختصارات، اختصارات، اختصارات تطبيقات ، حركات الفأرة; -Keywords[be]=Клавішы;Глабальныя скароты;Скароты;Рухі;Рухі мышы;Keys;Global key bindings;Key bindings;Gestures;Mouse gestures; -Keywords[bg]=бърз; клавиш; бързи; достъп; клавишна; комбинация; жестове; мишка; жест; операция; Keys; Global key bindings; Key bindings; Gestures; Mouse gestures; -Keywords[bs]=Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;tipke;kratice tastature;globalne kratice tastature;geste;geste miša; -Keywords[ca]=Tecles;lligams de tecles globals;Lligams de tecles;gestos;gestos de ratolí; -Keywords[cs]=Klávesy;Globální klávesové zkratky;Schéma kláves;Klávesové zkratky;Zkratky;Gesta; -Keywords[csb]=klawisze;globalné klawiszowé skrodzënë;schemë skrodzënów;gestë;mësz; -Keywords[cy]=Bysyll;Bysellau;Rhwymiadau bysell eang;Ystumiau;Ystumiau llygoden; -Keywords[da]=Taster;Globale tastebindinger;Tastebindinger;Gester;Muse-gester; -Keywords[de]=Tasten;Tastenzuordnung;Tastenkürzel;Kurzbefehle;Tastenschema;Tastaturlayout;Gesten;Mausgesten; -Keywords[el]=Πλήκτρα;Καθολικοί συνδυασμοί πλήκτρων;Συνδυασμοί πλήκτρων;Gestures;Mouse gestures; -Keywords[eo]=klavoj;malloka;signifoj;asocioj;kombinoj;klavkombinoj;muzo; -Keywords[es]=Teclas;Asociaciones de teclas globales;Asociaciones de teclas;Gestos;Gestos del ratón; -Keywords[et]=Klahvid;Globaalsed kiirklahvid;Klahviskeem;Kiirklahvid;Klahvide seosed;Žestid;Hiirežestid; -Keywords[eu]=Teklak;Tekla elkarketa orokorrak;Tekla elkarketak;Keinuak;Saguaren keinuak; -Keywords[fa]=کلیدها، مقیدسازیهای کلید سراسری، مقیدسازیهای کلید، حرکات، حرکات موشی; -Keywords[fi]=Näppäimet;Yleiset näppäinsidokset;Näppäinteema;Näppäinsidokset;pikavalinnat;sovellusten pikavalinnat;hiirieleet; -Keywords[fr]=touches;raccourcis clavier globaux;raccourcis clavier;gestes;gestes de la souris; -Keywords[fy]=keys;toetsen;toetsenbindingen;key bindings;toetsbiningen;sneltoetsen;fluchtoetsen;globale toetsenbindingen;algemiene toetsbiningen;mouse gestures;muisgebaren;mûsstjoeringen;stjoeringen;gestures;gebaren; -Keywords[ga]=Eochracha;Ceangail chomhchoiteanna eochracha;Ceangail chomhchoiteanna;Gothaí;Gothaí luiche; -Keywords[gl]=Teclas;Atallos de teclado globais;Atallos de teclado;Xestos;Xestos co rato; -Keywords[he]=מקשים;תפקידי מקשים גלובליים;תצורת מקשים;תפקידי מקשים;קיצורים;קיצורים של יישומים; Keys;Global key bindings;Key bindings;Gestures;Mouse gestures; -Keywords[hi]=कुंजियाँ;ग्लोबल की-बाइंडिंग्स;की-बाइंडिंग्स;गेस्चर्स;माउस गेस्चर्स; -Keywords[hr]=Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;Tipke;Opći prečaci tipkovnice;Prečaci tipkovnice;Gestikulacije;Gestikulacije mišem; -Keywords[hu]=billentyűk;globális billentyűparancs;billentyűparancs;műveletek;mozdulatsorok; -Keywords[is]=Lyklar;Hnappar;Flýtihnappar;Flýtilyklar;Lyklabindingar; -Keywords[it]=tasti;associazioni globali di tasti;schema di tasti;associazioni di tasti;scorciatoie;gesti;gesti mouse;mouse gesti; -Keywords[ja]=キー;グローバルキー;キーバインド;ジェスチャー;マウスジェスチャー; -Keywords[km]=គ្រាប់ចុច;ការ​ចង​គ្រាប់ចុច​សកល;ការ​ចង​គ្រាប់ចុច;កាយវិការ;កាយវិការ​កណ្ដុរ; -Keywords[lt]=Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;klavišai;klavišų sietis;klavišų schema;klavišų išdėstymas;spartieji klavišai;programų spartieji klavišai;pelės veiksmai; -Keywords[lv]=Taustiņi;Globālās taustiņu sasaistes;Taustiņu shēma;Taustiņu sasaistes;mouse gestures; -Keywords[mk]=Keys;Global key bindings;Key bindings;Gestures;Mouse gestures; Копчиња;Глобални врски на копчиња;врски на копчиња;гестови;гестови со глушец; -Keywords[nb]=Taster;generelle hurtigtaster;hurtigtaster;bevegelser;musebevegelser; -Keywords[nds]=Tasten;Globale Tastkombinatschonen;Tastschema;Tastkombinatschonen;Ingaavtekens;Muusteken; -Keywords[ne]=कुञ्जीहरू; विश्वव्यापी कुञ्जी बाइन्डिङ; कुञ्जी बाइन्डिङ; सङ्केत; माउस सङ्केत; -Keywords[nl]=keys;toetsen;toetsenbindingen;key bindings;sneltoetsen;globale toetsenbindingen;mouse gestures;muisgebaren;gestures;gebaren; -Keywords[nn]=tastar;globale snøggtastar;tasteoppsett;snøggtastar;snarvegar;programsnarvegar;rørsler;muserørsler; -Keywords[pa]=Keys;Global key bindings;Key bindings;Gestures;ਮਾਊਸ gestures; ਸਵਿੱਚਾਂ; -Keywords[pl]=klawisze;globalne skróty klawiszowe;schematy skrótów;gesty;mysz; -Keywords[pt]=teclas;teclas globais;esquema de teclas;atribuições de teclas;gestos;gestos com rato; -Keywords[pt_BR]=Teclas;Teclas de atalho globais;esquema de teclado;gestos; gestos do mouse; -Keywords[ro]=taste;asocieri globale de taste;schemă taste;asocieri taste;acceleratori;acceleratori aplicații;scurtături;gesturi; -Keywords[ru]=Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;мышь;росчерк;клавиши;комбинации клавиш;действия; -Keywords[rw]=Buto;Ibyafataranyijwe urufunguzo rusange;Ibyafatanyijwe by'urufunguzo;Ibimenyetso;Ibimenyetso by'imbeba; -Keywords[se]=boalut;oppalaš jođánisboalut;boalločoahkádusat;boalločatnasat;njuolgobálgát;prográmmanjuolgabálgát;lihkádusat;sáhpánlihkádusat; -Keywords[sk]=Klávesy;Globálne klávesové skratky;schéma kláves;klávesové skratky;gestá;gestá myšou; -Keywords[sl]=tipke;globalne vezi tipk;vezi tipk;tipkovne vezi;gibi;miškini gibi; -Keywords[sr]=Keys;Global key bindings;Key scheme;Key bindings;shortcuts;application shortcuts;тастери;глобални тастери;пречица;шема тастера;пречице;програмске пречице; -Keywords[sr@Latn]=Keys;Global key bindings;Key scheme;Key bindings;shortcuts;application shortcuts;tasteri;globalni tasteri;prečica;šema tastera;prečice;programske prečice; -Keywords[sv]=tangenter;globala tangentbindningar;tangentbindningar;gester;musgester; -Keywords[ta]=விசைகள்;உலகலாவிய விசை பிணைப்புகள்;விசை திட்டம்;விசை பிணைப்புகள்;குறுக்குவழிகள்;பயன்பாட்டுக் குறுக்குவழிகள்; -Keywords[th]=ปุ่มพิมพ์;ปุ่มพิมพ์ส่วนกลาง;ชุดปุ่มพิมพ์;การจับคู่ปุ่มพิมพ์;ปุ่มพิมพ์ลัด;แป้นพิมพ์ลัด;ปุ่มพิมพ์ลัดแอพพลิเคชัน;การลากเมาส์; -Keywords[tr]=Tuşlar;Küresel tuş bağlantıları;Tuş bağlantıları;Kısayollar;Uygulama kısayolları;Fare hareketleri; -Keywords[uk]=клавіші;глобальні прив'язки клавіш;схема клавіш;прив'язка клавіш; жести; жести мишки; -Keywords[uz]=Gestures;Mouse gestures;Tugmalar;Umumiy tugmalar birikmasi;Tugmalar birikmasi; -Keywords[uz@cyrillic]=Gestures;Mouse gestures;Тугмалар;Умумий тугмалар бирикмаси;Тугмалар бирикмаси; -Keywords[vi]=Phím;tổ hợp phím toàn cục;tổ hợp phím;gõ phím;di chuyển chuột; -Keywords[wa]=Tapes;globås rascourtis;rascourtis;djesses;manire di bodjî;manire di bodjî li sori; -Keywords[zh_CN]=Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;键;全局键绑定;手势;鼠标手势; -Keywords[zh_TW]=Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;按鍵;全域按建連結;按鍵連結;手勢;滑鼠手勢; diff --git a/khotkeys/khotkeys.desktop b/khotkeys/khotkeys.desktop deleted file mode 100644 index e1e3e1732..000000000 --- a/khotkeys/khotkeys.desktop +++ /dev/null @@ -1,2 +0,0 @@ -[Desktop Entry] -Hidden=true -- cgit v1.2.3