diff --git a/constants.py b/constants.py index 87ed127..b5a722b 100644 --- a/constants.py +++ b/constants.py @@ -1,3 +1,3 @@ -raven_icon = "icon8d.png" +raven_icon = "icons/icon8d.png" tab_width = 4 diff --git a/icon8d.png b/icons/icon8d.png similarity index 100% rename from icon8d.png rename to icons/icon8d.png diff --git a/raven/mainwindow.py b/raven/mainwindow.py index e0ab304..b2dae17 100644 --- a/raven/mainwindow.py +++ b/raven/mainwindow.py @@ -12,7 +12,7 @@ from raven.plugins.domain.menucontribution import MenuContribution, sort_menu_co from raven.plugins.domain.raction import RAction from raven.plugins.domain.rmenu import RMenu from raven.settings.settingsstore import SettingsStore -from highlightingdialog import HighlightingDialog +from raven.ui.bigtext.highlightingdialog import HighlightingDialog from raven.ui.tabs import Tabs from raven.util.urlutils import url_is_file from functools import reduce diff --git a/raven/plugins/logfile/__init__.py b/raven/plugins/logfile/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/filterviewsyncer.py b/raven/plugins/logfile/filterviewsyncer.py similarity index 94% rename from filterviewsyncer.py rename to raven/plugins/logfile/filterviewsyncer.py index cc0910a..0f4bdf8 100644 --- a/filterviewsyncer.py +++ b/raven/plugins/logfile/filterviewsyncer.py @@ -1,4 +1,4 @@ -from bigtext import BigText +from raven.ui.bigtext.bigtext import BigText class FilterViewSyncer: diff --git a/filterwidget.py b/raven/plugins/logfile/filterwidget.py similarity index 98% rename from filterwidget.py rename to raven/plugins/logfile/filterwidget.py index a487998..e3e0c44 100644 --- a/filterwidget.py +++ b/raven/plugins/logfile/filterwidget.py @@ -7,8 +7,8 @@ from typing import Optional, Callable from PySide6.QtCore import QRunnable, QThreadPool from PySide6.QtWidgets import QWidget, QVBoxLayout, QHBoxLayout, QLineEdit, QCheckBox, QPushButton -from bigtext import BigText -from logFileModel import LogFileModel +from raven.ui.bigtext.bigtext import BigText +from raven.ui.bigtext.logFileModel import LogFileModel from raven.i18n import _ from raven.pluginregistry import PluginRegistry diff --git a/fulltabwidget.py b/raven/plugins/logfile/fulltabwidget.py similarity index 87% rename from fulltabwidget.py rename to raven/plugins/logfile/fulltabwidget.py index efb2392..ef93040 100644 --- a/fulltabwidget.py +++ b/raven/plugins/logfile/fulltabwidget.py @@ -1,10 +1,10 @@ from PySide6.QtWidgets import * from PySide6.QtCore import * -from bigtext import BigText -from filterviewsyncer import FilterViewSyncer -from filterwidget import FilterWidget -from logFileModel import LogFileModel +from raven.ui.bigtext.bigtext import BigText +from raven.plugins.logfile.filterviewsyncer import FilterViewSyncer +from raven.plugins.logfile.filterwidget import FilterWidget +from raven.ui.bigtext.logFileModel import LogFileModel from raven.plugins.ravenlog.Tab import Tab from raven.util.conversion import humanbytes diff --git a/raven/plugins/logfileplugin.py b/raven/plugins/logfileplugin.py index 7571304..38711e0 100644 --- a/raven/plugins/logfileplugin.py +++ b/raven/plugins/logfileplugin.py @@ -3,14 +3,15 @@ from typing import Optional from PySide6.QtWidgets import QMessageBox -from fulltabwidget import FullTabWidget -from logFileModel import LogFileModel +from raven.plugins.logfile.fulltabwidget import FullTabWidget +from raven.ui.bigtext.logFileModel import LogFileModel from raven.pluginbase import PluginBase from raven.plugins.ravenlog.Tab import Tab from raven.settings.settings import Settings from raven.i18n import _ + class LogFilePlugin(PluginBase): def __init__(self): super(LogFilePlugin, self).__init__() diff --git a/raven/plugins/ravenlog/aboutdialog.py b/raven/plugins/ravenlog/aboutdialog.py index 5229c97..0bf84a8 100644 --- a/raven/plugins/ravenlog/aboutdialog.py +++ b/raven/plugins/ravenlog/aboutdialog.py @@ -6,7 +6,7 @@ from PySide6.QtGui import QFont, QPixmap from PySide6.QtWidgets import * import constants -from label import Label +from raven.ui.label import Label from raven.ui.vbox import VBox from raven.i18n import _ diff --git a/raven/ui/bigtext/__init__.py b/raven/ui/bigtext/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/bigtext.py b/raven/ui/bigtext/bigtext.py similarity index 98% rename from bigtext.py rename to raven/ui/bigtext/bigtext.py index abb7de2..84a74fb 100644 --- a/bigtext.py +++ b/raven/ui/bigtext/bigtext.py @@ -13,12 +13,12 @@ from PySide6.QtWidgets import * import constants from raven.ui.ScaledScrollBar import ScaledScrollBar +from raven.ui.bigtext.highlight_selection import HighlightSelection +from raven.ui.bigtext.highlighted_range import HighlightedRange +from raven.ui.bigtext.highlightingdialog import HighlightingDialog +from raven.ui.bigtext.line import Line +from raven.ui.bigtext.logFileModel import LogFileModel from raven.util.conversion import humanbytes -from highlight_selection import HighlightSelection -from highlighted_range import HighlightedRange -from highlightingdialog import HighlightingDialog -from line import Line -from logFileModel import LogFileModel from raven.pluginregistry import PluginRegistry from raven.settings.settings import Settings diff --git a/highlight.py b/raven/ui/bigtext/highlight.py similarity index 65% rename from highlight.py rename to raven/ui/bigtext/highlight.py index f399a73..ce173c8 100644 --- a/highlight.py +++ b/raven/ui/bigtext/highlight.py @@ -1,7 +1,7 @@ from typing import Optional, List -from line import Line -from highlighted_range import HighlightedRange +from raven.ui.bigtext.line import Line +from raven.ui.bigtext.highlighted_range import HighlightedRange class Highlight: diff --git a/highlight_regex.py b/raven/ui/bigtext/highlight_regex.py similarity index 93% rename from highlight_regex.py rename to raven/ui/bigtext/highlight_regex.py index 034b114..a2b075e 100644 --- a/highlight_regex.py +++ b/raven/ui/bigtext/highlight_regex.py @@ -1,8 +1,8 @@ from typing import Optional -from highlight import Highlight -from highlighted_range import HighlightedRange -from line import Line +from raven.ui.bigtext.highlight import Highlight +from raven.ui.bigtext.highlighted_range import HighlightedRange +from raven.ui.bigtext.line import Line from PySide6.QtGui import QBrush, QColor from typing import List diff --git a/highlight_selection.py b/raven/ui/bigtext/highlight_selection.py similarity index 92% rename from highlight_selection.py rename to raven/ui/bigtext/highlight_selection.py index af7a327..3c9fc39 100644 --- a/highlight_selection.py +++ b/raven/ui/bigtext/highlight_selection.py @@ -1,8 +1,8 @@ from typing import Optional, List -from highlight import Highlight -from highlighted_range import HighlightedRange -from line import Line +from raven.ui.bigtext.highlight import Highlight +from raven.ui.bigtext.highlighted_range import HighlightedRange +from raven.ui.bigtext.line import Line from PySide6.QtCore import Qt from PySide6.QtGui import QBrush, QColor diff --git a/highlighted_range.py b/raven/ui/bigtext/highlighted_range.py similarity index 100% rename from highlighted_range.py rename to raven/ui/bigtext/highlighted_range.py diff --git a/highlighting.py b/raven/ui/bigtext/highlighting.py similarity index 97% rename from highlighting.py rename to raven/ui/bigtext/highlighting.py index 5b78ca6..b036e19 100644 --- a/highlighting.py +++ b/raven/ui/bigtext/highlighting.py @@ -1,7 +1,7 @@ import logging -from highlight_regex import HighlightRegex from raven.settings.settings import Settings +from raven.ui.bigtext.highlight_regex import HighlightRegex log = logging.getLogger("highlighting") diff --git a/highlightingdialog.py b/raven/ui/bigtext/highlightingdialog.py similarity index 98% rename from highlightingdialog.py rename to raven/ui/bigtext/highlightingdialog.py index f9919af..25d17fd 100644 --- a/highlightingdialog.py +++ b/raven/ui/bigtext/highlightingdialog.py @@ -2,10 +2,10 @@ from PySide6.QtGui import QIcon from PySide6.QtWidgets import QDialog, QLineEdit, QLabel, QGridLayout, QCheckBox, QListWidget, QListWidgetItem, \ QPushButton, QDialogButtonBox, QMessageBox, QSizePolicy +from raven.ui.bigtext.highlight_regex import HighlightRegex +from raven.ui.bigtext.highlighting import Highlighting from raven.ui.colorbutton import ColorButton from raven.ui.hbox import HBox -from highlight_regex import HighlightRegex -from highlighting import Highlighting from raven.settings.settings import Settings from raven.i18n import _ diff --git a/line.py b/raven/ui/bigtext/line.py similarity index 100% rename from line.py rename to raven/ui/bigtext/line.py diff --git a/linetolinemap.py b/raven/ui/bigtext/linetolinemap.py similarity index 100% rename from linetolinemap.py rename to raven/ui/bigtext/linetolinemap.py diff --git a/logFileModel.py b/raven/ui/bigtext/logFileModel.py similarity index 97% rename from logFileModel.py rename to raven/ui/bigtext/logFileModel.py index 8b00311..f95222b 100644 --- a/logFileModel.py +++ b/raven/ui/bigtext/logFileModel.py @@ -2,9 +2,9 @@ import math import re from typing import List, Optional from PySide6.QtCore import Signal -from highlight_regex import HighlightRegex -from highlighting import Highlighting -from line import Line +from raven.ui.bigtext.highlight_regex import HighlightRegex +from raven.ui.bigtext.highlighting import Highlighting +from raven.ui.bigtext.line import Line import os from raven.settings.settings import Settings diff --git a/testline.py b/raven/ui/bigtext/testline.py similarity index 100% rename from testline.py rename to raven/ui/bigtext/testline.py diff --git a/testlogfilemodel.py b/raven/ui/bigtext/testlogfilemodel.py similarity index 100% rename from testlogfilemodel.py rename to raven/ui/bigtext/testlogfilemodel.py diff --git a/label.py b/raven/ui/label.py similarity index 100% rename from label.py rename to raven/ui/label.py