andi/krowlog
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

rename findInFilesPlugin to filesBrowserPlugin

Browse Source
This commit is contained in:
Andreas Huber
2022-08-23 19:57:22 +02:00
parent 2d195bd137
commit 7e390cada6
6 changed files with 54 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
locales/de_DE/LC_MESSAGES/messages.mo
View File

Binary file not shown.

34
locales/de_DE/LC_MESSAGES/messages.po
View File

@@ -5,8 +5,8 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: RavenLog\n" "Project-Id-Version: RavenLog\n"
"POT-Creation-Date: 2022-08-21 09:51+0200\n" "POT-Creation-Date: 2022-08-23 20:08+0200\n"
"PO-Revision-Date: 2022-08-21 09:58+0200\n" "PO-Revision-Date: 2022-08-23 20:09+0200\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"
"Language: de\n" "Language: de\n"
@@ -54,30 +54,30 @@ msgstr "&Suchtreffer Hervorheben"
msgid "Open Tab on Save As File" msgid "Open Tab on Save As File"
msgstr "Öffne neues Tab wenn Selektion als neue Datei gespeichert wird" msgstr "Öffne neues Tab wenn Selektion als neue Datei gespeichert wird"
#: src/plugins/findInFiles/findinfileswidget.py:37 #: src/plugins/filesbrowserplugin.py:35
msgid "&Files Browser"
msgstr "&Dateibrowser"
#: src/plugins/filesbrowserplugin.py:41
msgid "Files Browser"
msgstr "Dateibrowser"
#: src/plugins/findInFiles/filesbrowserwidget.py:37
msgid "Focus on current file" msgid "Focus on current file"
msgstr "Auf aktuelle Datei fokussieren" msgstr "Auf aktuelle Datei fokussieren"
#: src/plugins/findInFiles/findinfileswidget.py:40 #: src/plugins/findInFiles/filesbrowserwidget.py:40
msgid "Folder:" msgid "Folder:"
msgstr "Ordner:" msgstr "Ordner:"
#: src/plugins/findInFiles/findinfileswidget.py:45 #: src/plugins/findInFiles/filesbrowserwidget.py:45
msgid "Filter:" msgid "Filter:"
msgstr "Filter:" msgstr "Filter:"
#: src/plugins/findInFiles/findinfileswidget.py:83 #: src/plugins/findInFiles/filesbrowserwidget.py:73
msgid "Open Directory" msgid "Open Directory"
msgstr "Ordner öffnen" msgstr "Ordner öffnen"
#: src/plugins/findinfilesplugin.py:31
msgid "&Find In Files"
msgstr "In &Dateien Suchen"
#: src/plugins/findinfilesplugin.py:37
msgid "Find In Files"
msgstr "In Dateien Suchen"
#: src/plugins/krowlog/aboutdialog.py:19 #: src/plugins/krowlog/aboutdialog.py:19
msgid "About KrowLog" msgid "About KrowLog"
msgstr "Über KrowLog" msgstr "Über KrowLog"
@@ -338,6 +338,12 @@ msgstr "Transparent"
msgid "custom" msgid "custom"
msgstr "individuell" msgstr "individuell"
#~ msgid "&Find In Files"
#~ msgstr "In &Dateien Suchen"
#~ msgid "Find In Files"
#~ msgstr "In Dateien Suchen"
#~ msgid "RavenLog" #~ msgid "RavenLog"
#~ msgstr "RavenLog" #~ msgstr "RavenLog"

30
locales/messages.pot
View File

@@ -5,7 +5,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2022-08-21 09:51+0200\n" "POT-Creation-Date: 2022-08-23 20:08+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -52,30 +52,30 @@ msgstr ""
msgid "Open Tab on Save As File" msgid "Open Tab on Save As File"
msgstr "" msgstr ""
#: src/plugins/findInFiles/findinfileswidget.py:37 #: src/plugins/filesbrowserplugin.py:35
msgid "&Files Browser"
msgstr ""
#: src/plugins/filesbrowserplugin.py:41
msgid "Files Browser"
msgstr ""
#: src/plugins/findInFiles/filesbrowserwidget.py:37
msgid "Focus on current file" msgid "Focus on current file"
msgstr "" msgstr ""
#: src/plugins/findInFiles/findinfileswidget.py:40 #: src/plugins/findInFiles/filesbrowserwidget.py:40
msgid "Folder:" msgid "Folder:"
msgstr "" msgstr ""
#: src/plugins/findInFiles/findinfileswidget.py:45 #: src/plugins/findInFiles/filesbrowserwidget.py:45
msgid "Filter:" msgid "Filter:"
msgstr "" msgstr ""
#: src/plugins/findInFiles/findinfileswidget.py:83 #: src/plugins/findInFiles/filesbrowserwidget.py:73
msgid "Open Directory" msgid "Open Directory"
msgstr "" msgstr ""
#: src/plugins/findinfilesplugin.py:31
msgid "&Find In Files"
msgstr ""
#: src/plugins/findinfilesplugin.py:37
msgid "Find In Files"
msgstr ""
#: src/plugins/krowlog/aboutdialog.py:19 #: src/plugins/krowlog/aboutdialog.py:19
msgid "About KrowLog" msgid "About KrowLog"
msgstr "" msgstr ""
@@ -180,10 +180,6 @@ msgstr ""
msgid "Open File" msgid "Open File"
msgstr "" msgstr ""
#: src/plugins/timediffplugin.py:17
msgid ""
msgstr ""
#: src/ui/bigtext/bigtext.py:171 #: src/ui/bigtext/bigtext.py:171
msgid "&Copy to Clipboard" msgid "&Copy to Clipboard"
msgstr "" msgstr ""

9
main.py
View File

@@ -55,20 +55,13 @@ if __name__ == "__main__":
PluginRegistry.load_plugin("LogFilePlugin") PluginRegistry.load_plugin("LogFilePlugin")
PluginRegistry.load_plugin("NotesPlugin") PluginRegistry.load_plugin("NotesPlugin")
PluginRegistry.load_plugin("TimeDiffPlugin") PluginRegistry.load_plugin("TimeDiffPlugin")
PluginRegistry.load_plugin("FindInFilesPlugin") PluginRegistry.load_plugin("FilesBrowserPlugin")
window = PluginRegistry.execute_single("create_main_window") window = PluginRegistry.execute_single("create_main_window")
window.show() window.show()
PluginRegistry.execute("after_start") PluginRegistry.execute("after_start")
# PluginRegistry.execute("open_file",
# "/home/andi/ws/performanceDb/data/production/lt_axc_21.4_133.02_maxInstance/"
# + "lt_axc_21.4_133.02_maxInstance/app/axcng-service_i-0a69bd43d3624a5bc_172_28_"
# + "60_222_VADPERFO01AA001_2021-09-21_091717/service/service.log")
# PluginRegistry.execute("open_file",
# "testbed/example.log")
signal.signal(signal.SIGINT, stop_signal) signal.signal(signal.SIGINT, stop_signal)
signal.signal(signal.SIGTERM, stop_signal) signal.signal(signal.SIGTERM, stop_signal)

24
src/plugins/findinfilesplugin.py → src/plugins/filesbrowserplugin.py
View File

@@ -1,25 +1,29 @@
from abc import ABC
from PySide6.QtCore import Qt from PySide6.QtCore import Qt
from src.pluginbase import PluginBase from src.pluginbase import PluginBase
from src.pluginregistry import PluginRegistry from src.pluginregistry import PluginRegistry
from src.plugins.domain.menucontribution import MenuContribution from src.plugins.domain.menucontribution import MenuContribution
from src.plugins.domain.raction import RAction from src.plugins.domain.raction import RAction
from src.plugins.findInFiles.findinfileswidget import FindInFilesWidget from src.plugins.findInFiles.filesbrowserwidget import FilesBrowserWidget
from src.plugins.notes.noteswidget import NotesWidget
from src.i18n import _ from src.i18n import _
from src.settings.settings import Settings from src.settings.settings import Settings
class FindInFilesPlugin(PluginBase): class FilesBrowserPlugin(PluginBase):
def __init__(self): def __init__(self):
super(FindInFilesPlugin, self).__init__() super(FilesBrowserPlugin, self).__init__()
self.settings = None self.settings = None
def copy(self):
return self
def set_settings(self, settings: Settings): def set_settings(self, settings: Settings):
self.settings = settings self.settings = settings
if not self.settings.session.has_section("findInFiles"): if not self.settings.session.has_section("filesBrowser"):
self.settings.session.add_section("findInFiles") self.settings.session.add_section("filesBrowser")
def get_menu_contributions(self) -> [MenuContribution]: def get_menu_contributions(self) -> [MenuContribution]:
return [ return [
@@ -28,13 +32,13 @@ class FindInFilesPlugin(PluginBase):
] ]
def _add_find_in_files_tab_action(self) -> RAction: def _add_find_in_files_tab_action(self) -> RAction:
return RAction(_("&Find In Files"), self._add_notes_tab, shortcut='Ctrl+Shift+F', return RAction(_("&Files Browser"), self._add_notes_tab, shortcut='Ctrl+Shift+F',
icon_file="icons/ionicons/search-outline.svg") icon_file="icons/ionicons/search-outline.svg")
def _add_notes_tab(self): def _add_notes_tab(self):
find_in_files = FindInFilesWidget( find_in_files = FilesBrowserWidget(
"find_in_files", "files_browser",
_("Find In Files"), _("Files Browser"),
self.settings self.settings
) )
PluginRegistry.execute_single("add_dock", Qt.DockWidgetArea.LeftDockWidgetArea, find_in_files) PluginRegistry.execute_single("add_dock", Qt.DockWidgetArea.LeftDockWidgetArea, find_in_files)

12
src/plugins/findInFiles/findinfileswidget.py → src/plugins/findInFiles/filesbrowserwidget.py
View File

@@ -15,10 +15,10 @@ from src.ui.formgrid import FormGrid
from src.ui.hbox import HBox from src.ui.hbox import HBox
class FindInFilesWidget(Tab): class FilesBrowserWidget(Tab):
def __init__(self, unique_id: str, title: str, settings: Settings): def __init__(self, unique_id: str, title: str, settings: Settings):
super(FindInFilesWidget, self).__init__(unique_id, title) super(FilesBrowserWidget, self).__init__(unique_id, title)
self._settings = settings self._settings = settings
self.layout = QVBoxLayout(self) self.layout = QVBoxLayout(self)
@@ -39,7 +39,7 @@ class FindInFilesWidget(Tab):
form.addRow(QLabel(_("Folder:")), form.addRow(QLabel(_("Folder:")),
HBox(self._base_dir, btn_select_base_dir, btn_base_dir_for_current_file)) HBox(self._base_dir, btn_select_base_dir, btn_base_dir_for_current_file))
self._filter = QLineEdit(self._settings.get_session("findInFiles", "filter", fallback="*.log")) self._filter = QLineEdit(self._settings.get_session("filesBrowser", "filter", fallback="*.log"))
self._filter.textChanged.connect(self._filter_changed) self._filter.textChanged.connect(self._filter_changed)
form.addRow(QLabel(_("Filter:")), self._filter) form.addRow(QLabel(_("Filter:")), self._filter)
@@ -80,17 +80,17 @@ class FindInFilesWidget(Tab):
self._base_dir.setText(dir) self._base_dir.setText(dir)
def _filter_changed(self, filter): def _filter_changed(self, filter):
self._settings.set_session("findInFiles", "filter", filter) self._settings.set_session("filesBrowser", "filter", filter)
self._model.setNameFilters([filter]) self._model.setNameFilters([filter])
def _base_dir_changed(self, base_dir): def _base_dir_changed(self, base_dir):
if os.path.isdir(base_dir): if os.path.isdir(base_dir):
self._settings.set_session("findInFiles", "folder", base_dir) self._settings.set_session("filesBrowser", "folder", base_dir)
self._model.setRootPath(base_dir) self._model.setRootPath(base_dir)
self._view.setRootIndex(self._model.index(base_dir)) self._view.setRootIndex(self._model.index(base_dir))
def _initialFolder(self) -> str: def _initialFolder(self) -> str:
folder = self._settings.get_session("findInFiles", "folder", fallback=None) folder = self._settings.get_session("filesBrowser", "folder", fallback=None)
if folder is None or not os.path.isdir(folder): if folder is None or not os.path.isdir(folder):
folder = self._get_base_dir_for_current_file() folder = self._get_base_dir_for_current_file()