From 8dc3cba00f9308bf730d2d5cf0d35419408d8126 Mon Sep 17 00:00:00 2001 From: Xintao Date: Sun, 7 Aug 2022 16:41:58 +0800 Subject: [PATCH] update tabs --- handyview/actions.py | 6 +++--- handyview/canvas_video.py | 2 +- handyview/handyviewer.py | 14 +++++++++++--- icons/crop.png | Bin 0 -> 2648 bytes icons/image.png | Bin 0 -> 2363 bytes icons/video.png | Bin 0 -> 1716 bytes 6 files changed, 15 insertions(+), 7 deletions(-) create mode 100644 icons/crop.png create mode 100644 icons/image.png create mode 100644 icons/video.png diff --git a/handyview/actions.py b/handyview/actions.py index 65a1b9d..bda496f 100644 --- a/handyview/actions.py +++ b/handyview/actions.py @@ -111,15 +111,15 @@ def switch_preview_canvas(parent): def select_basic_tab(parent): - return new_action(parent, 'Basic', icon_name='main_canvas.png', slot=parent.select_basic_tab) + return new_action(parent, 'Basic', icon_name='image.png', slot=parent.select_basic_tab) def select_crop_tab(parent): - return new_action(parent, 'Crop', icon_name='compare_canvas.png', slot=parent.select_crop_tab) + return new_action(parent, 'Crop', icon_name='crop.png', slot=parent.select_crop_tab) def select_video_tab(parent): - return new_action(parent, 'Video', icon_name='preview_canvas.png', slot=parent.select_video_tab) + return new_action(parent, 'Video', icon_name='video.png', slot=parent.select_video_tab) # --------------------------------------- diff --git a/handyview/canvas_video.py b/handyview/canvas_video.py index 68e5783..ecfc4d4 100644 --- a/handyview/canvas_video.py +++ b/handyview/canvas_video.py @@ -166,7 +166,7 @@ def init_widgets_layout(self): main_layout.addWidget(self.infoButton, 58, 0, 1, 1) main_layout.addLayout(controlLayout, 60, 0, -1, 49) - self.qviews[0].set_shown_text(['Click Open to open ·two· videos for comparison!']) + self.qviews[0].set_shown_text(['Click Open to open ·two· videos for comparison!', 'bug 出没 - 还在测试中']) def keyPressEvent(self, event): modifiers = QApplication.keyboardModifiers() diff --git a/handyview/handyviewer.py b/handyview/handyviewer.py index 5d7145b..1a5372c 100644 --- a/handyview/handyviewer.py +++ b/handyview/handyviewer.py @@ -46,9 +46,17 @@ def __init__(self, parent, hvdb): self.canvas = Canvas(self, hvdb) self.canvas_crop = CanvasCrop(self, hvdb) self.canvas_video = CanvasVideo(self) - self.tabs.addTab(self.canvas, 'View') - self.tabs.addTab(self.canvas_crop, 'Crop') - self.tabs.addTab(self.canvas_video, 'Video') + self.tabs.addTab(self.canvas, 'View 图像') + self.tabs.addTab(self.canvas_crop, 'Crop 裁剪') + self.tabs.addTab(self.canvas_video, 'Video 视频') + self.tabs.setTabIcon(0, QIcon(os.path.join(ROOT_DIR, 'icons/image.png'))) + self.tabs.setTabIcon(1, QIcon(os.path.join(ROOT_DIR, 'icons/crop.png'))) + self.tabs.setTabIcon(2, QIcon(os.path.join(ROOT_DIR, 'icons/video.png'))) + font = self.tabs.font() + font.setPointSize(13) + # font.setBold(True) + self.tabs.setFont(font) + layout.addWidget(self.tabs) self.tabs.currentChanged.connect(self.tabsCurrentChanged) diff --git a/icons/crop.png b/icons/crop.png new file mode 100644 index 0000000000000000000000000000000000000000..0094653d27512b53996910983fb22fb4e34c1c60 GIT binary patch literal 2648 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 literal 0 HcmV?d00001 diff --git a/icons/image.png b/icons/image.png new file mode 100644 index 0000000000000000000000000000000000000000..b682821271b76fbb562d74f83182c7a9c49021b6 GIT binary patch literal 2363 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 GF#iV0VfKjt literal 0 HcmV?d00001