diff --git a/locales/de_DE/LC_MESSAGES/messages.mo b/locales/de_DE/LC_MESSAGES/messages.mo index 8532273..f9f4104 100644 Binary files a/locales/de_DE/LC_MESSAGES/messages.mo and b/locales/de_DE/LC_MESSAGES/messages.mo differ diff --git a/locales/de_DE/LC_MESSAGES/messages.po b/locales/de_DE/LC_MESSAGES/messages.po index 06879f5..aa3f505 100644 --- a/locales/de_DE/LC_MESSAGES/messages.po +++ b/locales/de_DE/LC_MESSAGES/messages.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: RavenLog\n" -"POT-Creation-Date: 2022-08-21 09:51+0200\n" -"PO-Revision-Date: 2022-08-21 09:58+0200\n" +"POT-Creation-Date: 2022-08-23 20:08+0200\n" +"PO-Revision-Date: 2022-08-23 20:09+0200\n" "Last-Translator: \n" "Language-Team: \n" "Language: de\n" @@ -54,30 +54,30 @@ msgstr "&Suchtreffer Hervorheben" msgid "Open Tab on Save As File" 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" msgstr "Auf aktuelle Datei fokussieren" -#: src/plugins/findInFiles/findinfileswidget.py:40 +#: src/plugins/findInFiles/filesbrowserwidget.py:40 msgid "Folder:" msgstr "Ordner:" -#: src/plugins/findInFiles/findinfileswidget.py:45 +#: src/plugins/findInFiles/filesbrowserwidget.py:45 msgid "Filter:" msgstr "Filter:" -#: src/plugins/findInFiles/findinfileswidget.py:83 +#: src/plugins/findInFiles/filesbrowserwidget.py:73 msgid "Open Directory" 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 msgid "About KrowLog" msgstr "Über KrowLog" @@ -338,6 +338,12 @@ msgstr "Transparent" msgid "custom" msgstr "individuell" +#~ msgid "&Find In Files" +#~ msgstr "In &Dateien Suchen" + +#~ msgid "Find In Files" +#~ msgstr "In Dateien Suchen" + #~ msgid "RavenLog" #~ msgstr "RavenLog" diff --git a/locales/messages.pot b/locales/messages.pot index ddc0bb6..4a21cc9 100644 --- a/locales/messages.pot +++ b/locales/messages.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "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" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -52,30 +52,30 @@ msgstr "" msgid "Open Tab on Save As File" 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" msgstr "" -#: src/plugins/findInFiles/findinfileswidget.py:40 +#: src/plugins/findInFiles/filesbrowserwidget.py:40 msgid "Folder:" msgstr "" -#: src/plugins/findInFiles/findinfileswidget.py:45 +#: src/plugins/findInFiles/filesbrowserwidget.py:45 msgid "Filter:" msgstr "" -#: src/plugins/findInFiles/findinfileswidget.py:83 +#: src/plugins/findInFiles/filesbrowserwidget.py:73 msgid "Open Directory" 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 msgid "About KrowLog" msgstr "" @@ -180,10 +180,6 @@ msgstr "" msgid "Open File" msgstr "" -#: src/plugins/timediffplugin.py:17 -msgid "" -msgstr "" - #: src/ui/bigtext/bigtext.py:171 msgid "&Copy to Clipboard" msgstr "" diff --git a/main.py b/main.py index 98338dc..3695840 100644 --- a/main.py +++ b/main.py @@ -55,20 +55,13 @@ if __name__ == "__main__": PluginRegistry.load_plugin("LogFilePlugin") PluginRegistry.load_plugin("NotesPlugin") PluginRegistry.load_plugin("TimeDiffPlugin") - PluginRegistry.load_plugin("FindInFilesPlugin") + PluginRegistry.load_plugin("FilesBrowserPlugin") window = PluginRegistry.execute_single("create_main_window") window.show() 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.SIGTERM, stop_signal) diff --git a/src/plugins/findinfilesplugin.py b/src/plugins/filesbrowserplugin.py similarity index 66% rename from src/plugins/findinfilesplugin.py rename to src/plugins/filesbrowserplugin.py index 914b18f..34a089e 100644 --- a/src/plugins/findinfilesplugin.py +++ b/src/plugins/filesbrowserplugin.py @@ -1,25 +1,29 @@ +from abc import ABC + from PySide6.QtCore import Qt from src.pluginbase import PluginBase from src.pluginregistry import PluginRegistry from src.plugins.domain.menucontribution import MenuContribution from src.plugins.domain.raction import RAction -from src.plugins.findInFiles.findinfileswidget import FindInFilesWidget -from src.plugins.notes.noteswidget import NotesWidget +from src.plugins.findInFiles.filesbrowserwidget import FilesBrowserWidget from src.i18n import _ from src.settings.settings import Settings -class FindInFilesPlugin(PluginBase): +class FilesBrowserPlugin(PluginBase): def __init__(self): - super(FindInFilesPlugin, self).__init__() + super(FilesBrowserPlugin, self).__init__() self.settings = None + def copy(self): + return self + def set_settings(self, settings: Settings): self.settings = settings - if not self.settings.session.has_section("findInFiles"): - self.settings.session.add_section("findInFiles") + if not self.settings.session.has_section("filesBrowser"): + self.settings.session.add_section("filesBrowser") def get_menu_contributions(self) -> [MenuContribution]: return [ @@ -28,13 +32,13 @@ class FindInFilesPlugin(PluginBase): ] 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") def _add_notes_tab(self): - find_in_files = FindInFilesWidget( - "find_in_files", - _("Find In Files"), + find_in_files = FilesBrowserWidget( + "files_browser", + _("Files Browser"), self.settings ) PluginRegistry.execute_single("add_dock", Qt.DockWidgetArea.LeftDockWidgetArea, find_in_files) diff --git a/src/plugins/findInFiles/findinfileswidget.py b/src/plugins/findInFiles/filesbrowserwidget.py similarity index 89% rename from src/plugins/findInFiles/findinfileswidget.py rename to src/plugins/findInFiles/filesbrowserwidget.py index 12c59d7..db2b3ea 100644 --- a/src/plugins/findInFiles/findinfileswidget.py +++ b/src/plugins/findInFiles/filesbrowserwidget.py @@ -15,10 +15,10 @@ from src.ui.formgrid import FormGrid from src.ui.hbox import HBox -class FindInFilesWidget(Tab): +class FilesBrowserWidget(Tab): 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.layout = QVBoxLayout(self) @@ -39,7 +39,7 @@ class FindInFilesWidget(Tab): form.addRow(QLabel(_("Folder:")), 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) form.addRow(QLabel(_("Filter:")), self._filter) @@ -80,17 +80,17 @@ class FindInFilesWidget(Tab): self._base_dir.setText(dir) def _filter_changed(self, filter): - self._settings.set_session("findInFiles", "filter", filter) + self._settings.set_session("filesBrowser", "filter", filter) self._model.setNameFilters([filter]) def _base_dir_changed(self, 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._view.setRootIndex(self._model.index(base_dir)) 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): folder = self._get_base_dir_for_current_file()