Commit bc7060c9 authored by dmMaze's avatar dmMaze
Browse files

fix #56

parent 02b5e7fa

ballontranslator/dl/__init__.py

+1 −1
Original line number Diff line number Diff line
@@ -7,4 +7,4 @@ from .moduleparamparser import DEFAULT_DEVICE 
VALID_TEXTDETECTORS = list(TEXTDETECTORS.module_dict.keys())

VALID_TRANSLATORS = list(TRANSLATORS.module_dict.keys())

VALID_INPAINTERS = list(INPAINTERS.module_dict.keys())

VALID_OCR = OCR.module_dict.keys()
 
 No newline at end of file
 
VALID_OCR = list(OCR.module_dict.keys())
 
 No newline at end of file

ballontranslator/ui/canvas.py

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ class Canvas(QGraphicsScene): 
        self.ctrl_relesed = self.gv.ctrl_released

        self.vscroll_bar = self.gv.verticalScrollBar()

        self.hscroll_bar = self.gv.horizontalScrollBar()

        self.default_cursor = self.gv.cursor()

        # self.default_cursor = self.gv.cursor()

        self.rubber_band = self.addWidget(QRubberBand(QRubberBand.Shape.Rectangle))

        self.rubber_band.hide()

        self.rubber_band_origin = None

ballontranslator/ui/mainwindow.py

+0 −2
Original line number Diff line number Diff line
@@ -61,8 +61,6 @@ class MainWindow(FramelessWindow): 
                if osp.exists(proj_dir):

                    self.OpenProj(proj_dir)







    def setStyleSheet(self, styleSheet: str) -> None:

        self.imgtrans_progress_msgbox.setStyleSheet(styleSheet)

        self.export_doc_thread.progress_bar.setStyleSheet(styleSheet)

ballontranslator/ui/textedit_area.py

+27 −14
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ class SourceTextEdit(QTextEdit): 
        self.input_method_text = ''

        self.text_content_changed = False

        self.highlighting = False

        self.ctrlv_pressed = False



    def block_all_signals(self, block: bool):

        self.blockSignals(block)
@@ -62,17 +63,27 @@ class SourceTextEdit(QTextEdit): 
            self.text_content_changed = False

            if not self.highlighting:

                self.text_changed.emit()

                

        if self.hasFocus() and not self.pre_editing and not self.highlighting:



            if not self.in_redo_undo:

                

                change_from = self.change_from

                added_text = ''

                input_method_used = False

                

                if self.ctrlv_pressed:

                    self.ctrlv_pressed = False

                    cursor = self.textCursor()

                    cursor.setPosition(change_from)

                    cursor.setPosition(self.textCursor().position(), QTextCursor.MoveMode.KeepAnchor)

                    added_text = cursor.selectedText()

                

                else:

                    if self.input_method_from != -1:

                        added_text = self.input_method_text

                        change_from = self.input_method_from

                        input_method_used = True

        

                    elif self.change_added > 0:

                        len_text = len(self.toPlainText())

                        cursor = self.textCursor()
@@ -86,7 +97,6 @@ class SourceTextEdit(QTextEdit): 
                        added_text = cursor.selectedText()



                self.propagate_user_edited.emit(change_from, added_text, input_method_used)

                

                undo_steps = self.document().availableUndoSteps()

                new_steps = undo_steps - self.old_undo_steps

                if new_steps > 0:
@@ -147,6 +157,9 @@ class SourceTextEdit(QTextEdit): 
                e.accept()

                self.redo_signal.emit()

                return

            elif e.key() == Qt.Key.Key_V:

                self.ctrlv_pressed = True

                return super().keyPressEvent(e)

        elif e.key() == Qt.Key.Key_Return:

            e.accept()

            self.textCursor().insertText('\n')