From a640b35c875734b49c8423d8690eb479d65bb9d7 Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Sat, 12 Feb 2022 10:22:47 +0100 Subject: [PATCH] rename ravenlog to krowlog There is a database named RavenDB. KrowLog starts with a K, which is a) distinctive and b) has an association to KDE. --- .idea/ravenlog.iml | 3 +- README.md | 4 +- constants.py | 2 +- ravenlog.bat => krowlog.bat | 0 locales/de_DE/LC_MESSAGES/messages.mo | Bin 4062 -> 4207 bytes locales/de_DE/LC_MESSAGES/messages.po | 240 ++++++++++-------- locales/messages.pot | 223 ++++++++-------- main.py | 11 +- {raven => src}/__init__.py | 0 {raven => src}/i18n.py | 4 +- {raven => src}/mainwindow.py | 24 +- {raven => src}/pluginbase.py | 0 {raven => src}/pluginregistry.py | 11 +- {raven => src}/plugins/__init__.py | 4 +- {raven => src}/plugins/domain/__init__.py | 0 .../plugins/domain/menucontribution.py | 4 +- {raven => src}/plugins/domain/raction.py | 0 {raven => src}/plugins/domain/rmenu.py | 2 +- .../plugins/domain/testmenucontribution.py | 2 +- .../ravenlog => src/plugins/krowlog}/Tab.py | 0 .../plugins/krowlog}/__init__.py | 0 .../plugins/krowlog}/aboutdialog.py | 28 +- .../plugins/krowlogplugin.py | 29 +-- .../notes => src/plugins/logfile}/__init__.py | 0 .../plugins/logfile/filterviewsyncer.py | 2 +- .../plugins/logfile/filterwidget.py | 8 +- .../plugins/logfile/fulltabwidget.py | 12 +- {raven => src}/plugins/logfileplugin.py | 12 +- .../plugins/notes}/__init__.py | 0 {raven => src}/plugins/notes/noteswidget.py | 2 +- {raven => src}/plugins/notesplugin.py | 13 +- {raven => src}/plugins/openfileplugin.py | 15 +- {raven => src}/settings/__init__.py | 0 {raven => src}/settings/cutesettings.py | 2 +- {raven => src}/settings/settings.py | 0 {raven => src}/settings/settingsstore.py | 6 +- {raven => src}/ui/ScaledScrollBar.py | 0 {raven => src}/ui/__init__.py | 0 {raven => src}/ui/bigtext/__init__.py | 0 {raven => src}/ui/bigtext/bigtext.py | 20 +- {raven => src}/ui/bigtext/highlight.py | 4 +- {raven => src}/ui/bigtext/highlight_regex.py | 6 +- .../ui/bigtext/highlight_selection.py | 8 +- .../ui/bigtext/highlighted_range.py | 0 {raven => src}/ui/bigtext/highlighting.py | 5 +- .../ui/bigtext/highlightingdialog.py | 12 +- {raven => src}/ui/bigtext/line.py | 0 {raven => src}/ui/bigtext/linetolinemap.py | 2 +- {raven => src}/ui/bigtext/logFileModel.py | 8 +- {raven => src}/ui/bigtext/testline.py | 0 {raven => src}/ui/bigtext/testlogfilemodel.py | 2 +- {raven => src}/ui/colorbutton.py | 2 +- {raven => src}/ui/hbox.py | 0 {raven => src}/ui/label.py | 0 {raven => src}/ui/tabs.py | 6 +- {raven => src}/ui/vbox.py | 0 {raven => src}/util/__init__.py | 0 {raven => src}/util/conversion.py | 0 {raven => src}/util/int2intmap.py | 0 {raven => src}/util/testint2intmaplike.py | 2 +- {raven => src}/util/urlutils.py | 0 translate.sh | 2 +- 62 files changed, 380 insertions(+), 362 deletions(-) rename ravenlog.bat => krowlog.bat (100%) rename {raven => src}/__init__.py (100%) rename {raven => src}/i18n.py (88%) rename {raven => src}/mainwindow.py (89%) rename {raven => src}/pluginbase.py (100%) rename {raven => src}/pluginregistry.py (89%) rename {raven => src}/plugins/__init__.py (91%) rename {raven => src}/plugins/domain/__init__.py (100%) rename {raven => src}/plugins/domain/menucontribution.py (93%) rename {raven => src}/plugins/domain/raction.py (100%) rename {raven => src}/plugins/domain/rmenu.py (92%) rename {raven => src}/plugins/domain/testmenucontribution.py (93%) rename {raven/plugins/ravenlog => src/plugins/krowlog}/Tab.py (100%) rename {raven/plugins/logfile => src/plugins/krowlog}/__init__.py (100%) rename {raven/plugins/ravenlog => src/plugins/krowlog}/aboutdialog.py (81%) rename raven/plugins/ravenlogplugin.py => src/plugins/krowlogplugin.py (83%) rename {raven/plugins/notes => src/plugins/logfile}/__init__.py (100%) rename {raven => src}/plugins/logfile/filterviewsyncer.py (94%) rename {raven => src}/plugins/logfile/filterwidget.py (98%) rename {raven => src}/plugins/logfile/fulltabwidget.py (82%) rename {raven => src}/plugins/logfileplugin.py (75%) rename {raven/plugins/ravenlog => src/plugins/notes}/__init__.py (100%) rename {raven => src}/plugins/notes/noteswidget.py (89%) rename {raven => src}/plugins/notesplugin.py (76%) rename {raven => src}/plugins/openfileplugin.py (91%) rename {raven => src}/settings/__init__.py (100%) rename {raven => src}/settings/cutesettings.py (82%) rename {raven => src}/settings/settings.py (100%) rename {raven => src}/settings/settingsstore.py (85%) rename {raven => src}/ui/ScaledScrollBar.py (100%) rename {raven => src}/ui/__init__.py (100%) rename {raven => src}/ui/bigtext/__init__.py (100%) rename {raven => src}/ui/bigtext/bigtext.py (97%) rename {raven => src}/ui/bigtext/highlight.py (65%) rename {raven => src}/ui/bigtext/highlight_regex.py (93%) rename {raven => src}/ui/bigtext/highlight_selection.py (90%) rename {raven => src}/ui/bigtext/highlighted_range.py (100%) rename {raven => src}/ui/bigtext/highlighting.py (95%) rename {raven => src}/ui/bigtext/highlightingdialog.py (96%) rename {raven => src}/ui/bigtext/line.py (100%) rename {raven => src}/ui/bigtext/linetolinemap.py (92%) rename {raven => src}/ui/bigtext/logFileModel.py (97%) rename {raven => src}/ui/bigtext/testline.py (100%) rename {raven => src}/ui/bigtext/testlogfilemodel.py (99%) rename {raven => src}/ui/colorbutton.py (99%) rename {raven => src}/ui/hbox.py (100%) rename {raven => src}/ui/label.py (100%) rename {raven => src}/ui/tabs.py (94%) rename {raven => src}/ui/vbox.py (100%) rename {raven => src}/util/__init__.py (100%) rename {raven => src}/util/conversion.py (100%) rename {raven => src}/util/int2intmap.py (100%) rename {raven => src}/util/testint2intmaplike.py (98%) rename {raven => src}/util/urlutils.py (100%) diff --git a/.idea/ravenlog.iml b/.idea/ravenlog.iml index a3cf086..4f41a56 100644 --- a/.idea/ravenlog.iml +++ b/.idea/ravenlog.iml @@ -2,9 +2,8 @@ - - + diff --git a/README.md b/README.md index 81e064d..cabb417 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# ![Logo for RavenLog](icon7.png "Logo for RavenLog") RavenLog +# ![Logo for KrowLog](icons/icon8d.png "Logo for KrowLog") KrowLog -RavenLog is a viewer for text files of arbitrary length. +KrowLog is a viewer for text files of arbitrary size. ## Features diff --git a/constants.py b/constants.py index b5a722b..9bce3b0 100644 --- a/constants.py +++ b/constants.py @@ -1,3 +1,3 @@ -raven_icon = "icons/icon8d.png" +krow_icon = "icons/icon8d.png" tab_width = 4 diff --git a/ravenlog.bat b/krowlog.bat similarity index 100% rename from ravenlog.bat rename to krowlog.bat diff --git a/locales/de_DE/LC_MESSAGES/messages.mo b/locales/de_DE/LC_MESSAGES/messages.mo index 8e7b2139f867f333ba8debf604ae4803b7c94d7d..917c4b88da2b27cc7f599e8172232cf3b5030916 100644 GIT binary patch delta 1826 zcmZ{kTWC~Q6o$7+CX+aq#Ji2w9IsK6CX-2wHAZU^HPS?hAVDw)lX$G7Wrm(4MpNz3 zHX>LR^iV`vwH2gA`e1Dzg`$I^K_X&6!3(}9f|o);eUaezXHKJi=;r+A+iRb_*IIk+ zJ@cUWZ!7g+e9rfV)`X^`4Ozy-;K3YTw8C6tc+5Cn)}|q8ERb|=0gWEKV|mNDPf==PKLihIZVS4yau!3Z74@~VHiG!h43ZhF}Zlt{1BW3 zr$OzZ63Sl<)VeyTb8P#Vhdpf`RW z%Fhdr!%+UiY+pN{1yz|c*~B+X=uCx;-iLOm1#zgI?S(3Rzh@tVa&!_Z(O;nw{1YmX z%WyXwf(o>b$(p~37pH4%D8JiaN)wWFRJuKIE<6A~fajnl4nR4+2^H`mR7szC_CHWN z9)|K0rYw;$+$X4YYgsf6wnL_vU69<&Hv!IH0lxDFjzZZ#Ksh`OwctGDF&B8r;Z-OH zw_y!@2z7U+up1>%?y(N?$$SbY!Zy#|0eMVskoqe?KbA^-7|w)0LnV@i3N!%a;1<-; zJb}7gZ=jBD3{f>+1hu{#a_puRj)NPa{B4KY*cVWVeVwACz=u5k1dFi$fZFLGRDks~_z&L)T|6M{;t0`fg&YUpTT1C-+!Dv8U0taHO|5V=H6b{MD!w=?|v~ zRiKZM8XFmHOWcsJc#>{}4r4Z|NBaLPbnAT+QY+}a-)6mMETumW=}&4EQVJ2IV^?K# z->T3`^f6ME7a>)-4lP4dkWQl-eTdZb(^jj@xXKvwfsR2<<*#+0`%ab2?_6L-Bhjc; zpV;Equ`X*(PlxT8`i^8zcjj$1JIP-6L~gZvC-;C~MoaQDH|C!n?z9tKcCFRY)Y@Y0 ztaAJOWd(e)w#GlVt(|eZ*LK`9{{3!k-qT>4?R3SHiCXK+$X<6&{_&gn4g`hsKOW=pKwj@t=$ap;O04iEn~&p^RIp0{7~7PS=AZU6uP delta 1703 zcmY+ESxA*p5XZ;5OX|Iv+G3h!nQdxmmaSU07=aO)L_vjGAEtZJwRet++|RKqvtcg}osX6DTK?)_LWI4L%m8R$1;H98Sp zHNvb3wg(uHPeHQ~{0uYUH#iEWVidVs+UG#m*pLj}0v?APIF*0&&!J#~BqqpSzvSU3cAh7n{@+%Qz!DAfLmFhG7Q zWs-$qE=-5DFcofsa%_e?*2SPgdZ7XxgL>Z&weKoaoEuOld;ryf7jFF)X0v|p>;c-5 zMSja*La|l^RdEUAv2q5rd@}4T;%iWTH(^5{OgFNm=HsPDB}$ zCkHD2WT?&-N9g}#Ce_ZN5h_s&RG>XjcX|}+YR*F4;YDY^3AO(r%zz)D68(lMC`6x? zDATbB>Oc#j;;e}=kz*rN%i1A(?KoTp``!8_R3Y!65`2MtNA?q{;2=@;J`L)GQ=mFp z0#(3LsBdLGRH2Qq4aPc|$niB)As?Vl`W+J6enD-B;FJ&Z;dEF9sPm*%Qd8V$)FUF{@%yj;gvERLPd33DIwPDXI^29J(4^jOz4CtkX$~Q6)%- zicE+;@!H2!?#cY^JGBu6PC=5hl(#|0$qb- zKDx+{hAw5)H1FQmZNpWH#A9OTRW!9opDX zzlKalB9F2+?&)mWvCAuH@$L+C?DRUjt**7l>*({0} of data." msgstr "Du hast {0} selektiert." -#: raven/ui/bigtext/bigtext.py:335 +#: src/ui/bigtext/bigtext.py:335 msgid "Copy {0} to Clipboard" msgstr "Kopiere {0} in die Zwischenablage" -#: raven/ui/bigtext/bigtext.py:337 +#: src/ui/bigtext/bigtext.py:337 msgid "Write to File" msgstr "Schreibe in Datei" -#: raven/ui/bigtext/bigtext.py:359 +#: src/ui/bigtext/bigtext.py:359 msgid "Save File" msgstr "Speichere Datei" -#: raven/ui/bigtext/highlightingdialog.py:23 +#: src/ui/bigtext/highlightingdialog.py:23 msgid "Manage Highlighting" msgstr "Hervorhebungen Verwalten" -#: raven/ui/bigtext/highlightingdialog.py:35 +#: src/ui/bigtext/highlightingdialog.py:35 msgid "Add" msgstr "Hinzufügen" -#: raven/ui/bigtext/highlightingdialog.py:39 +#: src/ui/bigtext/highlightingdialog.py:39 msgid "Update" msgstr "Aktualisieren" -#: raven/ui/bigtext/highlightingdialog.py:43 +#: src/ui/bigtext/highlightingdialog.py:43 msgid "Remove" msgstr "Entfernen" -#: raven/ui/bigtext/highlightingdialog.py:47 +#: src/ui/bigtext/highlightingdialog.py:47 msgid "Up" msgstr "Hoch" -#: raven/ui/bigtext/highlightingdialog.py:51 +#: src/ui/bigtext/highlightingdialog.py:51 msgid "Down" msgstr "Runter" -#: raven/ui/bigtext/highlightingdialog.py:59 +#: src/ui/bigtext/highlightingdialog.py:59 msgid "Query:" msgstr "Suche:" -#: raven/ui/bigtext/highlightingdialog.py:63 +#: src/ui/bigtext/highlightingdialog.py:63 msgid "Ignore Case" msgstr "Groß-/Kleinschreibung ignorieren" -#: raven/ui/bigtext/highlightingdialog.py:68 +#: src/ui/bigtext/highlightingdialog.py:68 msgid "Regular Expression" msgstr "Regulärer Ausdruck" -#: raven/ui/bigtext/highlightingdialog.py:73 +#: src/ui/bigtext/highlightingdialog.py:73 msgid "Hit Background:" msgstr "Trefferhintergrund:" -#: raven/ui/bigtext/highlightingdialog.py:78 +#: src/ui/bigtext/highlightingdialog.py:78 msgid "Line Background:" msgstr "Zeilenhintergrund:" -#: raven/ui/bigtext/highlightingdialog.py:142 +#: src/ui/bigtext/highlightingdialog.py:142 msgid "unsaved changes" msgstr "Nicht Gespeicherte Änderungen" -#: raven/ui/bigtext/highlightingdialog.py:143 +#: src/ui/bigtext/highlightingdialog.py:143 msgid "You have unsaved changes." msgstr "Du hast nicht gespeicherte Änderungen." -#: raven/ui/colorbutton.py:18 +#: src/ui/colorbutton.py:18 msgid "Strawberry Cream" msgstr "Strawberry Cream" -#: raven/ui/colorbutton.py:19 +#: src/ui/colorbutton.py:19 msgid "Pale Crimson" msgstr "Pale Crimson" -#: raven/ui/colorbutton.py:21 +#: src/ui/colorbutton.py:21 msgid "Broken Buttercup" msgstr "Pale Crimson" -#: raven/ui/colorbutton.py:22 +#: src/ui/colorbutton.py:22 msgid "Passion Fruit Sugar" msgstr "Passion Fruit Sugar" -#: raven/ui/colorbutton.py:24 +#: src/ui/colorbutton.py:24 msgid "Sunrise Yellow" msgstr "Sonnenaufganggelb" -#: raven/ui/colorbutton.py:25 +#: src/ui/colorbutton.py:25 msgid "Magical Mustard" msgstr "Magischer Senf" -#: raven/ui/colorbutton.py:27 +#: src/ui/colorbutton.py:27 msgid "Trendy Green" msgstr "Trendiges Grün" -#: raven/ui/colorbutton.py:28 +#: src/ui/colorbutton.py:28 msgid "Garden Of Sweden" msgstr "Garten von Schweden" -#: raven/ui/colorbutton.py:30 +#: src/ui/colorbutton.py:30 msgid "Light Sky Blue" msgstr "Helles Himmelsblau" -#: raven/ui/colorbutton.py:31 +#: src/ui/colorbutton.py:31 msgid "True Blue" msgstr "Echtes Blau" -#: raven/ui/colorbutton.py:33 +#: src/ui/colorbutton.py:33 msgid "Fairy Topia" msgstr "" -#: raven/ui/colorbutton.py:34 +#: src/ui/colorbutton.py:34 msgid "Magenta Bachiego" msgstr "" -#: raven/ui/colorbutton.py:36 +#: src/ui/colorbutton.py:36 msgid "Breeze of Mist" msgstr "Nebelbriese" -#: raven/ui/colorbutton.py:37 +#: src/ui/colorbutton.py:37 msgid "Light Grey" msgstr "Helles Grau" -#: raven/ui/colorbutton.py:38 +#: src/ui/colorbutton.py:38 msgid "Grey" msgstr "Grau" -#: raven/ui/colorbutton.py:44 +#: src/ui/colorbutton.py:44 msgid "transparent" msgstr "Transparent" -#: raven/ui/colorbutton.py:51 +#: src/ui/colorbutton.py:51 msgid "custom" msgstr "individuell" -#: venv310/lib/python3.10/site-packages/PySide6/examples/widgets/gettext/main.py:58 -msgid "Quit" -msgstr "Beenden" +#~ msgid "RavenLog" +#~ msgstr "RavenLog" -#: venv310/lib/python3.10/site-packages/PySide6/examples/widgets/gettext/main.py:59 -msgid "CTRL+Q" -msgstr "STRG+Q" +#~ msgid "Quit" +#~ msgstr "Beenden" + +#~ msgid "CTRL+Q" +#~ msgstr "STRG+Q" #~ msgid "Continue" #~ msgstr "Weiter" diff --git a/locales/messages.pot b/locales/messages.pot index 1e525db..e865184 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-02-06 16:17+0100\n" +"POT-Creation-Date: 2022-02-12 10:14+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -15,287 +15,292 @@ msgstr "" "Generated-By: pygettext.py 1.5\n" -#: ./raven/mainwindow.py:39 ./raven/plugins/ravenlog/aboutdialog.py:23 -#: ./raven/plugins/ravenlogplugin.py:82 -msgid "RavenLog" +#: src/mainwindow.py:39 src/plugins/krowlog/aboutdialog.py:23 +#: src/plugins/krowlogplugin.py:85 +msgid "KrowLog" msgstr "" -#: ./raven/mainwindow.py:47 ./raven/plugins/openfileplugin.py:29 +#: src/mainwindow.py:47 src/plugins/openfileplugin.py:29 msgid "Open &Recent" msgstr "" -#: ./raven/mainwindow.py:66 -#: ./venv310/lib/python3.10/site-packages/PySide6/examples/widgets/gettext/main.py:57 +#: src/mainwindow.py:66 msgid "&File" msgstr "" -#: ./raven/mainwindow.py:67 +#: src/mainwindow.py:67 msgid "&Settings" msgstr "" -#: ./raven/mainwindow.py:68 +#: src/mainwindow.py:68 msgid "&Window" msgstr "" -#: ./raven/mainwindow.py:69 +#: src/mainwindow.py:69 msgid "&Help" msgstr "" -#: ./raven/mainwindow.py:101 ./raven/ui/bigtext/bigtext.py:187 +#: src/mainwindow.py:101 src/ui/bigtext/bigtext.py:187 msgid "&Highlighter" msgstr "" -#: ./raven/mainwindow.py:108 +#: src/mainwindow.py:108 msgid "Highlight &Searches" msgstr "" -#: ./raven/mainwindow.py:116 +#: src/mainwindow.py:116 msgid "Open Tab on Save As File" msgstr "" -#: ./raven/plugins/logfile/filterwidget.py:101 -msgid "Cancel" +#: src/plugins/krowlog/aboutdialog.py:18 +msgid "About KrowLog" msgstr "" -#: ./raven/plugins/logfile/filterwidget.py:105 -msgid "ignore case" +#: src/plugins/krowlog/aboutdialog.py:28 +msgid "Version: {0}" msgstr "" -#: ./raven/plugins/logfile/filterwidget.py:109 -msgid "regex" -msgstr "" - -#: ./raven/plugins/logfileplugin.py:25 -msgid "File not found" -msgstr "" - -#: ./raven/plugins/logfileplugin.py:26 -msgid "'{0}' is not a file or cannot be opened" -msgstr "" - -#: ./raven/plugins/notesplugin.py:25 -msgid "Add &Notes" -msgstr "" - -#: ./raven/plugins/notesplugin.py:33 -msgid "Notes {0}" -msgstr "" - -#: ./raven/plugins/openfileplugin.py:24 -msgid "&Open..." -msgstr "" - -#: ./raven/plugins/openfileplugin.py:45 -msgid "Open File" -msgstr "" - -#: ./raven/plugins/ravenlog/aboutdialog.py:18 -msgid "About RavenLog" -msgstr "" - -#: ./raven/plugins/ravenlog/aboutdialog.py:43 +#: src/plugins/krowlog/aboutdialog.py:43 msgid "About" msgstr "" -#: ./raven/plugins/ravenlog/aboutdialog.py:44 +#: src/plugins/krowlog/aboutdialog.py:44 msgid "License" msgstr "" -#: ./raven/plugins/ravenlogplugin.py:43 +#: src/plugins/krowlog/aboutdialog.py:57 +msgid "Log file viewer" +msgstr "" + +#: src/plugins/krowlog/aboutdialog.py:58 +msgid "(c) 2022 Andreas Huber" +msgstr "" + +#: src/plugins/krowlog/aboutdialog.py:59 +msgid "License: LGPL v3" +msgstr "" + +#: src/plugins/krowlogplugin.py:43 msgid "&Languages" msgstr "" -#: ./raven/plugins/ravenlogplugin.py:44 +#: src/plugins/krowlogplugin.py:44 msgid "&Default" msgstr "" -#: ./raven/plugins/ravenlogplugin.py:45 +#: src/plugins/krowlogplugin.py:45 msgid "&English" msgstr "" -#: ./raven/plugins/ravenlogplugin.py:46 +#: src/plugins/krowlogplugin.py:46 msgid "&German" msgstr "" -#: ./raven/plugins/ravenlogplugin.py:70 +#: src/plugins/krowlogplugin.py:70 msgid "Language Changed" msgstr "" -#: ./raven/plugins/ravenlogplugin.py:71 +#: src/plugins/krowlogplugin.py:71 msgid "The language for this application has been changed. The change will take effect the next time the application is started." msgstr "" -#: ./raven/plugins/ravenlogplugin.py:80 -msgid "{0} - RavenLog" +#: src/plugins/krowlogplugin.py:83 +msgid "{0} - KrowLog" msgstr "" -#: ./raven/plugins/ravenlogplugin.py:102 +#: src/plugins/krowlogplugin.py:105 msgid "&About" msgstr "" -#: ./raven/plugins/ravenlogplugin.py:110 +#: src/plugins/krowlogplugin.py:113 msgid "E&xit" msgstr "" -#: ./raven/ui/bigtext/bigtext.py:170 +#: src/plugins/logfile/filterwidget.py:134 +msgid "Cancel" +msgstr "" + +#: src/plugins/logfile/filterwidget.py:138 +msgid "ignore case" +msgstr "" + +#: src/plugins/logfile/filterwidget.py:142 +msgid "regex" +msgstr "" + +#: src/plugins/logfileplugin.py:25 +msgid "File not found" +msgstr "" + +#: src/plugins/logfileplugin.py:26 +msgid "'{0}' is not a file or cannot be opened" +msgstr "" + +#: src/plugins/notesplugin.py:25 +msgid "Add &Notes" +msgstr "" + +#: src/plugins/notesplugin.py:33 +msgid "Notes {0}" +msgstr "" + +#: src/plugins/openfileplugin.py:24 +msgid "&Open..." +msgstr "" + +#: src/plugins/openfileplugin.py:45 +msgid "Open File" +msgstr "" + +#: src/ui/bigtext/bigtext.py:170 msgid "&Copy to Clipboard" msgstr "" -#: ./raven/ui/bigtext/bigtext.py:176 +#: src/ui/bigtext/bigtext.py:176 msgid "Copy to &File" msgstr "" -#: ./raven/ui/bigtext/bigtext.py:181 +#: src/ui/bigtext/bigtext.py:181 msgid "Select &All" msgstr "" -#: ./raven/ui/bigtext/bigtext.py:331 +#: src/ui/bigtext/bigtext.py:331 msgid "data selection" msgstr "" -#: ./raven/ui/bigtext/bigtext.py:332 +#: src/ui/bigtext/bigtext.py:332 msgid "You have selected {0} of data." msgstr "" -#: ./raven/ui/bigtext/bigtext.py:335 +#: src/ui/bigtext/bigtext.py:335 msgid "Copy {0} to Clipboard" msgstr "" -#: ./raven/ui/bigtext/bigtext.py:337 +#: src/ui/bigtext/bigtext.py:337 msgid "Write to File" msgstr "" -#: ./raven/ui/bigtext/bigtext.py:359 +#: src/ui/bigtext/bigtext.py:359 msgid "Save File" msgstr "" -#: ./raven/ui/bigtext/highlightingdialog.py:23 +#: src/ui/bigtext/highlightingdialog.py:23 msgid "Manage Highlighting" msgstr "" -#: ./raven/ui/bigtext/highlightingdialog.py:35 +#: src/ui/bigtext/highlightingdialog.py:35 msgid "Add" msgstr "" -#: ./raven/ui/bigtext/highlightingdialog.py:39 +#: src/ui/bigtext/highlightingdialog.py:39 msgid "Update" msgstr "" -#: ./raven/ui/bigtext/highlightingdialog.py:43 +#: src/ui/bigtext/highlightingdialog.py:43 msgid "Remove" msgstr "" -#: ./raven/ui/bigtext/highlightingdialog.py:47 +#: src/ui/bigtext/highlightingdialog.py:47 msgid "Up" msgstr "" -#: ./raven/ui/bigtext/highlightingdialog.py:51 +#: src/ui/bigtext/highlightingdialog.py:51 msgid "Down" msgstr "" -#: ./raven/ui/bigtext/highlightingdialog.py:59 +#: src/ui/bigtext/highlightingdialog.py:59 msgid "Query:" msgstr "" -#: ./raven/ui/bigtext/highlightingdialog.py:63 +#: src/ui/bigtext/highlightingdialog.py:63 msgid "Ignore Case" msgstr "" -#: ./raven/ui/bigtext/highlightingdialog.py:68 +#: src/ui/bigtext/highlightingdialog.py:68 msgid "Regular Expression" msgstr "" -#: ./raven/ui/bigtext/highlightingdialog.py:73 +#: src/ui/bigtext/highlightingdialog.py:73 msgid "Hit Background:" msgstr "" -#: ./raven/ui/bigtext/highlightingdialog.py:78 +#: src/ui/bigtext/highlightingdialog.py:78 msgid "Line Background:" msgstr "" -#: ./raven/ui/bigtext/highlightingdialog.py:142 +#: src/ui/bigtext/highlightingdialog.py:142 msgid "unsaved changes" msgstr "" -#: ./raven/ui/bigtext/highlightingdialog.py:143 +#: src/ui/bigtext/highlightingdialog.py:143 msgid "You have unsaved changes." msgstr "" -#: ./raven/ui/colorbutton.py:18 +#: src/ui/colorbutton.py:18 msgid "Strawberry Cream" msgstr "" -#: ./raven/ui/colorbutton.py:19 +#: src/ui/colorbutton.py:19 msgid "Pale Crimson" msgstr "" -#: ./raven/ui/colorbutton.py:21 +#: src/ui/colorbutton.py:21 msgid "Broken Buttercup" msgstr "" -#: ./raven/ui/colorbutton.py:22 +#: src/ui/colorbutton.py:22 msgid "Passion Fruit Sugar" msgstr "" -#: ./raven/ui/colorbutton.py:24 +#: src/ui/colorbutton.py:24 msgid "Sunrise Yellow" msgstr "" -#: ./raven/ui/colorbutton.py:25 +#: src/ui/colorbutton.py:25 msgid "Magical Mustard" msgstr "" -#: ./raven/ui/colorbutton.py:27 +#: src/ui/colorbutton.py:27 msgid "Trendy Green" msgstr "" -#: ./raven/ui/colorbutton.py:28 +#: src/ui/colorbutton.py:28 msgid "Garden Of Sweden" msgstr "" -#: ./raven/ui/colorbutton.py:30 +#: src/ui/colorbutton.py:30 msgid "Light Sky Blue" msgstr "" -#: ./raven/ui/colorbutton.py:31 +#: src/ui/colorbutton.py:31 msgid "True Blue" msgstr "" -#: ./raven/ui/colorbutton.py:33 +#: src/ui/colorbutton.py:33 msgid "Fairy Topia" msgstr "" -#: ./raven/ui/colorbutton.py:34 +#: src/ui/colorbutton.py:34 msgid "Magenta Bachiego" msgstr "" -#: ./raven/ui/colorbutton.py:36 +#: src/ui/colorbutton.py:36 msgid "Breeze of Mist" msgstr "" -#: ./raven/ui/colorbutton.py:37 +#: src/ui/colorbutton.py:37 msgid "Light Grey" msgstr "" -#: ./raven/ui/colorbutton.py:38 +#: src/ui/colorbutton.py:38 msgid "Grey" msgstr "" -#: ./raven/ui/colorbutton.py:44 +#: src/ui/colorbutton.py:44 msgid "transparent" msgstr "" -#: ./raven/ui/colorbutton.py:51 +#: src/ui/colorbutton.py:51 msgid "custom" msgstr "" -#: -#: ./venv310/lib/python3.10/site-packages/PySide6/examples/widgets/gettext/main.py:58 -msgid "Quit" -msgstr "" - -#: -#: ./venv310/lib/python3.10/site-packages/PySide6/examples/widgets/gettext/main.py:59 -msgid "CTRL+Q" -msgstr "" - diff --git a/main.py b/main.py index 998e6f1..3836579 100644 --- a/main.py +++ b/main.py @@ -9,10 +9,11 @@ from PySide6.QtGui import QIcon import sys import constants -from raven.pluginregistry import PluginRegistry +from src.pluginregistry import PluginRegistry import gettext -gettext.install('ravenlog', 'locale') + +gettext.install('krowlog', 'locale') logging.basicConfig(level=logging.INFO) log = logging.getLogger("main") @@ -31,12 +32,12 @@ def stop_signal(signum, _stackframe): if __name__ == "__main__": app = QApplication(sys.argv) - app.setWindowIcon(QIcon(constants.raven_icon)) # works only for Linux + app.setWindowIcon(QIcon(constants.krow_icon)) # works only for Linux # make icon appear in Windows # see https://stackoverflow.com/questions/1551605/how-to-set-applications-taskbar-icon-in-windows-7/1552105#1552105 if sys.platform == 'win32' or sys.platform == 'cygwin': - myappid = 'opentext.ravenlog' # arbitrary string + myappid = 'krowlog' # arbitrary string ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(myappid) # workaround to make signals work in QT apps. @@ -49,7 +50,7 @@ if __name__ == "__main__": timer.start(100) # init plugins - PluginRegistry.load_plugin("RavenLogPlugin") + PluginRegistry.load_plugin("KrowLogPlugin") PluginRegistry.load_plugin("OpenFilePlugin") PluginRegistry.load_plugin("LogFilePlugin") PluginRegistry.load_plugin("NotesPlugin") diff --git a/raven/__init__.py b/src/__init__.py similarity index 100% rename from raven/__init__.py rename to src/__init__.py diff --git a/raven/i18n.py b/src/i18n.py similarity index 88% rename from raven/i18n.py rename to src/i18n.py index 4778842..06acb25 100644 --- a/raven/i18n.py +++ b/src/i18n.py @@ -2,8 +2,8 @@ import gettext import os from pathlib import Path -from raven.pluginregistry import PluginRegistry -from raven.settings.settingsstore import SettingsStore +from src.pluginregistry import PluginRegistry +from src.settings.settingsstore import SettingsStore settings = SettingsStore.load() locale = os.environ['LANG'] if 'LANG' in os.environ and os.environ['LANG'] else "en" diff --git a/raven/mainwindow.py b/src/mainwindow.py similarity index 89% rename from raven/mainwindow.py rename to src/mainwindow.py index 6b1709b..19451c6 100644 --- a/raven/mainwindow.py +++ b/src/mainwindow.py @@ -5,19 +5,19 @@ from PySide6.QtWidgets import * from PySide6.QtGui import * from PySide6.QtCore import Qt -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 raven.settings.settingsstore import SettingsStore -from raven.ui.bigtext.highlightingdialog import HighlightingDialog -from raven.ui.tabs import Tabs -from raven.util.urlutils import url_is_file +from src.util import urlutils +from src.settings.cutesettings import CuteSettings +from src.pluginregistry import PluginRegistry +from src.plugins.domain.menucontribution import MenuContribution, sort_menu_contributions +from src.plugins.domain.raction import RAction +from src.plugins.domain.rmenu import RMenu +from src.settings.settingsstore import SettingsStore +from src.ui.bigtext.highlightingdialog import HighlightingDialog +from src.ui.tabs import Tabs +from src.util.urlutils import url_is_file from functools import reduce -from raven.i18n import _ +from src.i18n import _ MAX_LINE_LENGTH = 4096 @@ -36,7 +36,7 @@ class MainWindow(QMainWindow): self.settings = SettingsStore.load() PluginRegistry.execute("set_settings", self.settings) - self.setWindowTitle(_("RavenLog")) + self.setWindowTitle(_("KrowLog")) self._restore_window() self.setDockNestingEnabled(True) diff --git a/raven/pluginbase.py b/src/pluginbase.py similarity index 100% rename from raven/pluginbase.py rename to src/pluginbase.py diff --git a/raven/pluginregistry.py b/src/pluginregistry.py similarity index 89% rename from raven/pluginregistry.py rename to src/pluginregistry.py index 991232a..c265082 100644 --- a/raven/pluginregistry.py +++ b/src/pluginregistry.py @@ -3,7 +3,7 @@ from typing import Dict, Optional from inspect import isclass from importlib import import_module from inspect import signature -from raven.pluginbase import PluginBase +from src.pluginbase import PluginBase class PluginRegistry(): @@ -15,16 +15,9 @@ class PluginRegistry(): def _register_plugin(name: str, plugin: PluginBase): PluginRegistry.plugins[name] = plugin - # @staticmethod - # def load_module(module_name: str) -> ModuleType: - # module_name = f"raven.plugins.{module_name}" - # module = import_module(module_name) - # PluginRegistry.modules.append(module) - # return module - @staticmethod def load_plugin(plugin_name: str) -> PluginBase: - module_name = f"raven.plugins.{plugin_name.lower()}" + module_name = f"src.plugins.{plugin_name.lower()}" module = import_module(module_name) if plugin_name in dir(module): plugin_class = getattr(module, plugin_name) diff --git a/raven/plugins/__init__.py b/src/plugins/__init__.py similarity index 91% rename from raven/plugins/__init__.py rename to src/plugins/__init__.py index 570a12b..eddb93e 100644 --- a/raven/plugins/__init__.py +++ b/src/plugins/__init__.py @@ -2,10 +2,10 @@ from inspect import isclass from pkgutil import iter_modules from pathlib import Path from importlib import import_module -from raven.pluginbase import PluginBase +from src.pluginbase import PluginBase # iterate through the modules in the current package -from raven.pluginregistry import PluginRegistry +from src.pluginregistry import PluginRegistry if False: package_dir = Path(__file__).resolve().parent diff --git a/raven/plugins/domain/__init__.py b/src/plugins/domain/__init__.py similarity index 100% rename from raven/plugins/domain/__init__.py rename to src/plugins/domain/__init__.py diff --git a/raven/plugins/domain/menucontribution.py b/src/plugins/domain/menucontribution.py similarity index 93% rename from raven/plugins/domain/menucontribution.py rename to src/plugins/domain/menucontribution.py index 424803e..6164c5c 100644 --- a/raven/plugins/domain/menucontribution.py +++ b/src/plugins/domain/menucontribution.py @@ -1,5 +1,5 @@ -from raven.plugins.domain.raction import RAction -from raven.plugins.domain.rmenu import RMenu +from src.plugins.domain.raction import RAction +from src.plugins.domain.rmenu import RMenu id_counter = 0 diff --git a/raven/plugins/domain/raction.py b/src/plugins/domain/raction.py similarity index 100% rename from raven/plugins/domain/raction.py rename to src/plugins/domain/raction.py diff --git a/raven/plugins/domain/rmenu.py b/src/plugins/domain/rmenu.py similarity index 92% rename from raven/plugins/domain/rmenu.py rename to src/plugins/domain/rmenu.py index e94ad6b..ca523a1 100644 --- a/raven/plugins/domain/rmenu.py +++ b/src/plugins/domain/rmenu.py @@ -1,6 +1,6 @@ from typing import Callable -from raven.plugins.domain.raction import RAction +from src.plugins.domain.raction import RAction class RMenu(): diff --git a/raven/plugins/domain/testmenucontribution.py b/src/plugins/domain/testmenucontribution.py similarity index 93% rename from raven/plugins/domain/testmenucontribution.py rename to src/plugins/domain/testmenucontribution.py index f9e4b3d..ae1b2be 100644 --- a/raven/plugins/domain/testmenucontribution.py +++ b/src/plugins/domain/testmenucontribution.py @@ -1,7 +1,7 @@ import unittest from random import shuffle -from raven.plugins.domain.menucontribution import MenuContribution, sort_menu_contributions +from src.plugins.domain.menucontribution import MenuContribution, sort_menu_contributions class MyTestCase(unittest.TestCase): diff --git a/raven/plugins/ravenlog/Tab.py b/src/plugins/krowlog/Tab.py similarity index 100% rename from raven/plugins/ravenlog/Tab.py rename to src/plugins/krowlog/Tab.py diff --git a/raven/plugins/logfile/__init__.py b/src/plugins/krowlog/__init__.py similarity index 100% rename from raven/plugins/logfile/__init__.py rename to src/plugins/krowlog/__init__.py diff --git a/raven/plugins/ravenlog/aboutdialog.py b/src/plugins/krowlog/aboutdialog.py similarity index 81% rename from raven/plugins/ravenlog/aboutdialog.py rename to src/plugins/krowlog/aboutdialog.py index 0bf84a8..76e94fa 100644 --- a/raven/plugins/ravenlog/aboutdialog.py +++ b/src/plugins/krowlog/aboutdialog.py @@ -6,30 +6,31 @@ from PySide6.QtGui import QFont, QPixmap from PySide6.QtWidgets import * import constants -from raven.ui.label import Label -from raven.ui.vbox import VBox -from raven.i18n import _ +from src.ui.label import Label +from src.ui.vbox import VBox +from src.i18n import _ + class AboutDialog(QDialog): - """Dialog for showing info about RavenLog""" + """Dialog for showing info about KrowLog""" def __init__(self, parent=None): super(AboutDialog, self).__init__(parent) - self.setWindowTitle(_("About RavenLog")) + self.setWindowTitle(_("About KrowLog")) self.setModal(True) self.layout = QVBoxLayout(self) - heading_app_name = QLabel(_("RavenLog")) + heading_app_name = QLabel(_("KrowLog")) heading_app_name.setAlignment(Qt.AlignmentFlag.AlignLeft) heading_app_name.setFont(QFont("default", 25)) heading_app_name.setTextInteractionFlags(Qt.TextInteractionFlag.TextSelectableByMouse) - version = QLabel(_("Version: {0}".format(self._version()))) + version = QLabel(_("Version: {0}").format(self._version())) version.setAlignment(Qt.AlignmentFlag.AlignLeft) app_icon = QLabel() - app_icon.setPixmap(QPixmap(constants.raven_icon)) + app_icon.setPixmap(QPixmap(constants.krow_icon)) heading = QWidget(self) hbox = QHBoxLayout(heading) hbox.addWidget(app_icon) @@ -53,10 +54,11 @@ class AboutDialog(QDialog): def _about(self) -> QWidget: result = QWidget() result.layout = QVBoxLayout(result) - label = Label(_(textwrap.dedent(""" - Log file viewer
- (c) 2022 Open Text Corporation
- License: LGPL v3"""))) + label = Label("{0}
{1}
{2}".format( + _("Log file viewer"), + _("(c) 2022 Andreas Huber"), + _("License: LGPL v3") + )) result.layout.addWidget(label) return result @@ -69,7 +71,7 @@ class AboutDialog(QDialog):
  • urllib3 (MIT) - https://github.com/urllib3/urllib3
  • watchdog 2.16 (Apache 2.0) - https://github.com/gorakhargosh/watchdog
    • """.format(pyside=PySide6.__version__, qt=PySide6.QtCore.__version__) - label = _(textwrap.dedent(dependencies)) + label = textwrap.dedent(dependencies) result = QWidget() result.layout = QVBoxLayout(result) diff --git a/raven/plugins/ravenlogplugin.py b/src/plugins/krowlogplugin.py similarity index 83% rename from raven/plugins/ravenlogplugin.py rename to src/plugins/krowlogplugin.py index 86fb3a0..2682565 100644 --- a/raven/plugins/ravenlogplugin.py +++ b/src/plugins/krowlogplugin.py @@ -5,21 +5,20 @@ from PySide6.QtCore import Qt from PySide6.QtWidgets import QDockWidget, QMessageBox import constants -from raven.pluginregistry import PluginRegistry -from raven.plugins.ravenlog.aboutdialog import AboutDialog -from raven.mainwindow import MainWindow -from raven.pluginbase import PluginBase -from raven.plugins.domain.menucontribution import MenuContribution -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 raven.settings.settings import Settings +from src.plugins.krowlog.aboutdialog import AboutDialog +from src.mainwindow import MainWindow +from src.pluginbase import PluginBase +from src.plugins.domain.menucontribution import MenuContribution +from src.plugins.domain.raction import RAction +from src.plugins.domain.rmenu import RMenu +from src.plugins.krowlog.Tab import Tab +from src.i18n import _, locale +from src.settings.settings import Settings -class RavenLogPlugin(PluginBase): +class KrowLogPlugin(PluginBase): def __init__(self): - super(RavenLogPlugin, self).__init__() + super(KrowLogPlugin, self).__init__() self.main_window = None self._locale = locale self._locale_actions = {} @@ -81,9 +80,9 @@ class RavenLogPlugin(PluginBase): def update_window_title(self, title: str): if len(title) > 0: - self.main_window.setWindowTitle(_("{0} - RavenLog").format(title)) + self.main_window.setWindowTitle(_("{0} - KrowLog").format(title)) else: - self.main_window.setWindowTitle(_("RavenLog")) + self.main_window.setWindowTitle(_("KrowLog")) def update_status_bar(self, text: str): if not self.main_window: @@ -105,7 +104,7 @@ class RavenLogPlugin(PluginBase): about_action = RAction( _("&About"), action=lambda: AboutDialog().exec(), - icon_file=constants.raven_icon + icon_file=constants.krow_icon ) return about_action diff --git a/raven/plugins/notes/__init__.py b/src/plugins/logfile/__init__.py similarity index 100% rename from raven/plugins/notes/__init__.py rename to src/plugins/logfile/__init__.py diff --git a/raven/plugins/logfile/filterviewsyncer.py b/src/plugins/logfile/filterviewsyncer.py similarity index 94% rename from raven/plugins/logfile/filterviewsyncer.py rename to src/plugins/logfile/filterviewsyncer.py index 0f4bdf8..9b22ae5 100644 --- a/raven/plugins/logfile/filterviewsyncer.py +++ b/src/plugins/logfile/filterviewsyncer.py @@ -1,4 +1,4 @@ -from raven.ui.bigtext.bigtext import BigText +from src.ui.bigtext.bigtext import BigText class FilterViewSyncer: diff --git a/raven/plugins/logfile/filterwidget.py b/src/plugins/logfile/filterwidget.py similarity index 98% rename from raven/plugins/logfile/filterwidget.py rename to src/plugins/logfile/filterwidget.py index 13ae27c..65066b5 100644 --- a/raven/plugins/logfile/filterwidget.py +++ b/src/plugins/logfile/filterwidget.py @@ -9,11 +9,11 @@ from typing import Optional, Callable from PySide6.QtCore import QRunnable, QThreadPool, Signal, QThread, QObject from PySide6.QtWidgets import QWidget, QVBoxLayout, QHBoxLayout, QLineEdit, QCheckBox, QPushButton, QLabel, QProgressBar -from raven.ui.bigtext.bigtext import BigText -from raven.ui.bigtext.logFileModel import LogFileModel +from src.ui.bigtext.bigtext import BigText +from src.ui.bigtext.logFileModel import LogFileModel -from raven.i18n import _ -from raven.pluginregistry import PluginRegistry +from src.i18n import _ +from src.pluginregistry import PluginRegistry log = logging.getLogger("filterwidget") diff --git a/raven/plugins/logfile/fulltabwidget.py b/src/plugins/logfile/fulltabwidget.py similarity index 82% rename from raven/plugins/logfile/fulltabwidget.py rename to src/plugins/logfile/fulltabwidget.py index ef93040..929b81f 100644 --- a/raven/plugins/logfile/fulltabwidget.py +++ b/src/plugins/logfile/fulltabwidget.py @@ -1,12 +1,12 @@ from PySide6.QtWidgets import * from PySide6.QtCore import * -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 +from src.ui.bigtext.bigtext import BigText +from src.plugins.logfile.filterviewsyncer import FilterViewSyncer +from src.plugins.logfile.filterwidget import FilterWidget +from src.ui.bigtext.logFileModel import LogFileModel +from src.plugins.krowlog.Tab import Tab +from src.util.conversion import humanbytes class FullTabWidget(Tab): diff --git a/raven/plugins/logfileplugin.py b/src/plugins/logfileplugin.py similarity index 75% rename from raven/plugins/logfileplugin.py rename to src/plugins/logfileplugin.py index 38711e0..2c802c7 100644 --- a/raven/plugins/logfileplugin.py +++ b/src/plugins/logfileplugin.py @@ -3,13 +3,13 @@ from typing import Optional from PySide6.QtWidgets import QMessageBox -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 src.plugins.logfile.fulltabwidget import FullTabWidget +from src.ui.bigtext.logFileModel import LogFileModel +from src.pluginbase import PluginBase +from src.plugins.krowlog.Tab import Tab +from src.settings.settings import Settings -from raven.i18n import _ +from src.i18n import _ class LogFilePlugin(PluginBase): diff --git a/raven/plugins/ravenlog/__init__.py b/src/plugins/notes/__init__.py similarity index 100% rename from raven/plugins/ravenlog/__init__.py rename to src/plugins/notes/__init__.py diff --git a/raven/plugins/notes/noteswidget.py b/src/plugins/notes/noteswidget.py similarity index 89% rename from raven/plugins/notes/noteswidget.py rename to src/plugins/notes/noteswidget.py index be38bc7..e3eea55 100644 --- a/raven/plugins/notes/noteswidget.py +++ b/src/plugins/notes/noteswidget.py @@ -1,4 +1,4 @@ -from raven.plugins.ravenlog.Tab import Tab +from src.plugins.krowlog.Tab import Tab from PySide6.QtWidgets import QTextEdit, QVBoxLayout diff --git a/raven/plugins/notesplugin.py b/src/plugins/notesplugin.py similarity index 76% rename from raven/plugins/notesplugin.py rename to src/plugins/notesplugin.py index c80b51b..370b53f 100644 --- a/raven/plugins/notesplugin.py +++ b/src/plugins/notesplugin.py @@ -2,12 +2,13 @@ from typing import Callable from PySide6.QtCore import Qt -from raven.pluginbase import PluginBase -from raven.pluginregistry import PluginRegistry -from raven.plugins.domain.menucontribution import MenuContribution -from raven.plugins.domain.raction import RAction -from raven.plugins.notes.noteswidget import NotesWidget -from raven.i18n import _ +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.notes.noteswidget import NotesWidget +from src.i18n import _ + class NotesPlugin(PluginBase): diff --git a/raven/plugins/openfileplugin.py b/src/plugins/openfileplugin.py similarity index 91% rename from raven/plugins/openfileplugin.py rename to src/plugins/openfileplugin.py index 9888fbf..5666734 100644 --- a/raven/plugins/openfileplugin.py +++ b/src/plugins/openfileplugin.py @@ -3,14 +3,15 @@ from pathlib import Path from PySide6.QtWidgets import QFileDialog -from raven.pluginbase import PluginBase -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 raven.settings.settings import Settings +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.domain.rmenu import RMenu +from src.settings.settings import Settings + +from src.i18n import _ -from raven.i18n import _ class OpenFilePlugin(PluginBase): def __init__(self): diff --git a/raven/settings/__init__.py b/src/settings/__init__.py similarity index 100% rename from raven/settings/__init__.py rename to src/settings/__init__.py diff --git a/raven/settings/cutesettings.py b/src/settings/cutesettings.py similarity index 82% rename from raven/settings/cutesettings.py rename to src/settings/cutesettings.py index 3cbb7ee..c0cf3f7 100644 --- a/raven/settings/cutesettings.py +++ b/src/settings/cutesettings.py @@ -4,7 +4,7 @@ from PySide6.QtCore import QSettings class CuteSettings: def __init__(self): - self._settings = QSettings("opentext", "ravenlog") + self._settings = QSettings("krowlog", "settings") def set_value(self, key: str, value: any): self._settings.setValue(key, value) diff --git a/raven/settings/settings.py b/src/settings/settings.py similarity index 100% rename from raven/settings/settings.py rename to src/settings/settings.py diff --git a/raven/settings/settingsstore.py b/src/settings/settingsstore.py similarity index 85% rename from raven/settings/settingsstore.py rename to src/settings/settingsstore.py index ac5e605..83ce526 100644 --- a/raven/settings/settingsstore.py +++ b/src/settings/settingsstore.py @@ -4,7 +4,7 @@ from pathlib import Path from os.path import join from configparser import ConfigParser -from raven.settings.settings import Settings +from src.settings.settings import Settings class SettingsStore(): @@ -14,9 +14,9 @@ class SettingsStore(): @staticmethod def _session_file() -> str: if sys.platform == 'win32' or sys.platform == 'cygwin': - return join(Path.home(), "AppData", "Local", "ravenlog", "session.ini") + return join(Path.home(), "AppData", "Local", "krowlog", "session.ini") else: - return join(Path.home(), ".local", "share", "ravenlog", "session.ini") + return join(Path.home(), ".local", "share", "krowlog", "session.ini") @staticmethod def load() -> Settings: diff --git a/raven/ui/ScaledScrollBar.py b/src/ui/ScaledScrollBar.py similarity index 100% rename from raven/ui/ScaledScrollBar.py rename to src/ui/ScaledScrollBar.py diff --git a/raven/ui/__init__.py b/src/ui/__init__.py similarity index 100% rename from raven/ui/__init__.py rename to src/ui/__init__.py diff --git a/raven/ui/bigtext/__init__.py b/src/ui/bigtext/__init__.py similarity index 100% rename from raven/ui/bigtext/__init__.py rename to src/ui/bigtext/__init__.py diff --git a/raven/ui/bigtext/bigtext.py b/src/ui/bigtext/bigtext.py similarity index 97% rename from raven/ui/bigtext/bigtext.py rename to src/ui/bigtext/bigtext.py index 84a74fb..9b0bea0 100644 --- a/raven/ui/bigtext/bigtext.py +++ b/src/ui/bigtext/bigtext.py @@ -12,19 +12,19 @@ from PySide6.QtGui import QMouseEvent 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 raven.pluginregistry import PluginRegistry +from src.ui.ScaledScrollBar import ScaledScrollBar +from src.ui.bigtext.highlight_selection import HighlightSelection +from src.ui.bigtext.highlighted_range import HighlightedRange +from src.ui.bigtext.highlightingdialog import HighlightingDialog +from src.ui.bigtext.line import Line +from src.ui.bigtext.logFileModel import LogFileModel +from src.util.conversion import humanbytes +from src.pluginregistry import PluginRegistry -from raven.settings.settings import Settings +from src.settings.settings import Settings from watchdog.observers import Observer from watchdog.events import FileSystemEventHandler -from raven.i18n import _ +from src.i18n import _ class FileObserver(FileSystemEventHandler): diff --git a/raven/ui/bigtext/highlight.py b/src/ui/bigtext/highlight.py similarity index 65% rename from raven/ui/bigtext/highlight.py rename to src/ui/bigtext/highlight.py index ce173c8..e6e938b 100644 --- a/raven/ui/bigtext/highlight.py +++ b/src/ui/bigtext/highlight.py @@ -1,7 +1,7 @@ from typing import Optional, List -from raven.ui.bigtext.line import Line -from raven.ui.bigtext.highlighted_range import HighlightedRange +from src.ui.bigtext.line import Line +from src.ui.bigtext.highlighted_range import HighlightedRange class Highlight: diff --git a/raven/ui/bigtext/highlight_regex.py b/src/ui/bigtext/highlight_regex.py similarity index 93% rename from raven/ui/bigtext/highlight_regex.py rename to src/ui/bigtext/highlight_regex.py index a2b075e..0184aaf 100644 --- a/raven/ui/bigtext/highlight_regex.py +++ b/src/ui/bigtext/highlight_regex.py @@ -1,8 +1,8 @@ from typing import Optional -from raven.ui.bigtext.highlight import Highlight -from raven.ui.bigtext.highlighted_range import HighlightedRange -from raven.ui.bigtext.line import Line +from src.ui.bigtext.highlight import Highlight +from src.ui.bigtext.highlighted_range import HighlightedRange +from src.ui.bigtext.line import Line from PySide6.QtGui import QBrush, QColor from typing import List diff --git a/raven/ui/bigtext/highlight_selection.py b/src/ui/bigtext/highlight_selection.py similarity index 90% rename from raven/ui/bigtext/highlight_selection.py rename to src/ui/bigtext/highlight_selection.py index 3c9fc39..14bdf2f 100644 --- a/raven/ui/bigtext/highlight_selection.py +++ b/src/ui/bigtext/highlight_selection.py @@ -1,12 +1,12 @@ from typing import Optional, List -from raven.ui.bigtext.highlight import Highlight -from raven.ui.bigtext.highlighted_range import HighlightedRange -from raven.ui.bigtext.line import Line +from src.ui.bigtext.highlight import Highlight +from src.ui.bigtext.highlighted_range import HighlightedRange +from src.ui.bigtext.line import Line from PySide6.QtCore import Qt from PySide6.QtGui import QBrush, QColor -from raven.settings.settings import Settings +from src.settings.settings import Settings class HighlightSelection(Highlight): diff --git a/raven/ui/bigtext/highlighted_range.py b/src/ui/bigtext/highlighted_range.py similarity index 100% rename from raven/ui/bigtext/highlighted_range.py rename to src/ui/bigtext/highlighted_range.py diff --git a/raven/ui/bigtext/highlighting.py b/src/ui/bigtext/highlighting.py similarity index 95% rename from raven/ui/bigtext/highlighting.py rename to src/ui/bigtext/highlighting.py index b036e19..92ec1cb 100644 --- a/raven/ui/bigtext/highlighting.py +++ b/src/ui/bigtext/highlighting.py @@ -1,10 +1,11 @@ import logging -from raven.settings.settings import Settings -from raven.ui.bigtext.highlight_regex import HighlightRegex +from src.settings.settings import Settings +from src.ui.bigtext.highlight_regex import HighlightRegex log = logging.getLogger("highlighting") + class Highlighting: @staticmethod diff --git a/raven/ui/bigtext/highlightingdialog.py b/src/ui/bigtext/highlightingdialog.py similarity index 96% rename from raven/ui/bigtext/highlightingdialog.py rename to src/ui/bigtext/highlightingdialog.py index 25d17fd..68e9532 100644 --- a/raven/ui/bigtext/highlightingdialog.py +++ b/src/ui/bigtext/highlightingdialog.py @@ -2,13 +2,13 @@ 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 raven.settings.settings import Settings +from src.ui.bigtext.highlight_regex import HighlightRegex +from src.ui.bigtext.highlighting import Highlighting +from src.ui.colorbutton import ColorButton +from src.ui.hbox import HBox +from src.settings.settings import Settings -from raven.i18n import _ +from src.i18n import _ class PayloadItem(QListWidgetItem): diff --git a/raven/ui/bigtext/line.py b/src/ui/bigtext/line.py similarity index 100% rename from raven/ui/bigtext/line.py rename to src/ui/bigtext/line.py diff --git a/raven/ui/bigtext/linetolinemap.py b/src/ui/bigtext/linetolinemap.py similarity index 92% rename from raven/ui/bigtext/linetolinemap.py rename to src/ui/bigtext/linetolinemap.py index a15d4ea..a437203 100644 --- a/raven/ui/bigtext/linetolinemap.py +++ b/src/ui/bigtext/linetolinemap.py @@ -2,7 +2,7 @@ import os import tempfile from typing import Optional -from raven.util.int2intmap import Int2IntMap +from src.util.int2intmap import Int2IntMap class LineToLineMap: diff --git a/raven/ui/bigtext/logFileModel.py b/src/ui/bigtext/logFileModel.py similarity index 97% rename from raven/ui/bigtext/logFileModel.py rename to src/ui/bigtext/logFileModel.py index f95222b..7ec5676 100644 --- a/raven/ui/bigtext/logFileModel.py +++ b/src/ui/bigtext/logFileModel.py @@ -2,11 +2,11 @@ import math import re from typing import List, Optional from PySide6.QtCore import Signal -from raven.ui.bigtext.highlight_regex import HighlightRegex -from raven.ui.bigtext.highlighting import Highlighting -from raven.ui.bigtext.line import Line +from src.ui.bigtext.highlight_regex import HighlightRegex +from src.ui.bigtext.highlighting import Highlighting +from src.ui.bigtext.line import Line import os -from raven.settings.settings import Settings +from src.settings.settings import Settings class LogFileModel: diff --git a/raven/ui/bigtext/testline.py b/src/ui/bigtext/testline.py similarity index 100% rename from raven/ui/bigtext/testline.py rename to src/ui/bigtext/testline.py diff --git a/raven/ui/bigtext/testlogfilemodel.py b/src/ui/bigtext/testlogfilemodel.py similarity index 99% rename from raven/ui/bigtext/testlogfilemodel.py rename to src/ui/bigtext/testlogfilemodel.py index e97b964..e6556ff 100644 --- a/raven/ui/bigtext/testlogfilemodel.py +++ b/src/ui/bigtext/testlogfilemodel.py @@ -4,7 +4,7 @@ from configparser import ConfigParser from os.path import join from logFileModel import LogFileModel -from raven.settings.settings import Settings +from src.settings.settings import Settings class TestLogFileModel(unittest.TestCase): diff --git a/raven/ui/colorbutton.py b/src/ui/colorbutton.py similarity index 99% rename from raven/ui/colorbutton.py rename to src/ui/colorbutton.py index 3a58649..725d8ec 100644 --- a/raven/ui/colorbutton.py +++ b/src/ui/colorbutton.py @@ -2,7 +2,7 @@ import re from PySide6.QtGui import QColor, QPixmap, QIcon from PySide6.QtWidgets import QWidget, QHBoxLayout, QPushButton, QColorDialog, QSizePolicy, QComboBox -from raven.i18n import _ +from src.i18n import _ class ColorButton(QWidget): def __init__(self, color: str, parent=None): diff --git a/raven/ui/hbox.py b/src/ui/hbox.py similarity index 100% rename from raven/ui/hbox.py rename to src/ui/hbox.py diff --git a/raven/ui/label.py b/src/ui/label.py similarity index 100% rename from raven/ui/label.py rename to src/ui/label.py diff --git a/raven/ui/tabs.py b/src/ui/tabs.py similarity index 94% rename from raven/ui/tabs.py rename to src/ui/tabs.py index 4d1d52d..465462c 100644 --- a/raven/ui/tabs.py +++ b/src/ui/tabs.py @@ -2,9 +2,9 @@ from typing import Optional from PySide6.QtWidgets import QWidget, QTabWidget, QVBoxLayout -from raven.pluginregistry import PluginRegistry -from raven.plugins.ravenlog.Tab import Tab -from raven.settings.settings import Settings +from src.pluginregistry import PluginRegistry +from src.plugins.krowlog.Tab import Tab +from src.settings.settings import Settings class Tabs(QWidget): diff --git a/raven/ui/vbox.py b/src/ui/vbox.py similarity index 100% rename from raven/ui/vbox.py rename to src/ui/vbox.py diff --git a/raven/util/__init__.py b/src/util/__init__.py similarity index 100% rename from raven/util/__init__.py rename to src/util/__init__.py diff --git a/raven/util/conversion.py b/src/util/conversion.py similarity index 100% rename from raven/util/conversion.py rename to src/util/conversion.py diff --git a/raven/util/int2intmap.py b/src/util/int2intmap.py similarity index 100% rename from raven/util/int2intmap.py rename to src/util/int2intmap.py diff --git a/raven/util/testint2intmaplike.py b/src/util/testint2intmaplike.py similarity index 98% rename from raven/util/testint2intmaplike.py rename to src/util/testint2intmaplike.py index d2a17ba..a9a9edf 100644 --- a/raven/util/testint2intmaplike.py +++ b/src/util/testint2intmaplike.py @@ -2,7 +2,7 @@ import tempfile import unittest from os.path import join -from raven.util.int2intmap import Int2IntMap +from src.util.int2intmap import Int2IntMap class Int2IntMapLike(unittest.TestCase): diff --git a/raven/util/urlutils.py b/src/util/urlutils.py similarity index 100% rename from raven/util/urlutils.py rename to src/util/urlutils.py diff --git a/translate.sh b/translate.sh index 6f046ab..ec827e7 100755 --- a/translate.sh +++ b/translate.sh @@ -1,6 +1,6 @@ #!/bin/bash echo "extract text from source files" -find . -iname "*.py" | xargs /home/andi/bin/Python-3.10.0/Tools/i18n/pygettext.py -o locales/messages.pot +find src -iname "*.py" | xargs /home/andi/bin/Python-3.10.0/Tools/i18n/pygettext.py -o locales/messages.pot echo "edit with poedit" \ No newline at end of file