diff options
Diffstat (limited to 'konsole')
63 files changed, 1161 insertions, 3356 deletions
diff --git a/konsole/CMakeL10n.txt b/konsole/CMakeL10n.txt index b585ce4af..69c8f8721 100644 --- a/konsole/CMakeL10n.txt +++ b/konsole/CMakeL10n.txt @@ -1,3 +1,31 @@ ##### create translation templates ############## tde_l10n_auto_add_subdirectories( ) + +file( + GLOB_RECURSE _konsole_desktops + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/*.desktop + ${CMAKE_CURRENT_SOURCE_DIR}/*.desktop.cmake +) +list( SORT _konsole_desktops ) + +file( + GLOB _konsole_profiles + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/other/*shells +) +list( SORT _konsole_profiles ) + +tde_l10n_create_template( + CATALOG "desktop_files/konsole-desktops/" + SOURCES_DESKTOP ${_konsole_desktops} ${_konsole_profiles} + KEYWORDS Title0 Title1 Title2 Title3 Title4 Title5 + DESTINATION "${CMAKE_SOURCE_DIR}/translations" +) + +tde_l10n_create_template( + CATALOG "desktop_files/konsole-eventsrc/" + SOURCES eventsrc + DESTINATION "${CMAKE_SOURCE_DIR}/translations" +) diff --git a/konsole/CMakeLists.txt b/konsole/CMakeLists.txt index b0059acbe..97dec84fb 100644 --- a/konsole/CMakeLists.txt +++ b/konsole/CMakeLists.txt @@ -18,41 +18,52 @@ add_subdirectory( fonts ) add_subdirectory( terminalhere ) -install( FILES - konsole.desktop konsolesu.desktop - DESTINATION ${XDG_APPS_INSTALL_DIR} ) - - -install( FILES - konsolepart.desktop kwrited.desktop konsole-script.desktop - DESTINATION ${SERVICES_INSTALL_DIR} ) - - -install( FILES - terminalemulator.desktop - DESTINATION ${SERVICETYPES_INSTALL_DIR} ) - - -install( FILES - konsole.upd - DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update ) - - -install( PROGRAMS - schemaStrip.pl - DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update ) - - -install( FILES - kwrited.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/kded ) - - -install( FILES - terminalhere.desktop - DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus ) - - -install( FILES - eventsrc tips - DESTINATION ${DATA_INSTALL_DIR}/konsole ) +tde_create_translated_desktop( + SOURCE konsole.desktop konsolesu.desktop + PO_DIR konsole-desktops +) + +tde_create_translated_desktop( + SOURCE konsolepart.desktop kwrited.desktop konsole-script.desktop + DESTINATION ${SERVICES_INSTALL_DIR} + PO_DIR konsole-desktops +) + +tde_create_translated_desktop( + SOURCE terminalemulator.desktop + DESTINATION ${SERVICETYPES_INSTALL_DIR} + PO_DIR konsole-desktops +) + +install( + FILES konsole.upd + DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update +) + +install( + PROGRAMS schemaStrip.pl + DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update +) + +tde_create_translated_desktop( + SOURCE kwrited.desktop + DESTINATION ${SERVICES_INSTALL_DIR}/kded + PO_DIR konsole-desktops +) + +tde_create_translated_desktop( + SOURCE terminalhere.desktop + DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus + PO_DIR konsole-desktops +) + +tde_create_translated_desktop( + SOURCE eventsrc + DESTINATION ${DATA_INSTALL_DIR}/konsole + PO_DIR konsole-eventsrc +) + +install( + FILES tips + DESTINATION ${DATA_INSTALL_DIR}/konsole +) diff --git a/konsole/README.konsole_kiosk b/konsole/README.konsole_kiosk index f769d5baf..c2d6525e9 100644 --- a/konsole/README.konsole_kiosk +++ b/konsole/README.konsole_kiosk @@ -50,7 +50,7 @@ action/scrollbar action/keyboard -So if you don't want the user to toggle his scrollbar settings, you would add: +So if you don't want the user to toggle their scrollbar settings, you would add: [KDE Action Restrictions] action/scrollbar=false diff --git a/konsole/README.ports b/konsole/README.ports index 06c3b6c13..71f3ae154 100644 --- a/konsole/README.ports +++ b/konsole/README.ports @@ -19,7 +19,6 @@ Lars Doelle <lars.doelle@on-line.de> Platform Experts ---------------- -- Tru64 - Thomas Leitner <tom@radar.tu-graz.ac.at> - Solaris - Stephan Kulow <coolo@kde.org> - FreeBSD - ? - HP-UX - ? diff --git a/konsole/eventsrc b/konsole/eventsrc index 12ceefc8b..f8d946059 100644 --- a/konsole/eventsrc +++ b/konsole/eventsrc @@ -1,736 +1,30 @@ [!Global!] IconName=konsole Comment=Konsole -Comment[ar]=مطراف سطر الأوامر -Comment[be]=Кансоль -Comment[bg]=Конзола -Comment[bn]=কনসোল -Comment[bs]=Konzola -Comment[csb]=Kònsole -Comment[da]=Konsol -Comment[eo]=Konzolo -Comment[et]=Konsool -Comment[hi]=कंसोल -Comment[hr]=Konzola -Comment[ka]=კონსოლი -Comment[kk]=Консоль -Comment[km]=កុងសូល -Comment[lt]=Konsolė -Comment[mk]=Конзола -Comment[mn]=Консол -Comment[nb]=Konsoll -Comment[nds]=Konsool -Comment[ne]=कन्सोल -Comment[nn]=Konsoll -Comment[pa]=ਕੰਨਸੋਲ -Comment[ro]=Consolă -Comment[sl]=Konzola -Comment[ta]=கான்சோல் -Comment[te]=కాన్సొల్ -Comment[tg]=Консол -Comment[th]=คอนโซล K -Comment[uz]=Terminal -Comment[uz@cyrillic]=Терминал -Comment[wa]=Konsole (terminå di KDE) -Comment[zh_TW]=Konsole 終端機程式 [BellVisible] Name=Bell in visible session -Name[af]=Klokkie in die sigbare sessie -Name[ar]=جرس في الجلسة المشاهدة -Name[be]=Званіць у актыўнай сесіі -Name[bg]=Камбана във видима сесия -Name[bn]=প্রদর্শিত সেশন-এ ঘণ্টা -Name[bs]=Zvono u vidljivoj sesiji -Name[ca]=Timbre a la sessió visible -Name[cs]=Zvonek ve viditelné relaci -Name[csb]=Zwónk w widzalny sesëji -Name[cy]=Cloch yn y sesiwn gweladwy -Name[da]=Klokke i synlig session -Name[de]=Signalton bei sichtbarer Sitzung -Name[el]=Κουδούνι στην ορατή συνεδρία -Name[eo]=Pepo en videbla seanco -Name[es]=Timbre en sesión visible -Name[et]=Heli nähtavas seansis -Name[eu]=Ezkila saio ikusgarrian -Name[fa]=زنگ در نشست مرئی -Name[fi]=Äänimerkki näkyvässä istunnossa -Name[fr]=Cloche dans la session visible -Name[fy]=Bel yn sichtbere sesje -Name[ga]=Clog i seisiún infheicthe -Name[gl]=Badalada na sesión visíbel -Name[he]=פעמון במשימה גלויה -Name[hi]=दृश्यमय सत्र में घंटी -Name[hr]=Zvono u vidljivoj sesiji -Name[hu]=Csengetés egy látható munkafolyamatban -Name[is]=Bjallan í sýnilegri setu -Name[it]=Campanella nella sessione visibile -Name[ja]=可視セッションのベル -Name[ka]=ხილული სესიისას ხმოვანი სიგნალი -Name[kk]=Көрінетін сеанстағы қоңырау -Name[km]=កណ្ដឹងក្នុងសម័យដែលមើលមិនឃើញ -Name[ko]=보이지 않는 세션에서 알림 발생 -Name[lt]=Skambutis matomose sesijose -Name[lv]=Zvans redzamā sesijā -Name[mk]=Ѕвонче во видлива сесија -Name[mn]=Ил суултын дуут сигналууд -Name[ms]=Loceng dalam sesi dapat dilihat -Name[mt]=Qanpiena waqt sessjoni viżibbli -Name[nb]=Varsel i synlig økt -Name[nds]=Pingel in'n sichtboren Törn -Name[ne]=दृश्यात्मक सत्रमा बेल -Name[nl]=Bel in zichtbare sessie -Name[nn]=Varsel i synleg økt -Name[pa]=ਦਿੱਖ ਸ਼ੈਸ਼ਨ ਵਿੱਚ ਘੰਟੀ -Name[pl]=Dzwonek w widocznej sesji -Name[pt]=Campainha numa sessão visível -Name[pt_BR]=Campainha em sessão visível -Name[ro]=Sunet în sesiunea vizibilă -Name[ru]=Звуковой сигнал в видимом сеансе -Name[rw]=Inzogera mu mukoro ugaragara -Name[se]=Ávaštus oidnos bargovuorus -Name[sk]=Zvonček v zobrazenej relácii -Name[sl]=Zvonec v vidni seji -Name[sr]=Звоно у видљивој сесији -Name[sr@Latn]=Zvono u vidljivoj sesiji -Name[sv]=Ljudsignal i synlig session -Name[ta]=பார்வை கால நேரத்தில் மணி -Name[te]=కనిపించె సెషన్ లొ గంట -Name[tg]=Занг дар нишасти дидан -Name[th]=ออดบนเซสชันที่มองเห็น -Name[tr]=Görünen oturumda zil -Name[tt]=Kürengän sessidän zil -Name[uk]=Дзвінок у видимому сеансі -Name[vi]=Chuông trong các phiên chạy nhìn thấy -Name[wa]=Xhilete e veyåves session -Name[zh_CN]=可见会话中的响铃 -Name[zh_TW]=在可見的工作階段使用響鈴 Comment=Bell emitted within a visible session -Comment[af]=Klokkie word gelui in die sigbare sessie -Comment[ar]=قرع جرس أثناء جلسة مرئية -Comment[be]=Не званіць у актыўнай сесіі -Comment[bg]=Камбана във видима сесия -Comment[bn]=একটি দৃশ্যমান সেশন-এ ঘণ্টা বেজেছে -Comment[bs]=Zvono emitovano u vidljivoj sesiji -Comment[ca]=Timbre emès dins d'una sessió visible -Comment[cs]=Vydán zvonek ve viditelné relaci -Comment[csb]=Zwónk jaczi zrësziwô sã w widzalny sesëji -Comment[cy]=Gollyngwyd cloch mewn sesiwn gweledig -Comment[da]=Klokke brugt indenfor en synlig session -Comment[de]=Signal gesendet innerhalb sichtbarer Sitzung -Comment[el]=Το μεγαφωνάκι ενεργοποιήθηκε σε μία ορατή συνεδρία -Comment[eo]=Pepo ekiĝis en videbla seanco -Comment[es]=Suena el timbre incluso en un sesión visible -Comment[et]=Heli nähtavas seansis -Comment[eu]=Saio ikusgarrian ezkila jo -Comment[fa]=زنگ در نشستی مرئی انتشار یافت -Comment[fi]=Äänimerkki lähetetty näkyvässä istunnossa -Comment[fr]=Cloche émise dans une session visible -Comment[fy]=Bel útstjoerd binnen in sichtbere sesje -Comment[ga]=Baineadh an clog i seisiún infheicthe -Comment[gl]=Badalada emitida nunha sesión visíbel -Comment[he]=פעמון נשמע במשימה גלוי -Comment[hi]=दृश्यमय सत्र में घंटी बजी -Comment[hr]=Zvono objavljeno u vidljivoj sesiji -Comment[hu]=Csengetés egy látható munkafolyamatban -Comment[is]=Bjallan hringdi í sýnilegu setunni -Comment[it]=Campanella suonata in una sessione visibile -Comment[ja]=可視セッションでベルが鳴りました -Comment[ka]=ხილულმა სესიისამ ხმოვანი სიგნალი გამოსცა -Comment[kk]=Көрінетін сеанс қоңырау соқты -Comment[km]=កណ្ដឹងបញ្ចេញសំឡេងក្នុងសម័យដែលមើលមិនឃើញ -Comment[ko]=보이는 세션에서 종소리 울림 -Comment[lt]=Matomos sesijos metu skambutis neveiks -Comment[lv]=Zvans, kas zvanīts redzamā sesijā -Comment[mk]=Емитувано е ѕвонче внатре во видливата сесија -Comment[mn]=Үзэгдэх суултад гарах дуу чимээ -Comment[ms]=Loceng dipancarkan dalam sesi dapat dilihat -Comment[nb]=Varsel sendt inne i en synlig økt -Comment[nds]=Pingel de in'n sichtboren Törn bruukt warrt -Comment[ne]=दृश्यात्मक सत्रमा बेल निकालियो -Comment[nl]=Bel uitgezonden binnen een zichtbare sessie -Comment[nn]=Varsel sendt inne i ei synleg økt -Comment[pa]=ਇੱਕ ਦਿੱਖ ਸ਼ੈਸ਼ਨ ਵਿੱਚ ਘੰਟੀ -Comment[pl]=Dzwonek uruchamiany w widocznej sesji -Comment[pt]=Campainha emitida dentro de uma sessão visível -Comment[pt_BR]=Campainha emitida dentro de uma sessão visível -Comment[ro]=Sunet emis în sesiunea vizibilă -Comment[ru]=Видимый сеанс подал звуковой сигнал -Comment[rw]=Inzogera yatangijwe mu mukoro ugaragara -Comment[se]=Ávaštus sáddejuvvui oidnos bargovuorus -Comment[sk]=Zvonček poslaný v zobrazenej relácii -Comment[sl]=Zvonec znotraj vidne seje -Comment[sr]=Звоно је емитовано унутар видљиве сесије -Comment[sr@Latn]=Zvono je emitovano unutar vidljive sesije -Comment[sv]=Ljudsignal inne i en synlig session -Comment[ta]=பார்க்கும் காலநேர அளவுக்குள் மணி வெளித்தள்ளப்பட்டது. -Comment[tg]=Ҳузфи занг дар нишасти дидан -Comment[th]=ส่งเสียงออดภายในเซสชันที่มองเห็นได้ -Comment[tr]=Görünen oturum ile zil çal -Comment[tt]=Kürengän sessidän zil kilde -Comment[uk]=Пролунав дзвінок у видимому сеансі -Comment[vi]=Chuông phát ra trong một phiên chạy nhìn thấy -Comment[wa]=Xhilete ki xhiltêye dins ene veyåve session -Comment[zh_CN]=可见会话中发生的响铃 -Comment[zh_TW]=在可見的工作階段使用響鈴 default_sound=KDE_Beep_Connect.ogg default_presentation=1 [BellInvisible] Name=Bell in non-visible session -Name[af]=Klokkie in nie-sigbare sessie -Name[ar]=جرس في جلسة غير مرئية -Name[be]=Званіць у неактыўных сесіях -Name[bg]=Камбана в невидима сесия -Name[bn]=আবৃত সেশন-এ ঘণ্টা -Name[bs]=Zvono u nevidljivoj sesiji -Name[ca]=Timbre a la sessió no visible -Name[cs]=Zvonek v neviditelné relaci -Name[csb]=Zwónk w niewidzalny sesëji -Name[cy]=Cloch mewn sesiwn anweledig -Name[da]=Klokke i ikke-synlig session -Name[de]=Signalton bei nicht sichtbarer Sitzung -Name[el]=Κουδούνι στη μη ορατή συνεδρία -Name[eo]=Pepo en nevidebla seanco -Name[es]=Timbre en sesión invisible -Name[et]=Heli nähtamatus seansis -Name[eu]=Ezkila saio ez ikusgarrian -Name[fa]=زنگ در نشست نامرئی -Name[fi]=Äänimerkki näkymättömässä istunnossa -Name[fr]=Cloche dans une session invisible -Name[fy]=Bel yn net-sichtbere sesje -Name[ga]=Clog i seisiún dofheicthe -Name[gl]=Badalada nunha sesión non visíbel -Name[he]=פעמון במשימה לא גלויה -Name[hi]=अदृश्यमय सत्र में घंटी -Name[hr]=Zvono u prikrivenoj sesiji -Name[hu]=Csengetés egy nem látható munkafolyamatban -Name[is]=Bjallan í ósýnilegri setu -Name[it]=Campanella nella sessione non-visibile -Name[ja]=不可視セッションのベル -Name[ka]=უხილავი სესიისას ხმოვანი სიგნალი -Name[kk]=Көрінбейтін сеанстағы қоңырау -Name[km]=កណ្ដឹងក្នុងសម័យដែលមើលឃើញ -Name[ko]=보이지 않는 세션에서 알림 발생 -Name[lt]=Skambutis nematomose sesijose -Name[lv]=Zvans neredzamā sesijā -Name[mk]=Ѕвонче во невидлива сесија -Name[mn]=Далд суултын дуут сигналууд -Name[ms]=Loceng dalam sesi tak dapat dilihat -Name[mt]=Qanpiena waqt sessjoni mhux viżibbli -Name[nb]=Varsel i usynlig økt -Name[nds]=Pingel in'n unsichtboren Törn -Name[ne]=देख्न नसकिने सत्रमा बेल -Name[nl]=Bel in niet-zichtbare sessie -Name[nn]=Varsel i usynleg økt -Name[pa]=ਨਾ-ਦਿੱਖ ਸ਼ੈਸ਼ਨ ਵਿੱਚ ਘੰਟੀ -Name[pl]=Dzwonek w niewidocznej sesji -Name[pt]=Campainha numa sessão não-visível -Name[pt_BR]=Campainha em sessão não-visível -Name[ro]=Sunet în sesiunea nevizibilă -Name[ru]=Звуковой сигнал в невидимых сеансах -Name[rw]=Inzogera mu mukoro utagaragara -Name[se]=Ávaštus oaidnemeahttun bargovuorus -Name[sk]=Zvonček v nezobrazenej relácii -Name[sl]=Zvonec v nevidni seji -Name[sr]=Звоно у невидљивој сесије -Name[sr@Latn]=Zvono u nevidljivoj sesije -Name[sv]=Ljudsignal i osynlig session -Name[ta]=பார்க்கமுடியாத காலநேரத்தில் மணி -Name[te]=కనిపించని సెషన్ లొ గంట -Name[tg]=Занг дар нишасти надидан -Name[th]=ออดบนเซสชันที่มองไม่เห็น -Name[tr]=Görünmeyen oturumda zil -Name[tt]=Kürenmägän sessidän zil -Name[uk]=Дзвінок у невидимому сеансі -Name[vi]=Chuông trong các phiên chạy không nhìn thấy -Name[wa]=Xhilete e nén veyåves session -Name[zh_CN]=不可见会话中的响铃 -Name[zh_TW]=在不可見的工作階段使用響鈴 Comment=Bell emitted within a non-visible session -Comment[af]=Klokkie word gelui in die nie-sigbare sessie -Comment[ar]=قرع جرس أثناء جلسة غير مرئية -Comment[be]=Не званіць у неактыўных сесіях -Comment[bg]=Камбана в невидима сесия -Comment[bn]=একটি অদৃশ্য সেশন-এ ঘণ্টা বেজেছে -Comment[bs]=Zvono emitovano u nevidljivoj sesiji -Comment[ca]=Timbre emès dins d'una sessió no visible -Comment[cs]=Vydán zvonek v neviditelné relaci -Comment[csb]=Zwónk jaczi zrësziwô sã w niewidzalny sesëji -Comment[cy]=Gollyngwyd cloch mewn sesiwn anweledig -Comment[da]=Klokke brugt indenfor en ikke-synlig session -Comment[de]=Signal gesendet innerhalb nicht sichtbarer Sitzung -Comment[el]=Το μεγαφωνάκι ενεργοποιήθηκε σε μία μη ορατή συνεδρία -Comment[eo]=Pepo ekiĝis en ne videbla seanco -Comment[es]=Suena el timbre incluso en un sesión visible -Comment[et]=Heli nähtamatus seansis -Comment[eu]=Saio ikusgarrian ezkila ez jo -Comment[fa]=زنگ در نشستی نامرئی انتشار یافت -Comment[fi]=Äänimerkki lähetetty näkymättömässä istunnossa -Comment[fr]=Cloche émise dans une session invisible -Comment[fy]=Bel útstjoerd yn in net-sichtbere sesje -Comment[ga]=Baineadh an clog i seisiún dofheicthe -Comment[gl]=Badalada emitida nunha sesión non visíbel -Comment[he]=פעמון נשמע במשימה לא גלוי -Comment[hi]=अदृश्यमय सत्र में घंटी बजी -Comment[hr]=Zvono objavljeno u prikrivenoj sesiji -Comment[hu]=Csengetés egy nem látható munkafolyamatban -Comment[is]=Bjallan hringdi í ósýnilegu setunni -Comment[it]=Campanella suonata in una sessione non-visibile -Comment[ja]=不可視セッションでベルが鳴りました -Comment[ka]=უხილავმა სესიისამ ხმოვანი სიგნალი გამოსცა -Comment[kk]=Көрінбейтін сеанс қоңырау соқты -Comment[km]=កណ្ដឹងបញ្ចេញសំឡេងក្នុងសម័យដែលមើលឃើញ -Comment[ko]=보이지 않는 세션에서 종소리 울림 -Comment[lt]=Nematomos sesijos metu skambutis neveiks -Comment[lv]=Zvans, kas zvanīts neredzamā sesijā -Comment[mk]=Емитувано е ѕвонче внатре во невидливата сесија -Comment[mn]=Үл үзэгдэх суултад гарах дуу чимээ -Comment[ms]=Loceng dipancarkan dalam sesi tak dapat dilihat -Comment[nb]=Varsel sendt inne i en usynlig økt -Comment[nds]=Pingel de in'n unsichtboren Törn bruukt warrt -Comment[ne]=देख्न नसकिने सत्रमा बेल निकालियो -Comment[nl]=Bel uitgezonden in een niet-zichtbare sessie -Comment[nn]=Varsel sendt inne i ei usynleg økt -Comment[pa]=ਇੱਕ ਨਾ-ਦਿੱਖ ਸ਼ੈਸ਼ਨ ਵਿੱਚ ਘੰਟੀ -Comment[pl]=Dzwonek uruchamiany w niewidocznej sesji -Comment[pt]=Campainha emitida dentro de uma sessão invisível -Comment[pt_BR]=Campainha emitida dentro de uma sessão invisível -Comment[ro]=Sunet emis într-o sesiune nevizibilă -Comment[ru]=Невидимый сеанс подал звуковой сигнал -Comment[rw]=Inzogera yatangijwe mu mukoro utagaragara -Comment[se]=Ávaštus sáddejuvvui oaidnemeahttun bargovuorus -Comment[sk]=Zvonček poslaný v nezobrazenej relácii -Comment[sl]=Zvonec znotraj nevidne seje -Comment[sr]=Звоно је емитовано унутар невидљиве сесије -Comment[sr@Latn]=Zvono je emitovano unutar nevidljive sesije -Comment[sv]=Ljudsignal inne i en osynlig session -Comment[ta]=பார்க்க முடியாத காலநேர அளவுக்குள் மணி வெளித்தள்ளப்பட்டது. -Comment[tg]=Ҳузфи занг дар нишасти надидан -Comment[th]=ส่งเสียงออดภายในเซสชันที่มองไม่เห็น -Comment[tr]=Görünmeyen oturumda zil -Comment[tt]=Kürenmägän sessidän zil kilde -Comment[uk]=Пролунав дзвінок у невидимому сеансі -Comment[vi]=Chuông phát ra trong một phiên chạy không nhìn thấy -Comment[wa]=Xhilete ki xhiltêye dins les nén veyåvès sessions -Comment[zh_CN]=不可见会话中发生的响铃 -Comment[zh_TW]=在不可見的工作階段使用響鈴 default_sound=KDE_Beep_Connect.ogg default_presentation=16 [Activity] Name=Activity in monitored session -Name[af]=Aktiveer in gemonitorde sessie -Name[ar]=نشاط في جلسة يتم مراقبتها -Name[be]=Актыўнасць у сесіі, за якой вядзецца назіранне -Name[bg]=Активност в наблюдавана сесия -Name[bn]=মনিটর করা সেশন-এ কিছু ঘটেছে -Name[bs]=Aktivnost u nadgledanoj sesiji -Name[ca]=Activitat a la sessió monitoritzada -Name[cs]=Aktivita v monitorované relaci -Name[csb]=Aktiwnota w mònitorowóny sesëji -Name[cy]=Gweithgarwch mewn sesiwn wedi'i fonitro -Name[da]=Aktivitet i overvåget session -Name[de]=Aktivität in überwachter Sitzung -Name[el]=Δραστηριότητα στην εποπτευόμενη συνεδρία -Name[eo]=Aktiveco en rigardata seanco -Name[es]=Actividad en sesión monitorizada -Name[et]=Aktiivsus jälgitavas seansis -Name[eu]=Monitorizatutako saioko iharduera -Name[fa]=فعالیت در نشست پایششده -Name[fi]=Aktiivisuutta tarkkailtavassa istunnossa -Name[fr]=Activité dans la session surveillée -Name[fy]=Aktiviteit yn observearre sesje -Name[ga]=Gníomhaíocht i seisiún monatóirithe -Name[gl]=Actividade na sesión monitoreada -Name[he]=פעילות במשימה מנוטרת -Name[hi]=मॉनीटर्ड सत्र में क्रिया -Name[hr]=Aktivnost u nadziranoj sesiji -Name[hu]=Aktivitás egy monitorozott munkafolyamatban -Name[is]=Virkni í setunni sem fylgst er með -Name[it]=Attività nella sessione controllata -Name[ja]=監視中のセッションの活動 -Name[kk]=Бақылаудағы сеанста белсендік -Name[km]=សកម្មភាពក្នុងសម័យដែលបានត្រួតពិនិត្យ -Name[ko]=보이는 세션에서 활동 발생 -Name[lt]=Stebimos sesijos veikla -Name[lv]=Aktivitāte monitorētā sesijā -Name[mk]=Активност во следената сесија -Name[mn]=Харагдаж буй суултын идэвхи -Name[ms]=Aktiviti dalam sesi yang dipantau -Name[mt]=Attività waqt sessjoni monitorjata -Name[nb]=Aktivitet i overvåket økt -Name[nds]=Bedrief in'n beluerten Törn -Name[ne]=मोनिटर गरिएको सत्रमा क्रियाकलाप -Name[nl]=Activiteit in geobserveerde sessie -Name[nn]=Aktivitet i overvaka økt -Name[pa]=ਨਿਗਰਾਨੀ ਅਧੀਨ ਸ਼ੈਸ਼ਨ ਵਿੱਚ ਸਰਗਰਮੀ -Name[pl]=Aktywność w monitorowanej sesji -Name[pt]=Actividade numa sessão vigiada -Name[pt_BR]=Atividade na sessão monitorada -Name[ro]=Activitate în sesiunea monitorizată -Name[ru]=Активность в отслеживаемом сеансе -Name[rw]=Igikorwa mu mukoro werekanwe -Name[se]=Aktivitehta gozihuvvon bargovuorus -Name[sk]=Aktivita v monitorovaných reláciách -Name[sl]=Dejavnost v opazovani seji -Name[sr]=Активност у надзираној сесији -Name[sr@Latn]=Aktivnost u nadziranoj sesiji -Name[sv]=Aktivitet i bevakad session -Name[ta]=கண்காணிக்கப்பட்ட கால நேரத்தில் செயல். -Name[tg]=Фаъолият дар нишасти таҳти назорат -Name[th]=กิจกรรมที่เกิดขึ้นบนเซสชันที่กำลังถูกเฝ้าติดตามการทำงาน -Name[tr]=İzlenen oturumda etkinlik -Name[tt]=Küzätelgän sessidä terelek -Name[uk]=Діяльність в контрольованому сеансі -Name[vi]=Các hoạt động trong phiên chạy được theo dõi -Name[wa]=Activité e corwaiteye session -Name[zh_CN]=被监视会话中的活动 -Name[zh_TW]=活動於監視中的工作階段 Comment=Activity detected in a monitored session -Comment[af]=Aktiwiteit bespeur in 'n sessie wat gemonitor word -Comment[ar]=التحقق من نشاط أثناء جلسة يتم مراقبتها -Comment[be]=Актыўнасць у сесіі, за якой вядзецца назіранне -Comment[bg]=Активност в наблюдавана сесия -Comment[bn]=মনিটর করা একটি সেশন-এ কিছু ঘটেছে -Comment[bs]=Aktivnost otkrivena u nadziranoj sesiji -Comment[ca]=Detectada activitat en una sessió monitoritzada -Comment[cs]=Detekována aktivita v monitorované relaci -Comment[csb]=Òstała wëkrëtô aktiwnota w monitorowóny sesëji -Comment[cy]=Datgelwyd gweithgaredd mewn seswin wedi'i fonitro -Comment[da]=Aktivitet detekteret i en overvåget session -Comment[de]=Aktivität in überwachter Sitzung -Comment[el]=Δραστηριότητα παρατηρήθηκε σε μια εποπτευόμενη συνεδρία -Comment[eo]=Aktiveco trovita en rigardata seanco -Comment[es]=Detectada actividad en una sesión monitorizada -Comment[et]=Tuvastati aktiivsus jälgitavas seansis -Comment[eu]=Iharduera detektatua monitorizatutako saioan -Comment[fa]=فعالیت در نشست پایششده آشکار شد -Comment[fi]=Aktiivisuutta havaittu tarkkailtavassa istunnossa -Comment[fr]=Activité détectée dans une session surveillée -Comment[fy]=Aktiviteit ûntdutsen yn observearre sesje -Comment[ga]=Braitheadh gníomhaíocht i seisiún monatóirithe -Comment[gl]=Actividade detectada na sesión baixo seguemento -Comment[he]=פעילות זוהתה במשימה מנוטרת -Comment[hi]=मॉनीटर्ड सत्र में क्रिया पता लगा -Comment[hr]=Otkrivena je aktivnost u nadziranoj sesiji -Comment[hu]=Aktivitás észlelve egy monitorozott munkafolyamatban -Comment[is]=Eitthvað er að gerast í setunni sem fylgst er með -Comment[it]=Rilevata attività in una sessione sotto controllo -Comment[ja]=監視中のセッションで活動を検出しました -Comment[kk]=Бақылаудағы сеанста белсендік байқалды -Comment[km]=បានរកឃើញសកម្មភាព ក្នុងសម័យដែលបានត្រួតពិនិត្យ -Comment[ko]=관찰하는 세션에서 활동 감지됨 -Comment[lt]=Stebimoje sesijoje pastebėta veikla -Comment[lv]=Ir konstatēta aktivitāte monitorētā sesijā -Comment[mk]=Откриена е активност во следената сесија -Comment[mn]=Харагдаж буй суултад илэрсэн үйл ажиллагаа -Comment[ms]=Aktiviti dikesan dalam sesi yang dipantau -Comment[nb]=Oppdaget aktivitet i en overvåket økt -Comment[nds]=Bedrief in'n beluerten Törn opdeckt -Comment[ne]=मोनिटर गरिएको सत्रमा पत्ता लगाएको क्रियाकलाप -Comment[nl]=Activiteit ontdekt in geobserveerde sessie -Comment[nn]=Oppdaga aktivitet i ei overvaka økt -Comment[pa]=ਇੱਕ ਨਿਗਰਾਨੀ ਅਧੀਨ ਸ਼ੈਸ਼ਨ ਵਿੱਚ ਸਰਗਰਮੀ ਪ੍ਰਾਪਤ ਹੋਈ -Comment[pl]=Wykryto aktywność w monitorowanej sesji -Comment[pt]=Actividade detectada numa sessão vigiada -Comment[pt_BR]=Atividade detectada em uma sessão monitorada -Comment[ro]=Activitate detectată într-o sesiune monitorizată -Comment[ru]=В отслеживаемом сеансе обнаружена активность -Comment[rw]=Igikorwa cyabonetse mu mukoro werekanwe -Comment[se]=Fuibmái aktivitehta gozihuvvon bargovuorus -Comment[sk]=Detekovaná aktivita v sledovanej relácii -Comment[sl]=Zaznana dejavnost v opazovani seji -Comment[sr]=Откривена је активност у надзираној сесији -Comment[sr@Latn]=Otkrivena je aktivnost u nadziranoj sesiji -Comment[sv]=Aktivitet funnen i en bevakad session -Comment[ta]=கண்காணிக்கப்பட்ட அமர்வில் செயல் கண்டுபிடிக்கப்பட்டது -Comment[tg]=Ёфтани фаъолият дар нишасти таҳти назорат -Comment[th]=กิจกรรมที่ตรวจจับได้บนเซสชันที่ถูกเฝ้าติดตามการทำงาน -Comment[tr]=İzlenen oturumda etkinlik var -Comment[tt]=Küzätelgän sessidä terelek küzätelä -Comment[uk]=В контрольованому сеансі зареєстровано діяльність -Comment[vi]=Hoạt động được phát hiện trong một phiên chạy được theo dõi -Comment[wa]=Activité trovêye en ene corwaiteye session -Comment[zh_CN]=被监视会话中检测到的活动 -Comment[zh_TW]=活動被偵測到於監視中的工作階段 default_presentation=16 [Silence] Name=Silence in monitored session -Name[af]=Stilte in gemonitorde sessie -Name[ar]=سكوت في جلسة يتم مراقبتها -Name[be]=Цішыня ў сесіі, за якой вядзецца назіранне -Name[bg]=Пасивност в наблюдавана сесия -Name[bn]=মনিটর করা সেশন-এ কিছু ঘটছে না -Name[bs]=Tišina u nadgledanoj sesiji -Name[ca]=Silenci a la sessió monitoritzada -Name[cs]=Ticho v monitorované relaci -Name[csb]=Felënk aktiwnotë w mònitorowóny sesëji -Name[cy]=Distawrwydd mewn sesiwn wedi'i fonitro -Name[da]=Stilhed i overvåget session -Name[de]=Stummschaltung in überwachter Sitzung -Name[el]=Ησυχία στην εποπτευόμενη συνεδρία -Name[eo]=Trankvilo en rigardata seanco -Name[es]=Silencio en sesión monitorizada -Name[et]=Vaikus jälgitavas seansis -Name[eu]=Isiltasuna monitorizatutako saioan -Name[fa]=سکوت در نشست پایششده -Name[fi]=Hiljaisuus valvotussa istunnossa -Name[fr]=Inactivité dans la session surveillée -Name[fy]=Stilte yn observearre sesje -Name[ga]=Ciúnas i seisiún monatóirithe -Name[gl]=Silencio na sesión monitoreada -Name[he]=שקט במשימה מנוטרת -Name[hi]=मॉनीटर्ड सत्र में शांति -Name[hr]=Tišina u praćenoj sesiji -Name[hu]=Üresjárat egy monitorozott munkafolyamatban -Name[is]=Þögn í setunni sem fylgst er með -Name[it]=Silenzio nella sessione controllata -Name[ja]=監視中のセッションの休止 -Name[kk]=Бақылаудағы сеанста тыныштық -Name[km]=ស្ងាត់ៗក្នុងសម័យដែលបានត្រួតពិនិត្យ -Name[ko]=관찰하는 세션에서 침묵 감지됨 -Name[lt]=Tyla stebimoje sesijoje -Name[lv]=Klusums monitorētā sesijā -Name[mk]=Тишина во следената сесија -Name[mn]=Харагдаж буй суултын Silence -Name[ms]=Senyap dalam sesi yang dipantau -Name[mt]=Silenzju waqt sessjoni monitorjata -Name[nb]=Stille i en overvåket økt -Name[nds]=Still in'n beluerten Törn -Name[ne]=मोनिटर गरिएको सत्रमा मौनता -Name[nl]=Stilte in geobserveerde sessie -Name[nn]=Stilt i overvaka økt -Name[pa]=ਨਿਗਰਾਨੀ ਅਧੀਨ ਸ਼ੈਸ਼ਨ ਵਿੱਚ ਖਾਮੋਸ਼ੀ -Name[pl]=Brak aktywności w monitorowanej sesji -Name[pt]=Silêncio numa sessão vigiada -Name[pt_BR]=Silêncio na sessão monitorada -Name[ro]=Liniște în sesiunea monitorizată -Name[ru]=Молчание в отслеживаемом сеансе -Name[rw]=Umutuzo mu mukoro werekanwe -Name[se]=Gozihuvvon bargovuorru jaskkodii -Name[sk]=Nečinnosť v sledovanej relácii -Name[sl]=Tišina v opazovani seji -Name[sr]=Тишина у надзираној сесији -Name[sr@Latn]=Tišina u nadziranoj sesiji -Name[sv]=Tystnad i bevakad session -Name[ta]=கண்காணிக்கப்பட்ட கால நேரத்தில் அமைதி -Name[tg]=Сукут дар нишасти таҳти назорат -Name[th]=ปิดออดบนเซสชันที่ถูกติดตามการทำงาน -Name[tr]=İzlenen oturumda sessizlik -Name[tt]=Küzätelgän sessidä tınlıq -Name[uk]=Тиша в контрольованому сеансі -Name[vi]=Im lặng trong các phiên chạy được theo dõi -Name[wa]=Silince e corwaiteye session -Name[zh_CN]=被监视会话中的缄默 -Name[zh_TW]=沉默於監視中工作階段 Comment=Silence detected in a monitored session -Comment[af]=Stilte bespeur in 'n sessie wat gemonitor word -Comment[ar]=التحقق من السكوت أثناء جلسة يتم مراقبتها -Comment[be]=Цішыня ў сесіі, за якой вядзецца назіранне -Comment[bg]=Пасивност в наблюдавана сесия -Comment[bn]=মনিটর করা একটি সেশন-এ কিছু ঘটছে না -Comment[bs]=Tišina otkrivena u nadziranoj sesiji -Comment[ca]=Detectat silenci en una sessió monitoritzada -Comment[cs]=Detekováno ticho v monitorované relaci -Comment[csb]=Òstôł wëkrëti felënk aktiwnotë w mònitorowóny sesëji -Comment[cy]=Datgelwyd distawrwydd mewn sesiwn wedi'i fonitro -Comment[da]=Stilhed detekteret i en overvåget session -Comment[de]=Stille in nicht überwachter Sitzung -Comment[el]=Ησυχία παρατηρήθηκε σε μια εποπτευόμενη συνεδρία -Comment[eo]=Trankvilo trovita en rigardata seanco -Comment[es]=Silencio detectado en una sesión monitorizada -Comment[et]=Tuvastati vaikus jälgitavas seansis -Comment[eu]=Isiltasuna detektatua monitorizatutako saioan -Comment[fa]=سکوت در نشست پایششده آشکار شد -Comment[fi]=Hiljaisuutta havaittu tarkkailtavassa istunnossa -Comment[fr]=Inactivité détectée dans une session surveillée -Comment[fy]=Stilte ûntdutsen yn observearre sesje -Comment[ga]=Braitheadh ciúnas i seisiún monatóirithe -Comment[gl]=Silencio detectado nunha sesión monitoreada -Comment[he]=שקט זוהה במשימה מנוטרת -Comment[hi]=मॉनीटर्ड सत्र में शांति पता लगी -Comment[hr]=Otkrivena je tišina u nadziranoj sesiji -Comment[hu]=Üresjárat észlelve egy monitorozott munkafolyamatban -Comment[is]=Ekkert er að gerast í setunni sem fylgst er með -Comment[it]=Rilevato silenzio in una sessione sotto controllo -Comment[ja]=監視中のセッションで休止を検出しました -Comment[kk]=Бақылаудағы сеанста тыныштық байқалады -Comment[km]=បានរកឃើញស្ងាត់ៗ ក្នុងសម័យដែលបានត្រួតពិនិត្យ -Comment[ko]=관찰하는 세션에서 침묵 감지됨 -Comment[lt]=Stebimoje sesijoje pastebėta tyla -Comment[lv]=Ir konstatēts klusums monitorētā sesijā -Comment[mk]=Откриена е тишина во следената сесија -Comment[mn]=Харагдаж буй суултад илэрсэн Silence -Comment[ms]=Senyap dikesan dalam sesi yang dipantau -Comment[nb]=Oppdaget at det er stille i en overvåket økt -Comment[nds]=Still in'n beluerten Törn opdeckt -Comment[ne]=मोनिटर गरिएको सत्रमा पत्ता लगाएको मौनता -Comment[nl]=Stilte ontdekt in geobserveerde sessie -Comment[nn]=Oppdaga at det er stilt i ei overvaka økt -Comment[pa]=ਨਿਗਰਾਨੀ ਅਧੀਨ ਸ਼ੈਸ਼ਨ ਵਿੱਚ ਖਾਮੋਸੀ ਪ੍ਰਾਪਤ -Comment[pl]=Wykryto brak aktywności w monitorowanej sesji -Comment[pt]=Silêncio detectado numa sessão vigiada -Comment[pt_BR]=Silêncio detectado em uma sessão monitorada -Comment[ro]=Liniște detectată într-o sesiune monitorizată -Comment[ru]=Обнаружение молчания в отслеживаемом сеансе -Comment[rw]=Umutuzo wabonetse mu mukoro werekanwe -Comment[se]=Fuobmái ahte bargovuorru jaskkodii -Comment[sk]=Detekovaná nečinnosť v sledovanej relácii -Comment[sl]=Zaznana tišina v opazovani seji -Comment[sr]=Откривена је тишина у надзираној сесији -Comment[sr@Latn]=Otkrivena je tišina u nadziranoj sesiji -Comment[sv]=Tystnad funnen i en bevakad session -Comment[ta]=கண்கானிக்கப்பட்ட அமர்வில் அமைதி கண்டுபிடிக்கப்பட்டது -Comment[tg]=Ёфтани сукут дар нишасти таҳти назорат -Comment[th]=ตรวจจับได้ว่าปิดออดบนเซสชั่นที่ถูกติดตามการทำงานอยู่ -Comment[tr]=İzlenen oturumda sessizlik var -Comment[tt]=Küzätelgän sessidä tınlıq küzätelä -Comment[uk]=В контрольованому сеансі зареєстровано тишу -Comment[vi]=Im lặng được phát hiện trong một phiên chạy bị theo dõi -Comment[wa]=Silince trové en ene corwaiteye session -Comment[zh_CN]=被监视会话中检测到的缄默 -Comment[zh_TW]=沉漠被偵測到於監視中的工作階段 default_presentation=16 [Finished] Name=Session finished with non-zero status -Name[af]=Sessie het geëindig met nie-zero status -Name[ar]=انتهت الجلسة في حالة غير صفرية -Name[be]=Сесія, завершаная ненулявым сігналам -Name[bg]=Сесия с код на изход различен от нула -Name[bn]=সেশন নন-জিরো স্ট্যাটাস সমেত সমাপ্ত -Name[bs]=Sesija završena sa ne-nula statusom -Name[ca]=Sessió finalitzada amb un estatus no zero -Name[cs]=Relace ukončena s nenulovým stavem -Name[csb]=Seséja òstała zakùńczonô z nienulowim stónã -Name[cy]=Gorffenodd y sesiwn efo cyflwr di-sero -Name[da]=Session afsluttet med ikke-nul status -Name[de]=Sitzung beendet mit Status ungleich Null -Name[el]=Η συνεδρία τελείωσε με μη μηδενική κατάσταση -Name[eo]=Seanco finiĝis kun eraro -Name[es]=Sesión terminada con estado no cero -Name[et]=Seanss lõpetas nullist erineva staatusega -Name[eu]=Ez-zero egoerarekin amaitutako saioa -Name[fa]=نشست توسط وضعیت غیر صفر پایان یافت -Name[fi]=Istunto lopetettiin paluuarvolla, joka oli eri kuin nolla -Name[fr]=La session s'est terminée anormalement -Name[fy]=Sesje is foltôge mei in non-zero tastân -Name[gl]=A sesión rematou cun estado non cero -Name[he]=משימה הסתיימה עם מצב שאינו אפס -Name[hi]=नॉन जीरो स्टेटस में सत्र पूर्ण -Name[hr]=Sesija je završila sa stanjem koje nije nula -Name[hu]=Egy munkafolyamat nem nulla értékkel fejeződött be -Name[is]=Setunni lauk með stöðu sem var ekki núll -Name[it]=La sessione è terminata con uno stato diverso da zero -Name[ja]=ゼロでないステータスでセッションが終了 -Name[ka]=სეანსი დასრულდა ნულოვანი რეზულტატით -Name[kk]=Сеанс нөл емес күйде аяқталды -Name[km]=សម័យបានបញ្ចប់ ដោយមានស្ថានភាព -Name[ko]=세션이 0이 아닌 상태로 끝남 -Name[lt]=Sesija baigta ne nuliniu statusu -Name[lv]=Sesija beidzās ar nenulles statusu -Name[mk]=Сесијата заврши со ненулти статус -Name[mn]=Тэг бус төлвөөр суулт дууслаа -Name[ms]=Sesi selesai dengan status bukan sifar -Name[mt]=Sessjoni temmet bi status mhux zero -Name[nb]=Økta ble avsluttet med en status ulik null -Name[nds]=Törn wöör mit Nich-Null-Status beendt -Name[ne]=शून्य नभएको स्थितिसँग सत्र अन्त्य भयो -Name[nl]=Sessie is voltooid met een non-zero status -Name[nn]=Økt avslutta med status ulik null -Name[pa]=ਨਾ-ਸਿਫਰ ਸਥਿਤੀ ਨਾਲ ਸ਼ੈਸ਼ਨ ਸਮਾਪਤ -Name[pl]=Sesja zakończona z niezerowym kodem powrotu -Name[pt]=Sessão terminada com código diferente de zero -Name[pt_BR]=Sessão finalizada com status diferente de zero -Name[ro]=Sesiunea s-a terminat cu rezultat diferit de zero -Name[ru]=Сеанс завершился с ненулевым состоянием -Name[rw]=Umukoro warangije ufite imimerere nta-zeru -Name[se]=Bargovuorro gearggai ii-nolla stáhtusain -Name[sk]=Relácia ukončená s nenulovým stavom -Name[sl]=Seja končana z neničelnim stanjem -Name[sr]=Сесија је завршена са не-нула статусом -Name[sr@Latn]=Sesija je završena sa ne-nula statusom -Name[sv]=Sessionen klar med status skild från noll -Name[ta]=கால நேரம் பூஜ்யம் இல்லாமல் முடிந்தது. -Name[tg]=Нишаст бо вазъияти ғайри сафар ба поён расид -Name[th]=เซสชันที่จบการทำงานด้วยสถานะที่ไม่ใช่ค่าศูนย์ -Name[tr]=Oturum sıfırdan farklı bir durumla çıktı -Name[tt]=Sessi buş bulmağan xäl belän tuqtadı -Name[uk]=Сеанс завершився з кодом помилки -Name[vi]=Phiên chạy kết thúc với trạng thái khác không -Name[wa]=Session fineye avou sins messaedje zero -Name[zh_CN]=非零状态完成的会话 -Name[zh_TW]=工作階段結束於非零狀態 Comment=A session has exited with non-zero status -Comment[af]='n Sessie het met 'n nie-zero status geëindig -Comment[ar]=انتهت جلسة بحالة غير صفرية -Comment[be]=Сесія скончыла працу ненулявым сігналам -Comment[bg]=Сесия с код на изход различен от нула -Comment[bn]=একটি সেশন নন-জিরো স্ট্যাটাস সমেত সমাপ্ত হয়েছে -Comment[bs]=Sesija je prekinuta sa ne-nula statusom -Comment[ca]=Una sessió ha eixit amb un estatus no zero -Comment[cs]=Relace byla ukončena s nenulovým stavem -Comment[csb]=Seséja zakùńczëła sã nienulowim stónã -Comment[cy]=Terfynnodd sesiwn efo cyflwr di-sero -Comment[da]=En session er afsluttet med ikke-nul status -Comment[de]=Sitzung beendet mit Status ungleich Null -Comment[el]=Μια συνεδρία τελείωσε με μη μηδενική κατάσταση -Comment[eo]=Seanco finiĝis kun eraro -Comment[es]=Ha terminado una sesión con estado no cero -Comment[et]=Seanss väljus nullist erineva staatusega -Comment[eu]=Saio bat amaitu egin da ez-zero egoerarekin -Comment[fa]=نشستی توسط وضعیت غیر صفر خارج شده است -Comment[fi]=Istunto lopetettiin paluuarvolla, joka ei ollut nolla -Comment[fr]=Une session s'est terminée anormalement -Comment[fy]=In sesje is einige mei in non-zero tastân -Comment[gl]=Unha sesión saiu cun estado non cero -Comment[he]=משימה הסתיימה עם קוד יציאה שונה מאפס -Comment[hi]=सत्र नॉन जीरो स्टेटस के साथ बाहर हुआ -Comment[hr]=Sesija je izašla sa stanjem koje nije nula -Comment[hu]=Egy munkafolyamat nem nulla értékkel fejeződött be -Comment[is]=Setu lauk með stöðu sem er ekki núll -Comment[it]=Una sessione è terminata con stato diverso da zero -Comment[ja]=ゼロでないステータスでセッションが終了しました -Comment[ka]=სეანსი დასრულდა არანულოვანი რეზულტატით -Comment[kk]=Сеанс нөл емес күйде аяқталды -Comment[km]=សម័យមួយបានចេញ ដោយមានស្ថានភាព -Comment[ko]=세션이 0이 아닌 상태로 끝났음 -Comment[lt]=Sesija baigė darbą su nenuliniu rėžimu -Comment[lv]=Sesija beidzās ar nenulles statusu -Comment[mk]=Сесијата излезе со ненулти статус -Comment[mn]=Name=Тэг бус төлвөөр суултаас гарлаа -Comment[ms]=Satu sesi keluar dengan status bukan sifar -Comment[mt]=Sessjoni temmet bi status mhux zero -Comment[nb]=En økt ble avsluttet med en status som ikke var null -Comment[nds]=En Törn is mit Nich-Null-Status to't Enn kamen -Comment[ne]=शून्य नभएको स्थितिसँग यो सत्र अन्त्य भयो -Comment[nl]=Een sessie is beëindigd met een non-zero status -Comment[nn]=Ei økt avslutta med status som ikkje var null -Comment[pa]=ਨਾ-ਸਿਫਰ ਸਥਿਤੀ ਨਾਲ ਸ਼ੈਸ਼ਨ ਬੰਦ -Comment[pl]=Sesja zakończyła się z niezerowym kodem powrotu -Comment[pt]=Uma sessão terminou com código diferente de zero -Comment[pt_BR]=Uma sessão foi finalizada com status diferente de zero -Comment[ro]=O sesiune s-a terminat cu rezultat diferit de zero -Comment[ru]=Сеанс завершился с ненулевым состоянием -Comment[rw]=Umukoro wahagaze ufite imimerere nta-zeru -Comment[se]=Bargovuorru lea geargan stáhtusain mii ii lean nolla -Comment[sk]=Relácia bola ukončená s nenulovou návratovou hodnotou -Comment[sl]=Seja je končana z neničelnim stanjem -Comment[sr]=Сесија је изашла са не-нула статусом -Comment[sr@Latn]=Sesija je izašla sa ne-nula statusom -Comment[sv]=En session har avslutats med status skild från noll -Comment[ta]=ஒரு கூட்டம் ஒன்றுமில்லாமல் முடிந்தது/ -Comment[tg]=Нишасте бо вазъияти ғайрисафар ба поён расидааст -Comment[th]=เซสชันจบการทำงานโดยไม่ได้คืนค่าเป็นศูนย์ -Comment[tr]=Bir oturum hata vererek çıktı -Comment[tt]=Sessi buş bulmağan xäl belän tuqtadı -Comment[uk]=Сеанс завершився з кодом помилки -Comment[uz]=Seans nolga teng boʻlmagan holat bilan tugadi -Comment[uz@cyrillic]=Сеанс нолга тенг бўлмаган ҳолат билан тугади -Comment[vi]=Một phiên chạy vừa kết thúc với trạng thái khác không -Comment[wa]=Ene session a cwité sins messaedje zero -Comment[zh_CN]=会话以非零状态退出 -Comment[zh_TW]=工作階段結束於非零狀態 default_presentation=0 diff --git a/konsole/fonts/CMakeLists.txt b/konsole/fonts/CMakeLists.txt index e61aa959b..379f357e2 100644 --- a/konsole/fonts/CMakeLists.txt +++ b/konsole/fonts/CMakeLists.txt @@ -19,14 +19,16 @@ install( CODE "execute_process( COMMAND mkfontdir \$ENV{DESTDIR}${DATA_INSTALL_D # FIXME generating fonts can be improved -add_custom_target( console8x16.pcf.gz ALL ) -add_custom_command( TARGET console8x16.pcf.gz +add_custom_target( konsole-font-8x16 ALL + DEPENDS console8x16.pcf.gz ) +add_custom_command( OUTPUT console8x16.pcf.gz COMMAND bdftopcf -o console8x16.pcf ${CMAKE_CURRENT_SOURCE_DIR}/console8x16.bdf COMMAND gzip -f --best console8x16.pcf DEPENDS console8x16.bdf ) -add_custom_target( 9x15.pcf.gz ALL ) -add_custom_command( TARGET 9x15.pcf.gz +add_custom_target( konsole-font-9x15 ALL + DEPENDS 9x15.pcf.gz ) +add_custom_command( OUTPUT 9x15.pcf.gz COMMAND bdftopcf -o 9x15.pcf ${CMAKE_CURRENT_SOURCE_DIR}/9x15.bdf COMMAND gzip -f --best 9x15.pcf DEPENDS 9x15.bdf ) diff --git a/konsole/kcmkonsole.desktop b/konsole/kcmkonsole.desktop index e5288c2c3..94e3d67dc 100644 --- a/konsole/kcmkonsole.desktop +++ b/konsole/kcmkonsole.desktop @@ -7,224 +7,7 @@ X-TDE-ControlModuleType=User X-TDE-HideFromPanel=true Name=Console -Name[af]=Konsole -Name[ar]=لوحة الأوامر -Name[az]=Konsol -Name[be]=Кансоль -Name[bg]=Конзола -Name[bn]=কনসোল -Name[br]=Letrin -Name[bs]=Konzola -Name[ca]=Consola -Name[cs]=Konsole -Name[csb]=Kònsola -Name[cy]=Terfynell -Name[da]=Konsol -Name[de]=Konsole -Name[el]=Κονσόλα -Name[eo]=Konzolo -Name[es]=Consola -Name[et]=Konsool -Name[eu]=Kontsola -Name[fa]=پیشانه -Name[fi]=Konsoli -Name[fy]=Konsole -Name[ga]=Consól -Name[gl]=Consola -Name[he]=מסוף -Name[hi]=कंसोल -Name[hr]=Konzola -Name[hu]=Konzol -Name[is]=Skjáhermir -Name[ja]=コンソール -Name[ka]=კონსოლი -Name[kk]=Консоль -Name[km]=កុងសូល -Name[ko]=X 콘솔 -Name[lo]=ຄອນໂໍໍຊລ -Name[lt]=Konsolė -Name[lv]=Konsole -Name[mk]=Конзола -Name[mn]=Консол -Name[ms]=Konsol -Name[mt]=Konsol -Name[nb]=Konsoll -Name[nds]=Konsool -Name[ne]=कन्सोल -Name[nn]=Konsoll -Name[oc]=Consola -Name[pa]=ਕੰਨਸੋਲ -Name[pl]=Konsola -Name[pt]=Consola -Name[ro]=Consolă -Name[ru]=Консоль -Name[rw]=Konsole -Name[se]=Konsolla -Name[sk]=Konzola -Name[sl]=Konzola -Name[sr]=Конзола -Name[sr@Latn]=Konzola -Name[sv]=Konsollen -Name[ta]=கான்சோல் -Name[te]=కంసోల్ -Name[tg]=Консол -Name[th]=คอนโซล -Name[tr]=Konsol -Name[tt]=Konsole -Name[uk]=Консоль -Name[uz]=Terminal -Name[uz@cyrillic]=Терминал -Name[vi]=Thiết bị cuối -Name[wa]=Conzôle -Name[xh]=Konsole -Name[zh_CN]=控制台 -Name[zh_TW]=主控台 -Name[zu]=Ikhonsoli GenericName=All Konsole Settings -GenericName[af]=Alle Konsole Instellings -GenericName[ar]=كل اعدادات Konsole -GenericName[az]=Bütün Konsol Qurğuları -GenericName[be]=Усе настаўленні Konsole -GenericName[bg]=Настройване на конзолата -GenericName[bn]=সব কনসোল সেটিংস -GenericName[br]=Hollgefluniadur Konsole -GenericName[bs]=Sve postavke za konzolu -GenericName[ca]=Tot l'arranjament de la consola -GenericName[cs]=Všechna nastavení programu Konsole -GenericName[csb]=Wszëtczé nastôwë Kònsolë -GenericName[cy]=Gosodiadau Llawn Konsole -GenericName[da]=Alle Konsole-indstillinger -GenericName[de]=Alle Einstellungen für die Konsole -GenericName[el]=Όλες οι ρυθμίσεις του Konsole -GenericName[eo]=Agordo de la Konzolo -GenericName[es]=Preferencias de Konsole -GenericName[et]=Konsooli seadistused -GenericName[eu]=Konsoleren ezarpen guztiak -GenericName[fa]=همۀ تنظیمات Konsole -GenericName[fi]=Kaikki konsolen asetukset -GenericName[fr]=Configuration de Konsole -GenericName[fy]=Alle Konsole-Ynstellings -GenericName[ga]=Gach Socrú Konsole -GenericName[gl]=Propriedades da Konsole -GenericName[he]=כל ההגדרות של המסוף -GenericName[hi]=सभी कंसोल विन्यास -GenericName[hr]=Sve postavke konzole -GenericName[hu]=Konzolbeállítások -GenericName[id]=Seting semua Konsole -GenericName[is]=Stilla Konsole skjáherminn -GenericName[it]=Tutte le impostazioni di Konsole -GenericName[ja]=Konsole のすべての設定です -GenericName[ka]=კონსოლის პარამეტრები -GenericName[kk]=Консоль баптаулары -GenericName[km]=ការកំណត់កុងសូលទាំងអស់ -GenericName[lo]=ຕັ້ງຄ່າຄອນໂໍຊລທັ້ງຫມົດ -GenericName[lt]=Visi Konsole nustatymai -GenericName[lv]=Visi Konsoles Uzstādījumi -GenericName[mk]=Сите поставувања на конзолата -GenericName[mn]=Консолын бүх тохируулга -GenericName[ms]=Semua Seting Konsol -GenericName[mt]=Setings kollha tal-Konsole -GenericName[nb]=Alle Konsoll-innstillinger -GenericName[nds]=All Konsole-Instellen -GenericName[ne]=सबै कन्सोल सेटिङ -GenericName[nl]=Alle Konsole-instellingen -GenericName[nn]=Alle konsoll-innstillingar -GenericName[nso]=Dipeakanyo Kamoka tsa Konsole -GenericName[oc]=Tot l'arranjament de la consola -GenericName[pa]=ਸਭ ਕੰਸੋਲ ਸੈਟਿੰਗ -GenericName[pl]=Wszystkie ustawienia Konsoli -GenericName[pt]=Configuração da Consola -GenericName[pt_BR]=Todas as configurações do Konsole -GenericName[ro]=Toate setările Konsole -GenericName[ru]=Настройка терминала -GenericName[rw]=Amagenamiterere ya Konsole Zose -GenericName[se]=Buot konsolla-heivehusat -GenericName[sk]=Všetky nastavenia Konzoly -GenericName[sl]=Vse nastavitve konzole -GenericName[sr]=Све поставке конзоле -GenericName[sr@Latn]=Sve postavke konzole -GenericName[ss]=Konkhe kuhleleka kwe Konsole -GenericName[sv]=Alla inställningar för Konsole -GenericName[ta]=எல்லா கான்சோல் அமைப்புகளும் -GenericName[te]=అన్ని కాన్సొల్ అమరికలు -GenericName[tg]=Тамоми танзимоти Konsole -GenericName[th]=ตั้งค่าคอนโซลทั้งหมด -GenericName[tr]=Tüm Konsol Ayarları -GenericName[tt]=Bar Konsollar Caylawı -GenericName[uk]=Всі параметри консолі -GenericName[uz]=Terminalning hamma moslamalari -GenericName[uz@cyrillic]=Терминалнинг ҳамма мосламалари -GenericName[ven]=Mavhekanyele a Konsole dzothe -GenericName[vi]=Tất cả các thiết lập của Konsole -GenericName[wa]=Tos ls apontiaedjes do terminå di TDE -GenericName[xh]=Zonke izicwangciso ze Konsole -GenericName[zh_CN]=Konsole 的全部设置 -GenericName[zh_TW]=所有的 Konsole 設定 -GenericName[zu]=Zonke Izilungiselelo zekhonsoli Keywords=konsole;console;terminal; -Keywords[ar]=konsole;سطر الأوامر;لوحة الأوامر;الطرفية; -Keywords[az]=konsol;terminal;konsole;console; -Keywords[be]=Кансоль;Тэрмінал;Эмулятар тэрміналу;konsole;console;terminal; -Keywords[bg]=конзола; терминал; програма; терминална; konsole; console; terminal; -Keywords[br]=konsole;letrin;termenell; -Keywords[bs]=konsole;console;terminal;konzola; -Keywords[ca]=konsole;consola;terminal; -Keywords[cs]=Konsole;Console;Terminál; -Keywords[csb]=kònsole;kònsola;terminal; -Keywords[cy]=konsole;console;terfynell; -Keywords[da]=konsole;konsol;terminal; -Keywords[de]=Konsole;Console;Terminal; -Keywords[el]=konsole;κονσόλα;τερματικό; -Keywords[eo]=konzolo;pupitro;terminalo; -Keywords[es]=konsole;consola;terminal; -Keywords[et]=konsool;terminal; -Keywords[eu]=konsole;kontsola;terminala; -Keywords[fa]=konsole، پیشانه، پایانه; -Keywords[fi]=konsole;konsoli;pääte-emulaattori;komento;komentoikkuna; -Keywords[ga]=konsole;consól;teirminéal; -Keywords[gl]=konsole;consola;terminal; -Keywords[he]=Konsole;Console;מסוף;טרמינל;terminal;יוניקס; -Keywords[hi]=कंसोल;कंसोल;टर्मिनल; -Keywords[hr]=konsole;console;terminal;konzola; -Keywords[hu]=Konsole;konzol;terminál; -Keywords[is]=skjáhermir; -Keywords[it]=konsole;console;terminale; -Keywords[ja]=konsole;コンソール;ターミナル; -Keywords[km]=កុងសូល;ស្ថានីយ; -Keywords[lo]=ຄອນໂໍຊລ;ເທີມິນອລ; -Keywords[lt]=konsolė;consolė;terminalas; -Keywords[lv]=konsole;console;termināls; -Keywords[mk]=konsole;console;terminal;конзола;терминал; -Keywords[mn]=Консол;Console;Терминал; -Keywords[nb]=konsole;konsoll;terminal; -Keywords[nds]=Konsole;Konsool;Terminal; -Keywords[ne]=केन्सोल; कन्सोल; टर्मिनल; -Keywords[nn]=konsole;konsoll;terminal;kommandolinje; -Keywords[oc]=konsole;consola;terminal; -Keywords[pa]=konsole;ਕੰਨਸੋਲ;ਟਰਮੀਨਲ; -Keywords[pl]=konsole;konsola;terminal; -Keywords[pt]=konsole;consola;terminal; -Keywords[ro]=konsole;consolă;terminal; -Keywords[ru]=konsole;console;terminal;терминал; -Keywords[rw]=konsole;konsole;igihera; -Keywords[se]=konsolla;console;konsole;terminála;gohččunlinnjá; -Keywords[sk]=konsole;konzola;terminál; -Keywords[sl]=konsole;konzola;terminal; -Keywords[sr]=konsole;console;terminal;терминал;конзола; -Keywords[sr@Latn]=konsole;console;terminal;terminal;konzola; -Keywords[sv]=konsoll;konsol;konsole;terminal; -Keywords[ta]=கான்சோல்;கான்சோல்;கடைசி; -Keywords[te]=కాన్సొల్;కంసోల్;టెర్మినల్; -Keywords[th]=คอนโซล;เทอร์มินัล; -Keywords[tr]=konsole;işletmen uç birimi;uç birim; -Keywords[uk]=konsole;консоль;термінал; -Keywords[uz]=konsole;konsol;terminal; -Keywords[uz@cyrillic]=konsole;консол;терминал; -Keywords[vi]=konsole;thiết bị cuối;đầu cuối; -Keywords[wa]=konsole;conzôle;terminå; -Keywords[xh]=konsole;isakhelo esiqulathe ibhodi yezitshixo;isiphelo sendlela; -Keywords[zh_CN]=konsole;console;terminal;终端;控制台; -Keywords[zh_TW]=konsole;console;terminal;主控台;終端機; -Keywords[zu]=ikhonsoli;ikhonsoli;okwangaphandle; diff --git a/konsole/konsole-script.desktop b/konsole/konsole-script.desktop index eb1bc1d73..3460992f4 100644 --- a/konsole/konsole-script.desktop +++ b/konsole/konsole-script.desktop @@ -7,122 +7,9 @@ Terminal=false X-TDE-StartupNotify=true Name=Konsole -Name[ar]=طرفية التحكم -Name[az]=Konsol -Name[be]=Кансоль -Name[bg]=Конзола -Name[bn]=কনসোল -Name[bs]=Konzola -Name[ca]=Consola -Name[csb]=Kònsola -Name[el]=Κονσόλα -Name[eo]=Konzolo -Name[et]=Konsool -Name[eu]=Kontsola -Name[he]=מסוף -Name[hi]=कंसोल -Name[hr]=Konzola -Name[is]=Skjáhermir -Name[ka]=კონსოლი -Name[lo]=ຄອນໂຊລ - K -Name[mk]=Конзола -Name[mn]=Консол -Name[nb]=Konsoll -Name[ne]=कन्सोल -Name[nn]=Konsoll -Name[pa]=ਕੰਨਸੋਲ -Name[pl]=Konsola -Name[ro]=Consolă -Name[se]=Konsolla -Name[sk]=Konzola -Name[sl]=Konzola -Name[ta]=கான்சோல் -Name[te]=కాన్సోల్ -Name[tg]=Консол -Name[th]=คอนโซล K -Name[zu]=Ikhonsoli GenericName=Terminal Program -GenericName[af]=Terminaal Program -GenericName[ar]=برنامج مطراف -GenericName[az]=Terminal Proqramı -GenericName[be]=Тэрмінал -GenericName[bg]=Терминална програма -GenericName[bn]=টার্মিনাল প্রোগ্রাম -GenericName[br]=Goulev termenell -GenericName[bs]=Terminalni program -GenericName[ca]=Programa de terminal -GenericName[cs]=Terminálový program -GenericName[csb]=Programa terminala -GenericName[cy]=Rhaglen Terfynell -GenericName[da]=Terminalprogram -GenericName[de]=Terminalprogramm -GenericName[el]=Πρόγραμμα τερματικού -GenericName[eo]=Terminalimitaĵo -GenericName[es]=Programa de terminal -GenericName[et]=Terminaliemulaator -GenericName[eu]=Terminal programa -GenericName[fa]=برنامۀ پایانه -GenericName[fi]=Komentoikkunaohjelma -GenericName[fr]=Terminal -GenericName[fy]=Terminalprogramma -GenericName[ga]=Clár Teirminéil -GenericName[gl]=Programa de Terminal -GenericName[he]=תוכנית מסוף -GenericName[hi]=टर्मिनल प्रोग्राम -GenericName[hr]=Terminalski program -GenericName[hu]=Parancsértelmező -GenericName[id]=Program Terminal -GenericName[is]=Skjáhermir -GenericName[it]=Programma terminale -GenericName[ja]=ターミナルプログラム -GenericName[ka]=პროგრამა ტერმინალისთვის -GenericName[kk]=Терминал бағдарламасы -GenericName[km]=កម្មវិធីស្ថានីយ -GenericName[ko]=터미널 프로그램 -GenericName[lo]=ອັບພລິກເຄເຊິນ ເທີມີນອນ -GenericName[lt]=Terminalo programa -GenericName[lv]=Termināla Programma -GenericName[mk]=Терминалска програма -GenericName[mn]=Терминал-Програм -GenericName[ms]=Program Terminal -GenericName[mt]=Programm ta' terminal -GenericName[nb]=Terminalprogram -GenericName[nds]=Terminal-Programm -GenericName[ne]=टर्मिनल कार्यक्रम -GenericName[nl]=Terminalprogramma -GenericName[nn]=Terminalprogram -GenericName[nso]=Lenaneo la Terminal -GenericName[pa]=ਟਰਮੀਨਲ ਪਰੋਗਰਾਮ -GenericName[pl]=Program terminala -GenericName[pt]=Programa de Terminal -GenericName[pt_BR]=Terminal -GenericName[ro]=Program terminal -GenericName[ru]=Терминал -GenericName[rw]=Porogaramu Umukiriya -GenericName[se]=Terminálaprográmma -GenericName[sk]=Terminál -GenericName[sl]=Terminalski program -GenericName[sr]=Терминалски програм -GenericName[sr@Latn]=Terminalski program -GenericName[ss]=Luhlelo lwesikhungo -GenericName[sv]=Terminalprogram -GenericName[ta]=கடைசி நிரலி -GenericName[te]=టెర్మినల్ కార్యక్రమం -GenericName[tg]=Барномаи поёна -GenericName[th]=โปรแกรมเทอร์มินัล -GenericName[tr]=Terminal Programı -GenericName[tt]=Terminal Yazılımı -GenericName[uk]=Програма терміналу -GenericName[uz]=Terminal dasturi -GenericName[uz@cyrillic]=Терминал дастури -GenericName[ven]=Mbekanyamushumo ya Mafhedziselo -GenericName[vi]=Trình đầu cuối -GenericName[wa]=Programe di terminå -GenericName[xh]=Inkqubo Yesixhobo sangaphandle sekhompyutha -GenericName[zh_CN]=终端程序 -GenericName[zh_TW]=終端機程式 -GenericName[zu]=Uhlelo lwemisebenzi lwangaohandle + X-DCOP-ServiceType=Multi X-TDE-AuthorizeAction=shell_access Categories=Qt;TDE;System;TerminalEmulator; diff --git a/konsole/konsole.desktop b/konsole/konsole.desktop index 408a4df11..b57c8c373 100644 --- a/konsole/konsole.desktop +++ b/konsole/konsole.desktop @@ -7,122 +7,9 @@ Terminal=false X-TDE-StartupNotify=true Name=Konsole -Name[ar]=طرفية التحكم -Name[az]=Konsol -Name[be]=Кансоль -Name[bg]=Конзола -Name[bn]=কনসোল -Name[bs]=Konzola -Name[ca]=Consola -Name[csb]=Kònsola -Name[el]=Κονσόλα -Name[eo]=Konzolo -Name[et]=Konsool -Name[eu]=Kontsola -Name[he]=מסוף -Name[hi]=कंसोल -Name[hr]=Konzola -Name[is]=Skjáhermir -Name[ka]=კონსოლი -Name[lo]=ຄອນໂຊລ - K -Name[mk]=Конзола -Name[mn]=Консол -Name[nb]=Konsoll -Name[ne]=कन्सोल -Name[nn]=Konsoll -Name[pa]=ਕੰਨਸੋਲ -Name[pl]=Konsola -Name[ro]=Consolă -Name[se]=Konsolla -Name[sk]=Konzola -Name[sl]=Konzola -Name[ta]=கான்சோல் -Name[te]=కాన్సోల్ -Name[tg]=Консол -Name[th]=คอนโซล K -Name[zu]=Ikhonsoli GenericName=Terminal Program -GenericName[af]=Terminaal Program -GenericName[ar]=برنامج مطراف -GenericName[az]=Terminal Proqramı -GenericName[be]=Тэрмінал -GenericName[bg]=Терминална програма -GenericName[bn]=টার্মিনাল প্রোগ্রাম -GenericName[br]=Goulev termenell -GenericName[bs]=Terminalni program -GenericName[ca]=Programa de terminal -GenericName[cs]=Terminálový program -GenericName[csb]=Programa terminala -GenericName[cy]=Rhaglen Terfynell -GenericName[da]=Terminalprogram -GenericName[de]=Terminalprogramm -GenericName[el]=Πρόγραμμα τερματικού -GenericName[eo]=Terminalimitaĵo -GenericName[es]=Programa de terminal -GenericName[et]=Terminaliemulaator -GenericName[eu]=Terminal programa -GenericName[fa]=برنامۀ پایانه -GenericName[fi]=Komentoikkunaohjelma -GenericName[fr]=Terminal -GenericName[fy]=Terminalprogramma -GenericName[ga]=Clár Teirminéil -GenericName[gl]=Programa de Terminal -GenericName[he]=תוכנית מסוף -GenericName[hi]=टर्मिनल प्रोग्राम -GenericName[hr]=Terminalski program -GenericName[hu]=Parancsértelmező -GenericName[id]=Program Terminal -GenericName[is]=Skjáhermir -GenericName[it]=Programma terminale -GenericName[ja]=ターミナルプログラム -GenericName[ka]=პროგრამა ტერმინალისთვის -GenericName[kk]=Терминал бағдарламасы -GenericName[km]=កម្មវិធីស្ថានីយ -GenericName[ko]=터미널 프로그램 -GenericName[lo]=ອັບພລິກເຄເຊິນ ເທີມີນອນ -GenericName[lt]=Terminalo programa -GenericName[lv]=Termināla Programma -GenericName[mk]=Терминалска програма -GenericName[mn]=Терминал-Програм -GenericName[ms]=Program Terminal -GenericName[mt]=Programm ta' terminal -GenericName[nb]=Terminalprogram -GenericName[nds]=Terminal-Programm -GenericName[ne]=टर्मिनल कार्यक्रम -GenericName[nl]=Terminalprogramma -GenericName[nn]=Terminalprogram -GenericName[nso]=Lenaneo la Terminal -GenericName[pa]=ਟਰਮੀਨਲ ਪਰੋਗਰਾਮ -GenericName[pl]=Program terminala -GenericName[pt]=Programa de Terminal -GenericName[pt_BR]=Terminal -GenericName[ro]=Program terminal -GenericName[ru]=Терминал -GenericName[rw]=Porogaramu Umukiriya -GenericName[se]=Terminálaprográmma -GenericName[sk]=Terminál -GenericName[sl]=Terminalski program -GenericName[sr]=Терминалски програм -GenericName[sr@Latn]=Terminalski program -GenericName[ss]=Luhlelo lwesikhungo -GenericName[sv]=Terminalprogram -GenericName[ta]=கடைசி நிரலி -GenericName[te]=టెర్మినల్ కార్యక్రమం -GenericName[tg]=Барномаи поёна -GenericName[th]=โปรแกรมเทอร์มินัล -GenericName[tr]=Terminal Programı -GenericName[tt]=Terminal Yazılımı -GenericName[uk]=Програма терміналу -GenericName[uz]=Terminal dasturi -GenericName[uz@cyrillic]=Терминал дастури -GenericName[ven]=Mbekanyamushumo ya Mafhedziselo -GenericName[vi]=Trình đầu cuối -GenericName[wa]=Programe di terminå -GenericName[xh]=Inkqubo Yesixhobo sangaphandle sekhompyutha -GenericName[zh_CN]=终端程序 -GenericName[zh_TW]=終端機程式 -GenericName[zu]=Uhlelo lwemisebenzi lwangaohandle + X-DCOP-ServiceType=Multi X-TDE-AuthorizeAction=shell_access Categories=Qt;TDE;System;TerminalEmulator; diff --git a/konsole/konsole/CMakeLists.txt b/konsole/konsole/CMakeLists.txt index 68566de4c..26fa93d70 100644 --- a/konsole/konsole/CMakeLists.txt +++ b/konsole/konsole/CMakeLists.txt @@ -23,7 +23,11 @@ link_directories( ##### other data ################################ -install( FILES x-konsole.desktop DESTINATION ${MIME_INSTALL_DIR}/application ) +tde_create_translated_desktop( + SOURCE x-konsole.desktop + DESTINATION ${MIME_INSTALL_DIR}/application + PO_DIR konsole-desktops +) ##### libkonsolepart (module) ################### @@ -74,5 +78,5 @@ set( ${target}_SRCS tde_add_tdeinit_executable( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK tdeprint-shared tdeio-shared ${XRENDER_LIBRARIES} ${DL_LIBRARIES} + LINK tdeprint-shared tdeio-shared ${XRENDER_LIBRARIES} ${CMAKE_DL_LIBS} ) diff --git a/konsole/konsole/TEPty.cpp b/konsole/konsole/TEPty.cpp index 2148ec03c..5e7aefa5b 100644 --- a/konsole/konsole/TEPty.cpp +++ b/konsole/konsole/TEPty.cpp @@ -80,7 +80,7 @@ #include <errno.h> #include <termios.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <kdebug.h> #include <kpty.h> @@ -171,12 +171,12 @@ void TEPty::setWriteable(bool writeable) TEPty::TEPty() { m_bufferFull = false; - connect(this, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )), - this, TQT_SLOT(dataReceived(TDEProcess *,char *, int))); - connect(this, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(donePty())); - connect(this, TQT_SIGNAL(wroteStdin(TDEProcess *)), - this, TQT_SLOT(writeReady())); + connect(this, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int )), + this, TQ_SLOT(dataReceived(TDEProcess *,char *, int))); + connect(this, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(donePty())); + connect(this, TQ_SIGNAL(wroteStdin(TDEProcess *)), + this, TQ_SLOT(writeReady())); setUsePty(All, false); // utmp will be overridden later } diff --git a/konsole/konsole/TEPty.h b/konsole/konsole/TEPty.h index 21ea3ff94..6ebf19bd0 100644 --- a/konsole/konsole/TEPty.h +++ b/konsole/konsole/TEPty.h @@ -23,7 +23,7 @@ #include <config.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tqsocketnotifier.h> #include <tqstrlist.h> #include <tqvaluelist.h> @@ -31,7 +31,7 @@ class TEPty: public TDEProcess { -Q_OBJECT +TQ_OBJECT public: diff --git a/konsole/konsole/TEScreen.cpp b/konsole/konsole/TEScreen.cpp index 9bd62ff4d..8f2473e31 100644 --- a/konsole/konsole/TEScreen.cpp +++ b/konsole/konsole/TEScreen.cpp @@ -81,7 +81,8 @@ TEScreen::TEScreen(int l, int c) ef_fg(cacol()), ef_bg(cacol()), ef_re(0), sa_cuX(0), sa_cuY(0), sa_cu_re(0), sa_cu_fg(cacol()), sa_cu_bg(cacol()), - lastPos(-1) + lastPos(-1), + lastDrawnChar(0) { /* this->lines = lines; @@ -175,7 +176,7 @@ void TEScreen::cursorLeft(int n) } /*! - Move the cursor left. + Move the cursor right. The cursor will not move beyond the rightmost column. */ @@ -188,6 +189,50 @@ void TEScreen::cursorRight(int n) } /*! + Move the cursor at most n lines next +*/ + +void TEScreen::cursorNextLine(int n) +//=CNL +{ + if (n == 0) + { + n = 1; // Default + } + cuX = 0; + while (n > 0) + { + if (cuY < lines - 1) + { + cuY += 1; + } + n--; + } +} + +/*! + Move the cursor at most n lines previous +*/ + +void TEScreen::cursorPrevLine(int n) +//=CPL +{ + if (n == 0) + { + n = 1; // Default + } + cuX = 0; + while (n > 0) + { + if (cuY > 0) + { + cuY -= 1; + } + n--; + } +} + +/*! Set top and bottom margin. */ @@ -300,6 +345,26 @@ void TEScreen::insertChars(int n) clearImage(loc(cuX,cuY),loc(q-1,cuY),' '); } +void TEScreen::repeatChars(int n) +{ + if (n == 0) + { + n = 1; // Default + } + + // From ECMA-48 version 5, section 8.3.103: + // "If the character preceding REP is a control function or part of a + // control function, the effect of REP is not defined by this Standard." + // + // So, a "normal" program should always use REP immediately after a visible + // character (those other than escape sequences). So, lastDrawnChar can be + // safely used. + for (int i = 0; i < n; i++) + { + ShowCharacter(lastDrawnChar); + } +} + /*! delete `n' lines starting from (including) the cursor position. The cursor is not moved by the operation. @@ -762,6 +827,8 @@ void TEScreen::ShowCharacter(unsigned short c) lastPos = i; + lastDrawnChar = c; + cuX += w--; while(w) @@ -802,10 +869,22 @@ void TEScreen::scrollUp(int n) void TEScreen::scrollUp(int from, int n) { - if (n <= 0 || from + n > bmargin) return; - //FIXME: make sure `tmargin', `bmargin', `from', `n' is in bounds. - moveImage(loc(0,from),loc(0,from+n),loc(columns-1,bmargin)); - clearImage(loc(0,bmargin-n+1),loc(columns-1,bmargin),' '); + if (n <= 0) + { + return; + } + if (from > bmargin) + { + return; + } + if ((from + n) > bmargin) + { + n = bmargin + 1 - from; + } + + //FIXME: make sure `tmargin', `bmargin', `from', `n' is in bounds. + moveImage(loc(0, from), loc(0, from+n), loc(columns, bmargin)); + clearImage(loc(0, bmargin-n+1), loc(columns-1, bmargin), ' '); } void TEScreen::scrollDown(int n) @@ -1013,12 +1092,6 @@ void TEScreen::clearToBeginOfScreen() void TEScreen::clearEntireScreen() { - // Add entire screen to history - for (int i = 0; i < (lines-1); i++) - { - addHistLine(); scrollUp(0,1); - } - clearImage(loc(0,0),loc(columns-1,lines-1),' '); } diff --git a/konsole/konsole/TEScreen.h b/konsole/konsole/TEScreen.h index 9797b53ab..a28aab949 100644 --- a/konsole/konsole/TEScreen.h +++ b/konsole/konsole/TEScreen.h @@ -52,14 +52,16 @@ public: // these are all `Screen' operations // // Cursor Movement // - void cursorUp (int n); - void cursorDown (int n); - void cursorLeft (int n); - void cursorRight (int n); - void setCursorY (int y); - void setCursorX (int x); - void setCursorYX (int y, int x); - void setMargins (int t, int b); + void cursorUp (int n); + void cursorDown (int n); + void cursorLeft (int n); + void cursorRight (int n); + void cursorNextLine(int n); + void cursorPrevLine(int n); + void setCursorY (int y); + void setCursorX (int x); + void setCursorYX (int y, int x); + void setMargins (int t, int b); // // Cursor Movement with Scrolling // @@ -83,6 +85,7 @@ public: // these are all `Screen' operations void eraseChars (int n); void deleteChars (int n); void insertChars (int n); + void repeatChars (int n); void deleteLines (int n); void insertLines (int n); // @@ -271,6 +274,9 @@ private: // helper // last position where we added a character int lastPos; + // used in REP (repeating char) + unsigned short lastDrawnChar; + // modes ScreenParm saveParm; diff --git a/konsole/konsole/TEWidget.cpp b/konsole/konsole/TEWidget.cpp index 52cd1236b..33dcf7f79 100644 --- a/konsole/konsole/TEWidget.cpp +++ b/konsole/konsole/TEWidget.cpp @@ -308,6 +308,19 @@ void TEWidget::fontChange(const TQFont &) update(); } +void TEWidget::biggerFont(void) { + TQFont f = getVTFont(); + f.setPointSize( f.pointSize() + 1 ); + setVTFont( f ); +} + +void TEWidget::smallerFont(void) { + TQFont f = getVTFont(); + if ( f.pointSize() < 6 ) return; // A minimum size + f.setPointSize( f.pointSize() - 1 ); + setVTFont( f ); +} + void TEWidget::setVTFont(const TQFont& f) { TQFont font = f; @@ -397,17 +410,17 @@ TEWidget::TEWidget(TQWidget *parent, const char *name) bY = bX = 1; cb = TQApplication::clipboard(); - TQObject::connect( (TQObject*)cb, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(onClearSelection()) ); + TQObject::connect( (TQObject*)cb, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(onClearSelection()) ); scrollbar = new TQScrollBar(this); - scrollbar->setCursor( tqarrowCursor ); - connect(scrollbar, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(scrollChanged(int))); + scrollbar->setCursor( TQt::arrowCursor ); + connect(scrollbar, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(scrollChanged(int))); blinkT = new TQTimer(this); - connect(blinkT, TQT_SIGNAL(timeout()), this, TQT_SLOT(blinkEvent())); + connect(blinkT, TQ_SIGNAL(timeout()), this, TQ_SLOT(blinkEvent())); blinkCursorT = new TQTimer(this); - connect(blinkCursorT, TQT_SIGNAL(timeout()), this, TQT_SLOT(blinkCursorEvent())); + connect(blinkCursorT, TQ_SIGNAL(timeout()), this, TQ_SLOT(blinkCursorEvent())); setMouseMarks(true); setColorTable(base_color_table); // init color table @@ -419,7 +432,7 @@ TEWidget::TEWidget(TQWidget *parent, const char *name) setAcceptDrops(true); // attempt dragInfo.state = diNone; - setFocusPolicy( TQ_WheelFocus ); + setFocusPolicy( TQWidget::WheelFocus ); // im setInputMethodEnabled(true); @@ -594,7 +607,7 @@ void TEWidget::drawTextFixed(TQPainter &paint, int x, int y, } } - paint.drawText(x,y, w, font_h, Qt::AlignHCenter | TQt::DontClip, drawstr, -1); + paint.drawText(x,y, w, font_h, TQt::AlignHCenter | TQt::DontClip, drawstr, -1); x += w; } } @@ -608,7 +621,7 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect, TQString& str, const ca *attr, bool pm, bool clear) { int a = font_a + m_lineSpacing / 2; - TQColor fColor = printerFriendly ? Qt::black : attr->f.color(color_table); + TQColor fColor = printerFriendly ? TQt::black : attr->f.color(color_table); TQColor bColor = attr->b.color(color_table); TQString drawstr; @@ -621,13 +634,9 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect, if (attr->isTransparent(color_table)) { if (pm) - paint.setBackgroundMode( Qt::TransparentMode ); + paint.setBackgroundMode( TQt::TransparentMode ); if (clear || (blinking && (attr->r & RE_BLINK))) { -#ifdef USE_QT4 - paint.eraseRect(rect); -#else // USE_QT4 erase(rect); -#endif // USE_QT4 } } else @@ -638,7 +647,7 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect, // draw background colors with 75% opacity if ( draw_translucent_background_colors && argb_visual && tqAlpha(blend_color) < 0xff ) { - QRgb col = bColor.rgb(); + TQRgb col = bColor.rgb(); TQ_UINT8 salpha = 192; TQ_UINT8 dalpha = 255 - salpha; @@ -667,7 +676,7 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect, tmpRect.setWidth( tmpRect.width() + font_w ); } - paint.fillRect( tmpRect, Qt::darkCyan ); // currently use hard code color + paint.fillRect( tmpRect, TQt::darkCyan ); // currently use hard code color } if ( m_isIMSel && !tmpStr.isEmpty() ) { // imput method selection background color @@ -682,13 +691,13 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect, tmpRect.setWidth( tmpRect.width() + font_w ); } - paint.fillRect( tmpRect, Qt::darkGray ); // currently use hard code color + paint.fillRect( tmpRect, TQt::darkGray ); // currently use hard code color } } // Paint cursor if ((attr->r & RE_CURSOR) && !isPrinting) { - paint.setBackgroundMode( Qt::TransparentMode ); + paint.setBackgroundMode( TQt::TransparentMode ); int h = font_h - m_lineSpacing; TQRect r(rect.x(),rect.y()+m_lineSpacing/2,rect.width(),h); if (hasFocus()) @@ -731,7 +740,7 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect, int y = rect.y(); // top of rect if ( shadow ) { - paint.setPen( Qt::black ); + paint.setPen( TQt::black ); drawTextFixed(paint, x+1, y+1, str, attr); paint.setPen(fColor); } @@ -744,7 +753,7 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect, int y = rect.y()+a; // baseline if ( shadow ) { - paint.setPen( Qt::black ); + paint.setPen( TQt::black ); paint.drawText(x+1,y+1, str, -1, bidiEnabled ? TQPainter::Auto : TQPainter::LTR ); paint.setPen(fColor); } @@ -762,7 +771,7 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect, { paint.setClipRect(rect); // On screen we use overstrike for bold - paint.setBackgroundMode( Qt::TransparentMode ); + paint.setBackgroundMode( TQt::TransparentMode ); int x = rect.x()+1; if(!fixed_font) { @@ -968,7 +977,7 @@ void TEWidget::setImage(const ca* const newimg, int lines, int columns) mResizeWidget->setMinimumWidth(mResizeLabel->fontMetrics().width(i18n("Size: XXX x XXX"))+20); mResizeWidget->setMinimumHeight(mResizeLabel->sizeHint().height()+20); mResizeTimer = new TQTimer(this); - connect(mResizeTimer, TQT_SIGNAL(timeout()), mResizeWidget, TQT_SLOT(hide())); + connect(mResizeTimer, TQ_SIGNAL(timeout()), mResizeWidget, TQ_SLOT(hide())); } TQString sizeStr = i18n("Size: %1 x %2").arg(columns).arg(lines); mResizeLabel->setText(sizeStr); @@ -1007,7 +1016,7 @@ void TEWidget::paintEvent( TQPaintEvent* pe ) TQPainter paint; setUpdatesEnabled(false); paint.begin( this ); - paint.setBackgroundMode( Qt::TransparentMode ); + paint.setBackgroundMode( TQt::TransparentMode ); // Note that the actual widget size can be slightly larger // that the image (the size is truncated towards the smaller @@ -1084,7 +1093,7 @@ void TEWidget::print(TQPainter &paint, bool friendly, bool exact) pm.fill(); TQPainter pm_paint; - pm_paint.begin(&pm, TQT_TQWIDGET(this)); + pm_paint.begin(&pm, this); paintContents(pm_paint, contentsRect(), true); pm_paint.end(); paint.drawPixmap(0, 0, pm); @@ -1245,13 +1254,13 @@ void TEWidget::scrollChanged(int) void TEWidget::setScroll(int cursor, int slines) { //kdDebug(1211)<<"TEWidget::setScroll() disconnect()"<<endl; - disconnect(scrollbar, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(scrollChanged(int))); + disconnect(scrollbar, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(scrollChanged(int))); //kdDebug(1211)<<"TEWidget::setScroll() setRange()"<<endl; scrollbar->setRange(0,slines); //kdDebug(1211)<<"TEWidget::setScroll() setSteps()"<<endl; scrollbar->setSteps(1,lines); scrollbar->setValue(cursor); - connect(scrollbar, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(scrollChanged(int))); + connect(scrollbar, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(scrollChanged(int))); //kdDebug(1211)<<"TEWidget::setScroll() done"<<endl; } @@ -1302,7 +1311,7 @@ void TEWidget::mousePressEvent(TQMouseEvent* ev) { //printf("press [%d,%d] %d\n",ev->x()/font_w,ev->y()/font_h,ev->button()); - if ( possibleTripleClick && (ev->button()==Qt::LeftButton) ) { + if ( possibleTripleClick && (ev->button()==TQt::LeftButton) ) { mouseTripleClickEvent(ev); return; } @@ -1315,7 +1324,7 @@ void TEWidget::mousePressEvent(TQMouseEvent* ev) TQPoint pos = TQPoint((ev->x()-tLx-bX+(font_w/2))/font_w,(ev->y()-tLy-bY)/font_h); //printf("press top left [%d,%d] by=%d\n",tLx,tLy, bY); - if ( ev->button() == Qt::LeftButton) + if ( ev->button() == TQt::LeftButton) { line_selection_mode = false; word_selection_mode = false; @@ -1352,14 +1361,14 @@ void TEWidget::mousePressEvent(TQMouseEvent* ev) } } } - else if ( ev->button() == Qt::MidButton ) + else if ( ev->button() == TQt::MidButton ) { if ( mouse_marks || (!mouse_marks && (ev->state() & ShiftButton)) ) emitSelection(true,ev->state() & ControlButton); else emit mouseSignal( 1, (ev->x()-tLx-bX)/font_w +1, (ev->y()-tLy-bY)/font_h +1 +scrollbar->value() -scrollbar->maxValue() ); } - else if ( ev->button() == Qt::RightButton ) + else if ( ev->button() == TQt::RightButton ) { if (mouse_marks || (ev->state() & ShiftButton)) { configureRequestPoint = TQPoint( ev->x(), ev->y() ); @@ -1373,7 +1382,7 @@ void TEWidget::mousePressEvent(TQMouseEvent* ev) void TEWidget::mouseMoveEvent(TQMouseEvent* ev) { // for auto-hiding the cursor, we need mouseTracking - if (ev->state() == Qt::NoButton ) return; + if (ev->state() == TQt::NoButton ) return; if (dragInfo.state == diPending) { // we had a mouse down, but haven't confirmed a drag yet @@ -1397,7 +1406,7 @@ void TEWidget::mouseMoveEvent(TQMouseEvent* ev) if (actSel == 0) return; // don't extend selection while pasting - if (ev->state() & Qt::MidButton) return; + if (ev->state() & TQt::MidButton) return; extendSelection( ev->pos() ); } @@ -1591,7 +1600,7 @@ void TEWidget::extendSelection( TQPoint pos ) void TEWidget::mouseReleaseEvent(TQMouseEvent* ev) { //printf("release [%d,%d] %d\n",ev->x()/font_w,ev->y()/font_h,ev->button()); - if ( ev->button() == Qt::LeftButton) + if ( ev->button() == TQt::LeftButton) { emit isBusySelecting(false); // Ok.. we can breath again. if(dragInfo.state == diPending) @@ -1621,8 +1630,8 @@ void TEWidget::mouseReleaseEvent(TQMouseEvent* ev) } dragInfo.state = diNone; } - if ( !mouse_marks && ((ev->button() == Qt::RightButton && !(ev->state() & ShiftButton)) - || ev->button() == Qt::MidButton) ) { + if ( !mouse_marks && ((ev->button() == TQt::RightButton && !(ev->state() & ShiftButton)) + || ev->button() == TQt::MidButton) ) { TQPoint tL = contentsRect().topLeft(); int tLx = tL.x(); int tLy = tL.y(); @@ -1634,7 +1643,7 @@ void TEWidget::mouseReleaseEvent(TQMouseEvent* ev) void TEWidget::mouseDoubleClickEvent(TQMouseEvent* ev) { - if ( ev->button() != Qt::LeftButton) return; + if ( ev->button() != TQt::LeftButton) return; TQPoint tL = contentsRect().topLeft(); int tLx = tL.x(); @@ -1687,14 +1696,25 @@ void TEWidget::mouseDoubleClickEvent(TQMouseEvent* ev) } possibleTripleClick=true; - TQTimer::singleShot(TQApplication::doubleClickInterval(),this,TQT_SLOT(tripleClickTimeout())); + TQTimer::singleShot(TQApplication::doubleClickInterval(),this,TQ_SLOT(tripleClickTimeout())); } void TEWidget::wheelEvent( TQWheelEvent* ev ) { - if (ev->orientation() != Qt::Vertical) + if (ev->orientation() != TQt::Vertical) return; + if (ev->state() & ControlButton) { + if (ev->delta() > 0) { + biggerFont(); + } + else { + smallerFont(); + } + ev->accept(); + return; + } + if ( mouse_marks ) { if (!screen || screen->hasScroll() || (scrollbar->maxValue() == 0 && screen_num == 0)) @@ -1810,7 +1830,7 @@ void TEWidget::setWordCharacters(TQString wc) void TEWidget::setMouseMarks(bool on) { mouse_marks = on; - setCursor( mouse_marks ? tqibeamCursor : tqarrowCursor ); + setCursor( mouse_marks ? TQt::ibeamCursor : TQt::arrowCursor ); } /* ------------------------------------------------------------------------- */ @@ -1850,15 +1870,15 @@ void TEWidget::setSelection(const TQString& t) { // Disconnect signal while WE set the clipboard TQClipboard *cb = TQApplication::clipboard(); - TQObject::disconnect( cb, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(onClearSelection()) ); + TQObject::disconnect( cb, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(onClearSelection()) ); cb->setSelectionMode( true ); cb->setText(t); cb->setSelectionMode( false ); - TQObject::connect( cb, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(onClearSelection()) ); + TQObject::connect( cb, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(onClearSelection()) ); } void TEWidget::copyClipboard() @@ -1911,14 +1931,14 @@ bool TEWidget::eventFilter( TQObject *obj, TQEvent *e ) if ( (e->type() == TQEvent::Accel || e->type() == TQEvent::AccelAvailable ) && tqApp->focusWidget() == this ) { - TQT_TQKEYEVENT( e )->ignore(); + static_cast<TQKeyEvent*>( e )->ignore(); return false; } - if ( TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(this) /* when embedded */ && TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(parent()) /* when standalone */ ) + if ( obj != this /* when embedded */ && obj != parent() /* when standalone */ ) return false; // not us if ( e->type() == TQEvent::KeyPress ) { - TQKeyEvent *ke = TQT_TQKEYEVENT(e); + TQKeyEvent *ke = static_cast<TQKeyEvent*>(e); actSel=0; // Key stroke implies a screen update, so TEWidget won't // know where the current selection is. @@ -1936,13 +1956,13 @@ bool TEWidget::eventFilter( TQObject *obj, TQEvent *e ) } if ( e->type() == TQEvent::KeyRelease ) { - TQKeyEvent *ke = TQT_TQKEYEVENT(e); + TQKeyEvent *ke = static_cast<TQKeyEvent*>(e); emit keyReleasedSignal(ke); return true; } if ( e->type() == TQEvent::FocusIn ) { - TQFocusEvent *fe = TQT_TQFOCUSEVENT(e); + TQFocusEvent *fe = static_cast<TQFocusEvent*>(e); if (fe->gotFocus()) { emit focusInSignal(fe); @@ -1952,13 +1972,13 @@ bool TEWidget::eventFilter( TQObject *obj, TQEvent *e ) } if ( e->type() == TQEvent::Enter ) { - TQObject::disconnect( (TQObject*)cb, TQT_SIGNAL(dataChanged()), - this, TQT_SLOT(onClearSelection()) ); + TQObject::disconnect( (TQObject*)cb, TQ_SIGNAL(dataChanged()), + this, TQ_SLOT(onClearSelection()) ); } if ( e->type() == TQEvent::Leave ) { - TQObject::connect( (TQObject*)cb, TQT_SIGNAL(dataChanged()), - this, TQT_SLOT(onClearSelection()) ); + TQObject::connect( (TQObject*)cb, TQ_SIGNAL(dataChanged()), + this, TQ_SLOT(onClearSelection()) ); } return TQFrame::eventFilter( obj, e ); } @@ -2030,7 +2050,7 @@ bool TEWidget::event( TQEvent *e ) { if ( e->type() == TQEvent::AccelOverride ) { - TQKeyEvent *ke = TQT_TQKEYEVENT( e ); + TQKeyEvent *ke = static_cast<TQKeyEvent*>( e ); KKey key( ke ); int keyCodeQt = key.keyCodeQt(); @@ -2104,7 +2124,7 @@ void TEWidget::Bell(bool visibleSession, TQString message) bellTimer.start(BELLVISUAL_DELAY,true); swapColorTable(); - TQTimer::singleShot(200,this,TQT_SLOT(swapColorTable())); + TQTimer::singleShot(200,this,TQ_SLOT(swapColorTable())); } } @@ -2250,7 +2270,7 @@ void TEWidget::dropEvent(TQDropEvent* event) m_drop->insertItem( "cp", cp ); m_drop->insertItem( "ln", ln ); m_drop->insertItem( "mv", mv ); - connect(m_drop, TQT_SIGNAL(activated(int)), TQT_SLOT(drop_menu_activated(int))); + connect(m_drop, TQ_SIGNAL(activated(int)), TQ_SLOT(drop_menu_activated(int))); }; // The current behaviour when url(s) are dropped is // * if there is only ONE url and if it's a LOCAL one, ask for paste or cd/cp/ln/mv diff --git a/konsole/konsole/TEWidget.h b/konsole/konsole/TEWidget.h index 967896082..047c04b4b 100644 --- a/konsole/konsole/TEWidget.h +++ b/konsole/konsole/TEWidget.h @@ -44,7 +44,7 @@ class TQTimer; class TEWidget : public TQFrame // a widget representing attributed text { - Q_OBJECT + TQ_OBJECT friend class Konsole; @@ -53,7 +53,7 @@ public: TEWidget(TQWidget *parent=0, const char *name=0); virtual ~TEWidget(); - void setBlendColor(const QRgb color) { blend_color = color; } + void setBlendColor(const TQRgb color) { blend_color = color; } void setDefaultBackColor(const TQColor& color); TQColor getDefaultBackColor(); @@ -126,6 +126,10 @@ public: */ void setVTFont(const TQFont& font); + /** Changes font size by 1 point */ + void biggerFont(); + void smallerFont(); + void setMouseMarks(bool on); static void setAntialias( bool enable ) { s_antialias = enable; } static bool antialias() { return s_antialias; } @@ -335,7 +339,7 @@ private: bool m_isIMEdit; bool m_isIMSel; - QRgb blend_color; + TQRgb blend_color; private slots: void drop_menu_activated(int item); diff --git a/konsole/konsole/TEmuVt102.cpp b/konsole/konsole/TEmuVt102.cpp index e0efab745..1d303089d 100644 --- a/konsole/konsole/TEmuVt102.cpp +++ b/konsole/konsole/TEmuVt102.cpp @@ -81,10 +81,10 @@ TEmuVt102::TEmuVt102(TEWidget* gui) : TEmulation(gui) { //kdDebug(1211)<<"TEmuVt102 ctor() connecting"<<endl; - TQObject::connect(gui,TQT_SIGNAL(mouseSignal(int,int,int)), - this,TQT_SLOT(onMouse(int,int,int))); - TQObject::connect(gui, TQT_SIGNAL(sendStringToEmu(const char*)), - this, TQT_SLOT(sendString(const char*))); + TQObject::connect(gui,TQ_SIGNAL(mouseSignal(int,int,int)), + this,TQ_SLOT(onMouse(int,int,int))); + TQObject::connect(gui, TQ_SIGNAL(sendStringToEmu(const char*)), + this, TQ_SLOT(sendString(const char*))); //kdDebug(1211)<<"TEmuVt102 ctor() initToken..."<<endl; initTokenizer(); //kdDebug(1211)<<"TEmuVt102 ctor() reset()"<<endl; @@ -100,16 +100,16 @@ void TEmuVt102::changeGUI(TEWidget* newgui) if (static_cast<TEWidget *>( gui )==newgui) return; if ( gui ) { - TQObject::disconnect(gui,TQT_SIGNAL(mouseSignal(int,int,int)), - this,TQT_SLOT(onMouse(int,int,int))); - TQObject::disconnect(gui, TQT_SIGNAL(sendStringToEmu(const char*)), - this, TQT_SLOT(sendString(const char*))); + TQObject::disconnect(gui,TQ_SIGNAL(mouseSignal(int,int,int)), + this,TQ_SLOT(onMouse(int,int,int))); + TQObject::disconnect(gui, TQ_SIGNAL(sendStringToEmu(const char*)), + this, TQ_SLOT(sendString(const char*))); } TEmulation::changeGUI(newgui); - TQObject::connect(gui,TQT_SIGNAL(mouseSignal(int,int,int)), - this,TQT_SLOT(onMouse(int,int,int))); - TQObject::connect(gui, TQT_SIGNAL(sendStringToEmu(const char*)), - this, TQT_SLOT(sendString(const char*))); + TQObject::connect(gui,TQ_SIGNAL(mouseSignal(int,int,int)), + this,TQ_SLOT(onMouse(int,int,int))); + TQObject::connect(gui, TQ_SIGNAL(sendStringToEmu(const char*)), + this, TQ_SLOT(sendString(const char*))); } /*! @@ -172,7 +172,7 @@ void TEmuVt102::reset() // Tokens ------------------------------------------------------------------ -- /* - Since the tokens are the central notion if this section, we've put them + Since the tokens are the central notion in this section, we've put them in front. They provide the syntactical elements used to represent the terminals operations as byte sequences. @@ -267,7 +267,7 @@ void TEmuVt102::initTokenizer() for(i = 0; i < 256; i++) tbl[ i] = 0; for(i = 0; i < 32; i++) tbl[ i] |= CTL; for(i = 32; i < 256; i++) tbl[ i] |= CHR; - for(s = (UINT8*)"@ABCDGHILMPSTXZcdfry"; *s; s++) tbl[*s] |= CPN; + for(s = (UINT8*)"@ABCDEFGHILMPSTXZbcdfry"; *s; s++) tbl[*s] |= CPN; // resize = \e[8;<row>;<col>t for(s = (UINT8*)"t"; *s; s++) tbl[*s] |= CPS; for(s = (UINT8*)"0123456789" ; *s; s++) tbl[*s] |= DIG; @@ -621,6 +621,8 @@ switch( N ) case TY_CSI_PN('B' ) : scr->cursorDown (p ); break; //VT100 case TY_CSI_PN('C' ) : scr->cursorRight (p ); break; //VT100 case TY_CSI_PN('D' ) : scr->cursorLeft (p ); break; //VT100 + case TY_CSI_PN('E' ) : scr->cursorNextLine (p ); break; //VT100 + case TY_CSI_PN('F' ) : scr->cursorPrevLine (p ); break; //VT100 case TY_CSI_PN('G' ) : scr->setCursorX (p ); break; //LINUX case TY_CSI_PN('H' ) : scr->setCursorYX (p, q); break; //VT100 case TY_CSI_PN('I' ) : scr->Tabulate (p ); break; @@ -631,6 +633,7 @@ switch( N ) case TY_CSI_PN('T' ) : scr->scrollDown (p ); break; case TY_CSI_PN('X' ) : scr->eraseChars (p ); break; case TY_CSI_PN('Z' ) : scr->backTabulate (p ); break; + case TY_CSI_PN('b' ) : scr->repeatChars (p ); break; case TY_CSI_PN('c' ) : reportTerminalType ( ); break; //VT100 case TY_CSI_PN('d' ) : scr->setCursorY (p ); break; //LINUX case TY_CSI_PN('f' ) : scr->setCursorYX (p, q); break; //VT100 @@ -964,17 +967,17 @@ void TEmuVt102::doKeyPress( TQKeyEvent* ev ) { switch(ev->key()) { - case Qt::Key_Down : gui->doScroll(+1); return; - case Qt::Key_Up : gui->doScroll(-1); return; - case Qt::Key_PageUp : gui->doScroll(-gui->Lines()/2); return; - case Qt::Key_PageDown : gui->doScroll(gui->Lines()/2); return; + case TQt::Key_Down : gui->doScroll(+1); return; + case TQt::Key_Up : gui->doScroll(-1); return; + case TQt::Key_PageUp : gui->doScroll(-gui->Lines()/2); return; + case TQt::Key_PageDown : gui->doScroll(gui->Lines()/2); return; } } // revert to non-history when typing if (scr->getHistCursor() != scr->getHistLines() && (!ev->text().isEmpty() - || ev->key()==Qt::Key_Down || ev->key()==Qt::Key_Up || ev->key()==Qt::Key_Left || ev->key()==Qt::Key_Right - || ev->key()==Qt::Key_PageUp || ev->key()==Qt::Key_PageDown)) + || ev->key()==TQt::Key_Down || ev->key()==TQt::Key_Up || ev->key()==TQt::Key_Left || ev->key()==TQt::Key_Right + || ev->key()==TQt::Key_PageUp || ev->key()==TQt::Key_PageDown)) scr->setHistCursor(scr->getHistLines()); if (cmd==CMD_send) @@ -1201,8 +1204,8 @@ void TEmuVt102::setConnect(bool c) TEmulation::setConnect(c); if (gui) { - TQObject::disconnect(gui, TQT_SIGNAL(sendStringToEmu(const char*)), - this, TQT_SLOT(sendString(const char*))); + TQObject::disconnect(gui, TQ_SIGNAL(sendStringToEmu(const char*)), + this, TQ_SLOT(sendString(const char*))); } if (c) { // refresh mouse mode @@ -1216,8 +1219,8 @@ void TEmuVt102::setConnect(bool c) else scrolllock_set_off(); #endif - TQObject::connect(gui, TQT_SIGNAL(sendStringToEmu(const char*)), - this, TQT_SLOT(sendString(const char*))); + TQObject::connect(gui, TQ_SIGNAL(sendStringToEmu(const char*)), + this, TQ_SLOT(sendString(const char*))); } } @@ -1228,7 +1231,7 @@ char TEmuVt102::getErase() int len; bool metaspecified; - if (keytrans->findEntry(Qt::Key_Backspace, 0, &cmd, &txt, &len, + if (keytrans->findEntry(TQt::Key_Backspace, 0, &cmd, &txt, &len, &metaspecified) && (cmd==CMD_send) && (len == 1)) return txt[0]; diff --git a/konsole/konsole/TEmuVt102.h b/konsole/konsole/TEmuVt102.h index 8832a73d8..e77fa0ea9 100644 --- a/konsole/konsole/TEmuVt102.h +++ b/konsole/konsole/TEmuVt102.h @@ -52,7 +52,7 @@ struct CharCodes }; class TEmuVt102 : public TEmulation -{ Q_OBJECT +{ TQ_OBJECT public: diff --git a/konsole/konsole/TEmulation.cpp b/konsole/konsole/TEmulation.cpp index 943d2f205..4a4c709e4 100644 --- a/konsole/konsole/TEmulation.cpp +++ b/konsole/konsole/TEmulation.cpp @@ -110,8 +110,8 @@ TEmulation::TEmulation(TEWidget* w) screen[1] = new TEScreen(gui->Lines(),gui->Columns()); scr = screen[0]; - TQObject::connect(&bulk_timer1, TQT_SIGNAL(timeout()), this, TQT_SLOT(showBulk()) ); - TQObject::connect(&bulk_timer2, TQT_SIGNAL(timeout()), this, TQT_SLOT(showBulk()) ); + TQObject::connect(&bulk_timer1, TQ_SIGNAL(timeout()), this, TQ_SLOT(showBulk()) ); + TQObject::connect(&bulk_timer2, TQ_SIGNAL(timeout()), this, TQ_SLOT(showBulk()) ); connectGUI(); setKeymap(0); // Default keymap } @@ -121,28 +121,28 @@ TEmulation::TEmulation(TEWidget* w) void TEmulation::connectGUI() { - TQObject::connect(gui,TQT_SIGNAL(changedHistoryCursor(int)), - this,TQT_SLOT(onHistoryCursorChange(int))); - TQObject::connect(gui,TQT_SIGNAL(keyPressedSignal(TQKeyEvent*)), - this,TQT_SLOT(onKeyPress(TQKeyEvent*))); - TQObject::connect(gui,TQT_SIGNAL(keyReleasedSignal(TQKeyEvent*)), - this,TQT_SLOT(onKeyReleased(TQKeyEvent*))); - TQObject::connect(gui,TQT_SIGNAL(focusInSignal(TQFocusEvent*)), - this,TQT_SLOT(onFocusIn(TQFocusEvent*))); - TQObject::connect(gui,TQT_SIGNAL(beginSelectionSignal(const int,const int,const bool)), - this,TQT_SLOT(onSelectionBegin(const int,const int,const bool)) ); - TQObject::connect(gui,TQT_SIGNAL(extendSelectionSignal(const int,const int)), - this,TQT_SLOT(onSelectionExtend(const int,const int)) ); - TQObject::connect(gui,TQT_SIGNAL(endSelectionSignal(const bool)), - this,TQT_SLOT(setSelection(const bool)) ); - TQObject::connect(gui,TQT_SIGNAL(copySelectionSignal()), - this,TQT_SLOT(copySelection()) ); - TQObject::connect(gui,TQT_SIGNAL(clearSelectionSignal()), - this,TQT_SLOT(clearSelection()) ); - TQObject::connect(gui,TQT_SIGNAL(isBusySelecting(bool)), - this,TQT_SLOT(isBusySelecting(bool)) ); - TQObject::connect(gui,TQT_SIGNAL(testIsSelected(const int, const int, bool &)), - this,TQT_SLOT(testIsSelected(const int, const int, bool &)) ); + TQObject::connect(gui,TQ_SIGNAL(changedHistoryCursor(int)), + this,TQ_SLOT(onHistoryCursorChange(int))); + TQObject::connect(gui,TQ_SIGNAL(keyPressedSignal(TQKeyEvent*)), + this,TQ_SLOT(onKeyPress(TQKeyEvent*))); + TQObject::connect(gui,TQ_SIGNAL(keyReleasedSignal(TQKeyEvent*)), + this,TQ_SLOT(onKeyReleased(TQKeyEvent*))); + TQObject::connect(gui,TQ_SIGNAL(focusInSignal(TQFocusEvent*)), + this,TQ_SLOT(onFocusIn(TQFocusEvent*))); + TQObject::connect(gui,TQ_SIGNAL(beginSelectionSignal(const int,const int,const bool)), + this,TQ_SLOT(onSelectionBegin(const int,const int,const bool)) ); + TQObject::connect(gui,TQ_SIGNAL(extendSelectionSignal(const int,const int)), + this,TQ_SLOT(onSelectionExtend(const int,const int)) ); + TQObject::connect(gui,TQ_SIGNAL(endSelectionSignal(const bool)), + this,TQ_SLOT(setSelection(const bool)) ); + TQObject::connect(gui,TQ_SIGNAL(copySelectionSignal()), + this,TQ_SLOT(copySelection()) ); + TQObject::connect(gui,TQ_SIGNAL(clearSelectionSignal()), + this,TQ_SLOT(clearSelection()) ); + TQObject::connect(gui,TQ_SIGNAL(isBusySelecting(bool)), + this,TQ_SLOT(isBusySelecting(bool)) ); + TQObject::connect(gui,TQ_SIGNAL(testIsSelected(const int, const int, bool &)), + this,TQ_SLOT(testIsSelected(const int, const int, bool &)) ); } /*! @@ -153,28 +153,28 @@ void TEmulation::changeGUI(TEWidget* newgui) if (static_cast<TEWidget *>( gui )==newgui) return; if ( gui ) { - TQObject::disconnect(gui,TQT_SIGNAL(changedHistoryCursor(int)), - this,TQT_SLOT(onHistoryCursorChange(int))); - TQObject::disconnect(gui,TQT_SIGNAL(keyPressedSignal(TQKeyEvent*)), - this,TQT_SLOT(onKeyPress(TQKeyEvent*))); - TQObject::disconnect(gui,TQT_SIGNAL(keyReleasedSignal(TQKeyEvent*)), - this,TQT_SLOT(onKeyReleased(TQKeyEvent*))); - TQObject::disconnect(gui,TQT_SIGNAL(focusInSignal(TQFocusEvent*)), - this,TQT_SLOT(onFocusIn(TQFocusEvent*))); - TQObject::disconnect(gui,TQT_SIGNAL(beginSelectionSignal(const int,const int,const bool)), - this,TQT_SLOT(onSelectionBegin(const int,const int,const bool)) ); - TQObject::disconnect(gui,TQT_SIGNAL(extendSelectionSignal(const int,const int)), - this,TQT_SLOT(onSelectionExtend(const int,const int)) ); - TQObject::disconnect(gui,TQT_SIGNAL(endSelectionSignal(const bool)), - this,TQT_SLOT(setSelection(const bool)) ); - TQObject::disconnect(gui,TQT_SIGNAL(copySelectionSignal()), - this,TQT_SLOT(copySelection()) ); - TQObject::disconnect(gui,TQT_SIGNAL(clearSelectionSignal()), - this,TQT_SLOT(clearSelection()) ); - TQObject::disconnect(gui,TQT_SIGNAL(isBusySelecting(bool)), - this,TQT_SLOT(isBusySelecting(bool)) ); - TQObject::disconnect(gui,TQT_SIGNAL(testIsSelected(const int, const int, bool &)), - this,TQT_SLOT(testIsSelected(const int, const int, bool &)) ); + TQObject::disconnect(gui,TQ_SIGNAL(changedHistoryCursor(int)), + this,TQ_SLOT(onHistoryCursorChange(int))); + TQObject::disconnect(gui,TQ_SIGNAL(keyPressedSignal(TQKeyEvent*)), + this,TQ_SLOT(onKeyPress(TQKeyEvent*))); + TQObject::disconnect(gui,TQ_SIGNAL(keyReleasedSignal(TQKeyEvent*)), + this,TQ_SLOT(onKeyReleased(TQKeyEvent*))); + TQObject::disconnect(gui,TQ_SIGNAL(focusInSignal(TQFocusEvent*)), + this,TQ_SLOT(onFocusIn(TQFocusEvent*))); + TQObject::disconnect(gui,TQ_SIGNAL(beginSelectionSignal(const int,const int,const bool)), + this,TQ_SLOT(onSelectionBegin(const int,const int,const bool)) ); + TQObject::disconnect(gui,TQ_SIGNAL(extendSelectionSignal(const int,const int)), + this,TQ_SLOT(onSelectionExtend(const int,const int)) ); + TQObject::disconnect(gui,TQ_SIGNAL(endSelectionSignal(const bool)), + this,TQ_SLOT(setSelection(const bool)) ); + TQObject::disconnect(gui,TQ_SIGNAL(copySelectionSignal()), + this,TQ_SLOT(copySelection()) ); + TQObject::disconnect(gui,TQ_SIGNAL(clearSelectionSignal()), + this,TQ_SLOT(clearSelection()) ); + TQObject::disconnect(gui,TQ_SIGNAL(isBusySelecting(bool)), + this,TQ_SLOT(isBusySelecting(bool)) ); + TQObject::disconnect(gui,TQ_SIGNAL(testIsSelected(const int, const int, bool &)), + this,TQ_SLOT(testIsSelected(const int, const int, bool &)) ); } gui=newgui; connectGUI(); diff --git a/konsole/konsole/TEmulation.h b/konsole/konsole/TEmulation.h index 9ddc2a4c7..e6050a9da 100644 --- a/konsole/konsole/TEmulation.h +++ b/konsole/konsole/TEmulation.h @@ -31,8 +31,8 @@ enum { NOTIFYNORMAL=0, NOTIFYBELL=1, NOTIFYACTIVITY=2, NOTIFYSILENCE=3 }; -class TEmulation : public QObject -{ Q_OBJECT +class TEmulation : public TQObject +{ TQ_OBJECT public: diff --git a/konsole/konsole/fontembedder.cpp b/konsole/konsole/fontembedder.cpp index 8b6da6d70..e4ededa51 100644 --- a/konsole/konsole/fontembedder.cpp +++ b/konsole/konsole/fontembedder.cpp @@ -115,5 +115,3 @@ int main(int argc, char **argv) cout<<"};\n"; return 0; } - -//kate: indent-width 4; tab-width 4; space-indent on; diff --git a/konsole/konsole/keytrans.cpp b/konsole/konsole/keytrans.cpp index 3712bb0da..6400598f6 100644 --- a/konsole/konsole/keytrans.cpp +++ b/konsole/konsole/keytrans.cpp @@ -30,7 +30,7 @@ #include <tqobject.h> #include <tqintdict.h> #include <tqfile.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <stdio.h> @@ -363,11 +363,11 @@ void KeyTrans::readConfig() TQBuffer* newbuf; newbuf = new TQBuffer(); newbuf->setBuffer(txt); - buf=TQT_TQIODEVICE(newbuf); + buf=newbuf; } else { - buf=TQT_TQIODEVICE(new TQFile(m_path)); + buf=new TQFile(m_path); }; KeytabReader ktr(m_path,*buf); ktr.parseTo(this); @@ -519,143 +519,143 @@ void KeyTransSymbols::defModSyms() void KeyTransSymbols::defKeySyms() { // Grey keys - defKeySym("Escape", Qt::Key_Escape ); - defKeySym("Tab", Qt::Key_Tab ); - defKeySym("Backtab", Qt::Key_Backtab ); - defKeySym("Backspace", Qt::Key_Backspace ); - defKeySym("Return", Qt::Key_Return ); - defKeySym("Enter", Qt::Key_Enter ); - defKeySym("Insert", Qt::Key_Insert ); - defKeySym("Delete", Qt::Key_Delete ); - defKeySym("Pause", Qt::Key_Pause ); - defKeySym("Print", Qt::Key_Print ); - defKeySym("SysReq", Qt::Key_SysReq ); - defKeySym("Home", Qt::Key_Home ); - defKeySym("End", Qt::Key_End ); - defKeySym("Left", Qt::Key_Left ); - defKeySym("Up", Qt::Key_Up ); - defKeySym("Right", Qt::Key_Right ); - defKeySym("Down", Qt::Key_Down ); + defKeySym("Escape", TQt::Key_Escape ); + defKeySym("Tab", TQt::Key_Tab ); + defKeySym("Backtab", TQt::Key_Backtab ); + defKeySym("Backspace", TQt::Key_Backspace ); + defKeySym("Return", TQt::Key_Return ); + defKeySym("Enter", TQt::Key_Enter ); + defKeySym("Insert", TQt::Key_Insert ); + defKeySym("Delete", TQt::Key_Delete ); + defKeySym("Pause", TQt::Key_Pause ); + defKeySym("Print", TQt::Key_Print ); + defKeySym("SysReq", TQt::Key_SysReq ); + defKeySym("Home", TQt::Key_Home ); + defKeySym("End", TQt::Key_End ); + defKeySym("Left", TQt::Key_Left ); + defKeySym("Up", TQt::Key_Up ); + defKeySym("Right", TQt::Key_Right ); + defKeySym("Down", TQt::Key_Down ); defKeySym("Prior", TQt::Key_Prior ); defKeySym("Next", TQt::Key_Next ); - defKeySym("Shift", Qt::Key_Shift ); - defKeySym("Control", Qt::Key_Control ); - defKeySym("Meta", Qt::Key_Meta ); - defKeySym("Alt", Qt::Key_Alt ); - defKeySym("CapsLock", Qt::Key_CapsLock ); - defKeySym("NumLock", Qt::Key_NumLock ); - defKeySym("ScrollLock", Qt::Key_ScrollLock ); - defKeySym("F1", Qt::Key_F1 ); - defKeySym("F2", Qt::Key_F2 ); - defKeySym("F3", Qt::Key_F3 ); - defKeySym("F4", Qt::Key_F4 ); - defKeySym("F5", Qt::Key_F5 ); - defKeySym("F6", Qt::Key_F6 ); - defKeySym("F7", Qt::Key_F7 ); - defKeySym("F8", Qt::Key_F8 ); - defKeySym("F9", Qt::Key_F9 ); - defKeySym("F10", Qt::Key_F10 ); - defKeySym("F11", Qt::Key_F11 ); - defKeySym("F12", Qt::Key_F12 ); - defKeySym("F13", Qt::Key_F13 ); - defKeySym("F14", Qt::Key_F14 ); - defKeySym("F15", Qt::Key_F15 ); - defKeySym("F16", Qt::Key_F16 ); - defKeySym("F17", Qt::Key_F17 ); - defKeySym("F18", Qt::Key_F18 ); - defKeySym("F19", Qt::Key_F19 ); - defKeySym("F20", Qt::Key_F20 ); - defKeySym("F21", Qt::Key_F21 ); - defKeySym("F22", Qt::Key_F22 ); - defKeySym("F23", Qt::Key_F23 ); - defKeySym("F24", Qt::Key_F24 ); - defKeySym("F25", Qt::Key_F25 ); - defKeySym("F26", Qt::Key_F26 ); - defKeySym("F27", Qt::Key_F27 ); - defKeySym("F28", Qt::Key_F28 ); - defKeySym("F29", Qt::Key_F29 ); - defKeySym("F30", Qt::Key_F30 ); - defKeySym("F31", Qt::Key_F31 ); - defKeySym("F32", Qt::Key_F32 ); - defKeySym("F33", Qt::Key_F33 ); - defKeySym("F34", Qt::Key_F34 ); - defKeySym("F35", Qt::Key_F35 ); - defKeySym("Super_L", Qt::Key_Super_L ); - defKeySym("Super_R", Qt::Key_Super_R ); - defKeySym("Menu", Qt::Key_Menu ); - defKeySym("Hyper_L", Qt::Key_Hyper_L ); - defKeySym("Hyper_R", Qt::Key_Hyper_R ); + defKeySym("Shift", TQt::Key_Shift ); + defKeySym("Control", TQt::Key_Control ); + defKeySym("Meta", TQt::Key_Meta ); + defKeySym("Alt", TQt::Key_Alt ); + defKeySym("CapsLock", TQt::Key_CapsLock ); + defKeySym("NumLock", TQt::Key_NumLock ); + defKeySym("ScrollLock", TQt::Key_ScrollLock ); + defKeySym("F1", TQt::Key_F1 ); + defKeySym("F2", TQt::Key_F2 ); + defKeySym("F3", TQt::Key_F3 ); + defKeySym("F4", TQt::Key_F4 ); + defKeySym("F5", TQt::Key_F5 ); + defKeySym("F6", TQt::Key_F6 ); + defKeySym("F7", TQt::Key_F7 ); + defKeySym("F8", TQt::Key_F8 ); + defKeySym("F9", TQt::Key_F9 ); + defKeySym("F10", TQt::Key_F10 ); + defKeySym("F11", TQt::Key_F11 ); + defKeySym("F12", TQt::Key_F12 ); + defKeySym("F13", TQt::Key_F13 ); + defKeySym("F14", TQt::Key_F14 ); + defKeySym("F15", TQt::Key_F15 ); + defKeySym("F16", TQt::Key_F16 ); + defKeySym("F17", TQt::Key_F17 ); + defKeySym("F18", TQt::Key_F18 ); + defKeySym("F19", TQt::Key_F19 ); + defKeySym("F20", TQt::Key_F20 ); + defKeySym("F21", TQt::Key_F21 ); + defKeySym("F22", TQt::Key_F22 ); + defKeySym("F23", TQt::Key_F23 ); + defKeySym("F24", TQt::Key_F24 ); + defKeySym("F25", TQt::Key_F25 ); + defKeySym("F26", TQt::Key_F26 ); + defKeySym("F27", TQt::Key_F27 ); + defKeySym("F28", TQt::Key_F28 ); + defKeySym("F29", TQt::Key_F29 ); + defKeySym("F30", TQt::Key_F30 ); + defKeySym("F31", TQt::Key_F31 ); + defKeySym("F32", TQt::Key_F32 ); + defKeySym("F33", TQt::Key_F33 ); + defKeySym("F34", TQt::Key_F34 ); + defKeySym("F35", TQt::Key_F35 ); + defKeySym("Super_L", TQt::Key_Super_L ); + defKeySym("Super_R", TQt::Key_Super_R ); + defKeySym("Menu", TQt::Key_Menu ); + defKeySym("Hyper_L", TQt::Key_Hyper_L ); + defKeySym("Hyper_R", TQt::Key_Hyper_R ); // Regular keys - defKeySym("Space", Qt::Key_Space ); - defKeySym("Exclam", Qt::Key_Exclam ); - defKeySym("QuoteDbl", Qt::Key_QuoteDbl ); - defKeySym("NumberSign", Qt::Key_NumberSign ); - defKeySym("Dollar", Qt::Key_Dollar ); - defKeySym("Percent", Qt::Key_Percent ); - defKeySym("Ampersand", Qt::Key_Ampersand ); - defKeySym("Apostrophe", Qt::Key_Apostrophe ); - defKeySym("ParenLeft", Qt::Key_ParenLeft ); - defKeySym("ParenRight", Qt::Key_ParenRight ); - defKeySym("Asterisk", Qt::Key_Asterisk ); - defKeySym("Plus", Qt::Key_Plus ); - defKeySym("Comma", Qt::Key_Comma ); - defKeySym("Minus", Qt::Key_Minus ); - defKeySym("Period", Qt::Key_Period ); - defKeySym("Slash", Qt::Key_Slash ); - defKeySym("0", Qt::Key_0 ); - defKeySym("1", Qt::Key_1 ); - defKeySym("2", Qt::Key_2 ); - defKeySym("3", Qt::Key_3 ); - defKeySym("4", Qt::Key_4 ); - defKeySym("5", Qt::Key_5 ); - defKeySym("6", Qt::Key_6 ); - defKeySym("7", Qt::Key_7 ); - defKeySym("8", Qt::Key_8 ); - defKeySym("9", Qt::Key_9 ); - defKeySym("Colon", Qt::Key_Colon ); - defKeySym("Semicolon", Qt::Key_Semicolon ); - defKeySym("Less", Qt::Key_Less ); - defKeySym("Equal", Qt::Key_Equal ); - defKeySym("Greater", Qt::Key_Greater ); - defKeySym("Question", Qt::Key_Question ); - defKeySym("At", Qt::Key_At ); - defKeySym("A", Qt::Key_A ); - defKeySym("B", Qt::Key_B ); - defKeySym("C", Qt::Key_C ); - defKeySym("D", Qt::Key_D ); - defKeySym("E", Qt::Key_E ); - defKeySym("F", Qt::Key_F ); - defKeySym("G", Qt::Key_G ); - defKeySym("H", Qt::Key_H ); - defKeySym("I", Qt::Key_I ); - defKeySym("J", Qt::Key_J ); - defKeySym("K", Qt::Key_K ); - defKeySym("L", Qt::Key_L ); - defKeySym("M", Qt::Key_M ); - defKeySym("N", Qt::Key_N ); - defKeySym("O", Qt::Key_O ); - defKeySym("P", Qt::Key_P ); - defKeySym("Q", Qt::Key_Q ); - defKeySym("R", Qt::Key_R ); - defKeySym("S", Qt::Key_S ); - defKeySym("T", Qt::Key_T ); - defKeySym("U", Qt::Key_U ); - defKeySym("V", Qt::Key_V ); - defKeySym("W", Qt::Key_W ); - defKeySym("X", Qt::Key_X ); - defKeySym("Y", Qt::Key_Y ); - defKeySym("Z", Qt::Key_Z ); - defKeySym("BracketLeft", Qt::Key_BracketLeft ); - defKeySym("Backslash", Qt::Key_Backslash ); - defKeySym("BracketRight", Qt::Key_BracketRight); - defKeySym("AsciiCircum", Qt::Key_AsciiCircum ); - defKeySym("Underscore", Qt::Key_Underscore ); - defKeySym("QuoteLeft", Qt::Key_QuoteLeft ); - defKeySym("BraceLeft", Qt::Key_BraceLeft ); - defKeySym("Bar", Qt::Key_Bar ); - defKeySym("BraceRight", Qt::Key_BraceRight ); - defKeySym("AsciiTilde", Qt::Key_AsciiTilde ); + defKeySym("Space", TQt::Key_Space ); + defKeySym("Exclam", TQt::Key_Exclam ); + defKeySym("QuoteDbl", TQt::Key_QuoteDbl ); + defKeySym("NumberSign", TQt::Key_NumberSign ); + defKeySym("Dollar", TQt::Key_Dollar ); + defKeySym("Percent", TQt::Key_Percent ); + defKeySym("Ampersand", TQt::Key_Ampersand ); + defKeySym("Apostrophe", TQt::Key_Apostrophe ); + defKeySym("ParenLeft", TQt::Key_ParenLeft ); + defKeySym("ParenRight", TQt::Key_ParenRight ); + defKeySym("Asterisk", TQt::Key_Asterisk ); + defKeySym("Plus", TQt::Key_Plus ); + defKeySym("Comma", TQt::Key_Comma ); + defKeySym("Minus", TQt::Key_Minus ); + defKeySym("Period", TQt::Key_Period ); + defKeySym("Slash", TQt::Key_Slash ); + defKeySym("0", TQt::Key_0 ); + defKeySym("1", TQt::Key_1 ); + defKeySym("2", TQt::Key_2 ); + defKeySym("3", TQt::Key_3 ); + defKeySym("4", TQt::Key_4 ); + defKeySym("5", TQt::Key_5 ); + defKeySym("6", TQt::Key_6 ); + defKeySym("7", TQt::Key_7 ); + defKeySym("8", TQt::Key_8 ); + defKeySym("9", TQt::Key_9 ); + defKeySym("Colon", TQt::Key_Colon ); + defKeySym("Semicolon", TQt::Key_Semicolon ); + defKeySym("Less", TQt::Key_Less ); + defKeySym("Equal", TQt::Key_Equal ); + defKeySym("Greater", TQt::Key_Greater ); + defKeySym("Question", TQt::Key_Question ); + defKeySym("At", TQt::Key_At ); + defKeySym("A", TQt::Key_A ); + defKeySym("B", TQt::Key_B ); + defKeySym("C", TQt::Key_C ); + defKeySym("D", TQt::Key_D ); + defKeySym("E", TQt::Key_E ); + defKeySym("F", TQt::Key_F ); + defKeySym("G", TQt::Key_G ); + defKeySym("H", TQt::Key_H ); + defKeySym("I", TQt::Key_I ); + defKeySym("J", TQt::Key_J ); + defKeySym("K", TQt::Key_K ); + defKeySym("L", TQt::Key_L ); + defKeySym("M", TQt::Key_M ); + defKeySym("N", TQt::Key_N ); + defKeySym("O", TQt::Key_O ); + defKeySym("P", TQt::Key_P ); + defKeySym("Q", TQt::Key_Q ); + defKeySym("R", TQt::Key_R ); + defKeySym("S", TQt::Key_S ); + defKeySym("T", TQt::Key_T ); + defKeySym("U", TQt::Key_U ); + defKeySym("V", TQt::Key_V ); + defKeySym("W", TQt::Key_W ); + defKeySym("X", TQt::Key_X ); + defKeySym("Y", TQt::Key_Y ); + defKeySym("Z", TQt::Key_Z ); + defKeySym("BracketLeft", TQt::Key_BracketLeft ); + defKeySym("Backslash", TQt::Key_Backslash ); + defKeySym("BracketRight", TQt::Key_BracketRight); + defKeySym("AsciiCircum", TQt::Key_AsciiCircum ); + defKeySym("Underscore", TQt::Key_Underscore ); + defKeySym("QuoteLeft", TQt::Key_QuoteLeft ); + defKeySym("BraceLeft", TQt::Key_BraceLeft ); + defKeySym("Bar", TQt::Key_Bar ); + defKeySym("BraceRight", TQt::Key_BraceRight ); + defKeySym("AsciiTilde", TQt::Key_AsciiTilde ); } KeyTransSymbols::KeyTransSymbols() diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp index 0101ecab3..1c435165c 100644 --- a/konsole/konsole/konsole.cpp +++ b/konsole/konsole/konsole.cpp @@ -99,7 +99,7 @@ Time to start a requirement list. #include <tdefontdialog.h> #include <kkeydialog.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqpainter.h> #include <tdemenubar.h> #include <tdemessagebox.h> @@ -132,7 +132,7 @@ Time to start a requirement list. #include <kiconloader.h> #include <kstringhandler.h> #include <ktip.h> -#include <kprocctrl.h> +#include <tdeprocctrl.h> #include <ktabwidget.h> #include <kregexpeditorinterface.h> #include <tdeparts/componentfactory.h> @@ -184,7 +184,7 @@ void KonsoleFontSelectAction::slotActivated(int index) { } template class TQPtrDict<TESession>; -template class TQIntDict<KSimpleConfig>; +template class TQIntDict<TDESimpleConfig>; template class TQPtrDict<TDERadioAction>; #define DEFAULT_HISTORY_SIZE 1000 @@ -266,6 +266,7 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo ,b_installBitmapFonts(false) ,b_framevis(true) ,b_metaAsAlt(false) +,b_realTransparency(false) ,b_fullscreen(false) ,m_menuCreated(false) ,b_warnQuit(false) @@ -289,16 +290,16 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo ,m_filterData(0) { isRestored = b_inRestore; - connect( &m_closeTimeout, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCouldNotClose())); + connect( &m_closeTimeout, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotCouldNotClose())); no2command.setAutoDelete(true); menubar = menuBar(); TDEAcceleratorManager::setNoAccel( menubar ); - sessionNumberMapper = new TQSignalMapper( TQT_TQOBJECT(this) ); - connect( sessionNumberMapper, TQT_SIGNAL( mapped( int ) ), - this, TQT_SLOT( newSessionTabbar( int ) ) ); + sessionNumberMapper = new TQSignalMapper( this ); + connect( sessionNumberMapper, TQ_SIGNAL( mapped( int ) ), + this, TQ_SLOT( newSessionTabbar( int ) ) ); colors = new ColorSchemaList(); colors->checkSchemas(); @@ -316,7 +317,7 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo if (currentSize != size()) defaultSize = size(); - KSimpleConfig *co; + TDESimpleConfig *co; if (!type.isEmpty()) setDefaultSession(type+".desktop"); co = defaultSession(); @@ -330,7 +331,7 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo if (isRestored) { n_tabbar = wanted_tabbar; - TDEConfig *c = TDEApplication::kApplication()->sessionConfig(); + TDEConfig *c = tdeApp->sessionConfig(); // c->setDesktopGroup(); // Reads from wrong group b_dynamicTabHide = c->readBoolEntry("DynamicTabHide", false); } @@ -358,14 +359,9 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo if (te) te->setScrollbarLocation(TEWidget::SCRNONE); } -// connect(kapp, TQT_SIGNAL(tdedisplayFontChanged()), this, TQT_SLOT(slotFontChanged())); +// connect(tdeApp, TQ_SIGNAL(tdedisplayFontChanged()), this, TQ_SLOT(slotFontChanged())); - kapp->dcopClient()->setDefaultObject( "konsole" ); - - // Signal that we want to be transparent to the desktop, not to windows behind us... - Atom kde_wm_transparent_to_desktop; - kde_wm_transparent_to_desktop = XInternAtom(tqt_xdisplay(), "_TDE_TRANSPARENT_TO_DESKTOP", False); - XChangeProperty(tqt_xdisplay(), winId(), kde_wm_transparent_to_desktop, XA_INTEGER, 32, PropModeReplace, (unsigned char *) "TRUE", 1L); + tdeApp->dcopClient()->setDefaultObject( "konsole" ); } @@ -480,29 +476,29 @@ void Konsole::makeGUI() if (m_menuCreated) return; if (m_tabbarSessionsCommands) - disconnect(m_tabbarSessionsCommands,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); - disconnect(m_session,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + disconnect(m_tabbarSessionsCommands,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); + disconnect(m_session,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_options) - disconnect(m_options,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + disconnect(m_options,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_help) - disconnect(m_help,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + disconnect(m_help,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_rightButton) - disconnect(m_rightButton,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); - disconnect(m_edit,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); - disconnect(m_view,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + disconnect(m_rightButton,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); + disconnect(m_edit,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); + disconnect(m_view,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_bookmarks) - disconnect(m_bookmarks,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + disconnect(m_bookmarks,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_bookmarksSession) - disconnect(m_bookmarksSession,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + disconnect(m_bookmarksSession,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_tabbarSessionsCommands) - connect(m_tabbarSessionsCommands,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(loadScreenSessions())); - connect(m_session,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(loadScreenSessions())); + connect(m_tabbarSessionsCommands,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(loadScreenSessions())); + connect(m_session,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(loadScreenSessions())); m_menuCreated=true; // Remove the empty separator Qt inserts if the menu is empty on popup, // not sure if this will be "fixed" in Qt, for now use this hack (malte) if(!(isRestored)) { - if (sender() && sender()->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) && + if (sender() && sender()->inherits("TQPopupMenu") && static_cast<const TQPopupMenu *>(sender())->count() == 1) const_cast<TQPopupMenu *>(static_cast<const TQPopupMenu *>(sender()))->removeItemAt(0); } @@ -510,7 +506,7 @@ void Konsole::makeGUI() TDEActionCollection* actions = actionCollection(); // Send Signal Menu ------------------------------------------------------------- - if (kapp->authorizeTDEAction("send_signal")) + if (tdeApp->authorizeTDEAction("send_signal")) { m_signals = new TDEPopupMenu(this); m_signals->insertItem( i18n( "&Suspend Task" ) + " (STOP)", SIGSTOP); @@ -521,7 +517,7 @@ void Konsole::makeGUI() m_signals->insertItem( i18n( "&Kill Task" ) + " (KILL)", SIGKILL); m_signals->insertItem( i18n( "User Signal &1") + " (USR1)", SIGUSR1); m_signals->insertItem( i18n( "User Signal &2") + " (USR2)", SIGUSR2); - connect(m_signals, TQT_SIGNAL(activated(int)), TQT_SLOT(sendSignal(int))); + connect(m_signals, TQ_SIGNAL(activated(int)), TQ_SLOT(sendSignal(int))); TDEAcceleratorManager::manage( m_signals ); } @@ -575,28 +571,28 @@ void Konsole::makeGUI() //bookmarks menu if (bookmarkHandler) - connect( bookmarkHandler, TQT_SIGNAL( openURL( const TQString&, const TQString& )), - TQT_SLOT( enterURL( const TQString&, const TQString& ))); + connect( bookmarkHandler, TQ_SIGNAL( openURL( const TQString&, const TQString& )), + TQ_SLOT( enterURL( const TQString&, const TQString& ))); if (bookmarkHandlerSession) - connect( bookmarkHandlerSession, TQT_SIGNAL( openURL( const TQString&, const TQString& )), - TQT_SLOT( newSession( const TQString&, const TQString& ))); + connect( bookmarkHandlerSession, TQ_SIGNAL( openURL( const TQString&, const TQString& )), + TQ_SLOT( newSession( const TQString&, const TQString& ))); if (m_bookmarks) - connect(m_bookmarks, TQT_SIGNAL(aboutToShow()), TQT_SLOT(bookmarks_menu_check())); + connect(m_bookmarks, TQ_SIGNAL(aboutToShow()), TQ_SLOT(bookmarks_menu_check())); if (m_bookmarksSession) - connect(m_bookmarksSession, TQT_SIGNAL(aboutToShow()), TQT_SLOT(bookmarks_menu_check())); + connect(m_bookmarksSession, TQ_SIGNAL(aboutToShow()), TQ_SLOT(bookmarks_menu_check())); // Schema Options Menu ----------------------------------------------------- m_schema = new TDEPopupMenu(this); m_schema->setCheckable(true); TDEAcceleratorManager::manage( m_schema ); - connect(m_schema, TQT_SIGNAL(activated(int)), TQT_SLOT(schema_menu_activated(int))); - connect(m_schema, TQT_SIGNAL(aboutToShow()), TQT_SLOT(schema_menu_check())); + connect(m_schema, TQ_SIGNAL(activated(int)), TQ_SLOT(schema_menu_activated(int))); + connect(m_schema, TQ_SIGNAL(aboutToShow()), TQ_SLOT(schema_menu_check())); // Keyboard Options Menu --------------------------------------------------- m_keytab = new TDEPopupMenu(this); m_keytab->setCheckable(true); TDEAcceleratorManager::manage( m_keytab ); - connect(m_keytab, TQT_SIGNAL(activated(int)), TQT_SLOT(keytab_menu_activated(int))); + connect(m_keytab, TQ_SIGNAL(activated(int)), TQ_SLOT(keytab_menu_activated(int))); //options menu if (m_options) @@ -605,16 +601,16 @@ void Konsole::makeGUI() showMenubar->plug ( m_options ); // Tabbar - selectTabbar = new TDESelectAction(i18n("&Tab Bar"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotSelectTabbar()), actions, "tabbar" ); + selectTabbar = new TDESelectAction(i18n("&Tab Bar"), 0, this, + TQ_SLOT(slotSelectTabbar()), actions, "tabbar" ); TQStringList tabbaritems; tabbaritems << i18n("&Hide") << i18n("&Top") << i18n("&Bottom"); selectTabbar->setItems(tabbaritems); selectTabbar->plug(m_options); // Scrollbar - selectScrollbar = new TDESelectAction(i18n("Sc&rollbar"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotSelectScrollbar()), actions, "scrollbar" ); + selectScrollbar = new TDESelectAction(i18n("Sc&rollbar"), 0, this, + TQ_SLOT(slotSelectScrollbar()), actions, "scrollbar" ); TQStringList scrollitems; scrollitems << i18n("&Hide") << i18n("&Left") << i18n("&Right"); selectScrollbar->setItems(scrollitems); @@ -629,8 +625,8 @@ void Konsole::makeGUI() } // Select Bell - selectBell = new TDESelectAction(i18n("&Bell"), SmallIconSet( "bell"), 0 , TQT_TQOBJECT(this), - TQT_SLOT(slotSelectBell()), actions, "bell"); + selectBell = new TDESelectAction(i18n("&Bell"), SmallIconSet( "bell"), 0 , this, + TQ_SLOT(slotSelectBell()), actions, "bell"); TQStringList bellitems; bellitems << i18n("System &Bell") << i18n("System &Notification") @@ -644,46 +640,46 @@ void Konsole::makeGUI() SmallIconSet( "text" ), actions, 0L ); m_fontsizes->insert( new TDEAction( i18n( "&Enlarge Font" ), - SmallIconSet( "fontsizeup" ), 0, TQT_TQOBJECT(this), - TQT_SLOT( biggerFont() ), actions, + SmallIconSet( "fontsizeup" ), 0, this, + TQ_SLOT( biggerFont() ), actions, "enlarge_font" ) ); m_fontsizes->insert( new TDEAction( i18n( "&Shrink Font" ), - SmallIconSet( "fontsizedown" ), 0, TQT_TQOBJECT(this), - TQT_SLOT( smallerFont() ), actions, + SmallIconSet( "fontsizedown" ), 0, this, + TQ_SLOT( smallerFont() ), actions, "shrink_font" ) ); m_fontsizes->insert( new TDEAction( i18n( "Se&lect..." ), - SmallIconSet( "font-x-generic" ), 0, TQT_TQOBJECT(this), - TQT_SLOT( slotSelectFont() ), actions, + SmallIconSet( "font-x-generic" ), 0, this, + TQ_SLOT( slotSelectFont() ), actions, "select_font" ) ); if ( b_installBitmapFonts ) { m_fontsizes->insert( new TDEAction( i18n( "&Install Bitmap..." ), - SmallIconSet( "font-x-generic" ), 0, TQT_TQOBJECT(this), - TQT_SLOT( slotInstallBitmapFonts() ), actions, + SmallIconSet( "font-x-generic" ), 0, this, + TQ_SLOT( slotInstallBitmapFonts() ), actions, "install_fonts" ) ); } m_fontsizes->plug(m_options); // encoding menu, start with default checked ! - selectSetEncoding = new TDESelectAction( i18n( "&Encoding" ), SmallIconSet( "charset" ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetEncoding()), actions, "set_encoding" ); + selectSetEncoding = new TDESelectAction( i18n( "&Encoding" ), SmallIconSet( "charset" ), 0, this, TQ_SLOT(slotSetEncoding()), actions, "set_encoding" ); TQStringList list = TDEGlobal::charsets()->descriptiveEncodingNames(); list.prepend( i18n( "Default" ) ); selectSetEncoding->setItems(list); selectSetEncoding->setCurrentItem (0); selectSetEncoding->plug(m_options); - if (kapp->authorizeTDEAction("keyboard")) + if (tdeApp->authorizeTDEAction("keyboard")) m_options->insertItem( SmallIconSet( "key_bindings" ), i18n( "&Keyboard" ), m_keytab ); // Schema - if (kapp->authorizeTDEAction("schema")) + if (tdeApp->authorizeTDEAction("schema")) m_options->insertItem( SmallIconSet( "colorize" ), i18n( "Sch&ema" ), m_schema); // Select size if (!b_fixedSize) { - selectSize = new KonsoleFontSelectAction(i18n("S&ize"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotSelectSize()), actions, "size"); + selectSize = new KonsoleFontSelectAction(i18n("S&ize"), 0, this, + TQ_SLOT(slotSelectSize()), actions, "size"); TQStringList sizeitems; sizeitems << i18n("40x15 (&Small)") << i18n("80x24 (&VT100)") @@ -696,14 +692,14 @@ void Konsole::makeGUI() selectSize->plug(m_options); } - TDEAction *historyType = new TDEAction(i18n("Hist&ory..."), "history", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotHistoryType()), actions, "history"); + TDEAction *historyType = new TDEAction(i18n("Hist&ory..."), "history", 0, this, + TQ_SLOT(slotHistoryType()), actions, "history"); historyType->plug(m_options); m_options->insertSeparator(); - TDEAction *save_settings = new TDEAction(i18n("&Save as Default"), "document-save", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotSaveSettings()), actions, "save_default"); + TDEAction *save_settings = new TDEAction(i18n("&Save as Default"), "document-save", 0, this, + TQ_SLOT(slotSaveSettings()), actions, "save_default"); save_settings->plug(m_options); m_options->insertSeparator(); @@ -712,9 +708,9 @@ void Konsole::makeGUI() m_options->insertSeparator(); - KStdAction::configureNotifications(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureNotifications()), actionCollection())->plug(m_options); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureKeys()), actionCollection())->plug(m_options); - TDEAction *configure = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actions); + KStdAction::configureNotifications(this, TQ_SLOT(slotConfigureNotifications()), actionCollection())->plug(m_options); + KStdAction::keyBindings(this, TQ_SLOT(slotConfigureKeys()), actionCollection())->plug(m_options); + TDEAction *configure = KStdAction::preferences(this, TQ_SLOT(slotConfigure()), actions); configure->plug(m_options); if (TDEGlobalSettings::insertTearOffHandle()) @@ -726,21 +722,21 @@ void Konsole::makeGUI() { m_help->insertSeparator(1); m_help->insertItem(SmallIcon( "idea" ), i18n("&Tip of the Day"), - this, TQT_SLOT(showTip()), 0, -1, 2); + this, TQ_SLOT(showTip()), 0, -1, 2); } //the different session menus buildSessionMenus(); - connect(m_session, TQT_SIGNAL(activated(int)), TQT_SLOT(newSession(int))); + connect(m_session, TQ_SIGNAL(activated(int)), TQ_SLOT(newSession(int))); // Right mouse button menu if (m_rightButton) { updateRMBMenu(); // show menubar / exit fullscreen - TDEAction* selectionEnd = new TDEAction(i18n("Set Selection End"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotSetSelectionEnd()), actions, "selection_end"); + TDEAction* selectionEnd = new TDEAction(i18n("Set Selection End"), 0, this, + TQ_SLOT(slotSetSelectionEnd()), actions, "selection_end"); selectionEnd->plug(m_rightButton); m_copyClipboard->plug(m_rightButton); @@ -748,7 +744,7 @@ void Konsole::makeGUI() m_openSelection = new TDEPopupMenu(this); m_rightButton->insertItem( i18n("&Open.."), m_openSelection ); - connect(m_openSelection, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotOpenSelection())); + connect(m_openSelection, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotOpenSelection())); if (m_signals) m_rightButton->insertItem(i18n("&Send Signal"), m_signals); @@ -825,57 +821,58 @@ void Konsole::makeGUI() if (!m_detachSession) { - m_detachSession = new TDEAction(i18n("&Detach Session"), SmallIconSet("tab_breakoff"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotDetachSession()), m_shortcuts, "detach_session"); + m_detachSession = new TDEAction(i18n("&Detach Session"), SmallIconSet("tab_breakoff"), 0, this, + TQ_SLOT(slotDetachSession()), m_shortcuts, "detach_session"); } m_detachSession->plug(m_tabPopupMenu); - m_tabPopupMenu->insertItem( i18n("&Rename Session..."), TQT_TQOBJECT(this), - TQT_SLOT(slotTabRenameSession()) ); + m_tabPopupMenu->insertItem( i18n("&Rename Session..."), this, + TQ_SLOT(slotTabRenameSession()) ); m_tabPopupMenu->insertSeparator(); m_tabMonitorActivity = new TDEToggleAction ( i18n( "Monitor for &Activity" ), - SmallIconSet("activity"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotTabToggleMonitor() ), TQT_TQOBJECT(this) ); + SmallIconSet("activity"), 0, this, TQ_SLOT( slotTabToggleMonitor() ), this ); m_tabMonitorActivity->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Activity" ) ) ); m_tabMonitorActivity->plug(m_tabPopupMenu); m_tabMonitorSilence = new TDEToggleAction ( i18n( "Monitor for &Silence" ), - SmallIconSet("silence"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotTabToggleMonitor() ), TQT_TQOBJECT(this) ); + SmallIconSet("silence"), 0, this, TQ_SLOT( slotTabToggleMonitor() ), this ); m_tabMonitorSilence->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Silence" ) ) ); m_tabMonitorSilence->plug(m_tabPopupMenu); - m_tabMasterMode = new TDEToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, TQT_TQOBJECT(this), - TQT_SLOT( slotTabToggleMasterMode() ), TQT_TQOBJECT(this)); + m_tabMasterMode = new TDEToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, this, + TQ_SLOT( slotTabToggleMasterMode() ), this); m_tabMasterMode->plug(m_tabPopupMenu); m_tabPopupMenu->insertSeparator(); if (!m_moveSessionLeft) { m_moveSessionLeft = new TDEAction(i18n("&Move Session Left"), TQApplication::reverseLayout() ? "forward" : "back", - TQApplication::reverseLayout() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Right : Qt::CTRL+Qt::SHIFT+Qt::Key_Left, TQT_TQOBJECT(this), - TQT_SLOT(moveSessionLeft()), m_shortcuts, "move_session_left"); + TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Right : TQt::CTRL+TQt::SHIFT+TQt::Key_Left, this, + TQ_SLOT(moveSessionLeft()), m_shortcuts, "move_session_left"); } m_moveSessionLeft->plug(m_tabPopupMenu); if (!m_moveSessionRight) { m_moveSessionRight = new TDEAction(i18n("M&ove Session Right"), TQApplication::reverseLayout() ? "back" : "forward", - TQApplication::reverseLayout() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Left : Qt::CTRL+Qt::SHIFT+Qt::Key_Right, TQT_TQOBJECT(this), - TQT_SLOT(moveSessionRight()), m_shortcuts, "move_session_right"); + TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Left : TQt::CTRL+TQt::SHIFT+TQt::Key_Right, this, + TQ_SLOT(moveSessionRight()), m_shortcuts, "move_session_right"); } m_moveSessionRight->plug(m_tabPopupMenu); m_tabPopupMenu->insertSeparator(); - m_tabPopupMenu->insertItem( SmallIconSet("colors"), i18n("Select &Tab Color..."), TQT_TQOBJECT(this), TQT_SLOT(slotTabSelectColor()) ); + m_tabPopupMenu->insertItem( SmallIconSet("colors"), i18n("Select &Tab Color..."), this, TQ_SLOT(slotTabSelectColor()) ); + m_tabPopupMenu->insertItem( i18n("Reset Tab Color"), this, TQ_SLOT(slotTabResetColor()) ); m_tabPopupMenu->insertSeparator(); m_tabPopupTabsMenu = new TDEPopupMenu( m_tabPopupMenu ); m_tabPopupMenu->insertItem( i18n("Switch to Tab" ), m_tabPopupTabsMenu ); - connect( m_tabPopupTabsMenu, TQT_SIGNAL( activated ( int ) ), - TQT_SLOT( activateSession( int ) ) ); + connect( m_tabPopupTabsMenu, TQ_SIGNAL( activated ( int ) ), + TQ_SLOT( activateSession( int ) ) ); m_tabPopupMenu->insertSeparator(); - m_tabPopupMenu->insertItem( SmallIcon("window-close"), i18n("C&lose Session"), TQT_TQOBJECT(this), - TQT_SLOT(slotTabCloseSession()) ); + m_tabPopupMenu->insertItem( SmallIcon("window-close"), i18n("C&lose Session"), this, + TQ_SLOT(slotTabCloseSession()) ); if (m_options) { // Fill tab bar context menu @@ -883,23 +880,23 @@ void Konsole::makeGUI() TDEAcceleratorManager::manage( m_tabbarPopupMenu ); selectTabbar->plug(m_tabbarPopupMenu); - TDESelectAction *viewOptions = new TDESelectAction(TQT_TQOBJECT(this)); + TDESelectAction *viewOptions = new TDESelectAction(this); viewOptions->setText(i18n("Tab &Options")); TQStringList options; options << i18n("&Text && Icons") << i18n("Text &Only") << i18n("&Icons Only"); viewOptions->setItems(options); viewOptions->setCurrentItem(m_tabViewMode); viewOptions->plug(m_tabbarPopupMenu); - connect(viewOptions, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotTabSetViewOptions(int))); + connect(viewOptions, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotTabSetViewOptions(int))); slotTabSetViewOptions(m_tabViewMode); - TDEToggleAction *dynamicTabHideOption = new TDEToggleAction ( i18n( "&Dynamic Hide" ), 0, TQT_TQOBJECT(this), - TQT_SLOT( slotTabbarToggleDynamicHide() ), TQT_TQOBJECT(this)); + TDEToggleAction *dynamicTabHideOption = new TDEToggleAction ( i18n( "&Dynamic Hide" ), 0, this, + TQ_SLOT( slotTabbarToggleDynamicHide() ), this); dynamicTabHideOption->setChecked(b_dynamicTabHide); dynamicTabHideOption->plug(m_tabbarPopupMenu); TDEToggleAction *m_autoResizeTabs = new TDEToggleAction( i18n("&Auto Resize Tabs"), - 0, TQT_TQOBJECT(this), TQT_SLOT( slotToggleAutoResizeTabs() ), TQT_TQOBJECT(this)); + 0, this, TQ_SLOT( slotToggleAutoResizeTabs() ), this); m_autoResizeTabs->setChecked(b_autoResizeTabs); m_autoResizeTabs->plug(m_tabbarPopupMenu); } @@ -955,23 +952,23 @@ void Konsole::makeTabWidget() TDEAcceleratorManager::setNoAccel( tabwidget ); - connect(tabwidget, TQT_SIGNAL(movedTab(int,int)), TQT_SLOT(slotMovedTab(int,int))); - connect(tabwidget, TQT_SIGNAL(mouseDoubleClick(TQWidget*)), TQT_SLOT(slotRenameSession())); - connect(tabwidget, TQT_SIGNAL(currentChanged(TQWidget*)), TQT_SLOT(activateSession(TQWidget*))); - connect(tabwidget, TQT_SIGNAL(contextMenu(TQWidget*, const TQPoint &)), - TQT_SLOT(slotTabContextMenu(TQWidget*, const TQPoint &))); - connect(tabwidget, TQT_SIGNAL(contextMenu(const TQPoint &)), - TQT_SLOT(slotTabbarContextMenu(const TQPoint &))); + connect(tabwidget, TQ_SIGNAL(movedTab(int,int)), TQ_SLOT(slotMovedTab(int,int))); + connect(tabwidget, TQ_SIGNAL(mouseDoubleClick(TQWidget*)), TQ_SLOT(slotRenameSession())); + connect(tabwidget, TQ_SIGNAL(currentChanged(TQWidget*)), TQ_SLOT(activateSession(TQWidget*))); + connect(tabwidget, TQ_SIGNAL(contextMenu(TQWidget*, const TQPoint &)), + TQ_SLOT(slotTabContextMenu(TQWidget*, const TQPoint &))); + connect(tabwidget, TQ_SIGNAL(contextMenu(const TQPoint &)), + TQ_SLOT(slotTabbarContextMenu(const TQPoint &))); - if (kapp->authorize("shell_access")) { - connect(tabwidget, TQT_SIGNAL(mouseDoubleClick()), TQT_SLOT(newSession())); + if (tdeApp->authorize("shell_access")) { + connect(tabwidget, TQ_SIGNAL(mouseDoubleClick()), TQ_SLOT(newSession())); m_newSessionButton = new TQToolButton( tabwidget ); TQToolTip::add(m_newSessionButton,i18n("Click for new standard session\nClick and hold for session menu")); m_newSessionButton->setIconSet( SmallIcon( "tab_new" ) ); m_newSessionButton->adjustSize(); m_newSessionButton->setPopup( m_tabbarSessionsCommands ); - connect(m_newSessionButton, TQT_SIGNAL(clicked()), TQT_SLOT(newSession())); + connect(m_newSessionButton, TQ_SIGNAL(clicked()), TQ_SLOT(newSession())); tabwidget->setCornerWidget( m_newSessionButton, BottomLeft ); m_newSessionButton->installEventFilter(this); @@ -980,7 +977,7 @@ void Konsole::makeTabWidget() m_removeSessionButton->setIconSet( SmallIconSet( "tab_remove" ) ); m_removeSessionButton->adjustSize(); m_removeSessionButton->setEnabled(false); - connect(m_removeSessionButton, TQT_SIGNAL(clicked()), TQT_SLOT(confirmCloseCurrentSession())); + connect(m_removeSessionButton, TQ_SIGNAL(clicked()), TQ_SLOT(confirmCloseCurrentSession())); tabwidget->setCornerWidget( m_removeSessionButton, BottomRight ); } @@ -988,18 +985,18 @@ void Konsole::makeTabWidget() bool Konsole::eventFilter( TQObject *o, TQEvent *ev ) { - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_newSessionButton)) + if (o == m_newSessionButton) { // Popup the menu when the left mousebutton is pressed and the mouse // is moved by a small distance. if (ev->type() == TQEvent::MouseButtonPress) { - TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev); + TQMouseEvent* mev = static_cast<TQMouseEvent*>(ev); m_newSessionButtonMousePressPos = mev->pos(); } else if (ev->type() == TQEvent::MouseMove) { - TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev); + TQMouseEvent* mev = static_cast<TQMouseEvent*>(ev); if ((mev->pos() - m_newSessionButtonMousePressPos).manhattanLength() > TDEGlobalSettings::dndEventDelay()) { @@ -1009,7 +1006,7 @@ bool Konsole::eventFilter( TQObject *o, TQEvent *ev ) } else if (ev->type() == TQEvent::ContextMenu) { - TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev); + TQMouseEvent* mev = static_cast<TQMouseEvent*>(ev); slotTabbarContextMenu(mev->globalPos()); return true; } @@ -1019,10 +1016,10 @@ bool Konsole::eventFilter( TQObject *o, TQEvent *ev ) void Konsole::makeBasicGUI() { - if (kapp->authorize("shell_access")) { + if (tdeApp->authorize("shell_access")) { m_tabbarSessionsCommands = new TDEPopupMenu( this ); TDEAcceleratorManager::manage( m_tabbarSessionsCommands ); - connect(m_tabbarSessionsCommands, TQT_SIGNAL(activated(int)), TQT_SLOT(newSessionTabbar(int))); + connect(m_tabbarSessionsCommands, TQ_SIGNAL(activated(int)), TQ_SLOT(newSessionTabbar(int))); } m_session = new TDEPopupMenu(this); @@ -1031,7 +1028,7 @@ void Konsole::makeBasicGUI() TDEAcceleratorManager::manage( m_edit ); m_view = new TDEPopupMenu(this); TDEAcceleratorManager::manage( m_view ); - if (kapp->authorizeTDEAction("bookmarks")) + if (tdeApp->authorizeTDEAction("bookmarks")) { bookmarkHandler = new KonsoleBookmarkHandler( this, true ); m_bookmarks = bookmarkHandler->menu(); @@ -1039,20 +1036,20 @@ void Konsole::makeBasicGUI() bookmarks_menu_check(); } - if (kapp->authorizeTDEAction("settings")) { + if (tdeApp->authorizeTDEAction("settings")) { m_options = new TDEPopupMenu(this); TDEAcceleratorManager::manage( m_options ); } - if (kapp->authorizeTDEAction("help")) + if (tdeApp->authorizeTDEAction("help")) m_help = helpMenu(0, false); - if (kapp->authorizeTDEAction("konsole_rmb")) { + if (tdeApp->authorizeTDEAction("konsole_rmb")) { m_rightButton = new TDEPopupMenu(this); TDEAcceleratorManager::manage( m_rightButton ); } - if (kapp->authorizeTDEAction("bookmarks")) + if (tdeApp->authorizeTDEAction("bookmarks")) { // Bookmarks that open new sessions. bookmarkHandlerSession = new KonsoleBookmarkHandler( this, false ); @@ -1065,20 +1062,20 @@ void Konsole::makeBasicGUI() // programs. if (m_tabbarSessionsCommands) - connect(m_tabbarSessionsCommands,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); - connect(m_session,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + connect(m_tabbarSessionsCommands,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); + connect(m_session,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_options) - connect(m_options,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + connect(m_options,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_help) - connect(m_help,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + connect(m_help,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_rightButton) - connect(m_rightButton,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); - connect(m_edit,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); - connect(m_view,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + connect(m_rightButton,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); + connect(m_edit,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); + connect(m_view,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_bookmarks) - connect(m_bookmarks,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + connect(m_bookmarks,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_bookmarksSession) - connect(m_bookmarksSession,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + connect(m_bookmarksSession,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); m_session_id=menubar->insertItem(m_session_string , m_session); m_edit_id=menubar->insertItem(m_edit_string, m_edit); @@ -1092,79 +1089,79 @@ void Konsole::makeBasicGUI() m_shortcuts = new TDEActionCollection(this); - m_copyClipboard = new TDEAction(i18n("&Copy"), "edit-copy", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotCopyClipboard()), m_shortcuts, "edit_copy"); - m_pasteClipboard = new TDEAction(i18n("&Paste"), "edit-paste", Qt::SHIFT+Qt::Key_Insert, TQT_TQOBJECT(this), - TQT_SLOT(slotPasteClipboard()), m_shortcuts, "edit_paste"); - m_pasteSelection = new TDEAction(i18n("Paste Selection"), Qt::CTRL+Qt::SHIFT+Qt::Key_Insert, TQT_TQOBJECT(this), - TQT_SLOT(slotPasteSelection()), m_shortcuts, "pasteselection"); - - m_clearTerminal = new TDEAction(i18n("C&lear Terminal"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotClearTerminal()), m_shortcuts, "clear_terminal"); - m_resetClearTerminal = new TDEAction(i18n("&Reset && Clear Terminal"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotResetClearTerminal()), m_shortcuts, "reset_clear_terminal"); - m_findHistory = new TDEAction(i18n("&Find in History..."), "edit-find", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotFindHistory()), m_shortcuts, "find_history"); + m_copyClipboard = new TDEAction(i18n("&Copy"), "edit-copy", 0, this, + TQ_SLOT(slotCopyClipboard()), m_shortcuts, "edit_copy"); + m_pasteClipboard = new TDEAction(i18n("&Paste"), "edit-paste", TQt::SHIFT+TQt::Key_Insert, this, + TQ_SLOT(slotPasteClipboard()), m_shortcuts, "edit_paste"); + m_pasteSelection = new TDEAction(i18n("Paste Selection"), TQt::CTRL+TQt::SHIFT+TQt::Key_Insert, this, + TQ_SLOT(slotPasteSelection()), m_shortcuts, "pasteselection"); + + m_clearTerminal = new TDEAction(i18n("C&lear Terminal"), 0, this, + TQ_SLOT(slotClearTerminal()), m_shortcuts, "clear_terminal"); + m_resetClearTerminal = new TDEAction(i18n("&Reset && Clear Terminal"), 0, this, + TQ_SLOT(slotResetClearTerminal()), m_shortcuts, "reset_clear_terminal"); + m_findHistory = new TDEAction(i18n("&Find in History..."), "edit-find", 0, this, + TQ_SLOT(slotFindHistory()), m_shortcuts, "find_history"); m_findHistory->setEnabled(b_histEnabled); - m_findNext = new TDEAction(i18n("Find &Next"), "go-next", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotFindNext()), m_shortcuts, "find_next"); + m_findNext = new TDEAction(i18n("Find &Next"), "go-next", 0, this, + TQ_SLOT(slotFindNext()), m_shortcuts, "find_next"); m_findNext->setEnabled(b_histEnabled); - m_findPrevious = new TDEAction(i18n("Find Pre&vious"), "go-previous", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotFindPrevious()), m_shortcuts, "find_previous"); + m_findPrevious = new TDEAction(i18n("Find Pre&vious"), "go-previous", 0, this, + TQ_SLOT(slotFindPrevious()), m_shortcuts, "find_previous"); m_findPrevious->setEnabled( b_histEnabled ); - m_saveHistory = new TDEAction(i18n("S&ave History As..."), "document-save-as", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotSaveHistory()), m_shortcuts, "save_history"); + m_saveHistory = new TDEAction(i18n("S&ave History As..."), "document-save-as", 0, this, + TQ_SLOT(slotSaveHistory()), m_shortcuts, "save_history"); m_saveHistory->setEnabled(b_histEnabled ); - m_clearHistory = new TDEAction(i18n("Clear &History"), "history_clear", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotClearHistory()), m_shortcuts, "clear_history"); + m_clearHistory = new TDEAction(i18n("Clear &History"), "history_clear", 0, this, + TQ_SLOT(slotClearHistory()), m_shortcuts, "clear_history"); m_clearHistory->setEnabled(b_histEnabled); m_clearAllSessionHistories = new TDEAction(i18n("Clear All H&istories"), "history_clear", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotClearAllSessionHistories()), m_shortcuts, "clear_all_histories"); + this, TQ_SLOT(slotClearAllSessionHistories()), m_shortcuts, "clear_all_histories"); if (!m_detachSession) { - m_detachSession = new TDEAction(i18n("&Detach Session"), SmallIconSet("tab_breakoff"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotDetachSession()), m_shortcuts, "detach_session"); + m_detachSession = new TDEAction(i18n("&Detach Session"), SmallIconSet("tab_breakoff"), 0, this, + TQ_SLOT(slotDetachSession()), m_shortcuts, "detach_session"); } m_detachSession->setEnabled(false); - m_renameSession = new TDEAction(i18n("&Rename Session..."), Qt::CTRL+Qt::SHIFT+Qt::Key_R, TQT_TQOBJECT(this), - TQT_SLOT(slotRenameSession()), m_shortcuts, "rename_session"); + m_renameSession = new TDEAction(i18n("&Rename Session..."), TQt::CTRL+TQt::SHIFT+TQt::Key_R, this, + TQ_SLOT(slotRenameSession()), m_shortcuts, "rename_session"); - if (kapp->authorizeTDEAction("zmodem_upload")) + if (tdeApp->authorizeTDEAction("zmodem_upload")) m_zmodemUpload = new TDEAction( i18n( "&ZModem Upload..." ), - Qt::CTRL+Qt::ALT+Qt::Key_U, TQT_TQOBJECT(this), - TQT_SLOT( slotZModemUpload() ), + TQt::CTRL+TQt::ALT+TQt::Key_U, this, + TQ_SLOT( slotZModemUpload() ), m_shortcuts, "zmodem_upload" ); monitorActivity = new TDEToggleAction ( i18n( "Monitor for &Activity" ), - SmallIconSet("activity"), 0, TQT_TQOBJECT(this), - TQT_SLOT( slotToggleMonitor() ), m_shortcuts, "monitor_activity" ); + SmallIconSet("activity"), 0, this, + TQ_SLOT( slotToggleMonitor() ), m_shortcuts, "monitor_activity" ); monitorActivity->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Activity" ) ) ); monitorSilence = new TDEToggleAction ( i18n( "Monitor for &Silence" ), - SmallIconSet("silence"), 0, TQT_TQOBJECT(this), - TQT_SLOT( slotToggleMonitor() ), m_shortcuts, "monitor_silence" ); + SmallIconSet("silence"), 0, this, + TQ_SLOT( slotToggleMonitor() ), m_shortcuts, "monitor_silence" ); monitorSilence->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Silence" ) ) ); - masterMode = new TDEToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, TQT_TQOBJECT(this), - TQT_SLOT( slotToggleMasterMode() ), m_shortcuts, "send_input_to_all_sessions" ); + masterMode = new TDEToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, this, + TQ_SLOT( slotToggleMasterMode() ), m_shortcuts, "send_input_to_all_sessions" ); - showMenubar = new TDEToggleAction ( i18n( "Show &Menubar" ), "showmenu", Qt::CTRL+Qt::SHIFT+Qt::ALT+Qt::Key_M, TQT_TQOBJECT(this), - TQT_SLOT( slotToggleMenubar() ), m_shortcuts, "show_menubar" ); + showMenubar = new TDEToggleAction ( i18n( "Show &Menubar" ), "showmenu", TQt::CTRL+TQt::SHIFT+TQt::ALT+TQt::Key_M, this, + TQ_SLOT( slotToggleMenubar() ), m_shortcuts, "show_menubar" ); showMenubar->setCheckedState( KGuiItem( i18n("Hide &Menubar"), "showmenu", TQString::null, TQString::null ) ); m_fullscreen = KStdAction::fullScreen(0, 0, m_shortcuts, this ); - connect( m_fullscreen,TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this),TQT_SLOT(updateFullScreen(bool))); + connect( m_fullscreen,TQ_SIGNAL(toggled(bool)), this,TQ_SLOT(updateFullScreen(bool))); m_fullscreen->setChecked(b_fullscreen); - m_saveProfile = new TDEAction( i18n( "Save Sessions &Profile..." ), SmallIconSet("document-save-as"), 0, TQT_TQOBJECT(this), - TQT_SLOT( slotSaveSessionsProfile() ), m_shortcuts, "save_sessions_profile" ); + m_saveProfile = new TDEAction( i18n( "Save Sessions &Profile..." ), SmallIconSet("document-save-as"), 0, this, + TQ_SLOT( slotSaveSessionsProfile() ), m_shortcuts, "save_sessions_profile" ); //help menu if (m_help) @@ -1172,43 +1169,43 @@ void Konsole::makeBasicGUI() // Don't steal F1 (handbook) accel (esp. since it not visible in // "Configure Shortcuts"). - m_closeSession = new TDEAction(i18n("C&lose Session"), "window-close", 0, TQT_TQOBJECT(this), - TQT_SLOT(confirmCloseCurrentSession()), m_shortcuts, "close_session"); - m_print = new TDEAction(i18n("&Print Screen..."), "document-print", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPrint() ), m_shortcuts, "file_print"); - m_quit = new TDEAction(i18n("&Quit"), "system-log-out", 0, TQT_TQOBJECT(this), TQT_SLOT( close() ), m_shortcuts, "file_quit"); + m_closeSession = new TDEAction(i18n("C&lose Session"), "window-close", 0, this, + TQ_SLOT(confirmCloseCurrentSession()), m_shortcuts, "close_session"); + m_print = new TDEAction(i18n("&Print Screen..."), "document-print", 0, this, TQ_SLOT( slotPrint() ), m_shortcuts, "file_print"); + m_quit = new TDEAction(i18n("&Quit"), "system-log-out", 0, this, TQ_SLOT( close() ), m_shortcuts, "file_quit"); - TDEShortcut shortcut(Qt::CTRL+Qt::ALT+Qt::Key_N); - shortcut.append(TDEShortcut(Qt::CTRL+Qt::SHIFT+Qt::Key_N)); - new TDEAction(i18n("New Session"), shortcut, TQT_TQOBJECT(this), TQT_SLOT(newSession()), m_shortcuts, "new_session"); - new TDEAction(i18n("Activate Menu"), Qt::CTRL+Qt::ALT+Qt::Key_M, TQT_TQOBJECT(this), TQT_SLOT(activateMenu()), m_shortcuts, "activate_menu"); - new TDEAction(i18n("List Sessions"), 0, TQT_TQOBJECT(this), TQT_SLOT(listSessions()), m_shortcuts, "list_sessions"); + TDEShortcut shortcut(TQt::CTRL+TQt::ALT+TQt::Key_N); + shortcut.append(TDEShortcut(TQt::CTRL+TQt::SHIFT+TQt::Key_N)); + new TDEAction(i18n("New Session"), shortcut, this, TQ_SLOT(newSession()), m_shortcuts, "new_session"); + new TDEAction(i18n("Activate Menu"), TQt::CTRL+TQt::ALT+TQt::Key_M, this, TQ_SLOT(activateMenu()), m_shortcuts, "activate_menu"); + new TDEAction(i18n("List Sessions"), 0, this, TQ_SLOT(listSessions()), m_shortcuts, "list_sessions"); if (!m_moveSessionLeft) { m_moveSessionLeft = new TDEAction(i18n("&Move Session Left"), TQApplication::reverseLayout() ? "forward" : "back", - TQApplication::reverseLayout() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Right : Qt::CTRL+Qt::SHIFT+Qt::Key_Left, TQT_TQOBJECT(this), - TQT_SLOT(moveSessionLeft()), m_shortcuts, "move_session_left"); + TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Right : TQt::CTRL+TQt::SHIFT+TQt::Key_Left, this, + TQ_SLOT(moveSessionLeft()), m_shortcuts, "move_session_left"); } if (!m_moveSessionRight) { m_moveSessionRight = new TDEAction(i18n("M&ove Session Right"), TQApplication::reverseLayout() ? "back" : "forward", - TQApplication::reverseLayout() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Left : Qt::CTRL+Qt::SHIFT+Qt::Key_Right, TQT_TQOBJECT(this), - TQT_SLOT(moveSessionRight()), m_shortcuts, "move_session_right"); + TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Left : TQt::CTRL+TQt::SHIFT+TQt::Key_Right, this, + TQ_SLOT(moveSessionRight()), m_shortcuts, "move_session_right"); } - new TDEAction(i18n("Go to Previous Session"), TQApplication::reverseLayout() ? Qt::SHIFT+Qt::Key_Right : Qt::SHIFT+Qt::Key_Left, - TQT_TQOBJECT(this), TQT_SLOT(prevSession()), m_shortcuts, "previous_session"); - new TDEAction(i18n("Go to Next Session"), TQApplication::reverseLayout() ? Qt::SHIFT+Qt::Key_Left : Qt::SHIFT+Qt::Key_Right, - TQT_TQOBJECT(this), TQT_SLOT(nextSession()), m_shortcuts, "next_session"); + new TDEAction(i18n("Go to Previous Session"), TQApplication::reverseLayout() ? TQt::SHIFT+TQt::Key_Right : TQt::SHIFT+TQt::Key_Left, + this, TQ_SLOT(prevSession()), m_shortcuts, "previous_session"); + new TDEAction(i18n("Go to Next Session"), TQApplication::reverseLayout() ? TQt::SHIFT+TQt::Key_Left : TQt::SHIFT+TQt::Key_Right, + this, TQ_SLOT(nextSession()), m_shortcuts, "next_session"); for (int i=1;i<13;i++) { // Due to 12 function keys? - new TDEAction(i18n("Switch to Session %1").arg(i), 0, TQT_TQOBJECT(this), TQT_SLOT(switchToSession()), m_shortcuts, TQString(TQString().sprintf("switch_to_session_%02d", i)).latin1()); + new TDEAction(i18n("Switch to Session %1").arg(i), 0, this, TQ_SLOT(switchToSession()), m_shortcuts, TQString(TQString().sprintf("switch_to_session_%02d", i)).latin1()); } - new TDEAction(i18n("Enlarge Font"), 0, TQT_TQOBJECT(this), TQT_SLOT(biggerFont()), m_shortcuts, "bigger_font"); - new TDEAction(i18n("Shrink Font"), 0, TQT_TQOBJECT(this), TQT_SLOT(smallerFont()), m_shortcuts, "smaller_font"); + new TDEAction(i18n("Enlarge Font"), 0, this, TQ_SLOT(biggerFont()), m_shortcuts, "bigger_font"); + new TDEAction(i18n("Shrink Font"), 0, this, TQ_SLOT(smallerFont()), m_shortcuts, "smaller_font"); - new TDEAction(i18n("Toggle Bidi"), Qt::CTRL+Qt::ALT+Qt::Key_B, TQT_TQOBJECT(this), TQT_SLOT(toggleBidi()), m_shortcuts, "toggle_bidi"); + new TDEAction(i18n("Toggle Bidi"), TQt::CTRL+TQt::ALT+TQt::Key_B, this, TQ_SLOT(toggleBidi()), m_shortcuts, "toggle_bidi"); // Should we load all *.desktop files now? Required for Session shortcuts. if ( TDEConfigGroup(TDEGlobal::config(), "General").readBoolEntry("SessionShortcutsEnabled", false) ) { @@ -1220,7 +1217,7 @@ void Konsole::makeBasicGUI() m_sessionList = new TDEPopupMenu(this); TDEAcceleratorManager::manage( m_sessionList ); - connect(m_sessionList, TQT_SIGNAL(activated(int)), TQT_SLOT(activateSession(int))); + connect(m_sessionList, TQ_SIGNAL(activated(int)), TQ_SLOT(activateSession(int))); } /** @@ -1242,7 +1239,7 @@ void Konsole::activateMenu() */ bool Konsole::queryClose() { - if(kapp->sessionSaving()) + if(tdeApp->sessionSaving()) // saving session - do not even think about doing any kind of cleanup here return true; @@ -1383,10 +1380,16 @@ void Konsole::slotTabRenameSession() { void Konsole::slotTabSelectColor() { TQColor color = tabwidget->tabColor( m_contextMenuSession->widget() ); - int result = KColorDialog::getColor( color ); + int result = KColorDialog::getColor( color, tabwidget->colorGroup().foreground() ); - if ( result == KColorDialog::Accepted ) + if ( result == KColorDialog::Accepted ) { tabwidget->setTabColor(m_contextMenuSession->widget(), color); + } +} + +void Konsole::slotTabResetColor() +{ + tabwidget->resetTabColor(m_contextMenuSession->widget()); } void Konsole::slotTabToggleMonitor() @@ -1484,7 +1487,7 @@ void Konsole::slotSaveSessionsProfile() if ( TQFile::exists( path ) ) TQFile::remove( path ); - KSimpleConfig cfg( path ); + TDESimpleConfig cfg( path ); savePropertiesInternal(&cfg,1); saveMainWindowSettings(&cfg); } @@ -1616,6 +1619,20 @@ void Konsole::readProperties(TDEConfig* config, const TQString &schema, bool glo s_word_seps= config->readEntry("wordseps",":@-./_~"); b_framevis = config->readBoolEntry("has frame",true); b_metaAsAlt = config->readBoolEntry("metaAsAltMode",false); + b_realTransparency = config->readBoolEntry("RealTransparency",false); + + Atom kde_wm_transparent_to_desktop; + kde_wm_transparent_to_desktop = XInternAtom(tqt_xdisplay(), "_TDE_TRANSPARENT_TO_DESKTOP", False); + if (b_realTransparency) + { + XDeleteProperty(tqt_xdisplay(), winId(), kde_wm_transparent_to_desktop); + } + else + { + // Signal that we want to be transparent to the desktop, not to windows behind us... + XChangeProperty(tqt_xdisplay(), winId(), kde_wm_transparent_to_desktop, XA_INTEGER, 32, PropModeReplace, (unsigned char *) "TRUE", 1L); + } + TQPtrList<TEWidget> tes = activeTEs(); for (TEWidget *_te = tes.first(); _te; _te = tes.next()) { _te->setWordCharacters(s_word_seps); @@ -1642,10 +1659,6 @@ void Konsole::readProperties(TDEConfig* config, const TQString &schema, bool glo config->setGroup("UTMP"); b_addToUtmp = config->readBoolEntry("AddToUtmp",true); config->setDesktopGroup(); - - // Do not set a default value; this allows the System-wide Scheme - // to set the tab text color. - m_tabColor = config->readColorEntry("TabColor"); } if (!globalConfigOnly) @@ -1720,7 +1733,7 @@ void Konsole::readProperties(TDEConfig* config, const TQString &schema, bool glo // profile scrollbar entry differs from the konsolerc scrollbar entry. TQPtrList<TEWidget> tes = activeTEs(); for (TEWidget *_te = tes.first(); _te; _te = tes.next()) { - if (_te->getScrollbarLocation() != n_scroll) + if (_te->getScrollbarLocation() != n_scroll) _te->setScrollbarLocation(n_scroll); } } @@ -1977,7 +1990,7 @@ void Konsole::slotToggleMenubar() { } if (!showMenubar->isChecked()) { setCaption(i18n("Use the right mouse button to bring back the menu")); - TQTimer::singleShot(5000,this,TQT_SLOT(updateTitle())); + TQTimer::singleShot(5000,this,TQ_SLOT(updateTitle())); } updateRMBMenu(); } @@ -2015,8 +2028,6 @@ void Konsole::createSessionTab(TEWidget *widget, const TQIconSet &iconSet, tabwidget->insertTab(widget, iconSet, TQString::null, index); break; } - if ( m_tabColor.isValid() ) - tabwidget->setTabColor(widget, m_tabColor); } TQIconSet Konsole::iconSetForSession(TESession *session) const @@ -2131,12 +2142,12 @@ void Konsole::reparseConfiguration() b_sessionShortcutsMapped = false; // Mappings may have to be changed...get a fresh mapper. - disconnect( sessionNumberMapper, TQT_SIGNAL( mapped( int ) ), - this, TQT_SLOT( newSessionTabbar( int ) ) ); + disconnect( sessionNumberMapper, TQ_SIGNAL( mapped( int ) ), + this, TQ_SLOT( newSessionTabbar( int ) ) ); delete sessionNumberMapper; - sessionNumberMapper = new TQSignalMapper( TQT_TQOBJECT(this) ); - connect( sessionNumberMapper, TQT_SIGNAL( mapped( int ) ), - this, TQT_SLOT( newSessionTabbar( int ) ) ); + sessionNumberMapper = new TQSignalMapper( this ); + connect( sessionNumberMapper, TQ_SIGNAL( mapped( int ) ), + this, TQ_SLOT( newSessionTabbar( int ) ) ); sl_sessionShortCuts.clear(); buildSessionMenus(); @@ -2287,7 +2298,7 @@ void Konsole::updateTitle(TESession* _se) TDERadioAction *ra = session2action.find(_se); if (ra && (ra->icon() != icon)) ra->setIcon(icon); - if (m_tabViewMode == ShowIconOnly) + if (m_tabViewMode == ShowIconOnly) tabwidget->changeTab( _se->widget(), TQString::null ); else if (b_matchTabWinTitle) tabwidget->setTabLabel( _se->widget(), _se->fullTitle().replace('&',"&&")); @@ -2369,12 +2380,12 @@ void Konsole::disableMasterModeConnections() TESession *to = to_it.current(); if (to!=from) { - disconnect(from->widget(), TQT_SIGNAL(keyPressedSignal(TQKeyEvent*)), - to->getEmulation(), TQT_SLOT(onKeyPress(TQKeyEvent*))); - disconnect(from->widget(), TQT_SIGNAL(keyReleasedSignal(TQKeyEvent*)), - to->getEmulation(), TQT_SLOT(onKeyReleased(TQKeyEvent*))); - disconnect(from->widget(), TQT_SIGNAL(focusInSignal(TQFocusEvent*)), - to->getEmulation(), TQT_SLOT(onFocusIn(TQFocusEvent*))); + disconnect(from->widget(), TQ_SIGNAL(keyPressedSignal(TQKeyEvent*)), + to->getEmulation(), TQ_SLOT(onKeyPress(TQKeyEvent*))); + disconnect(from->widget(), TQ_SIGNAL(keyReleasedSignal(TQKeyEvent*)), + to->getEmulation(), TQ_SLOT(onKeyReleased(TQKeyEvent*))); + disconnect(from->widget(), TQ_SIGNAL(focusInSignal(TQFocusEvent*)), + to->getEmulation(), TQ_SLOT(onFocusIn(TQFocusEvent*))); } } } @@ -2392,12 +2403,12 @@ void Konsole::enableMasterModeConnections() TESession *to = to_it.current(); if (to!=from) { - connect(from->widget(), TQT_SIGNAL(keyPressedSignal(TQKeyEvent*)), - to->getEmulation(), TQT_SLOT(onKeyPress(TQKeyEvent*))); - connect(from->widget(), TQT_SIGNAL(keyReleasedSignal(TQKeyEvent*)), - to->getEmulation(), TQT_SLOT(onKeyReleased(TQKeyEvent*))); - connect(from->widget(), TQT_SIGNAL(focusInSignal(TQFocusEvent*)), - to->getEmulation(), TQT_SLOT(onFocusIn(TQFocusEvent*))); + connect(from->widget(), TQ_SIGNAL(keyPressedSignal(TQKeyEvent*)), + to->getEmulation(), TQ_SLOT(onKeyPress(TQKeyEvent*))); + connect(from->widget(), TQ_SIGNAL(keyReleasedSignal(TQKeyEvent*)), + to->getEmulation(), TQ_SLOT(onKeyReleased(TQKeyEvent*))); + connect(from->widget(), TQ_SIGNAL(focusInSignal(TQFocusEvent*)), + to->getEmulation(), TQ_SLOT(onFocusIn(TQFocusEvent*))); } } } @@ -2492,7 +2503,7 @@ void Konsole::runSession(TESession* s) // give some time to get through the // resize events before starting up. - TQTimer::singleShot(100,s,TQT_SLOT(run())); + TQTimer::singleShot(100,s,TQ_SLOT(run())); } void Konsole::addSession(TESession* s) @@ -2525,8 +2536,8 @@ void Konsole::addSession(TESession* s) TDERadioAction *ra = new TDERadioAction(newTitle.replace('&',"&&"), s->IconName(), 0, - TQT_TQOBJECT(this), - TQT_SLOT(activateSession()), + this, + TQ_SLOT(activateSession()), m_shortcuts); ra->setExclusiveGroup("sessions"); ra->setChecked(true); @@ -2581,7 +2592,7 @@ void Konsole::listSessions() void Konsole::switchToSession() { - activateSession( TQString( TQT_TQOBJECT_CONST(sender())->name() ).right( 2 ).toInt() -1 ); + activateSession( TQString( sender()->name() ).right( 2 ).toInt() -1 ); } void Konsole::activateSession(int position) @@ -2654,8 +2665,8 @@ void Konsole::activateSession(TESession *s) pmPath = cs->imagePath(); n_render = cs->alignment(); -// BR 106464 temporary fix... -// only 2 sessions opened, 2nd session viewable, right-click on 1st tab and +// BR 106464 temporary fix... +// only 2 sessions opened, 2nd session viewable, right-click on 1st tab and // select 'Detach', close original Konsole window... crash // s is not set properly on original Konsole window TDERadioAction *ra = session2action.find(se); @@ -2665,7 +2676,7 @@ void Konsole::activateSession(TESession *s) } ra->setChecked(true); - TQTimer::singleShot(1,this,TQT_SLOT(allowPrevNext())); // hack, hack, hack + TQTimer::singleShot(1,this,TQ_SLOT(allowPrevNext())); // hack, hack, hack tabwidget->showPage( se->widget() ); te = se->widget(); @@ -2739,7 +2750,7 @@ void Konsole::setSessionEncoding( const TQString &encoding, TESession *session ) while ( it != encodingNames.end() && !found_encoding ) { - if ( TQString::compare( TDEGlobal::charsets()->encodingForName(*it), + if ( TQString::compare( TDEGlobal::charsets()->encodingForName(*it), t_encoding ) == 0 ) { found_encoding = true; } @@ -2786,7 +2797,7 @@ void Konsole::allowPrevNext() notifySessionState(se,NOTIFYNORMAL); } -KSimpleConfig *Konsole::defaultSession() +TDESimpleConfig *Konsole::defaultSession() { if (!m_defaultSession) { TDEConfig * config = TDEGlobal::config(); @@ -2799,7 +2810,7 @@ KSimpleConfig *Konsole::defaultSession() void Konsole::setDefaultSession(const TQString &filename) { delete m_defaultSession; - m_defaultSession = new KSimpleConfig(locate("appdata", filename), true /* read only */); + m_defaultSession = new TDESimpleConfig(locate("appdata", filename), true /* read only */); m_defaultSession->setDesktopGroup(); b_showstartuptip = m_defaultSession->readBoolEntry("Tips", true); @@ -2808,13 +2819,13 @@ void Konsole::setDefaultSession(const TQString &filename) void Konsole::newSession(const TQString &pgm, const TQStrList &args, const TQString &term, const TQString &icon, const TQString &title, const TQString &cwd) { - KSimpleConfig *co = defaultSession(); + TDESimpleConfig *co = defaultSession(); newSession(co, pgm, args, term, icon, title, cwd); } TQString Konsole::newSession() { - KSimpleConfig *co = defaultSession(); + TDESimpleConfig *co = defaultSession(); return newSession(co, TQString::null, TQStrList()); } @@ -2834,7 +2845,7 @@ void Konsole::newSession(int i) return; } - KSimpleConfig* co = no2command.find(i); + TDESimpleConfig* co = no2command.find(i); if (co) { newSession(co); resetScreenSessions(); @@ -2857,7 +2868,7 @@ void Konsole::newSessionTabbar(int i) return; } - KSimpleConfig* co = no2command.find(i); + TDESimpleConfig* co = no2command.find(i); if (co) { newSession(co); resetScreenSessions(); @@ -2866,15 +2877,15 @@ void Konsole::newSessionTabbar(int i) TQString Konsole::newSession(const TQString &type) { - KSimpleConfig *co; + TDESimpleConfig *co; if (type.isEmpty()) co = defaultSession(); else - co = new KSimpleConfig(locate("appdata", type + ".desktop"), true /* read only */); + co = new TDESimpleConfig(locate("appdata", type + ".desktop"), true /* read only */); return newSession(co); } -TQString Konsole::newSession(KSimpleConfig *co, TQString program, const TQStrList &args, +TQString Konsole::newSession(TDESimpleConfig *co, TQString program, const TQStrList &args, const TQString &_term,const TQString &_icon, const TQString &_title, const TQString &_cwd) { @@ -2942,8 +2953,8 @@ TQString Konsole::newSession(KSimpleConfig *co, TQString program, const TQStrLis TEWidget* te_old = te; te=new TEWidget(tabwidget); - connect( te, TQT_SIGNAL(configureRequest(TEWidget*, int, int, int)), - this, TQT_SLOT(configureRequest(TEWidget*,int,int,int)) ); + connect( te, TQ_SIGNAL(configureRequest(TEWidget*, int, int, int)), + this, TQ_SLOT(configureRequest(TEWidget*,int,int,int)) ); if (te_old) { initTEWidget(te, te_old); } @@ -2962,40 +2973,40 @@ TQString Konsole::newSession(KSimpleConfig *co, TQString program, const TQStrLis s->setMonitorSilenceSeconds(monitorSilenceSeconds); s->enableFullScripting(b_fullScripting); s->setMetaAsAltMode(b_metaAsAlt); - + // If you add any new signal-slot connection below, think about doing it in konsolePart too - connect( s,TQT_SIGNAL(done(TESession*)), - this,TQT_SLOT(doneSession(TESession*))); - connect( s, TQT_SIGNAL(updateTitle(TESession*)), - this, TQT_SLOT(updateTitle(TESession*))); - connect( s, TQT_SIGNAL(notifySessionState(TESession*, int)), - this, TQT_SLOT(notifySessionState(TESession*, int))); - connect( s, TQT_SIGNAL(disableMasterModeConnections()), - this, TQT_SLOT(disableMasterModeConnections())); - connect( s, TQT_SIGNAL(enableMasterModeConnections()), - this, TQT_SLOT(enableMasterModeConnections())); - connect( s, TQT_SIGNAL(renameSession(TESession*,const TQString&)), - this, TQT_SLOT(slotRenameSession(TESession*, const TQString&))); - connect( s->getEmulation(), TQT_SIGNAL(changeColumns(int)), - this, TQT_SLOT(changeColumns(int)) ); - connect( s->getEmulation(), TQT_SIGNAL(changeColLin(int,int)), - this, TQT_SLOT(changeColLin(int,int))); - connect( s->getEmulation(), TQT_SIGNAL(ImageSizeChanged(int,int)), - this, TQT_SLOT(notifySize(int,int))); - connect( s, TQT_SIGNAL(zmodemDetected(TESession*)), - this, TQT_SLOT(slotZModemDetected(TESession*))); - connect( s, TQT_SIGNAL(updateSessionConfig(TESession*)), - this, TQT_SLOT(slotUpdateSessionConfig(TESession*))); - connect( s, TQT_SIGNAL(resizeSession(TESession*, TQSize)), - this, TQT_SLOT(slotResizeSession(TESession*, TQSize))); - connect( s, TQT_SIGNAL(setSessionEncoding(TESession*, const TQString &)), - this, TQT_SLOT(slotSetSessionEncoding(TESession*, const TQString &))); - connect( s, TQT_SIGNAL(getSessionSchema(TESession*, TQString &)), - this, TQT_SLOT(slotGetSessionSchema(TESession*, TQString &))); - connect( s, TQT_SIGNAL(setSessionSchema(TESession*, const TQString &)), - this, TQT_SLOT(slotSetSessionSchema(TESession*, const TQString &))); - connect( s, TQT_SIGNAL(changeTabTextColor(TESession*, int)), - this,TQT_SLOT(changeTabTextColor(TESession*, int))); + connect( s,TQ_SIGNAL(done(TESession*)), + this,TQ_SLOT(doneSession(TESession*))); + connect( s, TQ_SIGNAL(updateTitle(TESession*)), + this, TQ_SLOT(updateTitle(TESession*))); + connect( s, TQ_SIGNAL(notifySessionState(TESession*, int)), + this, TQ_SLOT(notifySessionState(TESession*, int))); + connect( s, TQ_SIGNAL(disableMasterModeConnections()), + this, TQ_SLOT(disableMasterModeConnections())); + connect( s, TQ_SIGNAL(enableMasterModeConnections()), + this, TQ_SLOT(enableMasterModeConnections())); + connect( s, TQ_SIGNAL(renameSession(TESession*,const TQString&)), + this, TQ_SLOT(slotRenameSession(TESession*, const TQString&))); + connect( s->getEmulation(), TQ_SIGNAL(changeColumns(int)), + this, TQ_SLOT(changeColumns(int)) ); + connect( s->getEmulation(), TQ_SIGNAL(changeColLin(int,int)), + this, TQ_SLOT(changeColLin(int,int))); + connect( s->getEmulation(), TQ_SIGNAL(ImageSizeChanged(int,int)), + this, TQ_SLOT(notifySize(int,int))); + connect( s, TQ_SIGNAL(zmodemDetected(TESession*)), + this, TQ_SLOT(slotZModemDetected(TESession*))); + connect( s, TQ_SIGNAL(updateSessionConfig(TESession*)), + this, TQ_SLOT(slotUpdateSessionConfig(TESession*))); + connect( s, TQ_SIGNAL(resizeSession(TESession*, TQSize)), + this, TQ_SLOT(slotResizeSession(TESession*, TQSize))); + connect( s, TQ_SIGNAL(setSessionEncoding(TESession*, const TQString &)), + this, TQ_SLOT(slotSetSessionEncoding(TESession*, const TQString &))); + connect( s, TQ_SIGNAL(getSessionSchema(TESession*, TQString &)), + this, TQ_SLOT(slotGetSessionSchema(TESession*, TQString &))); + connect( s, TQ_SIGNAL(setSessionSchema(TESession*, const TQString &)), + this, TQ_SLOT(slotSetSessionSchema(TESession*, const TQString &))); + connect( s, TQ_SIGNAL(changeTabTextColor(TESession*, int)), + this,TQ_SLOT(changeTabTextColor(TESession*, int))); s->widget()->setVTFont(defaultFont);// Hack to set font again after newSession s->setSchemaNo(schmno); @@ -3037,7 +3048,7 @@ void Konsole::newSession(const TQString& sURL, const TQString& title) KURL url = KURL(sURL); if ((url.protocol() == "file") && (url.hasPath())) { - KSimpleConfig *co = defaultSession(); + TDESimpleConfig *co = defaultSession(); path = url.path(); newSession(co, TQString::null, TQStrList(), TQString::null, TQString::null, title.isEmpty() ? path : title, path); @@ -3138,7 +3149,7 @@ void Konsole::doneSession(TESession* s) // Since the timer approach only works at good weather, // the whole construction is not suited to what it // should do. Affected is the TEEmulation::setConnect. - TQTimer::singleShot(1,this,TQT_SLOT(activateSession())); + TQTimer::singleShot(1,this,TQ_SLOT(activateSession())); } else close(); @@ -3211,16 +3222,16 @@ void Konsole::moveSessionLeft() ra->plug(m_view,(m_view->count()-sessions.count()+1)+position-1); TQColor oldcolor = tabwidget->tabColor(se->widget()); - + tabwidget->blockSignals(true); tabwidget->removePage(se->widget()); tabwidget->blockSignals(false); TQString title = se->Title(); - createSessionTab(se->widget(), iconSetForSession(se), + createSessionTab(se->widget(), iconSetForSession(se), title.replace('&', "&&"), position-1); tabwidget->showPage(se->widget()); tabwidget->setTabColor(se->widget(),oldcolor); - + if (!m_menuCreated) makeGUI(); m_moveSessionLeft->setEnabled(position-1>0); @@ -3244,16 +3255,16 @@ void Konsole::moveSessionRight() ra->plug(m_view,(m_view->count()-sessions.count()+1)+position+1); TQColor oldcolor = tabwidget->tabColor(se->widget()); - + tabwidget->blockSignals(true); tabwidget->removePage(se->widget()); tabwidget->blockSignals(false); TQString title = se->Title(); - createSessionTab(se->widget(), iconSetForSession(se), + createSessionTab(se->widget(), iconSetForSession(se), title.replace('&', "&&"), position+1); tabwidget->showPage(se->widget()); tabwidget->setTabColor(se->widget(),oldcolor); - + if (!m_menuCreated) makeGUI(); m_moveSessionLeft->setEnabled(true); @@ -3383,7 +3394,7 @@ void Konsole::buildSessionMenus() createSessionMenus(); - if (kapp->authorizeTDEAction("file_print")) + if (tdeApp->authorizeTDEAction("file_print")) { m_session->insertSeparator(); m_print->plug(m_session); @@ -3422,11 +3433,11 @@ static void insertItemSorted(TDEPopupMenu *menu, const TQIconSet &iconSet, const void Konsole::addSessionCommand(const TQString &path) { - KSimpleConfig* co; + TDESimpleConfig* co; if (path.isEmpty()) - co = new KSimpleConfig(locate("appdata", "shell.desktop"), true /* read only */); + co = new TDESimpleConfig(locate("appdata", "shell.desktop"), true /* read only */); else - co = new KSimpleConfig(path,true); + co = new TDESimpleConfig(path,true); co->setDesktopGroup(); TQString typ = co->readEntry("Type"); TQString txt = co->readEntry("Name"); @@ -3434,6 +3445,7 @@ void Konsole::addSessionCommand(const TQString &path) // try to locate the binary TQString exec= co->readPathEntry("Exec"); exec.remove(TQRegExp("^(sudo )?su (- )?-c ?\'")); + exec.remove(TQRegExp("\'?$")); exec = KRun::binaryName(exec, false); exec = KShell::tildeExpand(exec); @@ -3468,9 +3480,9 @@ void Konsole::addSessionCommand(const TQString &path) if ( m_shortcuts->action( name.latin1() ) ) { sessionAction = m_shortcuts->action( name.latin1() ); } else { - sessionAction = new TDEAction( comment, 0, TQT_TQOBJECT(this), 0, m_shortcuts, name.latin1() ); + sessionAction = new TDEAction( comment, 0, this, 0, m_shortcuts, name.latin1() ); } - connect( sessionAction, TQT_SIGNAL( activated() ), sessionNumberMapper, TQT_SLOT( map() ) ); + connect( sessionAction, TQ_SIGNAL( activated() ), sessionNumberMapper, TQ_SLOT( map() ) ); sessionNumberMapper->setMapping( sessionAction, cmd_serial ); } @@ -3482,7 +3494,7 @@ void Konsole::loadSessionCommands() cmd_serial = 99; cmd_first_screen = -1; - if (!kapp->authorize("shell_access")) + if (!tdeApp->authorize("shell_access")) return; addSessionCommand(TQString::null); @@ -3506,7 +3518,7 @@ void Konsole::createSessionMenus() return; } - KSimpleConfig *cfg = no2command[SESSION_NEW_SHELL_ID]; + TDESimpleConfig *cfg = no2command[SESSION_NEW_SHELL_ID]; TQString txt = cfg->readEntry("Name"); TQString icon = cfg->readEntry("Icon", "konsole"); insertItemSorted(m_tabbarSessionsCommands, SmallIconSet(icon), @@ -3524,7 +3536,7 @@ void Konsole::createSessionMenus() m_session->insertSeparator(); m_tabbarSessionsCommands->insertSeparator(); - TQIntDictIterator<KSimpleConfig> it( no2command ); + TQIntDictIterator<TDESimpleConfig> it( no2command ); for ( ; it.current(); ++it ) { if ( it.currentKey() == SESSION_NEW_SHELL_ID ) continue; @@ -3555,7 +3567,7 @@ void Konsole::addScreenSession(const TQString &path, const TQString &socket) { KTempFile *tmpFile = new KTempFile(); tmpFile->setAutoDelete(true); - KSimpleConfig *co = new KSimpleConfig(tmpFile->name()); + TDESimpleConfig *co = new TDESimpleConfig(tmpFile->name()); co->setDesktopGroup(); co->writeEntry("Name", socket); TQString txt = i18n("Screen is a program controlling screens!", "Screen at %1").arg(socket); @@ -3571,7 +3583,7 @@ void Konsole::addScreenSession(const TQString &path, const TQString &socket) void Konsole::loadScreenSessions() { - if (!kapp->authorize("shell_access")) + if (!tdeApp->authorize("shell_access")) return; TQCString screenDir = getenv("SCREENDIR"); if (screenDir.isEmpty()) @@ -3740,31 +3752,31 @@ void Konsole::detachSession(TESession* _se) { TESession *from = from_it.current(); if(from->isMasterMode()) { - disconnect(from->widget(), TQT_SIGNAL(keyPressedSignal(TQKeyEvent*)), - _se->getEmulation(), TQT_SLOT(onKeyPress(TQKeyEvent*))); - disconnect(from->widget(), TQT_SIGNAL(keyReleasedSignal(TQKeyEvent*)), - _se->getEmulation(), TQT_SLOT(onKeyReleased(TQKeyEvent*))); - disconnect(from->widget(), TQT_SIGNAL(focusInSignal(TQFocusEvent*)), - _se->getEmulation(), TQT_SLOT(onFocusIn(TQFocusEvent*))); + disconnect(from->widget(), TQ_SIGNAL(keyPressedSignal(TQKeyEvent*)), + _se->getEmulation(), TQ_SLOT(onKeyPress(TQKeyEvent*))); + disconnect(from->widget(), TQ_SIGNAL(keyReleasedSignal(TQKeyEvent*)), + _se->getEmulation(), TQ_SLOT(onKeyReleased(TQKeyEvent*))); + disconnect(from->widget(), TQ_SIGNAL(focusInSignal(TQFocusEvent*)), + _se->getEmulation(), TQ_SLOT(onFocusIn(TQFocusEvent*))); } } } TQColor se_tabtextcolor = tabwidget->tabColor( _se->widget() ); - disconnect( _se,TQT_SIGNAL(done(TESession*)), - this,TQT_SLOT(doneSession(TESession*)) ); + disconnect( _se,TQ_SIGNAL(done(TESession*)), + this,TQ_SLOT(doneSession(TESession*)) ); - disconnect( _se->getEmulation(),TQT_SIGNAL(ImageSizeChanged(int,int)), this,TQT_SLOT(notifySize(int,int))); - disconnect( _se->getEmulation(),TQT_SIGNAL(changeColLin(int, int)), this,TQT_SLOT(changeColLin(int,int)) ); - disconnect( _se->getEmulation(),TQT_SIGNAL(changeColumns(int)), this,TQT_SLOT(changeColumns(int)) ); - disconnect( _se, TQT_SIGNAL(changeTabTextColor(TESession*, int)), this, TQT_SLOT(changeTabTextColor(TESession*, int)) ); + disconnect( _se->getEmulation(),TQ_SIGNAL(ImageSizeChanged(int,int)), this,TQ_SLOT(notifySize(int,int))); + disconnect( _se->getEmulation(),TQ_SIGNAL(changeColLin(int, int)), this,TQ_SLOT(changeColLin(int,int)) ); + disconnect( _se->getEmulation(),TQ_SIGNAL(changeColumns(int)), this,TQ_SLOT(changeColumns(int)) ); + disconnect( _se, TQ_SIGNAL(changeTabTextColor(TESession*, int)), this, TQ_SLOT(changeTabTextColor(TESession*, int)) ); - disconnect( _se,TQT_SIGNAL(updateTitle(TESession*)), this,TQT_SLOT(updateTitle(TESession*)) ); - disconnect( _se,TQT_SIGNAL(notifySessionState(TESession*,int)), this,TQT_SLOT(notifySessionState(TESession*,int)) ); - disconnect( _se,TQT_SIGNAL(disableMasterModeConnections()), this,TQT_SLOT(disableMasterModeConnections()) ); - disconnect( _se,TQT_SIGNAL(enableMasterModeConnections()), this,TQT_SLOT(enableMasterModeConnections()) ); - disconnect( _se,TQT_SIGNAL(renameSession(TESession*,const TQString&)), this,TQT_SLOT(slotRenameSession(TESession*,const TQString&)) ); + disconnect( _se,TQ_SIGNAL(updateTitle(TESession*)), this,TQ_SLOT(updateTitle(TESession*)) ); + disconnect( _se,TQ_SIGNAL(notifySessionState(TESession*,int)), this,TQ_SLOT(notifySessionState(TESession*,int)) ); + disconnect( _se,TQ_SIGNAL(disableMasterModeConnections()), this,TQ_SLOT(disableMasterModeConnections()) ); + disconnect( _se,TQ_SIGNAL(enableMasterModeConnections()), this,TQ_SLOT(enableMasterModeConnections()) ); + disconnect( _se,TQ_SIGNAL(renameSession(TESession*,const TQString&)), this,TQ_SLOT(slotRenameSession(TESession*,const TQString&)) ); // TODO: "type" isn't passed properly Konsole* konsole = new Konsole(name(), b_histEnabled, !menubar->isHidden(), n_tabbar != TabNone, b_framevis, @@ -3788,7 +3800,7 @@ void Konsole::detachSession(TESession* _se) { else se = sessions.at(sessionIndex ? sessionIndex - 1 : 0); session2action.find(se)->setChecked(true); - TQTimer::singleShot(1,this,TQT_SLOT(activateSession())); + TQTimer::singleShot(1,this,TQ_SLOT(activateSession())); } if (sessions.count()==1) @@ -3816,8 +3828,8 @@ void Konsole::attachSession(TESession* session) te=new TEWidget(tabwidget); - connect( te, TQT_SIGNAL(configureRequest(TEWidget*, int, int, int)), - this, TQT_SLOT(configureRequest(TEWidget*,int,int,int)) ); + connect( te, TQ_SIGNAL(configureRequest(TEWidget*, int, int, int)), + this, TQ_SLOT(configureRequest(TEWidget*,int,int,int)) ); te->resize(se_widget->size()); te->setSize(se_widget->Columns(), se_widget->Lines()); @@ -3833,7 +3845,7 @@ void Konsole::attachSession(TESession* session) TQString title=session->Title(); TDERadioAction *ra = new TDERadioAction(title.replace('&',"&&"), session->IconName(), - 0, TQT_TQOBJECT(this), TQT_SLOT(activateSession()), m_shortcuts); + 0, this, TQ_SLOT(activateSession()), m_shortcuts); ra->setExclusiveGroup("sessions"); ra->setChecked(true); @@ -3847,20 +3859,20 @@ void Konsole::attachSession(TESession* session) if (m_menuCreated) ra->plug(m_view); - connect( session,TQT_SIGNAL(done(TESession*)), - this,TQT_SLOT(doneSession(TESession*)) ); + connect( session,TQ_SIGNAL(done(TESession*)), + this,TQ_SLOT(doneSession(TESession*)) ); - connect( session,TQT_SIGNAL(updateTitle(TESession*)), this,TQT_SLOT(updateTitle(TESession*)) ); - connect( session,TQT_SIGNAL(notifySessionState(TESession*,int)), this,TQT_SLOT(notifySessionState(TESession*,int)) ); + connect( session,TQ_SIGNAL(updateTitle(TESession*)), this,TQ_SLOT(updateTitle(TESession*)) ); + connect( session,TQ_SIGNAL(notifySessionState(TESession*,int)), this,TQ_SLOT(notifySessionState(TESession*,int)) ); - connect( session,TQT_SIGNAL(disableMasterModeConnections()), this,TQT_SLOT(disableMasterModeConnections()) ); - connect( session,TQT_SIGNAL(enableMasterModeConnections()), this,TQT_SLOT(enableMasterModeConnections()) ); - connect( session,TQT_SIGNAL(renameSession(TESession*,const TQString&)), this,TQT_SLOT(slotRenameSession(TESession*,const TQString&)) ); - connect( session->getEmulation(),TQT_SIGNAL(ImageSizeChanged(int,int)), this,TQT_SLOT(notifySize(int,int))); - connect( session->getEmulation(),TQT_SIGNAL(changeColumns(int)), this,TQT_SLOT(changeColumns(int)) ); - connect( session->getEmulation(),TQT_SIGNAL(changeColLin(int, int)), this,TQT_SLOT(changeColLin(int,int)) ); + connect( session,TQ_SIGNAL(disableMasterModeConnections()), this,TQ_SLOT(disableMasterModeConnections()) ); + connect( session,TQ_SIGNAL(enableMasterModeConnections()), this,TQ_SLOT(enableMasterModeConnections()) ); + connect( session,TQ_SIGNAL(renameSession(TESession*,const TQString&)), this,TQ_SLOT(slotRenameSession(TESession*,const TQString&)) ); + connect( session->getEmulation(),TQ_SIGNAL(ImageSizeChanged(int,int)), this,TQ_SLOT(notifySize(int,int))); + connect( session->getEmulation(),TQ_SIGNAL(changeColumns(int)), this,TQ_SLOT(changeColumns(int)) ); + connect( session->getEmulation(),TQ_SIGNAL(changeColLin(int, int)), this,TQ_SLOT(changeColLin(int,int)) ); - connect( session, TQT_SIGNAL(changeTabTextColor(TESession*, int)), this, TQT_SLOT(changeTabTextColor(TESession*, int)) ); + connect( session, TQ_SIGNAL(changeTabTextColor(TESession*, int)), this, TQ_SLOT(changeTabTextColor(TESession*, int)) ); activateSession(session); } @@ -3922,7 +3934,7 @@ HistoryTypeDialog::HistoryTypeDialog(const HistoryType& histType, TQHBoxLayout *hb = new TQHBoxLayout(mainFrame); m_btnEnable = new TQCheckBox(i18n("&Enable"), mainFrame); - connect(m_btnEnable, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotHistEnable(bool))); + connect(m_btnEnable, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotHistEnable(bool))); m_label = new TQLabel(i18n("&Number of lines: "), mainFrame); @@ -3933,7 +3945,7 @@ HistoryTypeDialog::HistoryTypeDialog(const HistoryType& histType, m_label->setBuddy( m_size ); m_setUnlimited = new TQPushButton(i18n("&Set Unlimited"), mainFrame); - connect( m_setUnlimited,TQT_SIGNAL(clicked()), this,TQT_SLOT(slotSetUnlimited()) ); + connect( m_setUnlimited,TQ_SIGNAL(clicked()), this,TQ_SLOT(slotSetUnlimited()) ); hb->addWidget(m_btnEnable); hb->addSpacing(10); @@ -4027,8 +4039,8 @@ void Konsole::slotFindHistory() { if( !m_finddialog ) { m_finddialog = new KonsoleFind( this, "konsolefind", false); - connect(m_finddialog,TQT_SIGNAL(search()),this,TQT_SLOT(slotFind())); - connect(m_finddialog,TQT_SIGNAL(done()),this,TQT_SLOT(slotFindDone())); + connect(m_finddialog,TQ_SIGNAL(search()),this,TQ_SLOT(slotFind())); + connect(m_finddialog,TQ_SIGNAL(done()),this,TQ_SLOT(slotFindDone())); } TQString string; @@ -4047,7 +4059,7 @@ void Konsole::slotOpenSelection() delete m_filterData; m_openSelection->clear(); - disconnect(m_openSelection, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotOpenURI(int))); + disconnect(m_openSelection, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotOpenURI(int))); TQString selection = se->getEmulation()->getSelection(); TQString curdir = baseURL().path(); @@ -4062,7 +4074,7 @@ void Konsole::slotOpenSelection() KURIFilter::self()->filterURI( *(m_filterData) ); m_openSelection->insertItem( SmallIconSet( m_filterData->iconName() ),i18n( "%1" ).arg(m_filterData->uri().url()), 1 ); - connect(m_openSelection, TQT_SIGNAL(activated(int)), TQT_SLOT(slotOpenURI(int))); + connect(m_openSelection, TQ_SIGNAL(activated(int)), TQ_SLOT(slotOpenURI(int))); } void Konsole::slotOpenURI(int) @@ -4218,7 +4230,7 @@ void Konsole::slotZModemUpload() void Konsole::slotZModemDetected(TESession *session) { - if (!kapp->authorize("zmodem_download")) return; + if (!tdeApp->authorize("zmodem_download")) return; if(se != session) activateSession(session); @@ -4333,8 +4345,8 @@ KonsoleFind::KonsoleFind( TQWidget *parent, const char *name, bool /*modal*/ ) if (!TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty()) { m_editRegExp = new TQPushButton( i18n("&Edit..."), row, "editRegExp" ); - connect( m_asRegExp, TQT_SIGNAL( toggled(bool) ), m_editRegExp, TQT_SLOT( setEnabled(bool) ) ); - connect( m_editRegExp, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotEditRegExp() ) ); + connect( m_asRegExp, TQ_SIGNAL( toggled(bool) ), m_editRegExp, TQ_SLOT( setEnabled(bool) ) ); + connect( m_editRegExp, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotEditRegExp() ) ); m_editRegExp->setEnabled( false ); } } @@ -4342,7 +4354,7 @@ KonsoleFind::KonsoleFind( TQWidget *parent, const char *name, bool /*modal*/ ) void KonsoleFind::slotEditRegExp() { if ( m_editorDialog == 0 ) - m_editorDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) ); + m_editorDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), this ); assert( m_editorDialog ); @@ -4376,20 +4388,13 @@ void Konsole::slotFontChanged() void Konsole::biggerFont(void) { if ( !se ) return; - - TQFont f = te->getVTFont(); - f.setPointSize( f.pointSize() + 1 ); - te->setVTFont( f ); + te->biggerFont(); activateSession(); } void Konsole::smallerFont(void) { if ( !se ) return; - - TQFont f = te->getVTFont(); - if ( f.pointSize() < 6 ) return; // A minimum size - f.setPointSize( f.pointSize() - 1 ); - te->setVTFont( f ); + te->smallerFont(); activateSession(); } @@ -4472,7 +4477,7 @@ void Konsole::setMenuAcceleratos() if (m_help) menubar->changeItem(m_help_id, m_help_string); } - else + else { menubar->changeItem(m_session_id, TQString(m_session_string).replace(TQRegExp("&([^&])"), "\\1")); menubar->changeItem(m_edit_id, TQString(m_edit_string).replace(TQRegExp("&([^&])"), "\\1")); @@ -4485,5 +4490,5 @@ void Konsole::setMenuAcceleratos() menubar->changeItem(m_help_id, TQString(m_help_string).replace(TQRegExp("&([^&])"), "\\1")); } } - + #include "konsole.moc" diff --git a/konsole/konsole/konsole.h b/konsole/konsole/konsole.h index 30ca6e5a1..7af520661 100644 --- a/konsole/konsole/konsole.h +++ b/konsole/konsole/konsole.h @@ -28,7 +28,7 @@ #include <tdemainwindow.h> #include <kdialogbase.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <keditcl.h> #include <twinmodule.h> @@ -68,7 +68,7 @@ const char *konsole_shell(TQStrList &args); class Konsole : public TDEMainWindow, virtual public KonsoleIface { - Q_OBJECT + TQ_OBJECT friend class KonsoleSessionManaged; public: @@ -245,6 +245,7 @@ private slots: void slotTabDetachSession(); void slotTabRenameSession(); void slotTabSelectColor(); + void slotTabResetColor(); void slotTabCloseSession(); void slotTabToggleMonitor(); void slotTabToggleMasterMode(); @@ -256,8 +257,8 @@ private slots: void slotSetEncoding(); private: - KSimpleConfig *defaultSession(); - TQString newSession(KSimpleConfig *co, TQString pgm = TQString::null, const TQStrList &args = TQStrList(), + TDESimpleConfig *defaultSession(); + TQString newSession(TDESimpleConfig *co, TQString pgm = TQString::null, const TQStrList &args = TQStrList(), const TQString &_term = TQString::null, const TQString &_icon = TQString::null, const TQString &_title = TQString::null, const TQString &_cwd = TQString::null); void readProperties(TDEConfig *config, const TQString &schema, bool globalConfigOnly); @@ -297,9 +298,9 @@ private: TQPtrDict<TDERadioAction> session2action; TQPtrList<TESession> sessions; - TQIntDict<KSimpleConfig> no2command; //QT4 - convert to QList + TQIntDict<TDESimpleConfig> no2command; - KSimpleConfig* m_defaultSession; + TDESimpleConfig* m_defaultSession; TQString m_defaultSessionFilename; KTabWidget* tabwidget; @@ -428,6 +429,7 @@ private: bool b_framevis:1; bool b_metaAsAlt:1; + bool b_realTransparency:1; bool b_fullscreen:1; bool m_menuCreated:1; bool b_warnQuit:1; @@ -468,7 +470,7 @@ class TQSpinBox; class HistoryTypeDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: HistoryTypeDialog(const HistoryType& histType, unsigned int histSize, @@ -492,7 +494,7 @@ protected: class SizeDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: SizeDialog(unsigned int const columns, unsigned int const lines, @@ -511,7 +513,7 @@ protected: class KonsoleFind : public KEdFind { - Q_OBJECT + TQ_OBJECT public: KonsoleFind( TQWidget *parent = 0, const char *name=0, bool modal=true ); bool reg_exp() const; diff --git a/konsole/konsole/konsole_part.cpp b/konsole/konsole/konsole_part.cpp index 64fdfb700..ca275d40b 100644 --- a/konsole/konsole/konsole_part.cpp +++ b/konsole/konsole/konsole_part.cpp @@ -39,7 +39,7 @@ #include <krun.h> #include <kstdaction.h> #include <tqlabel.h> -#include <kprocctrl.h> +#include <tdeprocctrl.h> #include <tqcheckbox.h> #include <tqspinbox.h> @@ -151,10 +151,10 @@ konsolePart::konsolePart(TQWidget *_parentWidget, const char *widgetName, TQObje te = new TEWidget(parentWidget,widgetName); te->setMinimumSize(150,70); // allow resizing, cause resize in TEWidget - setWidget(TQT_TQWIDGET(te)); + setWidget(te); te->setFocus(); - connect( te,TQT_SIGNAL(configureRequest(TEWidget*,int,int,int)), - this,TQT_SLOT(configureRequest(TEWidget*,int,int,int)) ); + connect( te,TQ_SIGNAL(configureRequest(TEWidget*,int,int,int)), + this,TQ_SLOT(configureRequest(TEWidget*,int,int,int)) ); colors = new ColorSchemaList(); colors->checkSchemas(); @@ -214,7 +214,7 @@ konsolePart::konsolePart(TQWidget *_parentWidget, const char *widgetName, TQObje applySettingsToGUI(); - TQTimer::singleShot( 0, this, TQT_SLOT( autoShowShell() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( autoShowShell() ) ); } void konsolePart::autoShowShell() @@ -240,10 +240,10 @@ void konsolePart::doneSession(TESession*) if (se && b_autoDestroy) { // kdDebug(1211) << "doneSession - disconnecting done" << endl; - disconnect( se,TQT_SIGNAL(done(TESession*)), - this,TQT_SLOT(doneSession(TESession*)) ); + disconnect( se,TQ_SIGNAL(done(TESession*)), + this,TQ_SLOT(doneSession(TESession*)) ); se->setConnect(false); - //TQTimer::singleShot(100,se,TQT_SLOT(terminate())); + //TQTimer::singleShot(100,se,TQ_SLOT(terminate())); // kdDebug(1211) << "se->terminate()" << endl; se->terminate(); } @@ -252,7 +252,7 @@ void konsolePart::doneSession(TESession*) void konsolePart::sessionDestroyed() { // kdDebug(1211) << "sessionDestroyed()" << endl; - disconnect( se, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( sessionDestroyed() ) ); + disconnect( se, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( sessionDestroyed() ) ); se = 0; if (b_autoDestroy) delete this; @@ -275,7 +275,7 @@ konsolePart::~konsolePart() while(se && TDEProcessController::theTDEProcessController->waitForProcessExit(1)) ; - disconnect( se, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( sessionDestroyed() ) ); + disconnect( se, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( sessionDestroyed() ) ); // kdDebug(1211) << "Deleting se session" << endl; delete se; se=0; @@ -325,14 +325,14 @@ void konsolePart::emitOpenURLRequest(const TQString &cwd) void konsolePart::makeGUI() { - if (!kapp->authorizeTDEAction("konsole_rmb")) + if (!tdeApp->authorizeTDEAction("konsole_rmb")) return; actions = new TDEActionCollection( (TDEMainWindow*)parentWidget ); settingsActions = new TDEActionCollection( (TDEMainWindow*)parentWidget ); // Send Signal Menu ------------------------------------------------------------- - if (kapp->authorizeTDEAction("send_signal")) + if (tdeApp->authorizeTDEAction("send_signal")) { m_signals = new TDEPopupMenu((TDEMainWindow*)parentWidget); m_signals->insertItem( i18n( "&Suspend Task" ) + " (STOP)", SIGSTOP); @@ -343,17 +343,17 @@ void konsolePart::makeGUI() m_signals->insertItem( i18n( "&Kill Task" ) + " (KILL)", SIGKILL); m_signals->insertItem( i18n( "User Signal &1") + " (USR1)", SIGUSR1); m_signals->insertItem( i18n( "User Signal &2") + " (USR2)", SIGUSR2); - connect(m_signals, TQT_SIGNAL(activated(int)), TQT_SLOT(sendSignal(int))); + connect(m_signals, TQ_SIGNAL(activated(int)), TQ_SLOT(sendSignal(int))); } // Settings Menu ---------------------------------------------------------------- - if (kapp->authorizeTDEAction("settings")) + if (tdeApp->authorizeTDEAction("settings")) { m_options = new TDEPopupMenu((TDEMainWindow*)parentWidget); // Scrollbar selectScrollbar = new TDESelectAction(i18n("Sc&rollbar"), 0, this, - TQT_SLOT(slotSelectScrollbar()), settingsActions); + TQ_SLOT(slotSelectScrollbar()), settingsActions); TQStringList scrollitems; scrollitems << i18n("&Hide") << i18n("&Left") << i18n("&Right"); @@ -363,7 +363,7 @@ void konsolePart::makeGUI() // Select Bell m_options->insertSeparator(); selectBell = new TDESelectAction(i18n("&Bell"), SmallIconSet( "bell"), 0 , this, - TQT_SLOT(slotSelectBell()), settingsActions, "bell"); + TQ_SLOT(slotSelectBell()), settingsActions, "bell"); TQStringList bellitems; bellitems << i18n("System &Bell") @@ -374,13 +374,13 @@ void konsolePart::makeGUI() selectBell->plug(m_options); m_fontsizes = new TDEActionMenu( i18n( "Font" ), SmallIconSet( "text" ), settingsActions, 0L ); - m_fontsizes->insert( new TDEAction( i18n( "&Enlarge Font" ), SmallIconSet( "zoom-in" ), 0, this, TQT_SLOT( biggerFont() ), settingsActions, "enlarge_font" ) ); - m_fontsizes->insert( new TDEAction( i18n( "&Shrink Font" ), SmallIconSet( "zoom-out" ), 0, this, TQT_SLOT( smallerFont() ), settingsActions, "shrink_font" ) ); - m_fontsizes->insert( new TDEAction( i18n( "Se&lect..." ), SmallIconSet( "font-x-generic" ), 0, this, TQT_SLOT( slotSelectFont() ), settingsActions, "select_font" ) ); + m_fontsizes->insert( new TDEAction( i18n( "&Enlarge Font" ), SmallIconSet( "zoom-in" ), 0, this, TQ_SLOT( biggerFont() ), settingsActions, "enlarge_font" ) ); + m_fontsizes->insert( new TDEAction( i18n( "&Shrink Font" ), SmallIconSet( "zoom-out" ), 0, this, TQ_SLOT( smallerFont() ), settingsActions, "shrink_font" ) ); + m_fontsizes->insert( new TDEAction( i18n( "Se&lect..." ), SmallIconSet( "font-x-generic" ), 0, this, TQ_SLOT( slotSelectFont() ), settingsActions, "select_font" ) ); m_fontsizes->plug(m_options); // encoding menu, start with default checked ! - selectSetEncoding = new TDESelectAction( i18n( "&Encoding" ), SmallIconSet("charset" ), 0, this, TQT_SLOT(slotSetEncoding()), settingsActions, "set_encoding" ); + selectSetEncoding = new TDESelectAction( i18n( "&Encoding" ), SmallIconSet("charset" ), 0, this, TQ_SLOT(slotSetEncoding()), settingsActions, "set_encoding" ); TQStringList list = TDEGlobal::charsets()->descriptiveEncodingNames(); list.prepend( i18n( "Default" ) ); selectSetEncoding->setItems(list); @@ -388,34 +388,34 @@ void konsolePart::makeGUI() selectSetEncoding->plug(m_options); // Keyboard Options Menu --------------------------------------------------- - if (kapp->authorizeTDEAction("keyboard")) + if (tdeApp->authorizeTDEAction("keyboard")) { m_keytab = new TDEPopupMenu((TDEMainWindow*)parentWidget); m_keytab->setCheckable(true); - connect(m_keytab, TQT_SIGNAL(activated(int)), TQT_SLOT(keytab_menu_activated(int))); + connect(m_keytab, TQ_SIGNAL(activated(int)), TQ_SLOT(keytab_menu_activated(int))); m_options->insertItem( SmallIconSet( "key_bindings" ), i18n( "&Keyboard" ), m_keytab ); } // Schema Options Menu ----------------------------------------------------- - if (kapp->authorizeTDEAction("schema")) + if (tdeApp->authorizeTDEAction("schema")) { m_schema = new TDEPopupMenu((TDEMainWindow*)parentWidget); m_schema->setCheckable(true); - connect(m_schema, TQT_SIGNAL(activated(int)), TQT_SLOT(schema_menu_activated(int))); - connect(m_schema, TQT_SIGNAL(aboutToShow()), TQT_SLOT(schema_menu_check())); + connect(m_schema, TQ_SIGNAL(activated(int)), TQ_SLOT(schema_menu_activated(int))); + connect(m_schema, TQ_SIGNAL(aboutToShow()), TQ_SLOT(schema_menu_check())); m_options->insertItem( SmallIconSet( "colorize" ), i18n( "Sch&ema" ), m_schema); } TDEAction *historyType = new TDEAction(i18n("&History..."), "history", 0, this, - TQT_SLOT(slotHistoryType()), settingsActions, "history"); + TQ_SLOT(slotHistoryType()), settingsActions, "history"); historyType->plug(m_options); m_options->insertSeparator(); // Select line spacing selectLineSpacing = new TDESelectAction(i18n("Li&ne Spacing"), SmallIconSet("format-justify-left"), 0, this, - TQT_SLOT(slotSelectLineSpacing()), settingsActions ); + TQ_SLOT(slotSelectLineSpacing()), settingsActions ); TQStringList lineSpacingList; lineSpacingList @@ -433,35 +433,35 @@ void konsolePart::makeGUI() // Blinking Cursor blinkingCursor = new TDEToggleAction (i18n("Blinking &Cursor"), - 0, this,TQT_SLOT(slotBlinkingCursor()), settingsActions); + 0, this,TQ_SLOT(slotBlinkingCursor()), settingsActions); blinkingCursor->plug(m_options); // Frame on/off showFrame = new TDEToggleAction(i18n("Show Fr&ame"), 0, - this, TQT_SLOT(slotToggleFrame()), settingsActions); + this, TQ_SLOT(slotToggleFrame()), settingsActions); showFrame->setCheckedState(i18n("Hide Fr&ame")); showFrame->plug(m_options); // Meta key as Alt key metaAsAlt = new TDEToggleAction(i18n("Me&ta key as Alt key"), 0, - this, TQT_SLOT(slotToggleMetaAsAltMode()), settingsActions); + this, TQ_SLOT(slotToggleMetaAsAltMode()), settingsActions); metaAsAlt->plug(m_options); // Word Connectors TDEAction *WordSeps = new TDEAction(i18n("Wor&d Connectors..."), 0, this, - TQT_SLOT(slotWordSeps()), settingsActions); + TQ_SLOT(slotWordSeps()), settingsActions); WordSeps->plug(m_options); // Use Konsole's Settings m_options->insertSeparator(); m_useKonsoleSettings = new TDEToggleAction( i18n("&Use Konsole's Settings"), - 0, this, TQT_SLOT(slotUseKonsoleSettings()), 0, "use_konsole_settings" ); + 0, this, TQ_SLOT(slotUseKonsoleSettings()), 0, "use_konsole_settings" ); m_useKonsoleSettings->plug(m_options); // Save Settings m_options->insertSeparator(); TDEAction *saveSettings = new TDEAction(i18n("&Save as Default"), "document-save", 0, this, - TQT_SLOT(saveProperties()), actions, "save_default"); + TQ_SLOT(saveProperties()), actions, "save_default"); saveSettings->plug(m_options); if (TDEGlobalSettings::insertTearOffHandle()) m_options->insertTearOffHandle(); @@ -469,16 +469,16 @@ void konsolePart::makeGUI() // Popup Menu ------------------------------------------------------------------- m_popupMenu = new TDEPopupMenu((TDEMainWindow*)parentWidget); - TDEAction* selectionEnd = new TDEAction(i18n("Set Selection End"), 0, TQT_TQOBJECT(te), - TQT_SLOT(setSelectionEnd()), actions, "selection_end"); + TDEAction* selectionEnd = new TDEAction(i18n("Set Selection End"), 0, te, + TQ_SLOT(setSelectionEnd()), actions, "selection_end"); selectionEnd->plug(m_popupMenu); TDEAction *copyClipboard = new TDEAction(i18n("&Copy"), "edit-copy", 0, - TQT_TQOBJECT(te), TQT_SLOT(copyClipboard()), actions, "edit_copy"); + te, TQ_SLOT(copyClipboard()), actions, "edit_copy"); copyClipboard->plug(m_popupMenu); TDEAction *pasteClipboard = new TDEAction(i18n("&Paste"), "edit-paste", 0, - TQT_TQOBJECT(te), TQT_SLOT(pasteClipboard()), actions, "edit_paste"); + te, TQ_SLOT(pasteClipboard()), actions, "edit_paste"); pasteClipboard->plug(m_popupMenu); if (m_signals) @@ -494,7 +494,7 @@ void konsolePart::makeGUI() } TDEAction *closeSession = new TDEAction(i18n("&Close Terminal Emulator"), "window-close", 0, this, - TQT_SLOT(closeCurrentSession()), actions, "close_session"); + TQ_SLOT(closeCurrentSession()), actions, "close_session"); closeSession->plug(m_popupMenu); if (TDEGlobalSettings::insertTearOffHandle()) m_popupMenu->insertTearOffHandle(); @@ -608,7 +608,7 @@ void konsolePart::readProperties() if (sch->useTransparency()) { if (!argb_visual) { if (!rootxpm) - rootxpm = new KRootPixmap(TQT_TQWIDGET(te)); + rootxpm = new KRootPixmap(te); rootxpm->setFadeEffect(sch->tr_x(), TQColor(sch->tr_r(), sch->tr_g(), sch->tr_b())); rootxpm->start(); rootxpm->repaint(true); @@ -705,19 +705,12 @@ void konsolePart::slotSelectFont() { void konsolePart::biggerFont(void) { if ( !se ) return; - - TQFont f = te->getVTFont(); - f.setPointSize( f.pointSize() + 1 ); - te->setVTFont( f ); + te->biggerFont(); } void konsolePart::smallerFont(void) { if ( !se ) return; - - TQFont f = te->getVTFont(); - if ( f.pointSize() < 6 ) return; // A minimum size - f.setPointSize( f.pointSize() - 1 ); - te->setVTFont( f ); + te->smallerFont(); } void konsolePart::updateKeytabMenu() @@ -803,7 +796,7 @@ void konsolePart::setSchema(ColorSchema* s) if (s->useTransparency()) { if (!argb_visual) { if (!rootxpm) - rootxpm = new KRootPixmap(TQT_TQWIDGET(te)); + rootxpm = new KRootPixmap(te); rootxpm->setFadeEffect(s->tr_x(), TQColor(s->tr_r(), s->tr_g(), s->tr_b())); rootxpm->start(); rootxpm->repaint(true); @@ -1018,15 +1011,15 @@ HistoryTypeDialog::HistoryTypeDialog(const HistoryType& histType, m_btnEnable = new TQCheckBox(i18n("&Enable"), mainFrame); - TQObject::connect(m_btnEnable, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotHistEnable(bool))); + TQObject::connect(m_btnEnable, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotHistEnable(bool))); m_size = new TQSpinBox(0, 10 * 1000 * 1000, 100, mainFrame); m_size->setValue(histSize); m_size->setSpecialValueText(i18n("Unlimited (number of lines)", "Unlimited")); m_setUnlimited = new TQPushButton(i18n("&Set Unlimited"), mainFrame); - connect( m_setUnlimited,TQT_SIGNAL(clicked()), this,TQT_SLOT(slotSetUnlimited()) ); + connect( m_setUnlimited,TQ_SIGNAL(clicked()), this,TQ_SLOT(slotSetUnlimited()) ); hb->addWidget(m_btnEnable); hb->addSpacing(10); @@ -1128,42 +1121,42 @@ void konsolePart::newSession() { se = new TESession(te, "xterm", parentWidget->winId()); } - connect( se,TQT_SIGNAL(done(TESession*)), - this,TQT_SLOT(doneSession(TESession*)) ); - connect( se,TQT_SIGNAL(openURLRequest(const TQString &)), - this,TQT_SLOT(emitOpenURLRequest(const TQString &)) ); - connect( se, TQT_SIGNAL( updateTitle(TESession*) ), - this, TQT_SLOT( updateTitle(TESession*) ) ); - connect( se, TQT_SIGNAL(enableMasterModeConnections()), - this, TQT_SLOT(enableMasterModeConnections()) ); - connect( se, TQT_SIGNAL( processExited(TDEProcess *) ), - this, TQT_SIGNAL( processExited(TDEProcess *) ) ); - connect( se, TQT_SIGNAL( receivedData( const TQString& ) ), - this, TQT_SIGNAL( receivedData( const TQString& ) ) ); - connect( se, TQT_SIGNAL( forkedChild() ), - this, TQT_SIGNAL( forkedChild() )); - connect( se, TQT_SIGNAL(getSessionSchema(TESession*, TQString &)), - this, TQT_SLOT(slotGetSessionSchema(TESession*, TQString &))); - connect( se, TQT_SIGNAL(setSessionSchema(TESession*, const TQString &)), - this, TQT_SLOT(slotSetSessionSchema(TESession*, const TQString &))); - connect( se, TQT_SIGNAL(setSessionEncoding(TESession*, const TQString &)), - this, TQT_SLOT(slotSetSessionEncoding(TESession*, const TQString &))); - connect( se, TQT_SIGNAL(updateSessionKeytab(TESession *, const TQString &)), - this, TQT_SLOT(slotUpdateSessionKeytab(TESession *, const TQString &))); + connect( se,TQ_SIGNAL(done(TESession*)), + this,TQ_SLOT(doneSession(TESession*)) ); + connect( se,TQ_SIGNAL(openURLRequest(const TQString &)), + this,TQ_SLOT(emitOpenURLRequest(const TQString &)) ); + connect( se, TQ_SIGNAL( updateTitle(TESession*) ), + this, TQ_SLOT( updateTitle(TESession*) ) ); + connect( se, TQ_SIGNAL(enableMasterModeConnections()), + this, TQ_SLOT(enableMasterModeConnections()) ); + connect( se, TQ_SIGNAL( processExited(TDEProcess *) ), + this, TQ_SIGNAL( processExited(TDEProcess *) ) ); + connect( se, TQ_SIGNAL( receivedData( const TQString& ) ), + this, TQ_SIGNAL( receivedData( const TQString& ) ) ); + connect( se, TQ_SIGNAL( forkedChild() ), + this, TQ_SIGNAL( forkedChild() )); + connect( se, TQ_SIGNAL(getSessionSchema(TESession*, TQString &)), + this, TQ_SLOT(slotGetSessionSchema(TESession*, TQString &))); + connect( se, TQ_SIGNAL(setSessionSchema(TESession*, const TQString &)), + this, TQ_SLOT(slotSetSessionSchema(TESession*, const TQString &))); + connect( se, TQ_SIGNAL(setSessionEncoding(TESession*, const TQString &)), + this, TQ_SLOT(slotSetSessionEncoding(TESession*, const TQString &))); + connect( se, TQ_SIGNAL(updateSessionKeytab(TESession *, const TQString &)), + this, TQ_SLOT(slotUpdateSessionKeytab(TESession *, const TQString &))); // We ignore the following signals - //connect( se, TQT_SIGNAL(renameSession(TESession*,const TQString&)), - // this, TQT_SLOT(slotRenameSession(TESession*, const TQString&)) ); - //connect( se->getEmulation(), TQT_SIGNAL(changeColumns(int)), - // this, TQT_SLOT(changeColumns(int)) ); - //connect( se, TQT_SIGNAL(disableMasterModeConnections()), - // this, TQT_SLOT(disableMasterModeConnections()) ); + //connect( se, TQ_SIGNAL(renameSession(TESession*,const TQString&)), + // this, TQ_SLOT(slotRenameSession(TESession*, const TQString&)) ); + //connect( se->getEmulation(), TQ_SIGNAL(changeColumns(int)), + // this, TQ_SLOT(changeColumns(int)) ); + //connect( se, TQ_SIGNAL(disableMasterModeConnections()), + // this, TQ_SLOT(disableMasterModeConnections()) ); applyProperties(); se->setConnect(true); // se->run(); - connect( se, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( sessionDestroyed() ) ); + connect( se, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( sessionDestroyed() ) ); // setFont( n_font ); // we do this here, to make TEWidget recalculate // its geometry.. } diff --git a/konsole/konsole/konsole_part.h b/konsole/konsole/konsole_part.h index 39b037b67..aeb3ddca0 100644 --- a/konsole/konsole/konsole_part.h +++ b/konsole/konsole/konsole_part.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- +/* This file is part of the KDE system Copyright (C) 1999,2000 Boloni Laszlo <lboloni@cpe.ucf.edu> @@ -47,7 +47,7 @@ namespace KParts { class GUIActivateEvent; } class konsoleFactory : public KParts::Factory { - Q_OBJECT + TQ_OBJECT public: konsoleFactory(); virtual ~konsoleFactory(); @@ -68,7 +68,7 @@ public: class konsolePart: public KParts::ReadOnlyPart, public TerminalInterface, public ExtTerminalInterface { - Q_OBJECT + TQ_OBJECT public: konsolePart(TQWidget *parentWidget, const char *widgetName, TQObject * parent, const char *name, const char *classname = 0, const TQString &title = TQString::null); @@ -217,7 +217,7 @@ public: class HistoryTypeDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: HistoryTypeDialog(const HistoryType& histType, unsigned int histSize, @@ -241,7 +241,7 @@ protected: class konsoleBrowserExtension : public KParts::BrowserExtension { - Q_OBJECT + TQ_OBJECT friend class konsolePart; public: konsoleBrowserExtension(konsolePart *parent); diff --git a/konsole/konsole/konsole_wcwidth.cpp b/konsole/konsole/konsole_wcwidth.cpp index 098cd16d4..5159dfca7 100644 --- a/konsole/konsole/konsole_wcwidth.cpp +++ b/konsole/konsole/konsole_wcwidth.cpp @@ -213,7 +213,7 @@ int string_width( const TQString &txt ) { int w = 0; - for ( uint i = 1; i < txt.length(); ++i ) { + for ( uint i = 0; i < txt.length(); ++i ) { w += konsole_wcwidth(txt[i].unicode()); } return w; diff --git a/konsole/konsole/konsolebookmarkhandler.cpp b/konsole/konsole/konsolebookmarkhandler.cpp index 13af12ca5..8316455ac 100644 --- a/konsole/konsole/konsolebookmarkhandler.cpp +++ b/konsole/konsole/konsolebookmarkhandler.cpp @@ -19,7 +19,7 @@ // Born as tdelibs/tdeio/tdefile/tdefilebookmarkhandler.cpp #include <tdepopupmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kshell.h> #include <tdeio/job.h> #include <tdeio/netaccess.h> @@ -55,12 +55,12 @@ KonsoleBookmarkHandler::KonsoleBookmarkHandler( Konsole *konsole, bool toplevel m_file = locateLocal( "data", "konsole/bookmarks.xml" ); KBookmarkManager *manager = KBookmarkManager::managerForFile( m_file, false); - manager->setEditorOptions(kapp->caption(), false); + manager->setEditorOptions(tdeApp->caption(), false); manager->setUpdate( true ); manager->setShowNSBookmarks( false ); - connect( manager, TQT_SIGNAL( changed(const TQString &, const TQString &) ), - TQT_SLOT( slotBookmarksChanged(const TQString &, const TQString &) ) ); + connect( manager, TQ_SIGNAL( changed(const TQString &, const TQString &) ), + TQ_SLOT( slotBookmarksChanged(const TQString &, const TQString &) ) ); if (toplevel) { m_bookmarkMenu = new KonsoleBookmarkMenu( manager, this, m_menu, diff --git a/konsole/konsole/konsolebookmarkhandler.h b/konsole/konsole/konsolebookmarkhandler.h index 66680e095..0837a2b87 100644 --- a/konsole/konsole/konsolebookmarkhandler.h +++ b/konsole/konsole/konsolebookmarkhandler.h @@ -30,7 +30,7 @@ class KBookmarkManager; class KonsoleBookmarkHandler : public TQObject, public KBookmarkOwner { - Q_OBJECT + TQ_OBJECT public: KonsoleBookmarkHandler( Konsole *konsole, bool toplevel ); diff --git a/konsole/konsole/konsolebookmarkmenu.cpp b/konsole/konsole/konsolebookmarkmenu.cpp index 0afe6a693..d52175b0e 100644 --- a/konsole/konsole/konsolebookmarkmenu.cpp +++ b/konsole/konsole/konsolebookmarkmenu.cpp @@ -17,7 +17,7 @@ */ #include <tdepopupmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeaction.h> #include "konsole.h" @@ -36,14 +36,14 @@ KonsoleBookmarkMenu::KonsoleBookmarkMenu( KBookmarkManager* mgr, /* * First, we disconnect KBookmarkMenu::slotAboutToShow() * Then, we connect KonsoleBookmarkMenu::slotAboutToShow(). - * They are named differently because the TQT_SLOT() macro thinks we want + * They are named differently because the TQ_SLOT() macro thinks we want * KonsoleBookmarkMenu::KBookmarkMenu::slotAboutToShow() * Could this be solved if slotAboutToShow() is virtual in KBookmarMenu? */ - disconnect( _parentMenu, TQT_SIGNAL( aboutToShow() ), this, - TQT_SLOT( slotAboutToShow() ) ); - connect( _parentMenu, TQT_SIGNAL( aboutToShow() ), - TQT_SLOT( slotAboutToShow2() ) ); + disconnect( _parentMenu, TQ_SIGNAL( aboutToShow() ), this, + TQ_SLOT( slotAboutToShow() ) ); + connect( _parentMenu, TQ_SIGNAL( aboutToShow() ), + TQ_SLOT( slotAboutToShow2() ) ); } /* @@ -113,7 +113,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu() // kdDebug(1203) << "Creating URL bookmark menu item for " << bm.text() << endl; // create a normal URL item, with ID as a name TDEAction * action = new TDEAction( text, bm.icon(), 0, - this, TQT_SLOT( slotBookmarkSelected() ), + this, TQ_SLOT( slotBookmarkSelected() ), m_actionCollection, bm.url().url().utf8() ); action->setStatusText( bm.url().prettyURL() ); @@ -149,7 +149,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu() void KonsoleBookmarkMenu::slotBookmarkSelected() { if ( !m_pOwner ) return; // this view doesn't handle bookmarks... - m_kOwner->openBookmarkURL( TQString::fromUtf8(TQT_TQOBJECT_CONST(sender())->name()), /* URL */ + m_kOwner->openBookmarkURL( TQString::fromUtf8(sender()->name()), /* URL */ ( (TDEAction *)sender() )->text() /* Title */ ); } diff --git a/konsole/konsole/konsolebookmarkmenu.h b/konsole/konsole/konsolebookmarkmenu.h index e1dfdacba..547802fe8 100644 --- a/konsole/konsole/konsolebookmarkmenu.h +++ b/konsole/konsole/konsolebookmarkmenu.h @@ -38,7 +38,7 @@ class KonsoleBookmarkMenu; class KonsoleBookmarkMenu : public KBookmarkMenu { - Q_OBJECT + TQ_OBJECT public: KonsoleBookmarkMenu( KBookmarkManager* mgr, diff --git a/konsole/konsole/kwrited.cpp b/konsole/konsole/kwrited.cpp index 9eef57954..6aea6d6a4 100644 --- a/konsole/konsole/kwrited.cpp +++ b/konsole/konsole/kwrited.cpp @@ -34,13 +34,12 @@ #include <dcopclient.h> #include <tqsocketnotifier.h> -// KDE -#include <kuniqueapplication.h> +// TDE #include <tdecmdlineargs.h> #include <tdelocale.h> #include <tdeglobalsettings.h> #include <kdebug.h> -#include <kcrash.h> +#include <tdecrash.h> #include <kpty.h> #include <kuser.h> #include <tdeglobal.h> @@ -72,15 +71,15 @@ KWrited::KWrited() : TQTextEdit() setMinimumWidth(pref_width); setMinimumHeight(pref_height); setReadOnly(true); - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); setWordWrap(TQTextEdit::WidgetWidth); setTextFormat(TQt::PlainText); pty = new KPty(); pty->open(); pty->login(KUser().loginName().local8Bit().data(), getenv("DISPLAY")); - TQSocketNotifier *sn = new TQSocketNotifier(pty->masterFd(), TQSocketNotifier::Read, TQT_TQOBJECT(this)); - connect(sn, TQT_SIGNAL(activated(int)), this, TQT_SLOT(block_in(int))); + TQSocketNotifier *sn = new TQSocketNotifier(pty->masterFd(), TQSocketNotifier::Read, this); + connect(sn, TQ_SIGNAL(activated(int)), this, TQ_SLOT(block_in(int))); TQString txt = i18n("KWrited - Listening on Device %1").arg(pty->ttyName()); setCaption(txt); @@ -116,7 +115,7 @@ TQPopupMenu *KWrited::createPopupMenu( const TQPoint &pos ) TQPopupMenu *menu = TQTextEdit::createPopupMenu( pos ); menu->insertItem( i18n( "Clear Messages" ), - this, TQT_SLOT( clearText() ), + this, TQ_SLOT( clearText() ), 0, -1, 0 ); return menu; @@ -136,7 +135,7 @@ KWritedModule::~KWritedModule() } extern "C" -KDE_EXPORT KDEDModule* create_kwrited( const TQCString& obj ) +TDE_EXPORT KDEDModule* create_kwrited( const TQCString& obj ) { return new KWritedModule( obj ); } diff --git a/konsole/konsole/kwrited.h b/konsole/konsole/kwrited.h index 7c051c51a..5021b04c3 100644 --- a/konsole/konsole/kwrited.h +++ b/konsole/konsole/kwrited.h @@ -29,7 +29,7 @@ class KPty; class KWrited : public TQTextEdit -{ Q_OBJECT +{ TQ_OBJECT public: KWrited(); ~KWrited(); @@ -44,7 +44,7 @@ private: class KWritedModule : public KDEDModule { - Q_OBJECT + TQ_OBJECT K_DCOP public: KWritedModule( const TQCString& obj ); diff --git a/konsole/konsole/main.cpp b/konsole/konsole/main.cpp index 4039362e3..21bbbe66c 100644 --- a/konsole/konsole/main.cpp +++ b/konsole/konsole/main.cpp @@ -37,7 +37,7 @@ #include <tdecmdlineargs.h> #include <kimageio.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeglobalsettings.h> #include <tdeio/netaccess.h> #include <tdemessagebox.h> @@ -46,7 +46,7 @@ #include "konsole.h" -#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300 +#if defined(TQ_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300 #define COMPOSITE #endif @@ -150,7 +150,7 @@ public: /* --| main |------------------------------------------------------ */ -extern "C" int KDE_EXPORT kdemain(int argc, char* argv[]) +extern "C" int TDE_EXPORT kdemain(int argc, char* argv[]) { setgid(getgid()); setuid(getuid()); // drop privileges @@ -289,7 +289,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[]) eargs.append( args->arg(i) ); if (title.isEmpty() && - (kapp->caption() == kapp->aboutData()->programName())) + (tdeApp->caption() == tdeApp->aboutData()->programName())) { title = TQFile::decodeName(shell); // program executed in the title bar } @@ -413,7 +413,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[]) } } - if (!kapp->authorizeTDEAction("size")) + if (!tdeApp->authorizeTDEAction("size")) fixed_size = true; // /////////////////////////////////////////////// diff --git a/konsole/konsole/printsettings.h b/konsole/konsole/printsettings.h index 1e5a0c23d..393d777d3 100644 --- a/konsole/konsole/printsettings.h +++ b/konsole/konsole/printsettings.h @@ -27,7 +27,7 @@ class TQCheckBox; class PrintSettings : public KPrintDialogPage { - Q_OBJECT + TQ_OBJECT public: PrintSettings(TQWidget *parent = 0, const char *name = 0); ~PrintSettings(); diff --git a/konsole/konsole/schema.cpp b/konsole/konsole/schema.cpp index 8778a1ee9..cf80136f3 100644 --- a/konsole/konsole/schema.cpp +++ b/konsole/konsole/schema.cpp @@ -55,7 +55,7 @@ #include <tqdir.h> #include <tqdatetime.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <tdeconfig.h> #include <kdebug.h> @@ -388,7 +388,7 @@ bool ColorSchema::rereadSchemaFile() if (!(0 <= fi && fi <= TABLE_COLORS)) continue; if (!(0 <= tr && tr <= 1 )) continue; if (!(0 <= bo && bo <= 1 )) continue; - m_table[fi].color = kapp->palette().active().text(); + m_table[fi].color = tdeApp->palette().active().text(); m_table[fi].transparent = tr; m_table[fi].bold = bo; } @@ -399,7 +399,7 @@ bool ColorSchema::rereadSchemaFile() if (!(0 <= fi && fi <= TABLE_COLORS)) continue; if (!(0 <= tr && tr <= 1 )) continue; if (!(0 <= bo && bo <= 1 )) continue; - m_table[fi].color = kapp->palette().active().base(); + m_table[fi].color = tdeApp->palette().active().base(); m_table[fi].transparent = tr; m_table[fi].bold = bo; } diff --git a/konsole/konsole/schema.h b/konsole/konsole/schema.h index 618683c17..c32f26221 100644 --- a/konsole/konsole/schema.h +++ b/konsole/konsole/schema.h @@ -187,10 +187,6 @@ public: uint count() const { return TQPtrList<ColorSchema>::count(); } ; const ColorSchema *at(unsigned int i) { return TQPtrList<ColorSchema>::at(i); } ; -#ifdef USE_QT4 - const ColorSchema *at(unsigned int i) - { return at(i); } ; -#endif // USE_QT4 void sort() {TQPtrList<ColorSchema>::sort();}; diff --git a/konsole/konsole/session.cpp b/konsole/konsole/session.cpp index dcfe9fee4..4a3b1975e 100644 --- a/konsole/konsole/session.cpp +++ b/konsole/konsole/session.cpp @@ -26,10 +26,10 @@ #include <tdemessagebox.h> #include <knotifyclient.h> #include <tdelocale.h> -#include <kprocio.h> +#include <tdeprocio.h> #include <krun.h> #include <kshell.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <stdlib.h> #include <tqfile.h> @@ -78,10 +78,10 @@ TESession::TESession(TEWidget* _te, const TQString &_term, ulong _winId, const T em = new TEmuVt102(te); font_h = te-> fontHeight(); font_w = te-> fontWidth(); - TQObject::connect(te,TQT_SIGNAL(changedContentSizeSignal(int,int)), - this,TQT_SLOT(onContentSizeChange(int,int))); - TQObject::connect(te,TQT_SIGNAL(changedFontMetricSignal(int,int)), - this,TQT_SLOT(onFontMetricChange(int,int))); + TQObject::connect(te,TQ_SIGNAL(changedContentSizeSignal(int,int)), + this,TQ_SLOT(onContentSizeChange(int,int))); + TQObject::connect(te,TQ_SIGNAL(changedFontMetricSignal(int,int)), + this,TQ_SLOT(onFontMetricChange(int,int))); term = _term; winId = _winId; @@ -89,17 +89,17 @@ TESession::TESession(TEWidget* _te, const TQString &_term, ulong _winId, const T setPty( new TEPty() ); - connect( em, TQT_SIGNAL( changeTitle( int, const TQString & ) ), - this, TQT_SLOT( setUserTitle( int, const TQString & ) ) ); - connect( em, TQT_SIGNAL( notifySessionState(int) ), - this, TQT_SLOT( notifySessionState(int) ) ); + connect( em, TQ_SIGNAL( changeTitle( int, const TQString & ) ), + this, TQ_SLOT( setUserTitle( int, const TQString & ) ) ); + connect( em, TQ_SIGNAL( notifySessionState(int) ), + this, TQ_SLOT( notifySessionState(int) ) ); monitorTimer = new TQTimer(this); - connect(monitorTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(monitorTimerDone())); + connect(monitorTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(monitorTimerDone())); - connect( em, TQT_SIGNAL( zmodemDetected() ), this, TQT_SLOT(slotZModemDetected())); + connect( em, TQ_SIGNAL( zmodemDetected() ), this, TQ_SLOT(slotZModemDetected())); - connect( em, TQT_SIGNAL( changeTabTextColor( int ) ), - this, TQT_SLOT( changeTabTextColor( int ) ) ); + connect( em, TQ_SIGNAL( changeTabTextColor( int ) ), + this, TQ_SLOT( changeTabTextColor( int ) ) ); //kdDebug(1211)<<"TESession ctor() done"<<endl; } @@ -110,23 +110,23 @@ void TESession::setPty(TEPty *_sh) delete sh; } sh = _sh; - connect( sh, TQT_SIGNAL( forkedChild() ), - this, TQT_SIGNAL( forkedChild() )); + connect( sh, TQ_SIGNAL( forkedChild() ), + this, TQ_SIGNAL( forkedChild() )); //kdDebug(1211)<<"TESession ctor() sh->setSize()"<<endl; sh->setSize(te->Lines(),te->Columns()); // not absolutely nessesary sh->useUtf8(em->utf8()); //kdDebug(1211)<<"TESession ctor() connecting"<<endl; - connect( sh,TQT_SIGNAL(block_in(const char*,int)),this,TQT_SLOT(onRcvBlock(const char*,int)) ); + connect( sh,TQ_SIGNAL(block_in(const char*,int)),this,TQ_SLOT(onRcvBlock(const char*,int)) ); - connect( em,TQT_SIGNAL(sndBlock(const char*,int)),sh,TQT_SLOT(send_bytes(const char*,int)) ); - connect( em,TQT_SIGNAL(lockPty(bool)),sh,TQT_SLOT(lockPty(bool)) ); - connect( em,TQT_SIGNAL(useUtf8(bool)),sh,TQT_SLOT(useUtf8(bool)) ); + connect( em,TQ_SIGNAL(sndBlock(const char*,int)),sh,TQ_SLOT(send_bytes(const char*,int)) ); + connect( em,TQ_SIGNAL(lockPty(bool)),sh,TQ_SLOT(lockPty(bool)) ); + connect( em,TQ_SIGNAL(useUtf8(bool)),sh,TQ_SLOT(useUtf8(bool)) ); - connect( sh,TQT_SIGNAL(done(int)), this,TQT_SLOT(done(int)) ); + connect( sh,TQ_SIGNAL(done(int)), this,TQ_SLOT(done(int)) ); if (!sh->error().isEmpty()) - TQTimer::singleShot(0, this, TQT_SLOT(ptyError())); + TQTimer::singleShot(0, this, TQ_SLOT(ptyError())); } void TESession::ptyError() @@ -143,10 +143,10 @@ void TESession::ptyError() void TESession::changeWidget(TEWidget* w) { - TQObject::disconnect(te,TQT_SIGNAL(changedContentSizeSignal(int,int)), - this,TQT_SLOT(onContentSizeChange(int,int))); - TQObject::disconnect(te,TQT_SIGNAL(changedFontMetricSignal(int,int)), - this,TQT_SLOT(onFontMetricChange(int,int))); + TQObject::disconnect(te,TQ_SIGNAL(changedContentSizeSignal(int,int)), + this,TQ_SLOT(onContentSizeChange(int,int))); + TQObject::disconnect(te,TQ_SIGNAL(changedFontMetricSignal(int,int)), + this,TQ_SLOT(onFontMetricChange(int,int))); te=w; em->changeGUI(w); font_h = te->fontHeight(); @@ -155,10 +155,10 @@ void TESession::changeWidget(TEWidget* w) te->setDefaultBackColor(modifiedBackground); - TQObject::connect(te,TQT_SIGNAL(changedContentSizeSignal(int,int)), - this,TQT_SLOT(onContentSizeChange(int,int))); - TQObject::connect(te,TQT_SIGNAL(changedFontMetricSignal(int,int)), - this,TQT_SLOT(onFontMetricChange(int,int))); + TQObject::connect(te,TQ_SIGNAL(changedContentSizeSignal(int,int)), + this,TQ_SLOT(onContentSizeChange(int,int))); + TQObject::connect(te,TQ_SIGNAL(changedFontMetricSignal(int,int)), + this,TQ_SLOT(onFontMetricChange(int,int))); } void TESession::setProgram( const TQString &_pgm, const TQStrList &_args ) @@ -177,11 +177,11 @@ void TESession::run() TQString pexec = TDEGlobal::dirs()->findExe(exec); if ( pexec.isEmpty() ) { kdError()<<"can not execute "<<exec<<endl; - TQTimer::singleShot(1, this, TQT_SLOT(done())); + TQTimer::singleShot(1, this, TQ_SLOT(done())); return; } - TQString appId=kapp->dcopClient()->appId(); + TQString appId=tdeApp->dcopClient()->appId(); TQString cwd_save = TQDir::currentDirPath(); if (!initial_cwd.isEmpty()) @@ -194,7 +194,7 @@ void TESession::run() ("DCOPRef("+appId+","+sessionId+")").latin1()); if (result < 0) { // Error in opening pseudo teletype kdWarning()<<"Unable to open a pseudo teletype!"<<endl; - TQTimer::singleShot(0, this, TQT_SLOT(ptyError())); + TQTimer::singleShot(0, this, TQ_SLOT(ptyError())); } sh->setErase(em->getErase()); @@ -311,7 +311,7 @@ bool TESession::closeSession() if (!sh->isRunning() || !sendSignal(SIGHUP)) { // Forced close. - TQTimer::singleShot(1, this, TQT_SLOT(done())); + TQTimer::singleShot(1, this, TQ_SLOT(done())); } return true; } @@ -341,8 +341,8 @@ void TESession::renameSession(const TQString &name) TESession::~TESession() { //kdDebug(1211) << "disconnnecting..." << endl; - TQObject::disconnect( sh, TQT_SIGNAL( done(int) ), - this, TQT_SLOT( done(int) ) ); + TQObject::disconnect( sh, TQ_SIGNAL( done(int) ), + this, TQ_SLOT( done(int) ) ); delete em; delete sh; @@ -605,7 +605,7 @@ void TESession::slotZModemDetected() { if (!zmodemBusy) { - TQTimer::singleShot(10, this, TQT_SLOT(emitZModemDetected())); + TQTimer::singleShot(10, this, TQ_SLOT(emitZModemDetected())); zmodemBusy = true; } } @@ -624,7 +624,7 @@ void TESession::cancelZModem() void TESession::startZModem(const TQString &zmodem, const TQString &dir, const TQStringList &list) { zmodemBusy = true; - zmodemProc = new KProcIO; + zmodemProc = new TDEProcIO; (*zmodemProc) << zmodem << "-v"; for(TQStringList::ConstIterator it = list.begin(); @@ -636,26 +636,26 @@ void TESession::startZModem(const TQString &zmodem, const TQString &dir, const T if (!dir.isEmpty()) zmodemProc->setWorkingDirectory(dir); - zmodemProc->start(KProcIO::NotifyOnExit, false); + zmodemProc->start(TDEProcIO::NotifyOnExit, false); - // Override the read-processing of KProcIO - disconnect(zmodemProc,TQT_SIGNAL (receivedStdout (TDEProcess *, char *, int)), 0, 0); - connect(zmodemProc,TQT_SIGNAL (receivedStdout (TDEProcess *, char *, int)), - this, TQT_SLOT(zmodemSendBlock(TDEProcess *, char *, int))); - connect(zmodemProc,TQT_SIGNAL (receivedStderr (TDEProcess *, char *, int)), - this, TQT_SLOT(zmodemStatus(TDEProcess *, char *, int))); - connect(zmodemProc,TQT_SIGNAL (processExited(TDEProcess *)), - this, TQT_SLOT(zmodemDone())); + // Override the read-processing of TDEProcIO + disconnect(zmodemProc,TQ_SIGNAL (receivedStdout (TDEProcess *, char *, int)), 0, 0); + connect(zmodemProc,TQ_SIGNAL (receivedStdout (TDEProcess *, char *, int)), + this, TQ_SLOT(zmodemSendBlock(TDEProcess *, char *, int))); + connect(zmodemProc,TQ_SIGNAL (receivedStderr (TDEProcess *, char *, int)), + this, TQ_SLOT(zmodemStatus(TDEProcess *, char *, int))); + connect(zmodemProc,TQ_SIGNAL (processExited(TDEProcess *)), + this, TQ_SLOT(zmodemDone())); - disconnect( sh,TQT_SIGNAL(block_in(const char*,int)), this, TQT_SLOT(onRcvBlock(const char*,int)) ); - connect( sh,TQT_SIGNAL(block_in(const char*,int)), this, TQT_SLOT(zmodemRcvBlock(const char*,int)) ); - connect( sh,TQT_SIGNAL(buffer_empty()), this, TQT_SLOT(zmodemContinue())); + disconnect( sh,TQ_SIGNAL(block_in(const char*,int)), this, TQ_SLOT(onRcvBlock(const char*,int)) ); + connect( sh,TQ_SIGNAL(block_in(const char*,int)), this, TQ_SLOT(zmodemRcvBlock(const char*,int)) ); + connect( sh,TQ_SIGNAL(buffer_empty()), this, TQ_SLOT(zmodemContinue())); zmodemProgress = new ZModemDialog(te->topLevelWidget(), false, i18n("ZModem Progress")); - connect(zmodemProgress, TQT_SIGNAL(user1Clicked()), - this, TQT_SLOT(zmodemDone())); + connect(zmodemProgress, TQ_SIGNAL(user1Clicked()), + this, TQ_SLOT(zmodemDone())); zmodemProgress->show(); } @@ -720,9 +720,9 @@ void TESession::zmodemDone() zmodemProc = 0; zmodemBusy = false; - disconnect( sh,TQT_SIGNAL(block_in(const char*,int)), this ,TQT_SLOT(zmodemRcvBlock(const char*,int)) ); - disconnect( sh,TQT_SIGNAL(buffer_empty()), this, TQT_SLOT(zmodemContinue())); - connect( sh,TQT_SIGNAL(block_in(const char*,int)), this, TQT_SLOT(onRcvBlock(const char*,int)) ); + disconnect( sh,TQ_SIGNAL(block_in(const char*,int)), this ,TQ_SLOT(zmodemRcvBlock(const char*,int)) ); + disconnect( sh,TQ_SIGNAL(buffer_empty()), this, TQ_SLOT(zmodemContinue())); + connect( sh,TQ_SIGNAL(block_in(const char*,int)), this, TQ_SLOT(onRcvBlock(const char*,int)) ); sh->send_bytes("\030\030\030\030", 4); // Abort sh->send_bytes("\001\013\n", 3); // Try to get prompt back diff --git a/konsole/konsole/session.h b/konsole/konsole/session.h index 03b5941dd..0b4dbed50 100644 --- a/konsole/konsole/session.h +++ b/konsole/konsole/session.h @@ -31,12 +31,12 @@ #include "sessioniface.h" -class KProcIO; +class TDEProcIO; class TDEProcess; class ZModemDialog; class TESession : public TQObject, virtual public SessionIface -{ Q_OBJECT +{ TQ_OBJECT public: @@ -208,7 +208,7 @@ private: bool xon_xoff; bool fullScripting; - QString stateIconName; + TQString stateIconName; TQString pgm; TQStrList args; @@ -222,7 +222,7 @@ private: // ZModem bool zmodemBusy; - KProcIO* zmodemProc; + TDEProcIO* zmodemProc; ZModemDialog* zmodemProgress; // Color/Font Changes by ESC Sequences diff --git a/konsole/konsole/x-konsole.desktop b/konsole/konsole/x-konsole.desktop index 779c733f3..e29113cdb 100644 --- a/konsole/konsole/x-konsole.desktop +++ b/konsole/konsole/x-konsole.desktop @@ -5,70 +5,3 @@ X-TDE-AutoEmbed=true Icon=konsole Patterns=*.shell; Comment=File to Open a Shell -Comment[af]=Lêer om 'n tolk mee oop te maak -Comment[ar]=ملف لفتح محارة -Comment[az]=Qabığı Açacaq Fayl -Comment[be]=Файл адкрыцця абалонкі -Comment[bg]=Файл за отваряне в конзолата -Comment[bn]=শেল খোলার জন্য ফাইল -Comment[bs]=Datoteka za otvaranje shella -Comment[ca]=Fitxer per a obrir una shell -Comment[cs]=Soubor k otevření příkazové řádky -Comment[csb]=Lopk do òtemkniãcô pòwłoczi -Comment[da]=Fil som skal åbnes i en skal -Comment[de]=Datei zum Öffnen einer Shell -Comment[el]=Αρχείο για άνοιγμα ενός κελύφους -Comment[eo]=Dosiero por malfermi komandinterpretilon -Comment[es]=Archivo para abrir un intérprete de órdenes -Comment[et]=Shelli avamise rakendus -Comment[eu]=Shella irekitzeko fitxategia -Comment[fa]=پرونده برای باز کردن پوسته -Comment[fi]=Tiedosto, joka avaa komentoikkunan -Comment[fr]=Fichier pour ouvrir un « shell » -Comment[fy]=Triem om in flues te iepenjen -Comment[ga]=Comhad a osclaíonn blaosc -Comment[gl]=Ficheiro para abrir unha shell -Comment[he]=קובץ לפתיחת מעטפת -Comment[hi]=शैल खोलने हेतु फ़ाइल -Comment[hr]=Otvaranje ljuske nije uspjelo -Comment[hu]=Parancsértelmező megnyitási fájlja -Comment[is]=Skrá sem opnar skel -Comment[it]=File per aprire una shell -Comment[ja]=シェルを開くファイル -Comment[ka]=გარსის გასახსნელი ფაილი -Comment[kk]=Қоршау-ортада ашатын файл -Comment[km]=ឯកសារដើម្បីបើកសែលមួយ -Comment[lt]=Byla apvalkalo atidarymui -Comment[lv]=Fails čaulas atvēršanai -Comment[mk]=Датотека за отворање на школка -Comment[ms]=Fail untuk Buka Shell -Comment[mt]=Fajl biex jiftaħ shell -Comment[nb]=Fil for å åpne et skall -Comment[nds]=Datei för't Opmaken vun en Konsool -Comment[ne]=शेल खोल्ने फाइल -Comment[nl]=Bestand om een shell te openen -Comment[nn]=Fil for opning av skal -Comment[pa]=ਇੱਕ ਸੈੱਲ ਖੋਲਣ ਲਈ ਫਾਇਲ -Comment[pl]=Plik do otwarcia powłoki -Comment[pt]=Ficheiro para Abrir uma Consola -Comment[pt_BR]=Arquivo para Abrir um Shell -Comment[ro]=Fișier pentru execuția unui interpretor -Comment[ru]=Файл для открытия оболочки -Comment[rw]=Idosiye yo Gufungura Sheli -Comment[se]=Fiila mainna rahpá skálžžu -Comment[sk]=Súbor na otvorenie shellu -Comment[sl]=Datoteka za odprtje lupine -Comment[sr]=Фајл за отварање шкољке -Comment[sr@Latn]=Fajl za otvaranje školjke -Comment[sv]=Fil som ska öppnas i ett skal -Comment[ta]=ஷெல்லை திறப்பதற்கு கோப்பு -Comment[th]=แฟ้มที่จะใช้เปิดเชลล์ -Comment[tr]=Kabuk'a Açılacak Dosya -Comment[tt]=Qabıq Açu öçen Birem -Comment[uk]=Файл, який треба відкрити у оболонці -Comment[uz]=Shelni ochish uchun fayl -Comment[uz@cyrillic]=Шелни очиш учун файл -Comment[vi]=Tập tin để Mở một Trình giao diện -Comment[wa]=Fitchî a drovi dins on shell -Comment[zh_CN]=打开 Shell 的文件 -Comment[zh_TW]=要打開 shell 的檔案 diff --git a/konsole/konsole/zmodem_dialog.cpp b/konsole/konsole/zmodem_dialog.cpp index b4f16dd49..230fc7f9a 100644 --- a/konsole/konsole/zmodem_dialog.cpp +++ b/konsole/konsole/zmodem_dialog.cpp @@ -32,7 +32,7 @@ ZModemDialog::ZModemDialog(TQWidget *parent, bool modal, const TQString &caption textEdit = new TQTextEdit(this); textEdit->setMinimumSize(400, 100); setMainWidget(textEdit); - connect(this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotClose())); + connect(this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(slotClose())); } void ZModemDialog::addProgressText(const TQString &txt) diff --git a/konsole/konsole/zmodem_dialog.h b/konsole/konsole/zmodem_dialog.h index 5487fba50..93b50ee18 100644 --- a/konsole/konsole/zmodem_dialog.h +++ b/konsole/konsole/zmodem_dialog.h @@ -25,7 +25,7 @@ class TQTextEdit; class ZModemDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: ZModemDialog(TQWidget *parent, bool modal, const TQString &caption); diff --git a/konsole/konsolepart.desktop b/konsole/konsolepart.desktop index a1ddc9a6c..c2374ec48 100644 --- a/konsole/konsolepart.desktop +++ b/konsole/konsolepart.desktop @@ -9,87 +9,6 @@ X-TDE-BrowserView-HideFromMenus=true X-TDE-BrowserView-Toggable=true X-TDE-BrowserView-ToggableView-Orientation=horizontal X-TDE-BrowserView-FollowActive=true +X-TDE-AuthorizeAction=shell_access Name=Terminal Emulator -Name[af]=Terminaal Emulasie -Name[ar]=مضاهِ مطراف -Name[az]=Terminal Emulyasiyası -Name[be]=Эмулятар тэрміналу -Name[bg]=Конзолна програма -Name[bn]=টার্মিনাল এমুলেটর -Name[br]=Kendarvanerezh termenell -Name[bs]=Simulator terminala -Name[ca]=Emulador de terminal -Name[cs]=Emulátor terminálu -Name[csb]=Emùlator terminala -Name[cy]=Efelychydd Terfynell -Name[da]=terminalemulator -Name[de]=Terminal-Emulator -Name[el]=Προσομοιωτής τερματικού -Name[eo]=Terminalimitaĵo -Name[es]=Emulador de terminal -Name[et]=Terminaliemulaator -Name[eu]=Terminal emuladorea -Name[fa]=مقلد پایانه -Name[fi]=Komentoikkuna -Name[fo]=Útstøðshermari -Name[fr]=Émulateur de terminal -Name[fy]=Terminal -Name[ga]=Aithriseoir Teirminéil -Name[gl]=Emulador de Terminal -Name[he]=הדמיית מסוף -Name[hi]=टर्मिनल एमुलेटर -Name[hr]=Emulator terminala -Name[hu]=Parancsértelmező -Name[id]=Emulator Terminal -Name[is]=Skjáhermir TDE -Name[it]=Emulatore di terminale -Name[ja]=ターミナルエミュレータ -Name[ka]=ტერმინალის ემულატორი -Name[kk]=Терминал эмуляторы -Name[km]=វត្ថុត្រាប់តាមស្ថានីយ -Name[ko]=터미널 에뮬레이터 -Name[lo]=ຕົວຈຳລອງເທີມີນອນ -Name[lt]=Terminalo emuliatorius -Name[lv]=Termināla Emulators -Name[mk]=Терминалски емулатор -Name[mn]=Терминал-Эмулатор -Name[ms]=Pelagak Terminal -Name[mt]=Emulatur ta' terminal -Name[nb]=Terminalemulator -Name[nds]=Terminal-Emulator -Name[ne]=टर्मिनल इमुलेटर -Name[nl]=Terminal -Name[nn]=Terminalemulator -Name[nso]=Moekisi wa Terminal -Name[pa]=ਟਰਮੀਨਲ ਸਮਰੂਪ -Name[pl]=Emulator terminala -Name[pt]=Emulador de Terminal -Name[pt_BR]=Emulador de Terminal -Name[ro]=Emulator de terminal -Name[ru]=Эмулятор терминала -Name[rw]= Mukuruzi Ihera -Name[se]=Terminálemuláhtor -Name[sk]=Emulátor terminálu -Name[sl]=Terminalski emulator -Name[sr]=Емулатор терминала -Name[sr@Latn]=Emulator terminala -Name[ss]=Silingiseli sesikhungo -Name[sv]=Terminalemulator -Name[ta]=கடைசி போட்டியாளர் -Name[te]=టెర్మినల్ ఎములేటర్ -Name[tg]=Эмулятори поёна -Name[th]=โปรแกรมจำลองเทอร์มินัล -Name[tr]=Uçbirim Emülasyonu -Name[tt]=Terminal Emulatorı -Name[uk]=Емуляція терміналу -Name[uz]=Terminal emulyatori -Name[uz@cyrillic]=Терминал эмулятори -Name[ven]=Mulingedzisi wa theminala -Name[vi]=Mô phỏng thiết bị cuối -Name[wa]=Terminå -Name[xh]=Umzami kulinganisela ngokulinganayo Wendlela yesiphelo -Name[zh_CN]=终端仿真器 -Name[zh_TW]=終端機模擬程式 -Name[zu]=Umlingisi wangaphandle -X-TDE-AuthorizeAction=shell_access diff --git a/konsole/konsolesu.desktop b/konsole/konsolesu.desktop index dc906b804..5d1f10306 100644 --- a/konsole/konsolesu.desktop +++ b/konsole/konsolesu.desktop @@ -8,78 +8,8 @@ Terminal=false OnlyShowIn=TDE; Name=Konsole + GenericName=Terminal Program - Super User Mode -GenericName[af]=Terminaal Program - Super Gebruiker Modus -GenericName[ar]=برنامج الشاشة الطرفيَة - نمط المستخدم الجذري -GenericName[az]=Terminal Programı - Ali İstifadəçi Modu -GenericName[be]=Тэрмінал - рэжым адміністратара -GenericName[bg]=Конзола - администратор -GenericName[bn]=টার্মিনাল প্রোগ্রাম - অ্যাডমিনস্ট্রেটর মোড -GenericName[br]=Gouvel termenell - Doare gourarveriad -GenericName[bs]=Terminalski program - Administratorski režim -GenericName[ca]=Programa de terminal - Mode superusuari -GenericName[cs]=Terminál - superuživatelský režim -GenericName[csb]=Terminal - Trib sprôwnika -GenericName[cy]=Rhaglen Derfynell - Modd Uwch-ddefnyddiwr -GenericName[da]=Terminalprogram (superbruger-tilstand) -GenericName[de]=Terminal (Systemverwaltungsmodus) -GenericName[el]=Πρόγραμμα τερματικού - Λειτουργία ως root -GenericName[eo]=Terminalprogramo - Superuzanta maniero -GenericName[es]=Programa de terminal - Modo de superusuario -GenericName[et]=Terminali rakendus (administraator) -GenericName[eu]=Terminaleko programa (root era) -GenericName[fa]=برنامۀ پایانه - حالت ابرکاربر -GenericName[fi]=Komentotulkki - pääkäyttäjätila -GenericName[fr]=Programme terminal - mode superutilisateur -GenericName[fy]=Terminalprogramma (yn systeembehearmodus) -GenericName[ga]=Clár Teirminéil - Mód Forúsáideora -GenericName[gl]=Programa de Terminal - Modo Super-Usuario -GenericName[he]=מסוף - מצב משתמש־על -GenericName[hi]=टर्मिनल प्रबंधक- सुपर यूज़र मोड -GenericName[hr]=Terminalski program - za administratora -GenericName[hu]=Konsole (rendszergazdai mód) -GenericName[is]=Skjáhermir (sem kerfisstjóri) -GenericName[it]=Programma emulazione terminale - modalità super utente -GenericName[ja]=ターミナルエミュレータ - スーパーユーザモード -GenericName[ka]=ტერმინალი - ზემომხმარებლის რეჟიმი -GenericName[kk]=Терминал (root құқықлы) -GenericName[km]=កម្មវិធីស្ថានីយ - របៀបអ្នកប្រើជាន់ខ្ពស់ -GenericName[ko]=파일 관리자 - 슈퍼유저 모드 -GenericName[lt]=Terminalo programa – super naudotojo veiksena -GenericName[lv]=Termināla programma - Superlietotāja režīms -GenericName[mk]=Терминалска програма - режим root -GenericName[mn]=Терминал програм (Системийн удирдлагын-Горим) -GenericName[ms]=Program Terminal - Mod Pengguna Super -GenericName[mt]=Terminal (modalità Super User) -GenericName[nb]=Terminalprogram – superbrukermodus -GenericName[nds]=Terminalprogramm - Systeempleegbedrief -GenericName[ne]=टर्मिनल कार्यक्रम - सुपर प्रयोगकर्ता मोड -GenericName[nl]=Terminalprogramma (in systeembeheermodus) -GenericName[nn]=Terminalprogram – Superbrukarmodus -GenericName[pa]=ਟਰਮੀਨਲ - ਮੈਨੇਜਰੀ ਢੰਗ(Super User) -GenericName[pl]=Terminal - Tryb administratora -GenericName[pt]=Terminal - Modo de Super Utilizador -GenericName[pt_BR]=Terminal - Modo Super-Usuário -GenericName[ro]=Program terminal - mod superutilizator -GenericName[ru]=Терминал - режим суперпользователя -GenericName[rw]=Porogaramu y'Impera - Uburyo Ukoresha Mukuru -GenericName[se]=Terminálprográmma – Hálddašanmodus -GenericName[sk]=Terminál - Super-používateľský mód -GenericName[sl]=Terminalski program - Skrbniški način -GenericName[sr]=Терминалски програм — режим супер корисника -GenericName[sr@Latn]=Terminalski program — režim super korisnika -GenericName[sv]=Terminalprogram - Administratörsläge -GenericName[ta]=கடைசி நிரலி - சிறந்த பயன்படுத்துபவர் வழி -GenericName[te]=టెర్మినల్ కార్యక్రమం - సూపర్ యూజర్ స్థితి -GenericName[th]=จัดการแฟ้ม - โหมดผู้ดูแลระบบ -GenericName[tr]=Terminal Programı - Süper Kullanıcı Kipi -GenericName[tt]=Terminal Yazılımı (root ısulı) -GenericName[uk]=Програма терміналу (режим адміністратора) -GenericName[uz]=Terminal dasturi (root) -GenericName[uz@cyrillic]=Терминал дастури (root) -GenericName[vi]=Chương trình đầu cuối - Dành cho người quản lý -GenericName[wa]=Terminå - Môde super uzeu (root) -GenericName[zh_CN]=终端程序 - 超级用户模式 -GenericName[zh_TW]=終端機程式 - 超級使用者模式 + X-TDE-AuthorizeAction=shell_access Categories=Qt;TDE;X-TDE-System-su; diff --git a/konsole/kwrited.desktop b/konsole/kwrited.desktop index cf8761d82..59d503662 100644 --- a/konsole/kwrited.desktop +++ b/konsole/kwrited.desktop @@ -1,142 +1,8 @@ [Desktop Entry] Name=TDE Write Daemon -Name[af]=TDE Skryf Bediener -Name[ar]=مرقب الكتابة لِــ TDE -Name[az]=TDE Write Demonu -Name[be]=Дэман запісу TDE -Name[bn]=কে.ডি.ই. রাইট ডিমন -Name[br]=Diaoul skrivañ TDE -Name[ca]=Dimoni d'escriptura del TDE -Name[cs]=Zapisovací démon TDE -Name[csb]=Demóna zôpisu TDE -Name[cy]=Daemon TDE Write -Name[da]=TDE Skrivedæmon -Name[de]=Write-Dienst -Name[el]=Δαίμονας Write του TDE -Name[eo]=Diskskrib-demono -Name[es]=Demonio de escritura de TDE -Name[et]=TDE Write deemon -Name[eu]=TDEren idazketa deabrua -Name[fa]=شبح نوشتن TDE -Name[fi]=TDE-kirjoituspalvelin -Name[fr]=Démon de commande Write de TDE -Name[fy]=TDE Skriuwdaemon -Name[ga]=Deamhan Scríofa TDE -Name[gl]=Demo de Escritura de TDE -Name[he]=תהליך הרקע Write של TDE -Name[hi]=केडीई राइट डेमन -Name[hr]=TDE demon za pisanje -Name[hu]=TDE adatkiíró szolgáltatás -Name[is]=TDE skriftarpúki -Name[it]=Demone write di TDE -Name[ja]=TDE Write デーモン -Name[ka]=TDE Writed გუშაგი -Name[kk]=TDE Write қызметі -Name[ko]=TDE Write 데몬 -Name[lo]=ເດມອນ Write ຂອງ TDE -Name[lt]=TDE Write tarnyba -Name[lv]=TDE Write Dēmons -Name[mn]=TDE Write-Хэвтүүл -Name[ms]=Daemon Tulis TDE -Name[mt]=Daemon tal-TDE għal Write -Name[nb]=TDEs skrivingsnisse -Name[nds]=TDE Write-Dämoon -Name[ne]=TDE लेख्ने डेइमन -Name[nl]=TDE Schrijfdaemon -Name[nn]=TDE Skrivingsdemon -Name[nso]=Daemon ya Mongwalo ya TDE -Name[pa]=TDE ਲਿਖਣ ਡਾਈਮੋਨ -Name[pl]=Demon zapisu TDE -Name[pt]=Servidor do Write do TDE -Name[pt_BR]=Serviço de escrita do TDE -Name[ro]=Demon "write" TDE -Name[ru]=Чат локальной сети -Name[rw]= TDE Kwandika Dayimoni -Name[se]=TDE čállinbálvá -Name[sk]=TDE Write démon -Name[sl]=Pisalni strežnik za TDE -Name[sr]=TDE Write демон -Name[sr@Latn]=TDE Write demon -Name[sv]=TDE-skrivdemon -Name[te]=కెడిఈ వ్రైట్ డెమన్ -Name[tg]=Барномаи навиштани TDE -Name[th]=เดมอน Write ของ TDE -Name[tr]=TDEWrite Programı -Name[tt]=TDE'nıñ Yazışu Xezmäte -Name[uk]=Демон запису TDE -Name[uz]=TDE write demoni -Name[uz@cyrillic]=TDE write демони -Name[ven]=Daemon yau nwala ya TDE -Name[vi]=Trình nền Write TDE -Name[wa]=Demon scrijheu di TDE -Name[zh_CN]=TDE Write 守护程序 -Name[zh_TW]=TDE Write 伺服程式 -Name[zu]=I-Daemon Yokubhala ye-TDE + Comment=Watch for messages from local users sent with write(1) or wall(1) -Comment[af]=Kyk uit vir boodskappe vanaf plaaslike gebruikers wat met write(1) of wall(1) gestuur is -Comment[ar]=راقب رسائل من المستخدمين المحلّيين المرسلة بواسطة write(1) أو wall(1) -Comment[be]=Назірае за паведамленнямі ад мясцовых карыстальнікаў, дасланымі праз write(1) ці wall(1) -Comment[bg]=Наблюдение за съобщения от локални потребители, изпратени с write(1) или wall(1) -Comment[bs]=Prati poruke od lokalnih korisnika poslane koristeći write(1) ili wall(1) -Comment[ca]=Fes atenció als missatges dels usuaris locals enviats amb write(1) o wall(1) -Comment[cs]=Sledování zpráv od místních uživatelů poslaných pomocí write(1) nebo wall(1) -Comment[csb]=Dozérô wiadłów òd môlowëch brëkòwników wësłónëch przez write(1) abò wall(1) -Comment[cy]=Gwylio am negeseuon oddiwrth defnyddwyr lleol a anfonwyd efo write(1) neu wall(1) -Comment[da]=Kig efter beskeder fra lokale brugere sendt med write(1) eller wall(1) -Comment[de]=Überwacht Meldungen lokaler Benutzer, die mittels write(1) oder wall(1) gesendet wurden -Comment[el]=Έλεγχος μηνυμάτων από τοπικούς χρήστες που στάλθηκαν με write(1) η wall(1) -Comment[eo]=Rigardu pri mesaĝoj de ĉi-lokaj uzantoj, senditaj per write(1) aŭ wall(1) -Comment[es]=Ver los mensajes de usuarios locales enviados con write(1) o wall(1) -Comment[et]=Jälgib kohalike kasutajate write(1) või wall(1) abil saadetud teateid -Comment[eu]=Begiratu write(1) edo wall(1)-ekin bidalitako erabiltzaile lokalen mezuak -Comment[fa]=منتظر پیامهای کاربران محلی ارسالشده توسط write(1) یا wall(1) -Comment[fi]=Seuraa viestejä, joita paikalliset käyttäjät lähettävät write(1) tai wall(1) -komennoilla -Comment[fr]=Afficher les messages écrits par les autres utilisateurs locaux à l'aide de la commande « write(1) » ou « wall(1) » -Comment[fy]=Berjochten fan lokale brûkers ferstjoerd mei write(1) of wall(1) observearje -Comment[gl]=Buscar mensaxes de usuarios locais enviadas con write(1) ou wall(1) -Comment[he]=תפוס הודעות הנשלחות על ידי משתמשים מקומיים, שנשלחו על ידי write(1) או wall(1) -Comment[hi]=स्थानीय उपयोक्ताओं द्वारा राइट(1) या वाल(1) के जरिए भेजे गए संदेशों के लिए देखें -Comment[hr]=Praćenje poruka lokalnih korisnika poslanih putem write(1) ili wall(1) -Comment[hu]=Helyi üzenetek figyelése (a write(1) és wall(1) segítségével) -Comment[is]=Fylgjast með skilaboðum frá notendum sem senda með write(1) eða wall(1) -Comment[it]=Controlla l'arrivo di messaggi da utenti locali inviati con write(1) o wall(1) -Comment[ja]= write(1) か wall(1) でローカルユーザから送信されたメッセージを監視 -Comment[ka]=ბრძანება write(1) ან wall(1)-ით ლოკალური მომხმარებლებისგან გაგზავნილ შეტყობინებებს იღებს -Comment[kk]=Жергілікті пайдаланушылардан write(1) және wall(1) командалармен жіберілген хабарларды қабылдайды -Comment[km]=ឃ្លាំមើលសារពីអ្នកប្រើក្នុងបណ្ដាញ ដែលបានផ្ញើដោយប្រើ write(1) ឬ wall(1) -Comment[ko]=write(1)이나 wall(1)을 통해 사용자가 보낸 메시지 감시하기 -Comment[lt]=Stebėti vietinių naudotojų išsiųstus laiškus su write(1) arba wall(1) -Comment[lv]=Novēro ziņojumus no lokālajiem lietotājiem, kuri sūtīti izmantojot write(1) vai wall(1) -Comment[mk]=Следи за пораки од локалните корисници пратени со write(1) или wall(1) -Comment[ms]=Perhatikan mesej dari pengguna setempat yang dihantar dengan arahan write(1) atau wall(1) -Comment[mt]=Għarrex għal messaġġi minn users lokali mibgħuta b'write jew wall -Comment[nb]=Se etter meldinger fra lokale brukere sendt med write(1) eller wall(1) -Comment[nds]=Kiekt na Narichten vun lokale Brukers, sendt mit write(1) oder wall(1) -Comment[ne]=सन्देशका लागि स्थानीय प्रयोगकर्ताबाट पठाएका लेख(१) वा वाल(१) हेर्नुहोस् -Comment[nl]=Observeer berichten van lokale gebruikers verzonden met write(1) of wall(1) -Comment[nn]=Sjå etter meldingar frå lokale brukarar sende med write(1) eller wall(1) -Comment[pa]=ਸਥਾਨਕ ਉਪਭੋਗੀ ਰਾਹੀਂ write(1) or wall(1) ਨਾਲ ਭੇਜੇ ਸੁਨੇਹੇ ਵੇਖੋ -Comment[pl]=Śledzi wiadomości od użytkowników lokalnych wysyłane za pomocą write(1) lub wall(1) -Comment[pt]=Escutar as mensagens dos utilizadores locais, enviadas com o write(1) ou o wall(1) -Comment[pt_BR]=Observa mensagens de usuários locais, enviadas com o write(1) ou o wall(1) -Comment[ro]=Așteaptă mesaje de la utilizatori, trimise cu write(1) sau wall(1) -Comment[ru]=Приём сообщения пользователей локальной сети, отправленных командами write(1) или wall(1) -Comment[rw]=Kugenzura ubutumwa buva ku bakoresha bahafi bwoherejwe hakoreshejwe kwandika(1) cyangwa urukuta(1) -Comment[se]=Gozit dieđuid mat báikkalaš geavaheaddjit sáddejit «write» dahje «wall» -Comment[sk]=Sledovanie správ od lokálnych používateľov poslaných pomocou príkazu write (1) alebo wall (1) -Comment[sl]=Opazuj sporočila od krajevnih uporabnikov, poslanih z write(1) ali wall(1) -Comment[sr]=Чека поруке од локалних корисника послатих помоћу write(1) или wall(1) -Comment[sr@Latn]=Čeka poruke od lokalnih korisnika poslatih pomoću write(1) ili wall(1) -Comment[sv]=Titta efter meddelanden från lokala användare som skickas med write(1) eller wall(1) -Comment[ta]=உள் பயனர் அணுப்பியதுடன் write(1) or wall(1) அதிலிருந்து பார்க்கவேண்டிய தகவல்கள் -Comment[th]=เฝ้าดูข้อความจากผู้ใช้ท้องถิ่นที่ถูกส่งมาด้วย write(1) หรือ wall(1) -Comment[tr]=Yerel kullanıcılarda write(1) veya wall(1) ile gönderilmiş mesajları izle -Comment[tt]=Cirle qullanuçılar tarafınnan write(1)/wall(1) aşa cibärelgän xäbärlär kötä -Comment[uk]=Спостерігання за повідомленнями від локальних користувачів, відісланих через write(1) або wall(1) -Comment[vi]=Theo dõi các thông báo từ người dùng trên máy được gửi bằng lệnh write(1) hay wall(1) -Comment[wa]=Riwaite après les messaedjes des locås uzeus evoyîs avou write (1) oudonbén wall(1) -Comment[zh_CN]=监视本地用户发出的 write(1) 或 wall(1) -Comment[zh_TW]=監控本地使用者以 write(1) 或 wall(1) 傳送的郵件 + Type=Service X-TDE-ServiceTypes=KDEDModule X-TDE-Library=kwrited diff --git a/konsole/other/CMakeLists.txt b/konsole/other/CMakeLists.txt index 58dcd038b..39992673e 100644 --- a/konsole/other/CMakeLists.txt +++ b/konsole/other/CMakeLists.txt @@ -20,25 +20,37 @@ else() set( KONSOLE_SUPER_USER_COMMAND su CACHE INTERNAL "" FORCE ) endif() -configure_file( su.desktop.cmake su.desktop @ONLY ) -configure_file( sumc.desktop.cmake sumc.desktop @ONLY ) - -install( FILES +install( + FILES BlackOnLightColor.schema BlackOnLightYellow.schema BlackOnWhite.schema Example.Schema GreenOnBlack.schema WhiteOnBlack.schema README.default.Schema syscolor.schema Linux.schema XTerm.schema vim.schema DarkPicture.schema LightPicture.schema Transparent.schema GreenTint.schema Transparent_MC.schema GreenTint_MC.schema Transparent_lightbg.schema - Transparent_darkbg.schema LightPaper.schema linux.desktop - mc.desktop shell.desktop - ${CMAKE_CURRENT_BINARY_DIR}/su.desktop - ${CMAKE_CURRENT_BINARY_DIR}/sumc.desktop + Transparent_darkbg.schema LightPaper.schema Solarized.schema + SolarizedLight.schema linux.keytab vt100.keytab vt420pc.keytab x11r5.keytab solaris.keytab README.Schema README.KeyTab README.default.Keytab + DESTINATION ${DATA_INSTALL_DIR}/konsole +) + +tde_create_translated_desktop( + SOURCE + linux.desktop + mc.desktop + shell.desktop screen.desktop - DESTINATION ${DATA_INSTALL_DIR}/konsole ) + su.desktop.cmake + sumc.desktop.cmake + DESTINATION ${DATA_INSTALL_DIR}/konsole + PO_DIR konsole-desktops +) -install( FILES +tde_create_translated_desktop( + SOURCE 2shells 3shells 4shells 5shells - DESTINATION ${DATA_INSTALL_DIR}/konsole/profiles ) + DESTINATION ${DATA_INSTALL_DIR}/konsole/profiles + KEYWORDS Title0 Title1 Title2 Title3 Title4 Title5 + PO_DIR konsole-desktops +) diff --git a/konsole/other/LICENSE.Solarized-themes b/konsole/other/LICENSE.Solarized-themes new file mode 100644 index 000000000..ee08d7e44 --- /dev/null +++ b/konsole/other/LICENSE.Solarized-themes @@ -0,0 +1,20 @@ +Copyright (c) 2011 Ethan Schoonover + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + diff --git a/konsole/other/README.KeyTab b/konsole/other/README.KeyTab index 75d6cfd79..4e23851bb 100644 --- a/konsole/other/README.KeyTab +++ b/konsole/other/README.KeyTab @@ -14,7 +14,7 @@ The syntax is that each entry has the form : "key" Keyname { ("+"|"-") Modename } ":" (String|Operation) Keynames are those defined in <qnamespace.h> with the -"Qt::Key_" prefix removed. +"TQt::Key_" prefix removed. Mode names are: diff --git a/konsole/other/Solarized.schema b/konsole/other/Solarized.schema new file mode 100644 index 000000000..ab98e4f06 --- /dev/null +++ b/konsole/other/Solarized.schema @@ -0,0 +1,40 @@ +# Solarized color scheme by Ethan Schoonover +# +# https://ethanschoonover.com/solarized/ + +title Solarized + +# foreground colors + +# note that the default background color is flagged +# to become transparent when an image is present. + +# slot transparent bold +# | | | +# V V--color--V V V + +color 0 131 148 150 0 0 # regular foreground color +color 1 0 43 54 1 0 # regular background color + +color 2 7 54 66 0 0 # regular color 0 Black +color 3 220 50 47 0 0 # regular color 1 Red +color 4 133 153 0 0 0 # regular color 2 Green +color 5 181 137 0 0 0 # regular color 3 Yellow +color 6 38 139 210 0 0 # regular color 4 Blue +color 7 211 54 130 0 0 # regular color 5 Magenta +color 8 42 161 152 0 0 # regular color 6 Cyan +color 9 238 232 213 0 0 # regular color 7 White + +# intensive colors + +color 10 147 161 161 0 0 # intensive foreground color +color 11 7 54 66 1 0 # intensive background color + +color 12 0 43 54 0 0 # intensive color 0 +color 13 203 75 22 0 0 # intensive color 1 +color 14 88 110 117 0 0 # intensive color 2 +color 15 101 123 131 0 0 # intensive color 3 +color 16 131 148 150 0 0 # intensive color 4 +color 17 108 113 196 0 0 # intensive color 5 +color 18 147 161 161 0 0 # intensive color 6 +color 19 253 246 227 0 0 # intensive color 7 diff --git a/konsole/other/SolarizedLight.schema b/konsole/other/SolarizedLight.schema new file mode 100644 index 000000000..61905f535 --- /dev/null +++ b/konsole/other/SolarizedLight.schema @@ -0,0 +1,40 @@ +# Solarized Light color scheme by Ethan Schoonover +# +# https://ethanschoonover.com/solarized/ + +title Solarized Light + +# foreground colors + +# note that the default background color is flagged +# to become transparent when an image is present. + +# slot transparent bold +# | | | +# V V--color--V V V + +color 0 101 123 131 0 0 # regular foreground color +color 1 253 246 227 1 0 # regular background color + +color 2 7 54 66 0 0 # regular color 0 Black +color 3 220 50 47 0 0 # regular color 1 Red +color 4 133 153 0 0 0 # regular color 2 Green +color 5 181 137 0 0 0 # regular color 3 Yellow +color 6 38 139 210 0 0 # regular color 4 Blue +color 7 211 54 130 0 0 # regular color 5 Magenta +color 8 42 161 152 0 0 # regular color 6 Cyan +color 9 238 232 213 0 0 # regular color 7 White + +# intensive colors + +color 10 88 110 117 0 0 # intensive foreground color +color 11 238 232 213 1 0 # intensive background color + +color 12 0 43 54 0 0 # intensive color 0 +color 13 203 75 22 0 0 # intensive color 1 +color 14 88 110 117 0 0 # intensive color 2 +color 15 101 123 131 0 0 # intensive color 3 +color 16 131 148 150 0 0 # intensive color 4 +color 17 108 113 196 0 0 # intensive color 5 +color 18 147 161 161 0 0 # intensive color 6 +color 19 253 246 227 0 0 # intensive color 7 diff --git a/konsole/other/linux.desktop b/konsole/other/linux.desktop index c8e7c5d6e..dc0a3b4a7 100644 --- a/konsole/other/linux.desktop +++ b/konsole/other/linux.desktop @@ -1,157 +1,7 @@ [Desktop Entry] Type=KonsoleApplication Name=Linux Console -Name[af]=Linux Konsole -Name[ar]=لوحة أوامر لينكس -Name[az]=Linuks Konsolu -Name[be]=Кансоль Linux -Name[bn]=লিনাক্স কনসোল -Name[br]=Letrin Linux -Name[bs]=Linux konzola -Name[ca]=Consola Linux -Name[cs]=Linuxová konzole -Name[csb]=Linuksowô kònsola -Name[cy]=Terfynell Linux -Name[da]=Linux-konsol -Name[de]=Linux-Konsole -Name[el]=Κονσόλα Linux -Name[eo]=Linuks-konzolo -Name[es]=Consola de Linux -Name[et]=Linuxi konsool -Name[eu]=Linux kontsola -Name[fa]=پیشانۀ لینوکس -Name[fi]=Linux-istunto -Name[fr]=Console Linux -Name[fy]=Linux Konsole -Name[ga]=Consól Linux -Name[gl]=Consola de Linux -Name[he]=מסוף לינוקס -Name[hi]=लिनक्स कंसोल -Name[hr]=Linux konzola -Name[hu]=Parancsértelmező (Linux-emuláció) -Name[is]=Aðalskjár Linux -Name[it]=Console Linux -Name[ja]=Linux コンソール -Name[ka]=Linux-ის კონსოლი -Name[kk]=Linux консоль -Name[km]=កុងសូល Linux -Name[lo]=ຄອນໂໍຊລລີນຸກ -Name[lt]=Linux konsolė -Name[lv]=Linux Konsole -Name[mk]=Линукс-конзола -Name[mn]=Линукс-Консол -Name[mt]=Konsol tal-Linux -Name[nb]=Linux-konsoll -Name[nds]=Linux-Konsool -Name[ne]=लिनक्स कन्सोल -Name[nn]=Linux-konsoll -Name[pa]=ਲੀਨਕਸ ਕੰਨਸੋਲ -Name[pl]=Konsola linuksowa -Name[pt]=Consola do Linux -Name[pt_BR]=Console do Linux -Name[ro]=Consolă Linux -Name[ru]=Консоль Linux -Name[rw]=Konsole Linux -Name[se]=Linux-konsolla -Name[sk]=Linuxová konzola -Name[sl]=Konzola za Linux -Name[sr]=Linux конзола -Name[sr@Latn]=Linux konzola -Name[ss]=i-console ku Linux -Name[sv]=Linux-konsoll -Name[ta]=லினக்சு கான்சோல் -Name[te]=లినక్స్ కంసోల్ -Name[tg]=Линукс console -Name[th]=คอนโซลลีนุกซ์ -Name[tr]=Linux Konsolu -Name[tt]=Linux Konsole -Name[uk]=Консоль Linux -Name[uz]=Linuks terminali -Name[uz@cyrillic]=Линукс терминали -Name[vi]=Thiết bị cuối Linux -Name[wa]=Conzôle Linux -Name[zh_CN]=Linux 控制台 -Name[zh_TW]=Linux 主控台 -Name[zu]=Ikhonsoli we-Linux Comment=New Linux Console -Comment[af]=Nuwe Linux Konsole -Comment[ar]=مطراف تحكم Linux جديد -Comment[az]=Yeni Linuks Konsolu -Comment[be]=Новая кансоль Linux -Comment[bg]=Нова Линукс конзола -Comment[bn]=নতুন লিনাক্স কনসোল -Comment[br]=Letrin Linux nevez -Comment[bs]=Nova Linux konzola -Comment[ca]=Nova consola Linux -Comment[cs]=Nová Linuxová konzole -Comment[csb]=Nowô linuksowô kònsola -Comment[cy]=Terfynell Linux Newydd -Comment[da]=Ny Linux-konsol -Comment[de]=Neue Linux-Konsole -Comment[el]=Νέα κονσόλα Linux -Comment[eo]=Nova Linuks-konzolo -Comment[es]=Nueva consola de Linux -Comment[et]=Uus Linuxi konsool -Comment[eu]=Linux kontsola berria -Comment[fa]=پیشانۀ جدید لینوکس -Comment[fi]=Uusi Linux-istunto -Comment[fr]=Nouvelle console Linux -Comment[fy]=Nije linuxkonsole -Comment[ga]=Consól Linux Nua -Comment[gl]=Nova Consola de Linux -Comment[he]=מסוף לינוקס חדש -Comment[hi]=नया लिनक्स कंसोल -Comment[hr]=Nova Linux konzola -Comment[hu]=Új parancsértelmező (Linux-emuláció) -Comment[is]=Aðalskjár Linux -Comment[it]=Nuova console Linux -Comment[ja]=新規 Linux コンソール -Comment[ka]=ახალი კონსოლი -Comment[kk]=Жаңа Linux консолін ашу -Comment[km]=កុងសូល Linux ថ្មី -Comment[lo]=ເປີດຄອນໂໍຊລລີນຸກໃຫມ່ -Comment[lt]=Nauja Linux konsolė -Comment[lv]=Jauna Linux Konsole -Comment[mk]=Нова Линукс-конзола -Comment[mn]=Шинэ Линукс-Консол -Comment[ms]= Linux Console Baru -Comment[mt]=Konsol ġdid tal-Linux -Comment[nb]=Nytt Linux-konsoll -Comment[nds]=Niege Linux-Konsool -Comment[ne]=नयाँ लिनक्स कन्सोल -Comment[nl]=Nieuwe linuxconsole -Comment[nn]=Ny Linux-konsoll -Comment[nso]=Console ye Ntshwa ya Linux -Comment[pa]=ਨਵੀਂ ਲੀਨਕਸ ਕੋਂਨਸੋਲ -Comment[pl]=Konsola linuksowa (nowa) -Comment[pt]=Nova Consola de Linux -Comment[pt_BR]=Novo Console do Linux -Comment[ro]=Consolă Linux nouă -Comment[ru]=Новая консоль Linux -Comment[rw]=Konsole Linux Nshya -Comment[se]=Ođđa Linux-konsolla -Comment[sk]=Nová linuxová konzola -Comment[sl]=Nova konzola za Linux -Comment[sr]=Нова Linux конзола -Comment[sr@Latn]=Nova Linux konzola -Comment[ss]=I-console lensha ku Linux -Comment[sv]=Ny Linux-konsoll -Comment[ta]=புதிய லினக்ஸ் கான்சோல் -Comment[te]=కొత్త లినక్స్ కంసోల్ -Comment[tg]=Нави Линукс Console -Comment[th]=เปิดคอนโซลลีนุกซ์ใหม่ -Comment[tr]=Yeni Linux Konsolu -Comment[tt]=Yaña Linux-Konsol -Comment[uk]=Нова консоль Linux -Comment[uz]=Yangi Linuks terminali -Comment[uz@cyrillic]=Янги Линукс терминали -Comment[ven]=Linux Console ntswa -Comment[vi]=Mở một Thiết bị cuối Linux mới -Comment[wa]=Novele conzôle linux -Comment[xh]=Konsole Entsha ye Linux -Comment[zh_CN]=新建 Linux 控制台 -Comment[zh_TW]=新增 Linux 主控台 -Comment[zu]=Ikhonsoli Entsha ye-Linux Exec=bash Schema=Linux.schema #VGA diff --git a/konsole/other/linux.keytab b/konsole/other/linux.keytab index d5149c3c8..aafbdd97f 100644 --- a/konsole/other/linux.keytab +++ b/konsole/other/linux.keytab @@ -15,7 +15,7 @@ keyboard "linux console" # "key" Keyname { ("+"|"-") Modename } ":" (String|Operation) # # Keynames are those defined in <qnamespace.h> with the -# "Qt::Key_" removed. (We'd better insert the list here) +# "TQt::Key_" removed. (We'd better insert the list here) # # Mode names are : # diff --git a/konsole/other/mc.desktop b/konsole/other/mc.desktop index 4d998dd01..6182dc485 100644 --- a/konsole/other/mc.desktop +++ b/konsole/other/mc.desktop @@ -1,103 +1,8 @@ [Desktop Entry] Type=KonsoleApplication Name=Midnight Commander -Name[bn]=মিডনাইট কমান্ডার -Name[eo]=Meznokta komandanto -Name[fa]=فرماندۀ نیمهشب -Name[hi]=मिडनाइट कमांडर -Name[km]=ពាក្យបញ្ជា Midnight -Name[ko]=미드나잇 커맨더 -Name[lo]=ມິດໄນຄອມມານເດີ -Name[lv]=Pusnakts Komandieris -Name[ms]=Pemberi Arahan Tengah Malam -Name[ne]=मिडनाइट आदेश -Name[nso]=Molaedi wa Bosegogare -Name[pa]=ਮਿਡਨਾਇਟ ਕਮਾਂਡਰ -Name[rw]=Mutangabwiriza Hagati-Ijoro -Name[ta]=நடு இரவு கட்டளை -Name[tg]=Фармондиҳандаи нимаи шаб -Name[th]=มิดไนท์คอมมานเดอร์ -Name[ven]=Muhulwane wa vhukati ha vhusiku -Name[xh]=Umyaleli Waphakathi kobusuku -Name[zu]=Umyaleli waphakathi nobusuku -Icon=konsoleblue Comment=New Midnight Commander -Comment[af]=Nuwe Midnight Commander -Comment[ar]=Midnight Commander جديد -Comment[az]=Yeni Midnight Commander -Comment[be]=Новы Midnight Commander -Comment[bg]=Нов Midnight Commander -Comment[bn]=নতুন মিডনাইট কমান্ডার -Comment[br]=Midnight Commander Nevez -Comment[bs]=Novi Midnight Commander -Comment[ca]=Nou Midnight Commander -Comment[cs]=Nový Midnight Commander -Comment[csb]=Nowi Midnight Commander -Comment[cy]=Midnight Commander Newydd -Comment[da]=Ny Midnight Commander -Comment[de]=Neuer Midnight Commander -Comment[el]=Νέος Midnight Commander -Comment[eo]=Dosieradministrilo "Meznokta komandanto" -Comment[es]=Nuevo Midnight Commander -Comment[et]=Uus Midnight Commander -Comment[eu]=Midnight Commander berria -Comment[fa]=فرماندۀ نیمه شب جدید -Comment[fi]=Uusi Midnight Commander -istunto -Comment[fr]=Nouveau Midnight Commander -Comment[fy]=nije Midnight Kommander -Comment[ga]=Midnight Commander Nua -Comment[gl]=Novo Midnight Commander -Comment[he]=משימת Midnight Commander חדשה -Comment[hi]=नया मिडनाइट कमांडर -Comment[hr]=Novi Midnight Commander -Comment[hu]=Új Midnight Commander -Comment[is]=Midnight Commander -Comment[it]=Nuovo Midnight Commander -Comment[ja]=新規 Midnight Commander -Comment[ka]=Midnight Commander-ის ახალი ფანჯარა -Comment[kk]=Жаңа Midnight Commander терезесін ашу -Comment[km]=ពាក្យបញ្ជា Midnight ថ្មី -Comment[ko]=미드나잇 커맨더 -Comment[lo]=ມິດໄນທຄອນມານເດີ ແບບສິດຜູ້ດູແລລະບົບ -Comment[lt]=Naujas Midnight Commander -Comment[lv]=Jauns Pusnakts Komandieris -Comment[mk]=Нов Midnight Commander -Comment[mn]=Шинэ Midnight Commander -Comment[ms]=Pemberi Arahan Tengah Malam Baru -Comment[mt]=Midnight Commander ġdid -Comment[nb]=Ny «Midnight Commander» -Comment[nds]=Niegen Midnight Commander -Comment[ne]=नयाँ मिडनाइट आदेशकर्ता -Comment[nl]=nieuwe Midnight Commander -Comment[nn]=Ny Midnight Commander -Comment[nso]=Moladi yo Moswa wa Bosegogare -Comment[pa]=ਨਵਾਂ ਮਿਡਨਾਈਟ ਕਮਾਂਡਰ -Comment[pl]=Midnight Commander -Comment[pt]=Novo Midnight Commander -Comment[pt_BR]=Novo Midnight Commander -Comment[ro]=Midnight Commander nou -Comment[ru]=Новое окно Midnight Commander -Comment[rw]=Mutangabwiriza IjoroHagati Mushya -Comment[se]=Ođđa Midnight Commander -Comment[sk]=Nový Midnight Commander -Comment[sl]=Novi Midnight Commander -Comment[sr]=Нови Midnight Commander -Comment[sr@Latn]=Novi Midnight Commander -Comment[sv]=Ny Midnight Commander -Comment[ta]=புதிய நடுஇரவு கட்டளை -Comment[tg]=Фармондиҳандаи намашаб -Comment[th]=เปิดมิดไนท์คอมมานเดอร์ใหม่ -Comment[tr]=Yeni Midnight Commander -Comment[tt]=Yaña Midnight Commander -Comment[uk]=Новий Midnight Commander -Comment[uz]=Yangi Midnight Commander -Comment[uz@cyrillic]=Янги Midnight Commander -Comment[ven]=Muhulwane wa vhukati ha vhusiku -Comment[vi]=Mở một Midnight Commander mới -Comment[wa]=Novea Midnight Commander -Comment[zh_CN]=新建 Midnight Commander -Comment[zh_TW]=新增 Midnight Commander -Comment[zu]=Umyaleli Waphakathi nobusuku Omusha +Icon=konsoleblue Exec=mc -c Cwd= Tips=false diff --git a/konsole/other/screen.desktop b/konsole/other/screen.desktop index 422f1f5d2..b48bdecfb 100644 --- a/konsole/other/screen.desktop +++ b/konsole/other/screen.desktop @@ -1,155 +1,6 @@ [Desktop Entry] Type=KonsoleApplication Name=Screen Session -Name[af]=Screen Sessie -Name[ar]=جلسة الشاشة -Name[az]=Screen İclası -Name[be]=Сесія Screen -Name[bn]=স্ক্রীন সেশন -Name[br]=Dalc'h Screen -Name[bs]=Sesija ekrana -Name[ca]=Sessió de la pantalla -Name[cs]=Screen relace -Name[csb]=Sesëjô screena -Name[cy]=Sesiwn Sgrîn -Name[da]=Skærmsession -Name[de]=Screen-Sitzung -Name[el]=Συνεδρία screen -Name[eo]=Seanco de komandinterpretilo "Screen" -Name[es]=Sesión de Screen -Name[et]=Screen'i seanss -Name[eu]=Pantailako saioa -Name[fa]=نشست پرده -Name[fi]=Screen-istunto -Name[fr]=Session Screen -Name[fy]=Skerm-sesje -Name[ga]=Seisiún Scáileáin -Name[gl]=Sesión de Pantalla -Name[he]=מנהל מסכים -Name[hi]=स्क्रीन सत्र -Name[hr]=Zaslonska sesija -Name[hu]='Screen'-munkafolyamat -Name[is]=Skjáseta -Name[it]=Sessione di Screen -Name[ja]=スクリーンセッション -Name[ka]=ეკრანის სეანსი -Name[kk]=Screen сеансы -Name[km]=សម័យអេក្រង់ -Name[lt]=Screen sesija -Name[lv]=Screen Sesija -Name[mk]=Екранска сесија -Name[mn]=Screen-Суулт -Name[ms]=Sesi Skrin -Name[mt]=Sessjoni ta' skrin -Name[nb]=Skjermøkt -Name[nds]=Screen-Törn -Name[ne]=पर्दा सत्र -Name[nl]=Screen-sessie -Name[nn]=Skjermøkt -Name[nso]=Tiragalo ya Pontsho -Name[pa]=ਸਕਰੀਨ ਸ਼ੈਸ਼ਨ -Name[pl]=Sesja screena -Name[pt]=Sessão do Screen -Name[pt_BR]=Sessão do Screen -Name[ro]=Sesiune "screen" -Name[ru]=Сеанс Screen -Name[rw]=Umukoro wa Mugaragaza -Name[se]=Šearbmabargovuorru -Name[sk]=Relácia screen -Name[sl]=Zaslonska seja -Name[sr]=Екранска сесија -Name[sr@Latn]=Ekranska sesija -Name[sv]=Session med screen -Name[ta]=திரை கால அளவு -Name[te]=తెర సెషన్ -Name[tg]=Нишасти сафҳа -Name[th]=เซสชันหน้าจอ -Name[tr]=Ekran Oturumu -Name[tt]=Screen Sessise -Name[uk]=Сеанс екрана -Name[uz]=Screen seansi -Name[uz@cyrillic]=Screen сеанси -Name[ven]=Tshipida tsha tshikirini -Name[vi]=Phiên chạy Màn hình -Name[wa]=Session «screen» -Name[xh]=Isiqendu Sekhusi -Name[zh_CN]=屏幕会话 -Name[zh_TW]=螢幕工作階段 -Name[zu]=Isiqendu seskrini Comment=New Screen Session -Comment[af]=Nuwe Screen Sessie -Comment[ar]=جلسة شاشة جديدة -Comment[az]=Yeni Screen İclası -Comment[be]=Новая сесія Screen -Comment[bg]=Нова сесия -Comment[bn]=নতুন স্ক্রীন সেশন -Comment[br]=Dalc'h Screen nevez -Comment[bs]=Nova sesija ekrana -Comment[ca]=Nova pantalla de la sessió -Comment[cs]=Nová 'screen' relace -Comment[csb]=Nowô sesëjô programë "screen" -Comment[cy]=Sesiwn Sgrîn Newydd -Comment[da]=Ny skærmsession -Comment[de]=Neue Sitzung des Terminalprogramms Screen -Comment[el]=Νέα συνεδρία screen -Comment[eo]=Nova seanco de programo "Screen" -Comment[es]=Nueva sesión de Screen -Comment[et]=Uus screen'i seanss -Comment[eu]=Pantailako saio berria -Comment[fa]=نشست پردۀ جدید -Comment[fi]=Uusi Screen-istunto -Comment[fr]=Nouvelle session Screen -Comment[fy]=Nije Skerm-sesje -Comment[ga]=Seisiún Nua Scáileáin -Comment[gl]=Nova Sesión de Pantalla -Comment[he]=מנהל מסכים חדש -Comment[hr]=Nova zaslonska sesija -Comment[hu]=Új 'Screen' -Comment[is]=Ný skjáseta -Comment[it]=Nuova sessione di Screen -Comment[ja]=新規スクリーンセッション -Comment[kk]=Жаңа Screen сеансты ашу -Comment[km]=សម័យអេក្រង់ថ្មី -Comment[lt]=Nauja Screen sesija -Comment[lv]=Jauna Screen Sesija -Comment[mk]=Нова екранска сесија -Comment[mn]=Терминал-програмын шинэ Screen суулт -Comment[ms]=Sesi Skrin Baru -Comment[mt]=Sessjoni ġdida ta' skrin -Comment[nb]=Ny skjermøkt -Comment[nds]=Niegen Screen-Törn -Comment[ne]=नयाँ पर्दा सत्र -Comment[nl]=nieuwe Screen-sessie -Comment[nn]=Ny skjermøkt -Comment[nso]=Tiragalo ye Ntshwa ya Pontsho -Comment[pa]=ਨਵਾਂ ਸਕਰੀਨ ਸ਼ੈਸ਼ਨ -Comment[pl]=Nowa sesja programu "screen" -Comment[pt]=Nova Sessão do Screen -Comment[pt_BR]=Nova Sessão do Screen -Comment[ro]=Sesiune "screen" nouă -Comment[ru]=Новое окно Screen -Comment[rw]=Umukoro wa Mugaragaza Mushya -Comment[se]=Ođđa šearbmabargovuorru -Comment[sk]=Nová relácia screen -Comment[sl]=Nova zaslonska seja -Comment[sr]=Нова екранска сесија -Comment[sr@Latn]=Nova ekranska sesija -Comment[ss]=Sigceme seskrini lesisha -Comment[sv]=Ny session med screen -Comment[ta]=புதிய திரை கால அளவு -Comment[te]=కొత్త తెర సెషన్ -Comment[tg]=Нави нишасти сафҳа -Comment[th]=เปิดเซสชันหน้าจอใหม่ -Comment[tr]=Yeni Ekran Oturumu -Comment[tt]=Yaña Screen-Sessi -Comment[uk]=Новий сеанс екрана -Comment[uz]=Yangi screen seansi -Comment[uz@cyrillic]=Янги screen сеанси -Comment[ven]=Tshipida tsha tshikirini tshiswa -Comment[vi]=Mở một Phiên chạy Màn hình mới -Comment[wa]=Novele session «screen» -Comment[zh_CN]=新建屏幕会话 -Comment[zh_TW]=新增螢幕工作階段 -Comment[zu]=Isiqendu Seskrini Esisha Exec=screen Cwd= diff --git a/konsole/other/shell.desktop b/konsole/other/shell.desktop index 36143bd34..04bc8ead9 100644 --- a/konsole/other/shell.desktop +++ b/konsole/other/shell.desktop @@ -1,145 +1,6 @@ [Desktop Entry] Type=KonsoleApplication Name=Shell -Name[af]=Tolk -Name[ar]=المحارة -Name[az]=Qabıq -Name[be]=Абалонка -Name[bn]=শেল -Name[ca]=Intèrpret de comandaments -Name[csb]=Pòwłoka -Name[cy]=Plisgyn -Name[da]=Skal -Name[de]=Befehlsfenster -Name[el]=Κέλυφος -Name[eo]=Ŝelo -Name[es]=Terminal -Name[eu]=Shella -Name[fa]=پوسته -Name[fi]=Komentotulkki -Name[fr]=Terminal -Name[fy]=Flues -Name[ga]=Blaosc -Name[he]=מעטפת -Name[hi]=शैल -Name[hr]=Ljuska -Name[hu]=Parancsértelmező -Name[is]=Skel -Name[ja]=シェル -Name[kk]=Қоршау-орта -Name[km]=សែល -Name[ko]=셸 -Name[lo]=ເຊລ -Name[lt]=Apvalkalas -Name[lv]=Čaula -Name[mk]=Школка -Name[mn]=Бүрхүүл -Name[nb]=Skall -Name[nds]=Befehlsfinster -Name[ne]=शेल -Name[nn]=Skal -Name[nso]=Legapi -Name[pa]=ਸੈੱਲ -Name[pl]=Powłoka -Name[pt]=Linha de Comandos -Name[ro]=Interpretor -Name[ru]=Консоль -Name[rw]=Sheli -Name[se]=Skálžu -Name[sl]=Ukazna lupina -Name[sr]=Шкољка -Name[sr@Latn]=Školjka -Name[sv]=Skal -Name[ta]=ஓடு -Name[te]=షెల్ -Name[tg]=Пӯста -Name[th]=เชลล์ -Name[tr]=Kabuk -Name[tt]=Qabıq -Name[uk]=Командний рядок -Name[uz]=Terminal -Name[uz@cyrillic]=Терминал -Name[vi]=Trình giao diện -Name[xh]=Iqokobhe -Name[zu]=Igobolodo Comment=New Shell -Comment[af]=Nuwe Tolk -Comment[ar]=محارة جديد -Comment[az]=Yeni Qabıq -Comment[be]=Новая абалонка -Comment[bg]=Нов Shell -Comment[bn]=নতুন শেল -Comment[br]=Shell Nevez -Comment[bs]=Novi shell -Comment[ca]=Nou intèrpret de comandaments -Comment[cs]=Nový shell -Comment[csb]=Nowô pòwłoka -Comment[cy]=Plisgyn Newydd -Comment[da]=Ny skal -Comment[de]=Neues Befehlsfenster -Comment[el]=Νέο κέλυφος -Comment[eo]=Nova komandinterpretilo -Comment[es]=Nuevo intérprete -Comment[et]=Uus shell -Comment[eu]=Shell berria -Comment[fa]=پوستۀ جدید -Comment[fi]=Uusi komentotulkki -Comment[fr]=Nouveau shell -Comment[fy]=Nije Flues -Comment[ga]=Blaosc Nua -Comment[gl]=Nova Shell -Comment[he]=מעטפת חדשה -Comment[hi]=नया शैल -Comment[hr]=Nova ljuska -Comment[hu]=Új parancsértelmező -Comment[is]=Ný skel -Comment[it]=Nuova shell -Comment[ja]=新規シェル -Comment[ka]=Shell - ახალი ფანჯარა -Comment[kk]=Жаңа көршауды ашу -Comment[km]=សែលថ្មី -Comment[lo]=ເຊລໃຫມ່ -Comment[lt]=Naujas apvalkalas -Comment[lv]=Jauna Čaula -Comment[mk]=Нова школка -Comment[mn]=Шинэ бүрхүүл -Comment[ms]=Shell Baru -Comment[mt]=Shell ġdid -Comment[nb]=Nytt skall -Comment[nds]=Nieg Befehlsfinster -Comment[ne]=नयाँ शेल -Comment[nl]=Nieuwe shell -Comment[nn]=Nytt skal -Comment[nso]=Legapi le Leswa -Comment[pa]=ਨਵੀਂ ਸੈੱਲ -Comment[pl]=Powłoka -Comment[pt]=Nova Linha de Comandos -Comment[pt_BR]=Novo Shell -Comment[ro]=Interpretor nou -Comment[ru]=Новая консоль -Comment[rw]=Sheli Nshya -Comment[se]=Ođđa skálžu -Comment[sk]=Nový shell -Comment[sl]=Nova ukazna lupina -Comment[sr]=Нова шкољка -Comment[sr@Latn]=Nova školjka -Comment[ss]=I-Shell lensha -Comment[sv]=Nytt skal -Comment[ta]=புதிய ஓடு -Comment[te]=కొత్త షెల్ -Comment[tg]=Нави пӯста -Comment[th]=เชลล์ใหม่ -Comment[tr]=Yeni Kabuk -Comment[tt]=Yaña Qabıq -Comment[uk]=Новий командний рядок -Comment[uz]=Yangi terminal -Comment[uz@cyrillic]=Янги терминал -Comment[ven]=Shell ntswa -Comment[vi]=Mở một Trình giao diện mới -Comment[wa]=Novea shell -Comment[xh]=Iqokobhe Elitsha -Comment[zh_CN]=新建 Shell -Comment[zh_TW]=新增 Shell -Comment[zu]=Igobolodo Elisha Exec= Cwd= diff --git a/konsole/other/solaris.keytab b/konsole/other/solaris.keytab index cb0626be9..e671cb13b 100644 --- a/konsole/other/solaris.keytab +++ b/konsole/other/solaris.keytab @@ -13,7 +13,7 @@ keyboard "Solaris" # "key" Keyname { ("+"|"-") Modename } ":" (String|Operation) # # Keynames are those defined in <qnamespace.h> with the -# "Qt::Key_" removed. (We'd better insert the list here) +# "TQt::Key_" removed. (We'd better insert the list here) # # Mode names are : # diff --git a/konsole/other/su.desktop.cmake b/konsole/other/su.desktop.cmake index da55a8c0b..27abb7e9a 100644 --- a/konsole/other/su.desktop.cmake +++ b/konsole/other/su.desktop.cmake @@ -1,128 +1,8 @@ [Desktop Entry] Type=KonsoleApplication Name=Root Shell -Name[af]=Root tolk -Name[ar]=محارة الجذر -Name[be]=Абалонка адміністратара -Name[bn]=রুট শেল -Name[br]=Shell gwrizienn -Name[ca]=Intèrpret de comandaments root -Name[cs]=Root shell -Name[csb]=Pòwłoka sprôwnika (root) -Name[da]=Root-skal -Name[de]=Befehlsfenster (Systemverwaltungsmodus) -Name[el]=Κέλυφος υπερχρήστη -Name[eo]=Radika Ŝelo -Name[es]=Intérprete de órdenes de root -Name[et]=Administraatori shell -Name[eu]=Root shella -Name[fa]=پوستۀ کاربر ارشد -Name[fi]=Pääkäyttäjän komentotulkki -Name[fr]=Shell superutilisateur -Name[ga]=Blaosc Fhorúsáideora -Name[gl]=Shell de Root -Name[he]=מעטפת root -Name[hr]=Korijenska ljuska -Name[hu]=Parancsértelmező (rendszergazdaként) -Name[is]=Skel -Name[it]=Shell di root -Name[ja]=シェル (root) -Name[kk]=Root қоршау-ортасы -Name[km]=សែល Root -Name[lt]=Root apvalkalas -Name[mk]=Школка за root -Name[ms]=Shell Root -Name[nb]=Rotskall -Name[nds]=Plegerkonsool -Name[ne]=रुट शेल -Name[nl]=Root-shell -Name[nn]=Rotskal -Name[pa]=root ਸੈੱਲ -Name[pl]=Powłoka administratora -Name[pt]=Linha de Comandos Root -Name[pt_BR]=Shell do Root -Name[ro]=Interpretor "root" -Name[ru]=Консоль с правами root -Name[rw]=Sheli Umuzi -Name[se]=Ruohtasskálžu -Name[sl]=Korenska lupina -Name[sr]=Корена шкољка -Name[sr@Latn]=Korena školjka -Name[sv]=Skal för root -Name[ta]=ஓடு ஷெல் -Name[te]=రూట్ షెల్ -Name[th]=เชลล์ของผู้ดูแลระบบ -Name[tr]=Root Kabuk -Name[tt]=Root Qabığı -Name[uk]=Командна оболонка з правами root -Name[vi]=Trình giao diện Gốc -Name[wa]=Shell root -Icon=konsolered Comment=New Root Shell -Comment[af]=Nuwe Root Tolk -Comment[ar]=محارة جذر جديدة -Comment[be]=Новая абалонка адміністратара -Comment[bg]=Нов Root Shell -Comment[bn]=নতুন রুট শেল -Comment[br]=Shell gwrizienn nevez -Comment[bs]=Novi root shell -Comment[ca]=Nou intèrpret de comandaments root -Comment[cs]=Nový root shell -Comment[csb]=Nowô pòwłoka sprôwnika -Comment[da]=Ny root-skal -Comment[de]=Neues Befehlsfenster (Systemverwaltungsmodus) -Comment[el]=Νέο κέλυφος υπερχρήστη -Comment[eo]=Nova radika ŝelo -Comment[es]=Nuevo intérprete de root -Comment[et]=Uus administraatori shell -Comment[eu]=Root shell berria -Comment[fa]=پوستۀ کاربر ارشد جدید -Comment[fi]=Uusi pääkäyttäjän komentotulkki -Comment[fr]=Nouveau shell superutilisateur -Comment[fy]=Nije Root Shell -Comment[ga]=Blaosc Nua an Fhorúsáideora -Comment[gl]=Nova Shell de Root -Comment[he]=מעטפת root חדשה -Comment[hr]=Nova korijenska ljuska -Comment[hu]=Új parancsértelmező (rendszergazdaként) -Comment[is]=Ný skel -Comment[it]=Nuova shell di root -Comment[ja]=新規シェル (root) -Comment[ka]=ახალი გარსი ზემომხმარებლის პრივილეგიებით -Comment[kk]=Жаңа Root қоршау-ортаны ашу -Comment[km]=សែល Root ថ្មី -Comment[lt]=Naujas Root apvalkalas -Comment[mk]=Нова школка за root -Comment[ms]=Shell Root Baru -Comment[nb]=Nytt rotskall -Comment[nds]=Niege Plegerkonsool -Comment[ne]=नयाँ रुट शेल -Comment[nl]=Nieuwe root-shell -Comment[nn]=Nytt rotskal -Comment[pa]=ਨਵੀਂ root ਸੈੱਲ -Comment[pl]=Nowa powłoka administratora -Comment[pt]=Nova Linha de Comandos Root -Comment[pt_BR]=Novo Shell do Root -Comment[ro]=Interpretor "roo" nou -Comment[ru]=Новая консоль с правами root -Comment[rw]=Sheli Umuzi Nshya -Comment[se]=Ođđa ruohtasskálžu -Comment[sk]=Nový Root shell -Comment[sl]=Nova korenska lupina -Comment[sr]=Нова корена шкољка -Comment[sr@Latn]=Nova korena školjka -Comment[sv]=Nytt skal för root -Comment[ta]=புதிய ஓடு ஷெல் -Comment[te]=కొత్త రూట్ షెల్ -Comment[tg]=Root Shell -и нав -Comment[th]=เชลล์ใหม่ของผู้ดูแลระบบ -Comment[tr]=Yeni Root Kabuk -Comment[tt]=Yaña Root Qabığı -Comment[uk]=Новий командна оболонка з правами root -Comment[vi]=Mở một Trình giao diện Gốc mới -Comment[wa]=Novea shell root -Comment[zh_CN]=新建 Root Shell -Comment[zh_TW]=新增 Root Shell +Icon=konsolered Exec=@KONSOLE_SUPER_USER_COMMAND@ - Schema=BlackOnLightYellow.schema #Schema=Linux.schema diff --git a/konsole/other/sumc.desktop.cmake b/konsole/other/sumc.desktop.cmake index fc5056f5e..f5f2d96c1 100644 --- a/konsole/other/sumc.desktop.cmake +++ b/konsole/other/sumc.desktop.cmake @@ -1,144 +1,8 @@ [Desktop Entry] Type=KonsoleApplication Name=Root Midnight Commander -Name[ar]=Midnight Commander للمستخدم الجذر -Name[az]=Ali İstifadəçi Modunda Midnight Commander -Name[be]=Midnight Commander для адміністратара -Name[bn]=রুট মিডনাইট কমান্ডার -Name[br]=Midnight Commander gwrizienn -Name[ca]=Midnight Commander root -Name[cs]=Midnight Commander (root) -Name[csb]=Midnight Commander - trib sprôwnika -Name[cy]=Midnight Commander Gwraidd -Name[de]=Midnight Commander (Systemverwaltungsmodus) -Name[el]=Midnight Commander υπερχρήστη -Name[eo]=Meznokta komandanto kiel sistemestro -Name[es]=Midnight Commander para root -Name[et]=Midnight Commander (administraator) -Name[eu]=Root-en Midnight Commander -Name[fa]=فرماندۀ نیمهشب کاربر ارشد -Name[fi]=Pääkäyttäjän Midnight Commander -Name[fr]=Midnight Commander en tant que superutilisateur -Name[fy]=Root Midnight Kommander -Name[gl]=Midnight Commander como Root -Name[hi]=रूट मिडनाइट कमांडर -Name[hr]=Midnight Commander - za administratora -Name[hu]=Midnight Commander (rendszergazdaként) -Name[is]=Midnight Commander kerfisstjóri -Name[it]=Midnight Commander di root -Name[ja]=Midnight Commander (root) -Name[km]=ពាក្យបញ្ជា Midnight Root -Name[ko]=미드나잇 커맨더 -Name[lo]=ມິດໄນຄອມມານເດີຜູ້ດູແລລະບົບ -Name[lv]=Root Pusnakts Komandieris -Name[mn]=Эзэн Midnight Commander -Name[ms]=Pemberi Arahan Tengah Malam Root -Name[mt]=Midnight Commander bħala root -Name[nb]=«Midnight Commander» for root -Name[nds]=Pleger-MC -Name[ne]=रुट मिडनाइट आदेशकर्ता -Name[nn]=Midnight Commander for root -Name[nso]=Molaedi wa Bosegogare wa Modu -Name[pa]=root ਮਿਡਨਾਇਟ ਕਮਾਂਡਰ -Name[pl]=Midnight Commander - tryb administratora -Name[pt]=Midnight Commander como Root -Name[pt_BR]=Midnight Commander - Root -Name[ro]=Midnight Commander "root" -Name[ru]=Midnight Commander c правами root -Name[rw]=Mutangabwiriza Hagati-Ijoro y'Umuzi -Name[se]=Midnight Commander root geavaheaddji várás -Name[sl]=Midnight Commander za root -Name[sr]=Корени Midnight Commander -Name[sr@Latn]=Koreni Midnight Commander -Name[sv]=Midnight Commander för root -Name[ta]=ஆரம்ப நடு இரவு கட்டளை -Name[tg]=Фармондиҳандаи нимашаби реша -Name[th]=มิดไนท์คอมมานเดอร์ผู้ดูแลระบบ -Name[tr]=Midnight Commander (Root) -Name[uk]=Midnight Commander для адміністратора -Name[uz]=Midnight Commander (root) -Name[uz@cyrillic]=Midnight Commander (root) -Name[ven]=Muhulwane wa mudzi wa vhukati ha vhusiku -Name[vi]=Midnight Commander Gốc -Name[wa]=Midnight Commander e môde root -Name[zu]=Umyaleli Waphakathi nobusuku -Icon=konsolered Comment=New Root Midnight Commander -Comment[af]=Nuwe Root Midnight Commander -Comment[ar]=Midnight Commander جديد للمستخدم الجذر -Comment[az]=Yeni Ali İstifadəçi Modunda Midnight Commander -Comment[be]=Новы Midnight Commander для адміністратара -Comment[bg]=Нов Root Midnight Commander -Comment[bn]=নতুন রুট মিডনাইট কমান্ডার -Comment[br]=Midnight Commander gwrizienn nevez -Comment[bs]=Novi Root Midnight Commander -Comment[ca]=Nou Midnight Commander root -Comment[cs]=Nový Midnight Commander pro superuživatele -Comment[csb]=Nowi Midnight Commander - trib sprôwnika -Comment[cy]=Midnight Commander Gwraidd Newydd -Comment[da]=Ny root Midnight Commander -Comment[de]=Neuer Midnight Commander für Benutzer root -Comment[el]=Νέο Midnight Commander υπερχρήστη -Comment[eo]=Nova Meznokta komandanto kiel sistemestro -Comment[es]=Nuevo Midnight Commander de root -Comment[et]=Uus administraatori Midnight Commander -Comment[eu]=Root-en Midnight Commander berria -Comment[fa]=فرماندۀ نیمه شب کاربر ارشد جدید -Comment[fi]=Uusi pääkäyttäjän Midnight Commander -istunto -Comment[fr]=Nouveau Midnight Commander en tant que superutilisateur -Comment[fy]=Nije Root Midnight Kommander -Comment[gl]=Novo Midnight Commander como Root -Comment[he]=משימת Root Midnight Commander חדשה -Comment[hi]=नया रूट मिडनाइट कमांडर -Comment[hr]=Novi Midnight Commander - za administratora -Comment[hu]=Új Midnight Commander (rendszergazdaként) -Comment[is]=Nýr Midnight Commander fyrir kerfisstjóra -Comment[it]=Nuovo Midnight Commander di root -Comment[ja]=新規 Midnight Commander (root) -Comment[ka]=ახალი Root Midnight Commander -Comment[kk]=Жаңа Root Midnight Commander терезесін ашу -Comment[km]=ពាក្យបញ្ជា Midnight Root ថ្មី -Comment[ko]=미드나잇 커맨더 -Comment[lo]=ມິດໄນຄອມມານເດີແບບສິດຜູ້ດູແລລະບົບ -Comment[lt]=Naujas Root Midnight Commander -Comment[lv]=Jauns Root Pusnakts Komandieris -Comment[mk]=Нов Root Midnight Commander -Comment[mn]=Шинэ Midnight Commander (Эзэн хэрэглэгч) -Comment[ms]=Pemberi Arahan Tengah Malam Baru -Comment[mt]=Midnight Commander ġdid bħala root -Comment[nb]=Ny «Midnight Commander» for root -Comment[nds]=Niegen Midnight Commander mit Systeemplegerverlöven -Comment[ne]=नयाँ रुट मिडनाइट आदेशकर्ता -Comment[nl]=Nieuwe root Midnight Commander -Comment[nn]=Ny Midnight Commander for root -Comment[nso]=Molaediwa yo Moswa wa Bosegogare wa Modu -Comment[pa]=ਨਵਾਂ root ਮਿਡਨਾਇਟ ਕਮਾਂਡਰ -Comment[pl]=Midnight Commander - tryb administratora -Comment[pt]=Novo Midnight Commander como Root -Comment[pt_BR]=Nova Janela do Midnight Commander- Root -Comment[ro]=Consolă Midnight Commander "root" nouă -Comment[ru]=Новое окно Midnight Commander с правами root -Comment[rw]=Mutangabwiriza Hagati-Ijoro y'Umuzi Nshya -Comment[se]=Ođđa Midnight Commander root geavadeaddji várás -Comment[sk]=Nový root Midnight Commander -Comment[sl]=Novi Midnight Commander za root -Comment[sr]=Нови корени Midnight Commander -Comment[sr@Latn]=Novi koreni Midnight Commander -Comment[sv]=Ny Midnight Commander för root -Comment[ta]=புதிய ஆரம்ப நடு இரவு கட்டளை -Comment[tg]=Нави фармондиҳандаи нимашаби реша -Comment[th]=มิดไนท์คอมมานเดอร์แบบสิทธิ์ผู้ดูแลระบบ -Comment[tr]=Yeni Midnight Commander (Root) -Comment[tt]=Yaña Midnight Commander (root ısulı) -Comment[uk]=Новий Midnight Commander для адміністратора -Comment[uz]=Yangi Midnight Commander (root) -Comment[uz@cyrillic]=Янги Midnight Commander (root) -Comment[ven]=Muhulwane wa mudzi wa vhukati ha vhusiku -Comment[vi]=Mở một Midnight Commander Gốc mới -Comment[wa]=Novea «Midnight Commander» e môde root -Comment[zh_CN]=新建 Root Midnight Commander -Comment[zh_TW]=新增 Root Midnight Commander -Comment[zu]=Umyaleli Waphakathi nobusuku Wempande Entsha +Icon=konsolered Exec=@KONSOLE_SUPER_USER_COMMAND@ - -c 'mc -c' Schema=BlackOnLightYellow.schema #VGA diff --git a/konsole/other/vt100.keytab b/konsole/other/vt100.keytab index dec49baac..fa57934bc 100644 --- a/konsole/other/vt100.keytab +++ b/konsole/other/vt100.keytab @@ -14,7 +14,7 @@ keyboard "vt100 (historical)" # "key" Keyname { ("+"|"-") Modename } ":" (String|Operation) # # Keynames are those defined in <qnamespace.h> with the -# "Qt::Key_" removed. (We'd better insert the list here) +# "TQt::Key_" removed. (We'd better insert the list here) # # Mode names are : # diff --git a/konsole/other/vt420pc.keytab b/konsole/other/vt420pc.keytab index d132797b1..376ce8d13 100644 --- a/konsole/other/vt420pc.keytab +++ b/konsole/other/vt420pc.keytab @@ -29,7 +29,7 @@ keyboard "VT420PC" # "key" Keyname { ("+"|"-") Modename } ":" (String|Operation) # # Keynames are those defined in <qnamespace.h> with the -# "Qt::Key_" removed. (We'd better insert the list here) +# "TQt::Key_" removed. (We'd better insert the list here) # # Mode names are : # diff --git a/konsole/terminalemulator.desktop b/konsole/terminalemulator.desktop index 7516d8237..cd3ee89ce 100644 --- a/konsole/terminalemulator.desktop +++ b/konsole/terminalemulator.desktop @@ -3,84 +3,3 @@ Type=ServiceType X-TDE-ServiceType=TerminalEmulator X-TDE-Derived=KParts/ReadOnlyPart Name=Terminal Emulator -Name[af]=Terminaal Emulasie -Name[ar]=مضاهِ مطراف -Name[az]=Terminal Emulyasiyası -Name[be]=Эмулятар тэрміналу -Name[bg]=Конзолна програма -Name[bn]=টার্মিনাল এমুলেটর -Name[br]=Kendarvanerezh termenell -Name[bs]=Simulator terminala -Name[ca]=Emulador de terminal -Name[cs]=Emulátor terminálu -Name[csb]=Emùlator terminala -Name[cy]=Efelychydd Terfynell -Name[da]=terminalemulator -Name[de]=Terminal-Emulator -Name[el]=Προσομοιωτής τερματικού -Name[eo]=Terminalimitaĵo -Name[es]=Emulador de terminal -Name[et]=Terminaliemulaator -Name[eu]=Terminal emuladorea -Name[fa]=مقلد پایانه -Name[fi]=Komentoikkuna -Name[fo]=Útstøðshermari -Name[fr]=Émulateur de terminal -Name[fy]=Terminal -Name[ga]=Aithriseoir Teirminéil -Name[gl]=Emulador de Terminal -Name[he]=הדמיית מסוף -Name[hi]=टर्मिनल एमुलेटर -Name[hr]=Emulator terminala -Name[hu]=Parancsértelmező -Name[id]=Emulator Terminal -Name[is]=Skjáhermir TDE -Name[it]=Emulatore di terminale -Name[ja]=ターミナルエミュレータ -Name[ka]=ტერმინალის ემულატორი -Name[kk]=Терминал эмуляторы -Name[km]=វត្ថុត្រាប់តាមស្ថានីយ -Name[ko]=터미널 에뮬레이터 -Name[lo]=ຕົວຈຳລອງເທີມີນອນ -Name[lt]=Terminalo emuliatorius -Name[lv]=Termināla Emulators -Name[mk]=Терминалски емулатор -Name[mn]=Терминал-Эмулатор -Name[ms]=Pelagak Terminal -Name[mt]=Emulatur ta' terminal -Name[nb]=Terminalemulator -Name[nds]=Terminal-Emulator -Name[ne]=टर्मिनल इमुलेटर -Name[nl]=Terminal -Name[nn]=Terminalemulator -Name[nso]=Moekisi wa Terminal -Name[pa]=ਟਰਮੀਨਲ ਸਮਰੂਪ -Name[pl]=Emulator terminala -Name[pt]=Emulador de Terminal -Name[pt_BR]=Emulador de Terminal -Name[ro]=Emulator de terminal -Name[ru]=Эмулятор терминала -Name[rw]= Mukuruzi Ihera -Name[se]=Terminálemuláhtor -Name[sk]=Emulátor terminálu -Name[sl]=Terminalski emulator -Name[sr]=Емулатор терминала -Name[sr@Latn]=Emulator terminala -Name[ss]=Silingiseli sesikhungo -Name[sv]=Terminalemulator -Name[ta]=கடைசி போட்டியாளர் -Name[te]=టెర్మినల్ ఎములేటర్ -Name[tg]=Эмулятори поёна -Name[th]=โปรแกรมจำลองเทอร์มินัล -Name[tr]=Uçbirim Emülasyonu -Name[tt]=Terminal Emulatorı -Name[uk]=Емуляція терміналу -Name[uz]=Terminal emulyatori -Name[uz@cyrillic]=Терминал эмулятори -Name[ven]=Mulingedzisi wa theminala -Name[vi]=Mô phỏng thiết bị cuối -Name[wa]=Terminå -Name[xh]=Umzami kulinganisela ngokulinganayo Wendlela yesiphelo -Name[zh_CN]=终端仿真器 -Name[zh_TW]=終端機模擬程式 -Name[zu]=Umlingisi wangaphandle diff --git a/konsole/terminalhere.desktop b/konsole/terminalhere.desktop index 00657f7bb..13ce3afe9 100644 --- a/konsole/terminalhere.desktop +++ b/konsole/terminalhere.desktop @@ -9,82 +9,3 @@ Name=Terminal Icon=konsole Exec=terminalhere --wd %f Name=Open Terminal Here -Name[af]=Maak Terminaal Hier Oop -Name[ar]=إفتح مطراف سطر الأوامر هنا -Name[az]=Terminalı Burada Aç -Name[be]=Адкрыць тэрмінал тут -Name[bg]=Отваряне на конзола тук -Name[bn]=এখানে টার্মিনাল খোলো -Name[br]=Digeriñ un termenell amañ -Name[bs]=Otvori terminal ovdje -Name[ca]=Obre un terminal aquí -Name[cs]=Otevřít terminál zde -Name[csb]=Òtemknij tuwò terminal -Name[cy]=Agor Terfynell Yma -Name[da]=Åbn terminal her -Name[de]=Terminal öffnen -Name[el]=Άνοιγμα τερματικού εδώ -Name[eo]=Lanĉu terminalon ĉi tie -Name[es]=Abrir terminal aquí -Name[et]=Ava siin terminal -Name[eu]=Ireki terminala hemen -Name[fa]=باز کردن پایانه در اینجا -Name[fi]=Avaa komentoikkuna tähän -Name[fr]=Ouvrir un terminal ici -Name[fy]=Terminal iepenje -Name[ga]=Oscail Teirminéal Anseo -Name[gl]=Abrir Terminal Aqui -Name[he]=פתח מסוף כאן -Name[hi]=टर्मिनल यहाँ खोलें -Name[hr]=Ovdje otvori terminal -Name[hu]=Parancsértelmező megnyitása itt -Name[is]=Opna skjáhermi hér -Name[it]=Apri terminale qui -Name[ja]=ここでターミナルを開く -Name[ka]=ტერმინალის აქ გახსნა -Name[kk]=Терминалды ашу -Name[km]=បើកស្ថានីយទីនេះ -Name[ko]=여기에서 터미널 열기 -Name[lo]=ເທີມິເນລຂອງ X -Name[lt]=Atverti čia terminalą -Name[lv]=Atvērt termināli šeit -Name[mk]=Отвори терминал тука -Name[mn]=Терминал нээх -Name[ms]=Buka Terminal Di Sini -Name[mt]=Iftaħ terminal hawn -Name[nb]=Åpne terminal her -Name[nds]=Terminal hier opmaken -Name[ne]=यहाँ टर्मिनल खोल्नुहोस् -Name[nl]=Terminal openen -Name[nn]=Opna terminal her -Name[nso]=Bula mafelelo Mo -Name[pa]=ਟਰਮੀਨਲ ਇੱਥੇ ਖੋਲੋ -Name[pl]=Otwórz tutaj terminal -Name[pt]=Abrir um Terminal Aqui -Name[pt_BR]=Abrir Terminal Aqui -Name[ro]=Deschide un terminal aici -Name[ru]=Открыть терминал в этой папке -Name[rw]= Gufungura Igihera Hano -Name[se]=Raba terminála dáppe -Name[sk]=Tu otvoriť terminál -Name[sl]=Tu odpri terminal -Name[sr]=Отвори терминал овде -Name[sr@Latn]=Otvori terminal ovde -Name[ss]=Vula sikhungo lapha -Name[sv]=Öppna terminal här -Name[ta]=முனைய இங்கே திற -Name[te]=టెర్మినల్ ను ఇక్కడ తెరువు -Name[tg]=Терминалро дар инҷо боз кунед -Name[th]=เปิดเทอร์มินัลที่นี่ -Name[tr]=Terminali Burada Aç -Name[tt]=Terminalnı Monda Açası -Name[uk]=Відкрити термінал -Name[uz]=Terminalni shu yerda ochish -Name[uz@cyrillic]=Терминални шу ерда очиш -Name[ven]=Vulani theminala hafhano -Name[vi]=Mở một Thiết bị cuối ở Đây -Name[wa]=Drovi on terminå chal -Name[xh]=Vula Isiphelo Sendlela Apha -Name[zh_CN]=在此打开终端 -Name[zh_TW]=在這裡開啟終端機 -Name[zu]=Vula ithuluzi langaphandle lapha diff --git a/konsole/terminalhere/terminalhere.cpp b/konsole/terminalhere/terminalhere.cpp index ece2ac30e..0fffd7538 100644 --- a/konsole/terminalhere/terminalhere.cpp +++ b/konsole/terminalhere/terminalhere.cpp @@ -21,7 +21,7 @@ #include <tdelocale.h> #include <tdeconfig.h> #include <tdeglobal.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdestartupinfo.h> #include <stdlib.h> @@ -32,7 +32,7 @@ TerminalHere::TerminalHere() : TDEApplication() { TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("General"); TQString term = config->readPathEntry("TerminalApplication", "konsole"); |