Commit 26ba6296 authored by dmMaze's avatar dmMaze
Browse files

Merge branch 'dev' of https://github.com/dmMaze/BallonsTranslator into dev

parents 4ab806c0 2debb6d5

README.md

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ OCR并翻译选中文本框 
* 0-9调整嵌字/原图透明度

* 文本编辑下 ```Ctrl+B``` 加粗，```Ctrl+U``` 下划线，```Ctrl+I``` 斜体

* 字体样式面板-"特效"修改透明度添加阴影

* ```Alt+Arrow Keys``` 或 ```Alt+WASD``` 在文本块间切换

* ```Alt+Arrow Keys``` 或 ```Alt+WASD``` (正在编辑文本块时 ```pageDown``` 或 ```pageUp```) 在文本块间切换



<img src="doc/src/configpanel.png">

README_EN.md

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ OCR & Translate Selected Area 
* ```0-9``` to adjust opacity of text layer

* For text editing: bold - ```Ctrl+B```, underline - ```Ctrl+U```, Italics - ```Ctrl+I``` 

* Set text shadow and transparency in the text style panel -> Effect.  

* ```Alt+Arrow Keys``` or ```Alt+WASD``` to switch between text blocks.

* ```Alt+Arrow Keys``` or ```Alt+WASD``` (```pageDown``` or ```pageUp``` while in text editing mode) to switch between text blocks.

  

<img src="doc/src/configpanel.png">

modules/ocr/ocr_stariver.py

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ class OCRStariver(OCRBase): 
    

    def __init__(self, **params) -> None:

        super().__init__(**params)

        self.url = 'https://dl.ap-sh.starivercs.cn/v2/manga_trans/advanced/manga_ocr'

        self.url = 'https://dl.ap-qz.starivercs.cn/v2/manga_trans/advanced/manga_ocr'

        self.debug = False

        self.token = ''

        self.token_obtained = False

modules/textdetector/detector_stariver.py

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ class StariverDetector(TextDetectorBase): 


    def __init__(self, **params) -> None:

        super().__init__(**params)

        self.url = 'https://dl.ap-sh.starivercs.cn/v2/manga_trans/advanced/manga_ocr'

        self.url = 'https://dl.ap-qz.starivercs.cn/v2/manga_trans/advanced/manga_ocr'

        self.debug = False

        self.token = ''

        self.token_obtained = False

ui/canvas.py

+4 −2
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ class Canvas(QGraphicsScene): 
        self.originallayer_trans_slider: QSlider = None



    def on_switch_item(self, switch_delta: int, key_event: QKeyEvent = None):

        if self.textEditMode() and self.editing_textblkitem is None:

        if self.textEditMode():

            self.switch_text_item.emit(switch_delta, key_event)



    def img_window_size(self):
@@ -487,7 +487,9 @@ class Canvas(QGraphicsScene): 
            self.alt_pressed = True



        modifiers = event.modifiers()

        if (modifiers == Qt.KeyboardModifier.AltModifier or self.alt_pressed) and not key == QKEY.Key_Alt:

        if (modifiers == Qt.KeyboardModifier.AltModifier or self.alt_pressed) and \

            not key == QKEY.Key_Alt and \

                self.editing_textblkitem is None:

            if key in {QKEY.Key_W, QKEY.Key_A, QKEY.Key_Left, QKEY.Key_Up}:

                self.on_switch_item(-1, event)

                return