From d4b559f91838a9d3e63c1aed0b3960dca4e4df14 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 14 Feb 2020 10:54:29 +0900 Subject: Fixed handling of RMC -> Actions -> Open terminal here. Signed-off-by: Michele Calgaro --- konsole/CMakeLists.txt | 3 +- konsole/Makefile.am | 6 +- konsole/konsolehere.desktop | 125 ---------------------------------- konsole/terminalhere.desktop | 90 ++++++++++++++++++++++++ konsole/terminalhere/CMakeLists.txt | 27 ++++++++ konsole/terminalhere/Makefile.am | 10 +++ konsole/terminalhere/terminalhere.cpp | 66 ++++++++++++++++++ konsole/terminalhere/terminalhere.h | 31 +++++++++ 8 files changed, 229 insertions(+), 129 deletions(-) delete mode 100644 konsole/konsolehere.desktop create mode 100644 konsole/terminalhere.desktop create mode 100644 konsole/terminalhere/CMakeLists.txt create mode 100644 konsole/terminalhere/Makefile.am create mode 100644 konsole/terminalhere/terminalhere.cpp create mode 100644 konsole/terminalhere/terminalhere.h diff --git a/konsole/CMakeLists.txt b/konsole/CMakeLists.txt index 65f2e1715..b0059acbe 100644 --- a/konsole/CMakeLists.txt +++ b/konsole/CMakeLists.txt @@ -15,6 +15,7 @@ add_subdirectory( konsole ) add_subdirectory( other ) # add_subdirectory( doc ) add_subdirectory( fonts ) +add_subdirectory( terminalhere ) install( FILES @@ -48,7 +49,7 @@ install( FILES install( FILES - konsolehere.desktop + terminalhere.desktop DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus ) diff --git a/konsole/Makefile.am b/konsole/Makefile.am index cb5fccb8e..c6003d034 100644 --- a/konsole/Makefile.am +++ b/konsole/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = konsole other doc fonts +SUBDIRS = konsole other doc fonts terminalhere xdg_apps_DATA = konsole.desktop konsolesu.desktop @@ -15,8 +15,8 @@ services_DATA = kwrited.desktop install-data-local: @-rm -f $(DESTDIR)$(datadir)/autostart/kwrited.desktop -konsolehere_DATA = konsolehere.desktop -konsoleheredir = $(kde_datadir)/konqueror/servicemenus +terminalhere_DATA = terminalhere.desktop +terminalheredir = $(kde_datadir)/konqueror/servicemenus misc_DATA = eventsrc tips miscdir = $(kde_datadir)/konsole diff --git a/konsole/konsolehere.desktop b/konsole/konsolehere.desktop deleted file mode 100644 index 5bf32424a..000000000 --- a/konsole/konsolehere.desktop +++ /dev/null @@ -1,125 +0,0 @@ -[Desktop Entry] -X-TDE-ServiceTypes=inode/directory -Actions=openTerminalHere; -X-TDE-AuthorizeAction=shell_access -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[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 - -[Desktop Action openTerminalHere] -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 -Icon=konsole -Exec=konsole --workdir %f diff --git a/konsole/terminalhere.desktop b/konsole/terminalhere.desktop new file mode 100644 index 000000000..00657f7bb --- /dev/null +++ b/konsole/terminalhere.desktop @@ -0,0 +1,90 @@ +[Desktop Entry] +X-TDE-ServiceTypes=inode/directory +Actions=openTerminalHere; +X-TDE-AuthorizeAction=shell_access +Type=Application +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[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/CMakeLists.txt b/konsole/terminalhere/CMakeLists.txt new file mode 100644 index 000000000..fbd0f198d --- /dev/null +++ b/konsole/terminalhere/CMakeLists.txt @@ -0,0 +1,27 @@ + +##### config ######## + +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} +) + + +##### terminalhere (executable) ######## + +set( target terminalhere ) + +set( ${target}_SRCS + terminalhere.cpp +) + +tde_add_executable( ${target} AUTOMOC + SOURCES ${${target}_SRCS} + LINK tdeio-shared + DESTINATION ${BIN_INSTALL_DIR} +) diff --git a/konsole/terminalhere/Makefile.am b/konsole/terminalhere/Makefile.am new file mode 100644 index 000000000..8e6c53063 --- /dev/null +++ b/konsole/terminalhere/Makefile.am @@ -0,0 +1,10 @@ +bin_PROGRAMS = terminalhere + +INCLUDES = $(all_includes) +AM_LDFLAGS = $(all_libraries) + +terminalhere_SOURCES = terminalhere.cpp +terminalhere_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) $(LIB_TDEIO) + +METASOURCES = AUTO + diff --git a/konsole/terminalhere/terminalhere.cpp b/konsole/terminalhere/terminalhere.cpp new file mode 100644 index 000000000..ece2ac30e --- /dev/null +++ b/konsole/terminalhere/terminalhere.cpp @@ -0,0 +1,66 @@ +/* This file is part of the TDE project + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "terminalhere.h" + + +TerminalHere::TerminalHere() : TDEApplication() +{ + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); + + TDEConfig *config = kapp->config(); + config->setGroup("General"); + TQString term = config->readPathEntry("TerminalApplication", "konsole"); + + TDEProcess proc; + proc << term; + if (args->isSet("wd")) + { + proc.setWorkingDirectory(args->getOption("wd")); + } + proc.start(TDEProcess::DontCare); + ::exit(0); +} + +static TDECmdLineOptions options[] = +{ + { "wd ", I18N_NOOP("Set working directory to 'dir'"), 0 }, + TDECmdLineLastOption +}; + +int main(int argc, char **argv) +{ + TDECmdLineArgs::init(argc, argv, "terminalhere", "terminalhere", "terminalhere", "0.1"); + TDECmdLineArgs::addCmdLineOptions(options); + TDEApplication::addCmdLineOptions(); + TDEApplication *app = new TerminalHere(); + + TDEStartupInfo::appStarted(); + return app->exec(); +} + +#include "terminalhere.moc" diff --git a/konsole/terminalhere/terminalhere.h b/konsole/terminalhere/terminalhere.h new file mode 100644 index 000000000..690e3e4ff --- /dev/null +++ b/konsole/terminalhere/terminalhere.h @@ -0,0 +1,31 @@ +/* This file is part of the TDE project + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#ifndef _TERMINALHERE_H_ +#define _TERMINALHERE_H_ + +#include + + +class TerminalHere : public TDEApplication +{ +public: + TerminalHere(); +}; + +#endif -- cgit v1.2.1