diff --git a/bigtext.py b/bigtext.py index 7e8d43b..abb7de2 100644 --- a/bigtext.py +++ b/bigtext.py @@ -13,7 +13,7 @@ from PySide6.QtWidgets import * import constants from raven.ui.ScaledScrollBar import ScaledScrollBar -from conversion import humanbytes +from raven.util.conversion import humanbytes from highlight_selection import HighlightSelection from highlighted_range import HighlightedRange from highlightingdialog import HighlightingDialog @@ -21,7 +21,7 @@ from line import Line from logFileModel import LogFileModel from raven.pluginregistry import PluginRegistry -from settings import Settings +from raven.settings.settings import Settings from watchdog.observers import Observer from watchdog.events import FileSystemEventHandler from raven.i18n import _ diff --git a/fulltabwidget.py b/fulltabwidget.py index 9a6e4fe..efb2392 100644 --- a/fulltabwidget.py +++ b/fulltabwidget.py @@ -6,7 +6,7 @@ from filterviewsyncer import FilterViewSyncer from filterwidget import FilterWidget from logFileModel import LogFileModel from raven.plugins.ravenlog.Tab import Tab -from conversion import humanbytes +from raven.util.conversion import humanbytes class FullTabWidget(Tab): diff --git a/highlight_selection.py b/highlight_selection.py index fa8ad98..af7a327 100644 --- a/highlight_selection.py +++ b/highlight_selection.py @@ -6,7 +6,7 @@ from line import Line from PySide6.QtCore import Qt from PySide6.QtGui import QBrush, QColor -from settings import Settings +from raven.settings.settings import Settings class HighlightSelection(Highlight): diff --git a/highlighting.py b/highlighting.py index aacef8e..5b78ca6 100644 --- a/highlighting.py +++ b/highlighting.py @@ -1,7 +1,7 @@ import logging from highlight_regex import HighlightRegex -from settings import Settings +from raven.settings.settings import Settings log = logging.getLogger("highlighting") diff --git a/highlightingdialog.py b/highlightingdialog.py index db6a3a4..f9919af 100644 --- a/highlightingdialog.py +++ b/highlightingdialog.py @@ -6,7 +6,7 @@ from raven.ui.colorbutton import ColorButton from raven.ui.hbox import HBox from highlight_regex import HighlightRegex from highlighting import Highlighting -from settings import Settings +from raven.settings.settings import Settings from raven.i18n import _ diff --git a/icon6.png b/icon6.png deleted file mode 100644 index 9f17f27..0000000 Binary files a/icon6.png and /dev/null differ diff --git a/icon7.png b/icon7.png deleted file mode 100644 index 2ab0a74..0000000 Binary files a/icon7.png and /dev/null differ diff --git a/icon7_gold3.png b/icon7_gold3.png deleted file mode 100644 index 2176237..0000000 Binary files a/icon7_gold3.png and /dev/null differ diff --git a/icon8_burned_sky.png b/icon8_burned_sky.png deleted file mode 100644 index 8a63e0f..0000000 Binary files a/icon8_burned_sky.png and /dev/null differ diff --git a/icon8c.png b/icon8c.png deleted file mode 100644 index d3cf8b8..0000000 Binary files a/icon8c.png and /dev/null differ diff --git a/linetolinemap.py b/linetolinemap.py index b9d8473..a15d4ea 100644 --- a/linetolinemap.py +++ b/linetolinemap.py @@ -2,7 +2,7 @@ import os import tempfile from typing import Optional -from int2intmap import Int2IntMap +from raven.util.int2intmap import Int2IntMap class LineToLineMap: diff --git a/logFileModel.py b/logFileModel.py index cc8fb12..8b00311 100644 --- a/logFileModel.py +++ b/logFileModel.py @@ -6,7 +6,7 @@ from highlight_regex import HighlightRegex from highlighting import Highlighting from line import Line import os -from settings import Settings +from raven.settings.settings import Settings class LogFileModel: diff --git a/raven/i18n.py b/raven/i18n.py index eefb20e..cd1c098 100644 --- a/raven/i18n.py +++ b/raven/i18n.py @@ -3,7 +3,7 @@ import os from pathlib import Path from raven.pluginregistry import PluginRegistry -from settingsstore import SettingsStore +from raven.settings.settingsstore import SettingsStore settings = SettingsStore.load() locale = os.environ['LANG'] if os.environ['LANG'] else "en" diff --git a/raven/mainwindow.py b/raven/mainwindow.py index e567ab5..e0ab304 100644 --- a/raven/mainwindow.py +++ b/raven/mainwindow.py @@ -5,16 +5,16 @@ from PySide6.QtWidgets import * from PySide6.QtGui import * from PySide6.QtCore import Qt -import urlutils -from cutesettings import CuteSettings +from raven.util import urlutils +from raven.settings.cutesettings import CuteSettings from raven.pluginregistry import PluginRegistry from raven.plugins.domain.menucontribution import MenuContribution, sort_menu_contributions from raven.plugins.domain.raction import RAction from raven.plugins.domain.rmenu import RMenu -from settingsstore import SettingsStore +from raven.settings.settingsstore import SettingsStore from highlightingdialog import HighlightingDialog from raven.ui.tabs import Tabs -from urlutils import url_is_file +from raven.util.urlutils import url_is_file from functools import reduce from raven.i18n import _ diff --git a/raven/plugins/logfileplugin.py b/raven/plugins/logfileplugin.py index 3e71d0c..7571304 100644 --- a/raven/plugins/logfileplugin.py +++ b/raven/plugins/logfileplugin.py @@ -1,5 +1,5 @@ import os.path -from typing import Callable, Optional +from typing import Optional from PySide6.QtWidgets import QMessageBox @@ -7,7 +7,7 @@ from fulltabwidget import FullTabWidget from logFileModel import LogFileModel from raven.pluginbase import PluginBase from raven.plugins.ravenlog.Tab import Tab -from settings import Settings +from raven.settings.settings import Settings from raven.i18n import _ diff --git a/raven/plugins/openfileplugin.py b/raven/plugins/openfileplugin.py index 32570ab..92efeae 100644 --- a/raven/plugins/openfileplugin.py +++ b/raven/plugins/openfileplugin.py @@ -1,8 +1,6 @@ import os -from typing import Callable from pathlib import Path -from PySide6.QtCore import QObject from PySide6.QtWidgets import QFileDialog from raven.pluginbase import PluginBase @@ -10,7 +8,7 @@ from raven.pluginregistry import PluginRegistry from raven.plugins.domain.menucontribution import MenuContribution from raven.plugins.domain.raction import RAction from raven.plugins.domain.rmenu import RMenu -from settings import Settings +from raven.settings.settings import Settings from raven.i18n import _ diff --git a/raven/plugins/ravenlogplugin.py b/raven/plugins/ravenlogplugin.py index c88723c..aef2cd2 100644 --- a/raven/plugins/ravenlogplugin.py +++ b/raven/plugins/ravenlogplugin.py @@ -13,7 +13,7 @@ from raven.plugins.domain.raction import RAction from raven.plugins.domain.rmenu import RMenu from raven.plugins.ravenlog.Tab import Tab from raven.i18n import _, locale -from settings import Settings +from raven.settings.settings import Settings class RavenLogPlugin(PluginBase): diff --git a/raven/settings/__init__.py b/raven/settings/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/cutesettings.py b/raven/settings/cutesettings.py similarity index 100% rename from cutesettings.py rename to raven/settings/cutesettings.py diff --git a/settings.py b/raven/settings/settings.py similarity index 100% rename from settings.py rename to raven/settings/settings.py diff --git a/settingsstore.py b/raven/settings/settingsstore.py similarity index 93% rename from settingsstore.py rename to raven/settings/settingsstore.py index baf35c8..ac5e605 100644 --- a/settingsstore.py +++ b/raven/settings/settingsstore.py @@ -1,12 +1,11 @@ import os import sys -from typing import Callable - -from settings import Settings from pathlib import Path -from os.path import join, isfile +from os.path import join from configparser import ConfigParser +from raven.settings.settings import Settings + class SettingsStore(): def __init__(self): diff --git a/raven/ui/tabs.py b/raven/ui/tabs.py index e2bb6f7..a7759fa 100644 --- a/raven/ui/tabs.py +++ b/raven/ui/tabs.py @@ -4,7 +4,7 @@ from PySide6.QtWidgets import QWidget, QTabWidget, QVBoxLayout from raven.pluginregistry import PluginRegistry from raven.plugins.ravenlog.Tab import Tab -from settings import Settings +from raven.settings.settings import Settings class Tabs(QWidget): diff --git a/raven/util/__init__.py b/raven/util/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/conversion.py b/raven/util/conversion.py similarity index 100% rename from conversion.py rename to raven/util/conversion.py diff --git a/int2intmap.py b/raven/util/int2intmap.py similarity index 100% rename from int2intmap.py rename to raven/util/int2intmap.py diff --git a/testint2intmaplike.py b/raven/util/testint2intmaplike.py similarity index 98% rename from testint2intmaplike.py rename to raven/util/testint2intmaplike.py index fa7cfc5..d2a17ba 100644 --- a/testint2intmaplike.py +++ b/raven/util/testint2intmaplike.py @@ -2,7 +2,7 @@ import tempfile import unittest from os.path import join -from int2intmap import Int2IntMap +from raven.util.int2intmap import Int2IntMap class Int2IntMapLike(unittest.TestCase): diff --git a/urlutils.py b/raven/util/urlutils.py similarity index 100% rename from urlutils.py rename to raven/util/urlutils.py diff --git a/testlogfilemodel.py b/testlogfilemodel.py index 4612dad..e97b964 100644 --- a/testlogfilemodel.py +++ b/testlogfilemodel.py @@ -4,7 +4,7 @@ from configparser import ConfigParser from os.path import join from logFileModel import LogFileModel -from settings import Settings +from raven.settings.settings import Settings class TestLogFileModel(unittest.TestCase):