Commit 82b08dfb authored by dmMaze's avatar dmMaze
Browse files

impl page search

parent 1ad2b962

ballontranslator/data/config/stylesheet.css

+0 −14
Original line number Diff line number Diff line
@@ -795,20 +795,6 @@ QCheckBox#CaseSensitiveToggle::indicator:checked { 
    image: url(data/icons/case-sensitive_activated.svg);

}



QCheckBox#ReplaceToggle::indicator {

    height: 24px;

    width: 24px;

    image: url(data/icons/chevron-right.svg)

}



QCheckBox#ReplaceToggle::indicator:hover {

    background-color: rgba(30, 147, 229, 20%);

}



QCheckBox#ReplaceToggle::indicator:checked {

    image: url(data/icons/chevron-down.svg)

}



SearchEditor {

    height: 32px;

}

ballontranslator/ui/canvas.py

+1 −0
Original line number Diff line number Diff line
@@ -409,6 +409,7 @@ class Canvas(QGraphicsScene): 
        self.erase_img_key = None

        self.txtblkShapeControl.setBlkItem(None)

        self.mid_btn_pressed = False

        self.search_widget.reInitialize()



        self.clearSelection()

        self.setProjSaveState(False)

ballontranslator/ui/fontformatpanel.py

+1 −3
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ from qtpy.QtGui import QColor, QTextCharFormat, QMouseEvent, QFont, QTextCursor 
from .stylewidgets import Widget, ColorPicker, ClickableLabel

from .misc import FontFormat, set_html_color, pt2px

from .textitem import TextBlkItem

from .canvas import Canvas

from .constants import CONFIG_FONTSIZE_CONTENT, WIDGET_SPACING_CLOSE

from .text_graphical_effect import TextEffectPanel

from .combobox import SizeComboBox
@@ -363,10 +362,9 @@ class FontFormatPanel(Widget): 
    

    global_format_changed = Signal()



    def __init__(self, app: QApplication, canvas: Canvas, *args, **kwargs) -> None:

    def __init__(self, app: QApplication, *args, **kwargs) -> None:

        super().__init__(*args, **kwargs)

        self.app = app

        self.canvas = canvas



        self.vlayout = QVBoxLayout(self)

        self.vlayout.setAlignment(Qt.AlignTop)

ballontranslator/ui/imgtranspanel.py

+2 −3
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ from .stylewidgets import Widget, SeparatorWidget 


from .textitem import TextBlock, TextBlkItem

from .fontformatpanel import FontFormatPanel

from .canvas import Canvas



class SourceTextEdit(QTextEdit):

    hover_enter = Signal(int)
@@ -120,12 +119,12 @@ class TextEditListScrollArea(QScrollArea): 




class TextPanel(Widget):

    def __init__(self, app: QApplication, canvas: Canvas, *args, **kwargs) -> None:

    def __init__(self, app: QApplication, *args, **kwargs) -> None:

        super().__init__(*args, **kwargs)

        layout = QVBoxLayout(self)

        self.textEditList = TextEditListScrollArea(self)

        self.activePair: TransPairWidget = None

        self.formatpanel = FontFormatPanel(app, canvas, self)

        self.formatpanel = FontFormatPanel(app, self)

        layout.addWidget(self.formatpanel)

        layout.addWidget(self.textEditList)

        layout.setContentsMargins(0, 0, 0, 0)

ballontranslator/ui/mainwindow.py

+6 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ from typing import List 


from qtpy.QtWidgets import QMainWindow, QHBoxLayout, QVBoxLayout, QApplication, QStackedWidget, QWidget, QSplitter, QListWidget, QShortcut, QListWidgetItem, QMessageBox

from qtpy.QtCore import Qt, QPoint, QSize

from qtpy.QtGui import QKeyEvent, QGuiApplication, QIcon, QCloseEvent, QKeySequence, QImage, QPainter, QFont

from qtpy.QtGui import QColor, QTextCursor, QGuiApplication, QIcon, QCloseEvent, QKeySequence, QImage, QPainter, QFont, QTextDocument



from utils.logger import logger as LOGGER

from utils.io_utils import json_dump_nested_obj
@@ -117,10 +117,11 @@ class MainWindow(QMainWindow): 
        self.config = self.configPanel.config



        self.drawingPanel = DrawingPanel(self.canvas, self.configPanel.inpaint_config_panel)

        self.textPanel = TextPanel(self.app, self.canvas)

        self.textPanel = TextPanel(self.app)

        self.textPanel.formatpanel.effect_panel.setParent(self)

        self.textPanel.formatpanel.effect_panel.setWindowFlags(Qt.WindowType.Window | Qt.WindowType.CustomizeWindowHint)

        self.textPanel.formatpanel.fontfmtLabel.clicked.connect(self.show_presets)

        

        self.presetPanel = PresetPanel(self)

        self.presetPanel.setParent(self)

        self.presetPanel.setWindowFlags(Qt.WindowType.Window)
@@ -129,6 +130,8 @@ class MainWindow(QMainWindow): 
        self.presetPanel.hide_signal.connect(self.save_config)

        self.presetPanel.load_preset.connect(self.textPanel.formatpanel.on_load_preset)

        self.st_manager = SceneTextManager(self.app, self.canvas, self.textPanel)

        self.canvas.search_widget.pairwidget_list = self.st_manager.pairwidget_list

        self.canvas.search_widget.textblk_item_list = self.st_manager.textblk_item_list



        # comic trans pannel

        self.rightComicTransStackPanel = QStackedWidget(self)
@@ -683,3 +686,4 @@ class MainWindow(QMainWindow):