From fc885d70c1c3c49f2179f27477c3f257e8a4c489 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 16 Feb 2020 20:16:52 +0900 Subject: [PATCH] Fixed handling of terminal application. Signed-off-by: Michele Calgaro --- src/dolphin.cpp | 12 +++-- src/servicemenus/CMakeLists.txt | 3 +- src/servicemenus/Makefile.am.new | 4 +- ...nsolehere.desktop => terminalhere.desktop} | 51 ++++--------------- 4 files changed, 21 insertions(+), 49 deletions(-) rename src/servicemenus/{konsolehere.desktop => terminalhere.desktop} (77%) diff --git a/src/dolphin.cpp b/src/dolphin.cpp index f9e984d..747eb93 100644 --- a/src/dolphin.cpp +++ b/src/dolphin.cpp @@ -50,6 +50,7 @@ #include #include #include +#include #include #include @@ -922,11 +923,14 @@ void Dolphin::goHome() void Dolphin::openTerminal() { - TQString command("konsole --workdir \""); - command.append(m_activeView->url().path()); - command.append('\"'); + TDEConfig * config = kapp->config(); + config->setGroup("General"); + TQString term = config->readPathEntry("TerminalApplication", "konsole"); - KRun::runCommand(command, "Konsole", "konsole"); + TDEProcess proc; + proc << term; + proc.setWorkingDirectory(m_activeView->url().path()); + proc.start(TDEProcess::DontCare); } void Dolphin::findFile() diff --git a/src/servicemenus/CMakeLists.txt b/src/servicemenus/CMakeLists.txt index 2137870..41af136 100644 --- a/src/servicemenus/CMakeLists.txt +++ b/src/servicemenus/CMakeLists.txt @@ -23,11 +23,12 @@ install( FILES k3b_handle_empty_cd.desktop k3b_handle_empty_dvd.desktop k3b_videodvd_rip.desktop k3b_write_bin_image.desktop k3b_write_iso_image.desktop kdesktopSetAsBackground.desktop - konqgwenview.desktop konsolehere.desktop + konqgwenview.desktop mail_as_attachment.desktop media_eject.desktop media_mount.desktop media_realfolder.desktop media_safelyremove.desktop media_unmount.desktop open_in_digikam.desktop run_as_root.desktop smb2rdc.desktop + terminalhere.desktop text-ada-print.desktop text-c++-print.desktop text-c++h-print.desktop text-ch-print.desktop text-css-print.desktop text-diff-print.desktop diff --git a/src/servicemenus/Makefile.am.new b/src/servicemenus/Makefile.am.new index 45d121f..e8c285c 100644 --- a/src/servicemenus/Makefile.am.new +++ b/src/servicemenus/Makefile.am.new @@ -7,9 +7,9 @@ servicemenus_DATA = compress.desktop amarok_addaspodcast.desktop amarok_append.d k3b_create_video_cd.desktop k3b_dvd_copy.desktop k3b_handle_empty_cd.desktop \ k3b_handle_empty_dvd.desktop k3b_videodvd_rip.desktop k3b_write_bin_image.desktop \ k3b_write_iso_image.desktop kdesktopSetAsBackground.desktop konqgwenview.desktop \ - konsolehere.desktop mail_as_attachment.desktop media_eject.desktop media_mount.desktop \ + mail_as_attachment.desktop media_eject.desktop media_mount.desktop \ media_realfolder.desktop media_safelyremove.desktop media_unmount.desktop \ - open_in_digikam.desktop run_as_root.desktop smb2rdc.desktop text-ada-print.desktop \ + open_in_digikam.desktop run_as_root.desktop smb2rdc.desktop terminalhere.desktop text-ada-print.desktop \ text-c++-print.desktop text-c++h-print.desktop text-ch-print.desktop text-css-print.desktop \ text-diff-print.desktop text-html-print.desktop text-java-print.desktop text-log-print.desktop \ text-makefile-print.desktop text-pas-print.desktop text-perl-print.desktop text-print.desktop \ diff --git a/src/servicemenus/konsolehere.desktop b/src/servicemenus/terminalhere.desktop similarity index 77% rename from src/servicemenus/konsolehere.desktop rename to src/servicemenus/terminalhere.desktop index db7c5f6..00657f7 100644 --- a/src/servicemenus/konsolehere.desktop +++ b/src/servicemenus/terminalhere.desktop @@ -2,54 +2,19 @@ X-TDE-ServiceTypes=inode/directory Actions=openTerminalHere; X-TDE-AuthorizeAction=shell_access -Encoding=UTF-8 Type=Application - -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[ko]=TDE용 콘솔 -Name[lo]=ຄອນໂຊລ - K -Name[mk]=Конзола -Name[mn]=Консол -Name[nb]=Konsoll -Name[ne]=कन्सोल -Name[nn]=Konsoll -Name[pa]=ਕੰਨਸੋਲ -Name[pl]=Konsola -Name[ro]=Consolă -Name[ru]=Консоль -Name[se]=Konsolla -Name[sk]=Konzola -Name[sl]=Konzola -Name[ta]=கான்சோல் -Name[te]=కాన్సోల్ -Name[tg]=Консол -Name[th]=คอนโซล K -Name[zu]=Ikhonsoli +Name=Terminal [Desktop Action openTerminalHere] +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[bn]=এখানে টার্মিনাল খোলো Name[br]=Digeriñ un termenell amañ Name[bs]=Otvori terminal ovdje Name[ca]=Obre un terminal aquí @@ -76,8 +41,10 @@ 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 @@ -106,12 +73,14 @@ 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]=Терминални шу ерда очиш +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 @@ -119,5 +88,3 @@ Name[xh]=Vula Isiphelo Sendlela Apha Name[zh_CN]=在此打开终端 Name[zh_TW]=在這裡開啟終端機 Name[zu]=Vula ithuluzi langaphandle lapha -Icon=konsole -Exec=konsole --workdir %f