mirror of
https://github.com/olivierkes/manuskript.git
synced 2024-06-01 10:39:34 +12:00
Started adding UI python code and renamed Qt files for compatibility
Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>
This commit is contained in:
parent
0b219a0b5f
commit
59662921a7
|
@ -10,4 +10,4 @@ sys.path.insert(1, os.path.join(os.path.dirname(realpath), '..'))
|
|||
|
||||
from manuskript import main
|
||||
|
||||
main.run()
|
||||
main.run()
|
||||
|
|
20
bin/test_gtk.py
Normal file
20
bin/test_gtk.py
Normal file
|
@ -0,0 +1,20 @@
|
|||
#!/usr/bin/env python3
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
import os
|
||||
import sys
|
||||
|
||||
print("blub")
|
||||
|
||||
realpath = os.path.realpath(__file__)
|
||||
|
||||
sys.path.insert(1, os.path.join(os.path.dirname(realpath), '..'))
|
||||
|
||||
print("real")
|
||||
|
||||
from manuskript.ui import MainWindow
|
||||
|
||||
print("Hi")
|
||||
|
||||
mw = MainWindow()
|
||||
mw.run()
|
|
@ -4,8 +4,8 @@ from PyQt5.QtCore import Qt, QUrl
|
|||
from PyQt5.QtWidgets import QPlainTextEdit, qApp, QTabWidget, QFrame, QTextEdit
|
||||
|
||||
from manuskript.exporter.manuskript.markdown import markdown, markdownSettings
|
||||
from manuskript.ui.views.webView import webView
|
||||
from manuskript.ui.exporters.manuskript.plainTextSettings import exporterSettings
|
||||
from manuskript.ui_qt.views.webView import webView
|
||||
from manuskript.ui_qt.exporters.manuskript.plainTextSettings import exporterSettings
|
||||
import os
|
||||
|
||||
try:
|
||||
|
|
|
@ -5,8 +5,8 @@ from PyQt5.QtWidgets import QPlainTextEdit, QGroupBox, qApp, QVBoxLayout, QCheck
|
|||
|
||||
from manuskript.exporter.manuskript.plainText import plainText
|
||||
from manuskript.functions import mainWindow
|
||||
from manuskript.ui.highlighters import MMDHighlighter
|
||||
from manuskript.ui.exporters.manuskript.plainTextSettings import exporterSettings
|
||||
from manuskript.ui_qt.highlighters import MMDHighlighter
|
||||
from manuskript.ui_qt.exporters.manuskript.plainTextSettings import exporterSettings
|
||||
|
||||
|
||||
class markdown(plainText):
|
||||
|
|
|
@ -7,7 +7,7 @@ from PyQt5.QtWidgets import QPlainTextEdit, qApp, QFrame, QFileDialog, QMessageB
|
|||
from manuskript.exporter.basic import basicFormat
|
||||
from manuskript.functions import mainWindow, getSaveFileNameWithSuffix
|
||||
from manuskript.models import outlineItem
|
||||
from manuskript.ui.exporters.manuskript.plainTextSettings import exporterSettings
|
||||
from manuskript.ui_qt.exporters.manuskript.plainTextSettings import exporterSettings
|
||||
import codecs
|
||||
|
||||
import logging
|
||||
|
|
|
@ -8,7 +8,7 @@ from PyQt5.QtWidgets import qApp
|
|||
|
||||
from manuskript.exporter.pandoc.abstractOutput import abstractOutput
|
||||
from manuskript.functions import tempFile
|
||||
from manuskript.ui.views.PDFViewer import PDFViewer
|
||||
from manuskript.ui_qt.views.PDFViewer import PDFViewer
|
||||
|
||||
|
||||
class PDF(abstractOutput):
|
||||
|
|
|
@ -6,7 +6,7 @@ from PyQt5.QtGui import QTextCharFormat, QFont
|
|||
from PyQt5.QtWidgets import qApp, QVBoxLayout, QCheckBox, QWidget, QHBoxLayout, QLabel, QSpinBox, QComboBox
|
||||
|
||||
from manuskript.exporter.manuskript.markdown import markdown, markdownSettings
|
||||
from manuskript.ui.collapsibleGroupBox2 import collapsibleGroupBox2
|
||||
from manuskript.ui_qt.collapsibleGroupBox2 import collapsibleGroupBox2
|
||||
|
||||
|
||||
class abstractPlainText(markdown):
|
||||
|
|
|
@ -83,7 +83,7 @@ def toString(text):
|
|||
|
||||
|
||||
def drawProgress(painter, rect, progress, radius=0):
|
||||
from manuskript.ui import style as S
|
||||
from manuskript.ui_qt import style as S
|
||||
progress = toFloat(progress) # handle invalid input (issue #561)
|
||||
painter.setPen(Qt.NoPen)
|
||||
painter.setBrush(QColor(S.base)) # "#dddddd"
|
||||
|
@ -199,7 +199,7 @@ def mixColors(col1, col2, f=.5):
|
|||
|
||||
def outlineItemColors(item):
|
||||
|
||||
from manuskript.ui import style as S
|
||||
from manuskript.ui_qt import style as S
|
||||
|
||||
"""Takes an OutlineItem and returns a dict of colors."""
|
||||
colors = {}
|
||||
|
@ -393,7 +393,7 @@ def statusMessage(message, duration=5000, importance=1):
|
|||
Shows a message in MainWindow's status bar.
|
||||
Importance: 0 = low, 1 = normal, 2 = important, 3 = critical.
|
||||
"""
|
||||
from manuskript.ui import style as S
|
||||
from manuskript.ui_qt import style as S
|
||||
MW.statusBar().hide()
|
||||
MW.statusLabel.setText(message)
|
||||
if importance == 0:
|
||||
|
|
|
@ -7,8 +7,8 @@ import subprocess
|
|||
from PyQt5.QtCore import QSettings
|
||||
from PyQt5.QtWidgets import QWidget, QVBoxLayout, QCheckBox, QHBoxLayout, \
|
||||
QLabel, QSpinBox, QComboBox, QLineEdit
|
||||
from manuskript.ui.collapsibleGroupBox2 import collapsibleGroupBox2
|
||||
from manuskript.ui import style
|
||||
from manuskript.ui_qt.collapsibleGroupBox2 import collapsibleGroupBox2
|
||||
from manuskript.ui_qt import style
|
||||
|
||||
|
||||
class abstractImporter:
|
||||
|
|
|
@ -370,7 +370,7 @@ def logRuntimeInformation(logger=None):
|
|||
logger.info("* Markdown %s", afom("markdown", "__version__") or "N/A")
|
||||
|
||||
# Web rendering engine
|
||||
from manuskript.ui.views.webView import webEngine
|
||||
from manuskript.ui_qt.views.webView import webEngine
|
||||
logger.info("Web rendering engine: %s", webEngine)
|
||||
|
||||
# Do not collect version information for Pandoc; that would require
|
||||
|
|
|
@ -108,7 +108,7 @@ def prepare(arguments, tests=False):
|
|||
else:
|
||||
# Auto-detect based on system locale.
|
||||
translation = QLocale().uiLanguages()
|
||||
source = "available ui languages"
|
||||
source = "available ui_qt languages"
|
||||
|
||||
LOGGER.info("Preferred translation: {} (based on {})".format(("builtin" if translation == "" else translation), source))
|
||||
activateTranslation(translation, source)
|
||||
|
|
|
@ -22,21 +22,21 @@ from manuskript.models import outlineModel
|
|||
from manuskript.models.plotModel import plotModel
|
||||
from manuskript.models.worldModel import worldModel
|
||||
from manuskript.settingsWindow import settingsWindow
|
||||
from manuskript.ui import style
|
||||
from manuskript.ui.about import aboutDialog
|
||||
from manuskript.ui.collapsibleDockWidgets import collapsibleDockWidgets
|
||||
from manuskript.ui.importers.importer import importerDialog
|
||||
from manuskript.ui.exporters.exporter import exporterDialog
|
||||
from manuskript.ui.helpLabel import helpLabel
|
||||
from manuskript.ui.mainWindow import Ui_MainWindow
|
||||
from manuskript.ui.tools.frequencyAnalyzer import frequencyAnalyzer
|
||||
from manuskript.ui.views.outlineDelegates import outlineCharacterDelegate
|
||||
from manuskript.ui.views.plotDelegate import plotDelegate
|
||||
from manuskript.ui.views.MDEditView import MDEditView
|
||||
from manuskript.ui.statusLabel import statusLabel
|
||||
from manuskript.ui_qt import style
|
||||
from manuskript.ui_qt.about import aboutDialog
|
||||
from manuskript.ui_qt.collapsibleDockWidgets import collapsibleDockWidgets
|
||||
from manuskript.ui_qt.importers.importer import importerDialog
|
||||
from manuskript.ui_qt.exporters.exporter import exporterDialog
|
||||
from manuskript.ui_qt.helpLabel import helpLabel
|
||||
from manuskript.ui_qt.mainWindow import Ui_MainWindow
|
||||
from manuskript.ui_qt.tools.frequencyAnalyzer import frequencyAnalyzer
|
||||
from manuskript.ui_qt.views.outlineDelegates import outlineCharacterDelegate
|
||||
from manuskript.ui_qt.views.plotDelegate import plotDelegate
|
||||
from manuskript.ui_qt.views.MDEditView import MDEditView
|
||||
from manuskript.ui_qt.statusLabel import statusLabel
|
||||
|
||||
# Spellcheck support
|
||||
from manuskript.ui.views.textEditView import textEditView
|
||||
from manuskript.ui_qt.views.textEditView import textEditView
|
||||
from manuskript.functions import Spellchecker
|
||||
|
||||
import logging
|
||||
|
@ -1639,7 +1639,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
|
|||
self.toolbar.setDockVisibility(self.dckNavigation, val)
|
||||
|
||||
# POV in metadata
|
||||
from manuskript.ui.views.propertiesView import propertiesView
|
||||
from manuskript.ui_qt.views.propertiesView import propertiesView
|
||||
for w in findWidgetsOfClass(propertiesView):
|
||||
w.lblPOV.setVisible(val)
|
||||
w.cmbPOV.setVisible(val)
|
||||
|
@ -1648,7 +1648,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
|
|||
if val == None and Outline.POV in settings.outlineViewColumns:
|
||||
settings.outlineViewColumns.remove(Outline.POV)
|
||||
|
||||
from manuskript.ui.views.outlineView import outlineView
|
||||
from manuskript.ui_qt.views.outlineView import outlineView
|
||||
for w in findWidgetsOfClass(outlineView):
|
||||
w.hideColumns()
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
#--!-- coding: utf8 --!--
|
||||
|
||||
from manuskript import enums
|
||||
from manuskript.ui import style as S
|
||||
from manuskript.ui_qt import style as S
|
||||
|
||||
|
||||
class persosProxyModel(QSortFilterProxyModel):
|
||||
|
|
|
@ -9,7 +9,7 @@ from PyQt5.QtGui import QColor
|
|||
from PyQt5.QtGui import QStandardItem
|
||||
|
||||
from manuskript.enums import Plot
|
||||
from manuskript.ui import style as S
|
||||
from manuskript.ui_qt import style as S
|
||||
|
||||
|
||||
class plotsProxyModel(QSortFilterProxyModel):
|
||||
|
|
|
@ -20,7 +20,7 @@ from manuskript.enums import Character
|
|||
from manuskript.enums import Plot
|
||||
from manuskript.enums import PlotStep
|
||||
from manuskript.functions import mainWindow, mixColors
|
||||
from manuskript.ui import style as S
|
||||
from manuskript.ui_qt import style as S
|
||||
|
||||
|
||||
RegEx = r"{(\w):(\d+):?.*?}"
|
||||
|
|
|
@ -8,7 +8,7 @@ from PyQt5.QtWidgets import QMenu, QAction, qApp
|
|||
|
||||
from manuskript.enums import World, Model
|
||||
from manuskript.functions import mainWindow
|
||||
from manuskript.ui import style as S
|
||||
from manuskript.ui_qt import style as S
|
||||
from manuskript.models.searchableModel import searchableModel
|
||||
from manuskript.models.searchableItem import searchableItem
|
||||
from manuskript.searchLabels import WorldSearchLabels
|
||||
|
|
|
@ -119,10 +119,10 @@ def initDefaultValues():
|
|||
"""
|
||||
global textEditor
|
||||
if not textEditor["background"]:
|
||||
from manuskript.ui import style as S
|
||||
from manuskript.ui_qt import style as S
|
||||
textEditor["background"] = S.base
|
||||
if not textEditor["fontColor"]:
|
||||
from manuskript.ui import style as S
|
||||
from manuskript.ui_qt import style as S
|
||||
textEditor["fontColor"] = S.text
|
||||
|
||||
def save(filename=None, protocol=None):
|
||||
|
|
|
@ -16,15 +16,15 @@ from manuskript import settings
|
|||
from manuskript.enums import Outline
|
||||
from manuskript.functions import allPaths, iconColor, writablePath, appPath, findWidgetsOfClass
|
||||
from manuskript.functions import mainWindow, findBackground, themeIcon
|
||||
from manuskript.ui.editors.tabSplitter import tabSplitter
|
||||
from manuskript.ui.editors.themes import createThemePreview
|
||||
from manuskript.ui.editors.themes import getThemeName
|
||||
from manuskript.ui.editors.themes import loadThemeDatas
|
||||
from manuskript.ui.settings_ui import Ui_Settings
|
||||
from manuskript.ui.views.outlineView import outlineView
|
||||
from manuskript.ui.views.textEditView import textEditView
|
||||
from manuskript.ui.welcome import welcome
|
||||
from manuskript.ui import style as S
|
||||
from manuskript.ui_qt.editors.tabSplitter import tabSplitter
|
||||
from manuskript.ui_qt.editors.themes import createThemePreview
|
||||
from manuskript.ui_qt.editors.themes import getThemeName
|
||||
from manuskript.ui_qt.editors.themes import loadThemeDatas
|
||||
from manuskript.ui_qt.settings_ui import Ui_Settings
|
||||
from manuskript.ui_qt.views.outlineView import outlineView
|
||||
from manuskript.ui_qt.views.textEditView import textEditView
|
||||
from manuskript.ui_qt.welcome import welcome
|
||||
from manuskript.ui_qt import style as S
|
||||
|
||||
|
||||
class settingsWindow(QWidget, Ui_Settings):
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/env python
|
||||
# --!-- coding: utf8 --!--
|
||||
|
||||
"""Tests for stuff in ui."""
|
||||
"""Tests for stuff in ui_qt."""
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/env python
|
||||
# --!-- coding: utf8 --!--
|
||||
|
||||
"""Tests for exporters, ui part."""
|
||||
"""Tests for exporters, ui_qt part."""
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/env python
|
||||
# --!-- coding: utf8 --!--
|
||||
|
||||
"""Tests for importers, ui part."""
|
||||
"""Tests for importers, ui_qt part."""
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env python
|
||||
# --!-- coding: utf8 --!--
|
||||
|
||||
from manuskript.ui.searchMenu import searchMenu
|
||||
from manuskript.ui_qt.searchMenu import searchMenu
|
||||
from manuskript.enums import Outline, Character, FlatData, World, Plot, PlotStep, Model
|
||||
from manuskript.searchLabels import PLOT_STEP_COLUMNS_OFFSET
|
||||
|
||||
|
|
|
@ -0,0 +1,12 @@
|
|||
#!/usr/bin/env python3
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from manuskript.ui.generalView import GeneralView
|
||||
from manuskript.ui.summaryView import SummaryView
|
||||
from manuskript.ui.charactersView import CharactersView
|
||||
from manuskript.ui.plotView import PlotView
|
||||
from manuskript.ui.worldView import WorldView
|
||||
from manuskript.ui.outlineView import OutlineView
|
||||
from manuskript.ui.editorView import EditorView
|
||||
|
||||
from manuskript.ui.mainWindow import MainWindow
|
19
manuskript/ui/charactersView.py
Normal file
19
manuskript/ui/charactersView.py
Normal file
|
@ -0,0 +1,19 @@
|
|||
#!/usr/bin/env python3
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk
|
||||
|
||||
|
||||
class CharactersView:
|
||||
|
||||
def __init__(self):
|
||||
builder = Gtk.Builder()
|
||||
builder.add_from_file("ui/characters.glade")
|
||||
|
||||
self.widget = builder.get_object("characters_view")
|
||||
|
||||
def show(self):
|
||||
self.widget.show_all()
|
19
manuskript/ui/editorView.py
Normal file
19
manuskript/ui/editorView.py
Normal file
|
@ -0,0 +1,19 @@
|
|||
#!/usr/bin/env python3
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk
|
||||
|
||||
|
||||
class EditorView:
|
||||
|
||||
def __init__(self):
|
||||
builder = Gtk.Builder()
|
||||
builder.add_from_file("ui/editor.glade")
|
||||
|
||||
self.widget = builder.get_object("editor_view")
|
||||
|
||||
def show(self):
|
||||
self.widget.show_all()
|
19
manuskript/ui/generalView.py
Normal file
19
manuskript/ui/generalView.py
Normal file
|
@ -0,0 +1,19 @@
|
|||
#!/usr/bin/env python3
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk
|
||||
|
||||
|
||||
class GeneralView:
|
||||
|
||||
def __init__(self):
|
||||
builder = Gtk.Builder()
|
||||
builder.add_from_file("ui/general.glade")
|
||||
|
||||
self.widget = builder.get_object("general_view")
|
||||
|
||||
def show(self):
|
||||
self.widget.show_all()
|
|
@ -1,12 +0,0 @@
|
|||
#!/usr/bin/python
|
||||
# -*- coding: utf8 -*-
|
||||
|
||||
from manuskript.ui.highlighters.basicHighlighter import BasicHighlighter
|
||||
from manuskript.ui.highlighters.MMDHighlighter import MMDHighlighter
|
||||
|
||||
# Markdown highlighter
|
||||
from manuskript.ui.highlighters.markdownEnums import MarkdownState
|
||||
from manuskript.ui.highlighters.markdownEnums import MarkdownTokenType
|
||||
from manuskript.ui.highlighters.markdownEnums import BlockquoteStyle
|
||||
from manuskript.ui.highlighters.markdownTokenizer import MarkdownTokenizer
|
||||
from manuskript.ui.highlighters.markdownHighlighter import MarkdownHighlighter
|
File diff suppressed because it is too large
Load diff
19
manuskript/ui/outlineView.py
Normal file
19
manuskript/ui/outlineView.py
Normal file
|
@ -0,0 +1,19 @@
|
|||
#!/usr/bin/env python3
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk
|
||||
|
||||
|
||||
class OutlineView:
|
||||
|
||||
def __init__(self):
|
||||
builder = Gtk.Builder()
|
||||
builder.add_from_file("ui/outline.glade")
|
||||
|
||||
self.widget = builder.get_object("outline_view")
|
||||
|
||||
def show(self):
|
||||
self.widget.show_all()
|
19
manuskript/ui/plotView.py
Normal file
19
manuskript/ui/plotView.py
Normal file
|
@ -0,0 +1,19 @@
|
|||
#!/usr/bin/env python3
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk
|
||||
|
||||
|
||||
class PlotView:
|
||||
|
||||
def __init__(self):
|
||||
builder = Gtk.Builder()
|
||||
builder.add_from_file("ui/plot.glade")
|
||||
|
||||
self.widget = builder.get_object("plot_view")
|
||||
|
||||
def show(self):
|
||||
self.widget.show_all()
|
98
manuskript/ui/summaryView.py
Normal file
98
manuskript/ui/summaryView.py
Normal file
|
@ -0,0 +1,98 @@
|
|||
#!/usr/bin/env python3
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk
|
||||
|
||||
from manuskript.util import WordCounter, PageCounter
|
||||
|
||||
|
||||
class SummaryView:
|
||||
|
||||
def __init__(self):
|
||||
builder = Gtk.Builder()
|
||||
builder.add_from_file("ui/summary.glade")
|
||||
|
||||
self.widget = builder.get_object("summary_view")
|
||||
self.stack = builder.get_object("stack")
|
||||
|
||||
stackCombo = builder.get_object("stack_combo")
|
||||
stackCombo.connect("changed", self.summaryStackChanged)
|
||||
|
||||
self.situationBuffer = builder.get_object("situation")
|
||||
|
||||
self.oneSentenceBuffer = builder.get_object("summary_one_sentence")
|
||||
self.oneSentenceLabel = builder.get_object("one_sentence_label")
|
||||
|
||||
self.oneParagraphBuffer = builder.get_object("summary_one_paragraph")
|
||||
self.oneParagraphLabel = builder.get_object("one_paragraph_label")
|
||||
|
||||
self.onePageBuffer = builder.get_object("summary_one_page")
|
||||
self.onePageLabel = builder.get_object("one_page_label")
|
||||
|
||||
self.fullBuffer = builder.get_object("summary_full")
|
||||
self.fullLabel = builder.get_object("full_label")
|
||||
|
||||
self.situationBuffer.connect("deleted-text", self.situationDeletedText)
|
||||
self.situationBuffer.connect("inserted-text", self.situationInsertedText)
|
||||
self.oneSentenceBuffer.connect("changed", self.summaryOneSentenceChanged)
|
||||
self.oneParagraphBuffer.connect("changed", self.summaryOneParagraphChanged)
|
||||
self.onePageBuffer.connect("changed", self.summaryOnePageChanged)
|
||||
self.fullBuffer.connect("changed", self.summaryFullChanged)
|
||||
|
||||
def show(self):
|
||||
self.widget.show_all()
|
||||
|
||||
def summaryStackChanged(self, combo):
|
||||
tree_iter = combo.get_active_iter()
|
||||
|
||||
if tree_iter is None:
|
||||
return
|
||||
|
||||
model = combo.get_model()
|
||||
page = model[tree_iter][1]
|
||||
|
||||
self.stack.set_visible_child_name(page)
|
||||
|
||||
def situationChanged(self, buffer: Gtk.EntryBuffer):
|
||||
print(buffer.get_text())
|
||||
|
||||
def situationDeletedText(self, buffer: Gtk.EntryBuffer, position, count):
|
||||
self.situationChanged(buffer)
|
||||
|
||||
def situationInsertedText(self, buffer: Gtk.EntryBuffer, position, value, count):
|
||||
self.situationChanged(buffer)
|
||||
|
||||
def summaryOneSentenceChanged(self, buffer: Gtk.TextBuffer):
|
||||
start_iter = buffer.get_start_iter()
|
||||
end_iter = buffer.get_end_iter()
|
||||
|
||||
text = buffer.get_text(start_iter, end_iter, False)
|
||||
|
||||
self.oneSentenceLabel.set_text("Words: {}".format(WordCounter.count(text)))
|
||||
|
||||
def summaryOneParagraphChanged(self, buffer: Gtk.TextBuffer):
|
||||
start_iter = buffer.get_start_iter()
|
||||
end_iter = buffer.get_end_iter()
|
||||
|
||||
text = buffer.get_text(start_iter, end_iter, False)
|
||||
|
||||
self.oneParagraphLabel.set_text("Words: {}".format(WordCounter.count(text)))
|
||||
|
||||
def summaryOnePageChanged(self, buffer: Gtk.TextBuffer):
|
||||
start_iter = buffer.get_start_iter()
|
||||
end_iter = buffer.get_end_iter()
|
||||
|
||||
text = buffer.get_text(start_iter, end_iter, False)
|
||||
|
||||
self.onePageLabel.set_text("Words: {} (~{} pages)".format(WordCounter.count(text), PageCounter.count(text)))
|
||||
|
||||
def summaryFullChanged(self, buffer: Gtk.TextBuffer):
|
||||
start_iter = buffer.get_start_iter()
|
||||
end_iter = buffer.get_end_iter()
|
||||
|
||||
text = buffer.get_text(start_iter, end_iter, False)
|
||||
|
||||
self.fullLabel.set_text("Words: {} (~{} pages)".format(WordCounter.count(text), PageCounter.count(text)))
|
19
manuskript/ui/worldView.py
Normal file
19
manuskript/ui/worldView.py
Normal file
|
@ -0,0 +1,19 @@
|
|||
#!/usr/bin/env python3
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk
|
||||
|
||||
|
||||
class WorldView:
|
||||
|
||||
def __init__(self):
|
||||
builder = Gtk.Builder()
|
||||
builder.add_from_file("ui/world.glade")
|
||||
|
||||
self.widget = builder.get_object("world_view")
|
||||
|
||||
def show(self):
|
||||
self.widget.show_all()
|
|
@ -7,7 +7,7 @@ from PyQt5.QtWidgets import QWidget
|
|||
from platform import python_version
|
||||
|
||||
from manuskript.functions import appPath
|
||||
from manuskript.ui.about_ui import Ui_about
|
||||
from manuskript.ui_qt.about_ui import Ui_about
|
||||
from manuskript.version import getVersion
|
||||
|
||||
class aboutDialog(QWidget, Ui_about):
|
|
@ -1,6 +1,6 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
# Form implementation generated from reading ui file 'manuskript/ui/about_ui.ui'
|
||||
# Form implementation generated from reading ui_qt file 'manuskript/ui_qt/about_ui.ui_qt'
|
||||
#
|
||||
# Created: Wed Oct 11 08:28:24 2017
|
||||
# by: PyQt5 UI code generator 5.2.1
|
|
@ -7,10 +7,10 @@ from PyQt5.QtWidgets import QWidget, QListWidgetItem, QToolTip, QStyledItemDeleg
|
|||
from manuskript.enums import Character
|
||||
from manuskript.enums import Plot
|
||||
from manuskript.functions import mainWindow
|
||||
from manuskript.ui import style as S
|
||||
from manuskript.ui.cheatSheet_ui import Ui_cheatSheet
|
||||
from manuskript.ui_qt import style as S
|
||||
from manuskript.ui_qt.cheatSheet_ui import Ui_cheatSheet
|
||||
from manuskript.models import references as Ref
|
||||
from manuskript.ui.editors.completer import completer
|
||||
from manuskript.ui_qt.editors.completer import completer
|
||||
|
||||
|
||||
class cheatSheet(QWidget, Ui_cheatSheet):
|
|
@ -1,6 +1,6 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
# Form implementation generated from reading ui file 'manuskript/ui/cheatSheet_ui.ui'
|
||||
# Form implementation generated from reading ui_qt file 'manuskript/ui_qt/cheatSheet_ui.ui_qt'
|
||||
#
|
||||
# Created: Fri Apr 8 14:27:04 2016
|
||||
# by: PyQt5 UI code generator 5.2.1
|
|
@ -4,7 +4,7 @@ from PyQt5.QtCore import Qt
|
|||
from PyQt5.QtWidgets import QToolBar, QDockWidget, QAction, QToolButton, QSizePolicy, QStylePainter, \
|
||||
QStyleOptionButton, QStyle
|
||||
|
||||
from manuskript.ui import style
|
||||
from manuskript.ui_qt import style
|
||||
|
||||
|
||||
class collapsibleDockWidgets(QToolBar):
|
|
@ -4,7 +4,7 @@ from PyQt5.QtCore import Qt, QRect, QRectF
|
|||
from PyQt5.QtGui import QColor, QBrush, QRegion, QTextOption, QFont
|
||||
from PyQt5.QtWidgets import QSizePolicy, QGroupBox, QWidget, QStylePainter, QStyleOptionGroupBox, qApp, QVBoxLayout, \
|
||||
QStyle, QStyleOptionFrame, QStyleOptionFocusRect
|
||||
from manuskript.ui import style as S
|
||||
from manuskript.ui_qt import style as S
|
||||
|
||||
import logging
|
||||
LOGGER = logging.getLogger(__name__)
|
|
@ -3,7 +3,7 @@
|
|||
from PyQt5.QtCore import Qt
|
||||
from PyQt5.QtWidgets import QWidget, QFrame, QPushButton, QVBoxLayout, QSizePolicy, qApp
|
||||
|
||||
from manuskript.ui import style
|
||||
from manuskript.ui_qt import style
|
||||
|
||||
|
||||
class collapsibleGroupBox2(QWidget):
|
|
@ -5,9 +5,9 @@ from PyQt5.QtGui import QBrush, QFontMetrics, QPalette, QColor
|
|||
from PyQt5.QtWidgets import QWidget, QListWidgetItem, QStyledItemDelegate, QStyle
|
||||
|
||||
from manuskript.functions import mainWindow
|
||||
from manuskript.ui.editors.completer_ui import Ui_completer
|
||||
from manuskript.ui_qt.editors.completer_ui import Ui_completer
|
||||
from manuskript.models import references as Ref
|
||||
from manuskript.ui import style as S
|
||||
from manuskript.ui_qt import style as S
|
||||
|
||||
|
||||
class completer(QWidget, Ui_completer):
|
|
@ -1,6 +1,6 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
# Form implementation generated from reading ui file 'manuskript/ui/editors/completer_ui.ui'
|
||||
# Form implementation generated from reading ui_qt file 'manuskript/ui_qt/editors/completer_ui.ui_qt'
|
||||
#
|
||||
# Created by: PyQt5 UI code generator 5.4.1
|
||||
#
|
|
@ -7,9 +7,9 @@ from PyQt5.QtWidgets import QVBoxLayout, qApp, QStyle
|
|||
|
||||
from manuskript import settings
|
||||
from manuskript.functions import AUC, mainWindow
|
||||
from manuskript.ui.editors.editorWidget_ui import Ui_editorWidget_ui
|
||||
from manuskript.ui.views.MDEditView import MDEditView
|
||||
from manuskript.ui.tools.splitDialog import splitDialog
|
||||
from manuskript.ui_qt.editors.editorWidget_ui import Ui_editorWidget_ui
|
||||
from manuskript.ui_qt.views.MDEditView import MDEditView
|
||||
from manuskript.ui_qt.tools.splitDialog import splitDialog
|
||||
|
||||
|
||||
class editorWidget(QWidget, Ui_editorWidget_ui):
|
|
@ -1,6 +1,6 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
# Form implementation generated from reading ui file 'manuskript/ui/editors/editorWidget_ui.ui'
|
||||
# Form implementation generated from reading ui_qt file 'manuskript/ui_qt/editors/editorWidget_ui.ui_qt'
|
||||
#
|
||||
# Created by: PyQt5 UI code generator 5.5.1
|
||||
#
|
||||
|
@ -74,6 +74,6 @@ class Ui_editorWidget_ui(object):
|
|||
_translate = QtCore.QCoreApplication.translate
|
||||
editorWidget_ui.setWindowTitle(_translate("editorWidget_ui", "Form"))
|
||||
|
||||
from manuskript.ui.views.MDEditView import MDEditView
|
||||
from manuskript.ui.views.corkView import corkView
|
||||
from manuskript.ui.views.outlineView import outlineView
|
||||
from manuskript.ui_qt.views.MDEditView import MDEditView
|
||||
from manuskript.ui_qt.views.corkView import corkView
|
||||
from manuskript.ui_qt.views.outlineView import outlineView
|
|
@ -13,10 +13,10 @@ from manuskript import settings
|
|||
from manuskript.enums import Outline
|
||||
from manuskript.models import outlineItem
|
||||
from manuskript.functions import allPaths, drawProgress
|
||||
from manuskript.ui.editors.locker import locker
|
||||
from manuskript.ui.editors.themes import findThemePath, generateTheme, setThemeEditorDatas
|
||||
from manuskript.ui.editors.themes import loadThemeDatas
|
||||
from manuskript.ui.views.MDEditView import MDEditView
|
||||
from manuskript.ui_qt.editors.locker import locker
|
||||
from manuskript.ui_qt.editors.themes import findThemePath, generateTheme, setThemeEditorDatas
|
||||
from manuskript.ui_qt.editors.themes import loadThemeDatas
|
||||
from manuskript.ui_qt.views.MDEditView import MDEditView
|
||||
from manuskript.functions import Spellchecker
|
||||
|
||||
import logging
|
|
@ -3,7 +3,7 @@
|
|||
from PyQt5.QtCore import pyqtSignal, QTimer
|
||||
from PyQt5.QtWidgets import QWidget, qApp
|
||||
|
||||
from manuskript.ui.editors.locker_ui import Ui_locker
|
||||
from manuskript.ui_qt.editors.locker_ui import Ui_locker
|
||||
|
||||
|
||||
class locker(QWidget, Ui_locker):
|
|
@ -1,6 +1,6 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
# Form implementation generated from reading ui file 'manuskript/ui/editors/locker_ui.ui'
|
||||
# Form implementation generated from reading ui_qt file 'manuskript/ui_qt/editors/locker_ui.ui_qt'
|
||||
#
|
||||
# Created: Tue Jul 7 17:57:16 2015
|
||||
# by: PyQt5 UI code generator 5.2.1
|
|
@ -10,10 +10,10 @@ from PyQt5.QtWidgets import QWidget, qApp, QDesktopWidget
|
|||
from manuskript import settings
|
||||
from manuskript.enums import Outline
|
||||
from manuskript.functions import AUC, mainWindow, drawProgress, appPath, uiParse
|
||||
from manuskript.ui import style
|
||||
from manuskript.ui.editors.editorWidget import editorWidget
|
||||
from manuskript.ui.editors.fullScreenEditor import fullScreenEditor
|
||||
from manuskript.ui.editors.mainEditor_ui import Ui_mainEditor
|
||||
from manuskript.ui_qt import style
|
||||
from manuskript.ui_qt.editors.editorWidget import editorWidget
|
||||
from manuskript.ui_qt.editors.fullScreenEditor import fullScreenEditor
|
||||
from manuskript.ui_qt.editors.mainEditor_ui import Ui_mainEditor
|
||||
|
||||
try:
|
||||
locale.setlocale(locale.LC_ALL, '')
|
|
@ -1,6 +1,6 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
# Form implementation generated from reading ui file 'manuskript/ui/editors/mainEditor_ui.ui'
|
||||
# Form implementation generated from reading ui_qt file 'manuskript/ui_qt/editors/mainEditor_ui.ui_qt'
|
||||
#
|
||||
# Created by: PyQt5 UI code generator 5.5.1
|
||||
#
|
||||
|
@ -98,4 +98,4 @@ class Ui_mainEditor(object):
|
|||
self.btnRedacFolderOutline.setText(_translate("mainEditor", "Outline"))
|
||||
self.btnRedacFullscreen.setShortcut(_translate("mainEditor", "F11"))
|
||||
|
||||
from manuskript.ui.editors.tabSplitter import tabSplitter
|
||||
from manuskript.ui_qt.editors.tabSplitter import tabSplitter
|
|
@ -7,8 +7,8 @@ from PyQt5.QtGui import QIcon, QPalette
|
|||
from PyQt5.QtWidgets import QWidget, QPushButton, qApp
|
||||
|
||||
from manuskript.functions import mainWindow, appPath
|
||||
from manuskript.ui import style
|
||||
from manuskript.ui.editors.tabSplitter_ui import Ui_tabSplitter
|
||||
from manuskript.ui_qt import style
|
||||
from manuskript.ui_qt.editors.tabSplitter_ui import Ui_tabSplitter
|
||||
|
||||
import logging
|
||||
LOGGER = logging.getLogger(__name__)
|
|
@ -1,6 +1,6 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
# Form implementation generated from reading ui file 'manuskript/ui/editors/tabSplitter_ui.ui'
|
||||
# Form implementation generated from reading ui_qt file 'manuskript/ui_qt/editors/tabSplitter_ui.ui_qt'
|
||||
#
|
||||
# Created by: PyQt5 UI code generator 5.9
|
||||
#
|
|
@ -5,7 +5,7 @@ from PyQt5.QtWidgets import QWidget, QAction
|
|||
|
||||
from manuskript.enums import Outline
|
||||
from manuskript.models import outlineModel
|
||||
from manuskript.ui.editors.textFormat_ui import Ui_textFormat
|
||||
from manuskript.ui_qt.editors.textFormat_ui import Ui_textFormat
|
||||
|
||||
|
||||
class textFormat(QWidget, Ui_textFormat):
|
|
@ -1,6 +1,6 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
# Form implementation generated from reading ui file 'manuskript/ui/editors/textFormat_ui.ui'
|
||||
# Form implementation generated from reading ui_qt file 'manuskript/ui_qt/editors/textFormat_ui.ui_qt'
|
||||
#
|
||||
# Created: Fri Apr 8 18:15:49 2016
|
||||
# by: PyQt5 UI code generator 5.2.1
|
|
@ -10,7 +10,7 @@ from PyQt5.QtGui import QPixmap, QPainter, QColor, QBrush, QImage, QTextBlockFor
|
|||
from PyQt5.QtWidgets import qApp, QFrame
|
||||
|
||||
from manuskript.functions import allPaths, appPath, findBackground, findFirstFile
|
||||
from manuskript.ui.views.MDEditView import MDEditView
|
||||
from manuskript.ui_qt.views.MDEditView import MDEditView
|
||||
|
||||
_thumbCache = {}
|
||||
|
|
@ -9,9 +9,9 @@ from PyQt5.QtWidgets import QWidget, QStyle
|
|||
|
||||
from manuskript import exporter
|
||||
from manuskript.functions import writablePath, openURL
|
||||
from manuskript.ui.exporters.exporter_ui import Ui_exporter
|
||||
from manuskript.ui.exporters.exportersManager import exportersManager
|
||||
from manuskript.ui import style as S
|
||||
from manuskript.ui_qt.exporters.exporter_ui import Ui_exporter
|
||||
from manuskript.ui_qt.exporters.exportersManager import exportersManager
|
||||
from manuskript.ui_qt import style as S
|
||||
|
||||
|
||||
class exporterDialog(QWidget, Ui_exporter):
|
|
@ -1,6 +1,6 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
# Form implementation generated from reading ui file 'manuskript/ui/exporters/exporter_ui.ui'
|
||||
# Form implementation generated from reading ui_qt file 'manuskript/ui_qt/exporters/exporter_ui.ui_qt'
|
||||
#
|
||||
# Created: Fri Apr 8 12:22:37 2016
|
||||
# by: PyQt5 UI code generator 5.2.1
|
|
@ -9,8 +9,8 @@ from PyQt5.QtGui import QIcon
|
|||
from PyQt5.QtWidgets import QWidget, QListWidgetItem, QFileDialog
|
||||
|
||||
from manuskript import exporter
|
||||
from manuskript.ui.exporters.exportersManager_ui import Ui_ExportersManager
|
||||
from manuskript.ui import style as S
|
||||
from manuskript.ui_qt.exporters.exportersManager_ui import Ui_ExportersManager
|
||||
from manuskript.ui_qt import style as S
|
||||
|
||||
|
||||
class exportersManager(QWidget, Ui_ExportersManager):
|
|
@ -1,6 +1,6 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
# Form implementation generated from reading ui file 'manuskript/ui/exporters/exportersManager_ui.ui'
|
||||
# Form implementation generated from reading ui_qt file 'manuskript/ui_qt/exporters/exportersManager_ui.ui_qt'
|
||||
#
|
||||
# Created by: PyQt5 UI code generator 5.9
|
||||
#
|
|
@ -8,8 +8,8 @@ from PyQt5.QtGui import QIcon, QFontMetrics, QFont
|
|||
from PyQt5.QtWidgets import QWidget, QTableWidgetItem, QListWidgetItem, QTreeView
|
||||
|
||||
from manuskript.functions import mainWindow, writablePath
|
||||
from manuskript.ui.exporters.manuskript.plainTextSettings_ui import Ui_exporterSettings
|
||||
from manuskript.ui import style as S
|
||||
from manuskript.ui_qt.exporters.manuskript.plainTextSettings_ui import Ui_exporterSettings
|
||||
from manuskript.ui_qt import style as S
|
||||
|
||||
|
||||
class exporterSettings(QWidget, Ui_exporterSettings):
|
||||
|
@ -221,7 +221,7 @@ class exporterSettings(QWidget, Ui_exporterSettings):
|
|||
self.spnPreviewSize.setValue(f.pointSize())
|
||||
|
||||
def getSettings(self):
|
||||
"""Updates settings from ui, and return."""
|
||||
"""Updates settings from ui_qt, and return."""
|
||||
# Content
|
||||
s = self.settings.get("Content", {})
|
||||
s["More"] = self.chkContentMore.isChecked()
|
|
@ -1,6 +1,6 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
# Form implementation generated from reading ui file 'manuskript/ui/exporters/manuskript/plainTextSettings_ui.ui'
|
||||
# Form implementation generated from reading ui_qt file 'manuskript/ui_qt/exporters/manuskript/plainTextSettings_ui.ui_qt'
|
||||
#
|
||||
# Created by: PyQt5 UI code generator 5.15.4
|
||||
#
|
||||
|
@ -559,4 +559,4 @@ class Ui_exporterSettings(object):
|
|||
self.label_7.setText(_translate("exporterSettings", "Font:"))
|
||||
self.label_8.setText(_translate("exporterSettings", "Font size:"))
|
||||
self.toolBox.setItemText(self.toolBox.indexOf(self.preview), _translate("exporterSettings", "Preview"))
|
||||
from manuskript.ui.collapsibleGroupBox2 import collapsibleGroupBox2
|
||||
from manuskript.ui_qt.collapsibleGroupBox2 import collapsibleGroupBox2
|
|
@ -5,7 +5,7 @@ import re
|
|||
from PyQt5.QtCore import Qt
|
||||
from PyQt5.QtGui import QTextCharFormat, QFont, QTextCursor, QFontMetrics
|
||||
|
||||
from manuskript.ui.highlighters import BasicHighlighter
|
||||
from manuskript.ui_qt.highlighters import BasicHighlighter
|
||||
|
||||
|
||||
class MMDHighlighter(BasicHighlighter):
|
12
manuskript/ui_qt/highlighters/__init__.py
Normal file
12
manuskript/ui_qt/highlighters/__init__.py
Normal file
|
@ -0,0 +1,12 @@
|
|||
#!/usr/bin/python
|
||||
# -*- coding: utf8 -*-
|
||||
|
||||
from manuskript.ui_qt.highlighters.basicHighlighter import BasicHighlighter
|
||||
from manuskript.ui_qt.highlighters.MMDHighlighter import MMDHighlighter
|
||||
|
||||
# Markdown highlighter
|
||||
from manuskript.ui_qt.highlighters.markdownEnums import MarkdownState
|
||||
from manuskript.ui_qt.highlighters.markdownEnums import MarkdownTokenType
|
||||
from manuskript.ui_qt.highlighters.markdownEnums import BlockquoteStyle
|
||||
from manuskript.ui_qt.highlighters.markdownTokenizer import MarkdownTokenizer
|
||||
from manuskript.ui_qt.highlighters.markdownHighlighter import MarkdownHighlighter
|
|
@ -8,7 +8,7 @@ from PyQt5.QtGui import QBrush, QTextCursor, QColor, QFont, QSyntaxHighlighter
|
|||
from PyQt5.QtGui import QTextBlockFormat, QTextCharFormat
|
||||
|
||||
import manuskript.models.references as Ref
|
||||
import manuskript.ui.style as S
|
||||
import manuskript.ui_qt.style as S
|
||||
from manuskript import settings
|
||||
from manuskript import functions as F
|
||||
|
|
@ -12,12 +12,12 @@ from PyQt5.QtGui import (QSyntaxHighlighter, QTextBlock, QColor, QFont,
|
|||
QTextCharFormat, QBrush, QPalette)
|
||||
from PyQt5.QtWidgets import qApp, QStyle
|
||||
|
||||
from manuskript.ui.highlighters import BasicHighlighter
|
||||
from manuskript.ui.highlighters import MarkdownTokenizer
|
||||
from manuskript.ui.highlighters import MarkdownState as MS
|
||||
from manuskript.ui.highlighters import MarkdownTokenType as MTT
|
||||
from manuskript.ui.highlighters import BlockquoteStyle as BS
|
||||
from manuskript.ui import style as S
|
||||
from manuskript.ui_qt.highlighters import BasicHighlighter
|
||||
from manuskript.ui_qt.highlighters import MarkdownTokenizer
|
||||
from manuskript.ui_qt.highlighters import MarkdownState as MS
|
||||
from manuskript.ui_qt.highlighters import MarkdownTokenType as MTT
|
||||
from manuskript.ui_qt.highlighters import BlockquoteStyle as BS
|
||||
from manuskript.ui_qt import style as S
|
||||
from manuskript import settings
|
||||
from manuskript import functions as F
|
||||
|
|
@ -6,8 +6,8 @@ from PyQt5.QtCore import *
|
|||
from PyQt5.QtGui import *
|
||||
from PyQt5.QtWidgets import *
|
||||
|
||||
from manuskript.ui.highlighters import MarkdownState as MS
|
||||
from manuskript.ui.highlighters import MarkdownTokenType as MTT
|
||||
from manuskript.ui_qt.highlighters import MarkdownState as MS
|
||||
from manuskript.ui_qt.highlighters import MarkdownTokenType as MTT
|
||||
|
||||
import logging
|
||||
LOGGER = logging.getLogger(__name__)
|
|
@ -2,7 +2,7 @@
|
|||
# --!-- coding: utf8 --!--
|
||||
|
||||
|
||||
from manuskript.ui.highlighters.searchResultHighlighters.widgetSelectionHighlighter import widgetSelectionHighlighter
|
||||
from manuskript.ui_qt.highlighters.searchResultHighlighters.widgetSelectionHighlighter import widgetSelectionHighlighter
|
||||
|
||||
|
||||
class abstractSearchResultHighlighter():
|
|
@ -6,7 +6,7 @@ from manuskript.models import references as Ref
|
|||
from manuskript.functions import mainWindow
|
||||
from manuskript.enums import Character
|
||||
from PyQt5.QtWidgets import QTextEdit, QTableView, QLineEdit
|
||||
from manuskript.ui.highlighters.searchResultHighlighters.abstractSpecificSearchResultHighlighter import abstractSearchResultHighlighter
|
||||
from manuskript.ui_qt.highlighters.searchResultHighlighters.abstractSpecificSearchResultHighlighter import abstractSearchResultHighlighter
|
||||
|
||||
|
||||
class characterSearchResultHighlighter(abstractSearchResultHighlighter):
|
|
@ -4,7 +4,7 @@
|
|||
from manuskript.functions import mainWindow
|
||||
from manuskript.enums import FlatData
|
||||
from PyQt5.QtWidgets import QTextEdit, QLineEdit
|
||||
from manuskript.ui.highlighters.searchResultHighlighters.abstractSpecificSearchResultHighlighter import abstractSearchResultHighlighter
|
||||
from manuskript.ui_qt.highlighters.searchResultHighlighters.abstractSpecificSearchResultHighlighter import abstractSearchResultHighlighter
|
||||
|
||||
|
||||
class flatDataSearchResultHighlighter(abstractSearchResultHighlighter):
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
from manuskript.models import references as Ref
|
||||
from manuskript.enums import Outline
|
||||
from manuskript.ui.highlighters.searchResultHighlighters.abstractSpecificSearchResultHighlighter import abstractSearchResultHighlighter
|
||||
from manuskript.ui_qt.highlighters.searchResultHighlighters.abstractSpecificSearchResultHighlighter import abstractSearchResultHighlighter
|
||||
from manuskript.functions import mainWindow
|
||||
from PyQt5.QtWidgets import QTextEdit, QLineEdit, QLabel
|
||||
from manuskript.ui.views.metadataView import metadataView
|
||||
from manuskript.ui.collapsibleGroupBox2 import collapsibleGroupBox2
|
||||
from manuskript.ui_qt.views.metadataView import metadataView
|
||||
from manuskript.ui_qt.collapsibleGroupBox2 import collapsibleGroupBox2
|
||||
|
||||
|
||||
class outlineSearchResultHighlighter(abstractSearchResultHighlighter):
|
|
@ -6,7 +6,7 @@ from manuskript.models import references as Ref
|
|||
from manuskript.functions import mainWindow
|
||||
from manuskript.enums import Plot
|
||||
from PyQt5.QtWidgets import QTextEdit, QLineEdit, QListView
|
||||
from manuskript.ui.highlighters.searchResultHighlighters.abstractSpecificSearchResultHighlighter import abstractSearchResultHighlighter
|
||||
from manuskript.ui_qt.highlighters.searchResultHighlighters.abstractSpecificSearchResultHighlighter import abstractSearchResultHighlighter
|
||||
|
||||
|
||||
class plotSearchResultHighlighter(abstractSearchResultHighlighter):
|
|
@ -6,7 +6,7 @@ from manuskript.models import references as Ref
|
|||
from manuskript.functions import mainWindow
|
||||
from manuskript.enums import PlotStep
|
||||
from PyQt5.QtWidgets import QTableView, QTextEdit
|
||||
from manuskript.ui.highlighters.searchResultHighlighters.abstractSpecificSearchResultHighlighter import abstractSearchResultHighlighter
|
||||
from manuskript.ui_qt.highlighters.searchResultHighlighters.abstractSpecificSearchResultHighlighter import abstractSearchResultHighlighter
|
||||
|
||||
|
||||
class plotStepSearchResultHighlighter(abstractSearchResultHighlighter):
|
|
@ -1,13 +1,13 @@
|
|||
#!/usr/bin/env python
|
||||
# --!-- coding: utf8 --!--
|
||||
|
||||
from manuskript.ui.highlighters.searchResultHighlighters.abstractSearchResultHighlighter import abstractSearchResultHighlighter
|
||||
from manuskript.ui.highlighters.searchResultHighlighters.characterSearchResultHighlighter import characterSearchResultHighlighter
|
||||
from manuskript.ui.highlighters.searchResultHighlighters.flatDataSearchResultHighlighter import flatDataSearchResultHighlighter
|
||||
from manuskript.ui.highlighters.searchResultHighlighters.outlineSearchResultHighlighter import outlineSearchResultHighlighter
|
||||
from manuskript.ui.highlighters.searchResultHighlighters.worldSearchResultHighlighter import worldSearchResultHighlighter
|
||||
from manuskript.ui.highlighters.searchResultHighlighters.plotSearchResultHighlighter import plotSearchResultHighlighter
|
||||
from manuskript.ui.highlighters.searchResultHighlighters.plotStepSearchResultHighlighter import plotStepSearchResultHighlighter
|
||||
from manuskript.ui_qt.highlighters.searchResultHighlighters.abstractSearchResultHighlighter import abstractSearchResultHighlighter
|
||||
from manuskript.ui_qt.highlighters.searchResultHighlighters.characterSearchResultHighlighter import characterSearchResultHighlighter
|
||||
from manuskript.ui_qt.highlighters.searchResultHighlighters.flatDataSearchResultHighlighter import flatDataSearchResultHighlighter
|
||||
from manuskript.ui_qt.highlighters.searchResultHighlighters.outlineSearchResultHighlighter import outlineSearchResultHighlighter
|
||||
from manuskript.ui_qt.highlighters.searchResultHighlighters.worldSearchResultHighlighter import worldSearchResultHighlighter
|
||||
from manuskript.ui_qt.highlighters.searchResultHighlighters.plotSearchResultHighlighter import plotSearchResultHighlighter
|
||||
from manuskript.ui_qt.highlighters.searchResultHighlighters.plotStepSearchResultHighlighter import plotStepSearchResultHighlighter
|
||||
from manuskript.enums import Model
|
||||
|
||||
|
|
@ -6,7 +6,7 @@ from manuskript.models import references as Ref
|
|||
from manuskript.functions import mainWindow
|
||||
from manuskript.enums import World
|
||||
from PyQt5.QtWidgets import QTextEdit, QLineEdit
|
||||
from manuskript.ui.highlighters.searchResultHighlighters.abstractSpecificSearchResultHighlighter import abstractSearchResultHighlighter
|
||||
from manuskript.ui_qt.highlighters.searchResultHighlighters.abstractSpecificSearchResultHighlighter import abstractSearchResultHighlighter
|
||||
|
||||
|
||||
class worldSearchResultHighlighter(abstractSearchResultHighlighter):
|
|
@ -8,9 +8,9 @@ from PyQt5.QtGui import QIcon, QFontMetrics, QFont
|
|||
from PyQt5.QtWidgets import QWidget, QTableWidgetItem, QListWidgetItem, QTreeView
|
||||
|
||||
from manuskript.functions import mainWindow, writablePath
|
||||
from manuskript.ui.importers.generalSettings_ui import Ui_generalSettings
|
||||
from manuskript.ui_qt.importers.generalSettings_ui import Ui_generalSettings
|
||||
from manuskript.enums import Outline
|
||||
from manuskript.ui import style
|
||||
from manuskript.ui_qt import style
|
||||
|
||||
|
||||
class generalSettings(QWidget, Ui_generalSettings):
|
|
@ -1,6 +1,6 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
# Form implementation generated from reading ui file 'manuskript/ui/importers/generalSettings_ui.ui'
|
||||
# Form implementation generated from reading ui_qt file 'manuskript/ui_qt/importers/generalSettings_ui.ui_qt'
|
||||
#
|
||||
# Created by: PyQt5 UI code generator 5.9
|
||||
#
|
|
@ -8,9 +8,9 @@ from PyQt5.QtGui import QBrush, QColor, QIcon
|
|||
from PyQt5.QtWidgets import QWidget, QFileDialog, QMessageBox, QStyle
|
||||
|
||||
from manuskript.functions import writablePath, appPath, openURL, statusMessage
|
||||
from manuskript.ui.importers.importer_ui import Ui_importer
|
||||
from manuskript.ui.importers.generalSettings import generalSettings
|
||||
from manuskript.ui import style
|
||||
from manuskript.ui_qt.importers.importer_ui import Ui_importer
|
||||
from manuskript.ui_qt.importers.generalSettings import generalSettings
|
||||
from manuskript.ui_qt import style
|
||||
from manuskript import importer
|
||||
from manuskript.models import outlineModel, outlineItem
|
||||
from manuskript.enums import Outline
|
|
@ -1,6 +1,6 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
# Form implementation generated from reading ui file 'manuskript/ui/importers/importer_ui.ui'
|
||||
# Form implementation generated from reading ui_qt file 'manuskript/ui_qt/importers/importer_ui.ui_qt'
|
||||
#
|
||||
# Created by: PyQt5 UI code generator 5.9
|
||||
#
|
||||
|
@ -104,4 +104,4 @@ class Ui_importer(object):
|
|||
self.grpSettings.setTitle(_translate("importer", "Settings"))
|
||||
self.grpPreview.setTitle(_translate("importer", "Preview"))
|
||||
|
||||
from manuskript.ui.editors.editorWidget import editorWidget
|
||||
from manuskript.ui_qt.editors.editorWidget import editorWidget
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue