From 34c61291bb02c3e287af16a731a0630c6de68a71 Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Sat, 23 Sep 2023 14:31:35 +0900 Subject: [PATCH 1/5] =?UTF-8?q?[Update]=20Main=20Window:=20Update=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E3=81=AEUI=E8=BF=BD=E5=8A=A0=E3=80=82=E8=A6=8B?= =?UTF-8?q?=E3=81=9F=E7=9B=AE=E3=81=A0=E3=81=91=E3=80=82(=E5=B8=B8?= =?UTF-8?q?=E3=81=AB=E8=A1=A8=E7=A4=BA=E7=8A=B6=E6=85=8B)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- img/refresh_icon.png | Bin 0 -> 1487 bytes view.py | 3 + .../main_window/createMainWindowWidgets.py | 57 +++++++++++++++++- .../main_window/widgets/create_sidebar.py | 10 +++ vrct_gui/ui_managers/ImageFileManager.py | 1 + 5 files changed, 68 insertions(+), 3 deletions(-) create mode 100644 img/refresh_icon.png diff --git a/img/refresh_icon.png b/img/refresh_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c5acad15a2097d399ea98438bb784d5d25bde461 GIT binary patch literal 1487 zcmV;=1u*)FP)GiuAvY1wdH`4h z0B-_7gwyO^UBI@>XOySOM4Ke)A)5!~RWD@{5OIPbI~;5C-dq*|O_6~W$#nXpB-*_c;@Mz`gI3kjb9LLk zM9Bm+g#53kg@_T+J2|Q)BHls3C}Vinq9~J9tKOIb0C@2D&sS5LRxKsf5s;gR-U9&k z3>m~Rm2>Cy*3QR87od~Bony&JhIp29ek|JBX=r1*L;h+Z#1TofD_aO6PNiJMNw<66@h#v8pHh#AW*Kg9+;Yo zxr6>n0D!2c^U(_la0dEz3MtQLgrvgx`eBdvZZXN{!q!WtEl-n)+W-J7t+ox9w(d>k z$}6~pBvH?zWW=wRgFFC0JefF7M0G?|7f&XR=gZ40pdr*>MMSlkG0yq1%Zcp-FMEDKcm?Bmicw#0!atC13mcd9yZOJrS)N^DwP)UK90rm%OPrhX*Q>TKXOltu{G<6IMm7 zVE_P8k9UGI)?u_UXRMiXW_+&p5$gKJ}5mlyyc4E;lhKo>=x_cQj!M% zkRg?q{`4~<+DJqjXVR%?V|ZZ6zr^P7fFl=q zhIsmUzj0Y-PASs83Krty1o9~4O>(J z0JFx|bYiAef5BmDGb7>{L+o8?wFM$u_ALJkj%+l9`l~b{>UA^VEdZ#5#jlut2Y_+? p71Pb@tp^Nk_%g~Uqm2JI{sUJKZNPuA Date: Sat, 23 Sep 2023 15:34:11 +0900 Subject: [PATCH 2/5] =?UTF-8?q?[Update]=20Main=20Window:=20=E8=89=B2?= =?UTF-8?q?=E3=82=84UI=E3=82=B9=E3=82=B1=E3=83=BC=E3=83=AB=E5=A4=89?= =?UTF-8?q?=E6=9B=B4=E3=81=AB=E5=AF=BE=E5=BF=9C=E3=81=99=E3=82=8B=E3=81=9F?= =?UTF-8?q?=E3=82=81=E3=81=AB=E5=A4=89=E6=95=B0=E8=BF=BD=E5=8A=A0=E3=80=82?= =?UTF-8?q?=E6=8C=87=E5=AE=9A=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main_window/createMainWindowWidgets.py | 29 +++++++++---------- vrct_gui/ui_managers/ColorThemeManager.py | 7 +++++ vrct_gui/ui_managers/UiScalingManager.py | 12 +++++++- 3 files changed, 32 insertions(+), 16 deletions(-) diff --git a/vrct_gui/main_window/createMainWindowWidgets.py b/vrct_gui/main_window/createMainWindowWidgets.py index 7f7eaa2e..b684d3ac 100644 --- a/vrct_gui/main_window/createMainWindowWidgets.py +++ b/vrct_gui/main_window/createMainWindowWidgets.py @@ -41,26 +41,26 @@ def createMainWindowWidgets(vrct_gui, settings, view_variable): + # Update Available Button vrct_gui.update_available_container = CTkFrame( vrct_gui.main_topbar_container, - corner_radius=settings.uism.HELP_AND_INFO_BUTTON_CORNER_RADIUS, + corner_radius=settings.uism.UPDATE_AVAILABLE_BUTTON_CORNER_RADIUS, fg_color=settings.ctm.MAIN_BG_COLOR, cursor="hand2", ) - vrct_gui.update_available_container.grid(row=0, column=3, padx=(0,4), pady=settings.uism.HELP_AND_INFO_BUTTON_PADY, sticky="nse") + vrct_gui.update_available_container.grid(row=0, column=3, padx=settings.uism.UPDATE_AVAILABLE_BUTTON_PADX, pady=settings.uism.TOP_BAR_BUTTON_PADY, sticky="nse") vrct_gui.update_available_container.rowconfigure((0,2), weight=1) - vrct_gui.update_available_icon = CTkLabel( vrct_gui.update_available_container, text=None, corner_radius=0, height=0, - image=CTkImage(settings.image_file.REFRESH_ICON.rotate(25), size=(settings.uism.HELP_AND_INFO_BUTTON_SIZE-6,settings.uism.HELP_AND_INFO_BUTTON_SIZE-6)), + image=CTkImage(settings.image_file.REFRESH_ICON.rotate(25), size=settings.uism.UPDATE_AVAILABLE_BUTTON_SIZE) ) - vrct_gui.update_available_icon.grid(row=1, column=0, padx=(6,4), pady=0) + vrct_gui.update_available_icon.grid(row=1, column=0, padx=(settings.uism.UPDATE_AVAILABLE_BUTTON_IPADX, settings.uism.UPDATE_AVAILABLE_PADX_BETWEEN_LABEL_AND_ICON), pady=0) vrct_gui.update_available_label = CTkLabel( @@ -68,15 +68,12 @@ def createMainWindowWidgets(vrct_gui, settings, view_variable): textvariable=view_variable.VAR_UPDATE_AVAILABLE, height=0, corner_radius=0, - font=CTkFont(family=settings.FONT_FAMILY, size=12, weight="normal"), + font=CTkFont(family=settings.FONT_FAMILY, size=settings.uism.UPDATE_AVAILABLE_BUTTON_FONT_SIZE, weight="normal"), anchor="e", - text_color="#61b4a7", + text_color=settings.ctm.UPDATE_AVAILABLE_BUTTON_TEXT_COLOR, ) # This "right padx +1" is for fixing a bug that sticks out from the frame. I don't know why that happens... - vrct_gui.update_available_label.grid(row=1, column=1, padx=(0,6+1), pady=0) - - - + vrct_gui.update_available_label.grid(row=1, column=1, padx=(0,settings.uism.UPDATE_AVAILABLE_BUTTON_IPADX+1), pady=0) bindButtonFunctionAndColor( @@ -85,14 +82,16 @@ def createMainWindowWidgets(vrct_gui, settings, view_variable): vrct_gui.update_available_label, vrct_gui.update_available_icon, ], - enter_color=settings.ctm.HELP_AND_INFO_BUTTON_HOVERED_BG_COLOR, - leave_color=settings.ctm.HELP_AND_INFO_BUTTON_BG_COLOR, - clicked_color=settings.ctm.HELP_AND_INFO_BUTTON_CLICKED_BG_COLOR, + enter_color=settings.ctm.UPDATE_AVAILABLE_BUTTON_HOVERED_BG_COLOR, + leave_color=settings.ctm.UPDATE_AVAILABLE_BUTTON_BG_COLOR, + clicked_color=settings.ctm.UPDATE_AVAILABLE_BUTTON_CLICKED_BG_COLOR, buttonReleasedFunction=vrct_gui.openHelpAndInfoWindow, ) + + # Help and Info button vrct_gui.help_and_info_button_container = createButtonWithImage( parent_widget=vrct_gui.main_topbar_container, @@ -105,7 +104,7 @@ def createMainWindowWidgets(vrct_gui, settings, view_variable): button_command=vrct_gui.openHelpAndInfoWindow, corner_radius=settings.uism.HELP_AND_INFO_BUTTON_CORNER_RADIUS, ) - vrct_gui.help_and_info_button_container.grid(row=0, column=4, padx=settings.uism.HELP_AND_INFO_BUTTON_PADX, pady=settings.uism.HELP_AND_INFO_BUTTON_PADY, sticky="e") + vrct_gui.help_and_info_button_container.grid(row=0, column=4, padx=settings.uism.HELP_AND_INFO_BUTTON_PADX, pady=settings.uism.TOP_BAR_BUTTON_PADY, sticky="e") createSidebar(settings, vrct_gui, view_variable) diff --git a/vrct_gui/ui_managers/ColorThemeManager.py b/vrct_gui/ui_managers/ColorThemeManager.py index 9c288b55..e73eac81 100644 --- a/vrct_gui/ui_managers/ColorThemeManager.py +++ b/vrct_gui/ui_managers/ColorThemeManager.py @@ -172,6 +172,13 @@ class ColorThemeManager(): self.main.MINIMIZE_SIDEBAR_BUTTON_CLICKED_BG_COLOR = self.DARK_900_COLOR # self.main.MINIMIZE_SIDEBAR_BUTTON_DISABLE_COLOR = self.DARK_900_COLOR + + self.main.UPDATE_AVAILABLE_BUTTON_BG_COLOR = self.main.MAIN_BG_COLOR + self.main.UPDATE_AVAILABLE_BUTTON_HOVERED_BG_COLOR = self.DARK_850_COLOR + self.main.UPDATE_AVAILABLE_BUTTON_CLICKED_BG_COLOR = self.DARK_950_COLOR + # self.main.UPDATE_AVAILABLE_BUTTON_DISABLE_COLOR = self.DARK_900_COLOR + self.main.UPDATE_AVAILABLE_BUTTON_TEXT_COLOR = self.PRIMARY_300_COLOR + self.main.HELP_AND_INFO_BUTTON_BG_COLOR = self.main.MAIN_BG_COLOR self.main.HELP_AND_INFO_BUTTON_HOVERED_BG_COLOR = self.DARK_850_COLOR self.main.HELP_AND_INFO_BUTTON_CLICKED_BG_COLOR = self.DARK_950_COLOR diff --git a/vrct_gui/ui_managers/UiScalingManager.py b/vrct_gui/ui_managers/UiScalingManager.py index a5769c12..ebac9bec 100644 --- a/vrct_gui/ui_managers/UiScalingManager.py +++ b/vrct_gui/ui_managers/UiScalingManager.py @@ -75,11 +75,21 @@ class UiScalingManager(): self.main.SIDEBAR_CONFIG_BUTTON_PADY = self._calculateUiSize(10) self.main.SIDEBAR_CONFIG_BUTTON_IPADY = self._calculateUiSize(8) + self.main.TOP_BAR_BUTTON_PADY = (self._calculateUiSize(6),0) + + self.main.UPDATE_AVAILABLE_BUTTON_CORNER_RADIUS = self._calculateUiSize(6) + self.main.UPDATE_AVAILABLE_BUTTON_SIZE = (self._calculateUiSize(18), self._calculateUiSize(18)) + self.main.UPDATE_AVAILABLE_BUTTON_FONT_SIZE = self._calculateUiSize(12) + self.main.UPDATE_AVAILABLE_BUTTON_PADX = (0, self._calculateUiSize(4)) + self.main.UPDATE_AVAILABLE_BUTTON_IPADX = self._calculateUiSize(6) + self.main.UPDATE_AVAILABLE_ICON_PADX = (self._calculateUiSize(6), self._calculateUiSize(4)) + self.main.UPDATE_AVAILABLE_PADX_BETWEEN_LABEL_AND_ICON = self._calculateUiSize(4) + + self.main.HELP_AND_INFO_BUTTON_CORNER_RADIUS = self._calculateUiSize(6) self.main.HELP_AND_INFO_BUTTON_SIZE = self._calculateUiSize(24) self.main.HELP_AND_INFO_BUTTON_PADX = (0, self._calculateUiSize(6)) - self.main.HELP_AND_INFO_BUTTON_PADY = (self._calculateUiSize(6),0) self.main.HELP_AND_INFO_BUTTON_IPADXY = self._calculateUiSize(6) self.main.MINIMIZE_SIDEBAR_BUTTON_ICON_SIZE_X = int(self.main.TEXTBOX_PADX/2+self.main.TEXTBOX_CORNER_RADIUS*2) From 79e70089cd48d01b5b8a8e1b35122eabbc698139 Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Sat, 23 Sep 2023 15:50:00 +0900 Subject: [PATCH 3/5] =?UTF-8?q?[Chore]=20Main=20Window:=20=E8=89=B2?= =?UTF-8?q?=E8=AA=BF=E6=95=B4=E3=80=82=E3=83=88=E3=83=83=E3=83=97=E3=83=90?= =?UTF-8?q?=E3=83=BC=E3=81=AE=E3=83=9C=E3=82=BF=E3=83=B3=E9=A1=9E=E3=81=AE?= =?UTF-8?q?=E8=89=B2=E6=8C=87=E5=AE=9A=E3=81=BE=E3=81=A8=E3=82=81=E3=80=82?= =?UTF-8?q?=E3=82=AF=E3=83=AA=E3=83=83=E3=82=AF=E6=99=82=E3=81=AE=E8=89=B2?= =?UTF-8?q?=E3=82=92=E5=B0=91=E3=81=97=E3=81=A0=E3=81=91=E8=96=84=E3=81=8F?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vrct_gui/ui_managers/ColorThemeManager.py | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/vrct_gui/ui_managers/ColorThemeManager.py b/vrct_gui/ui_managers/ColorThemeManager.py index e73eac81..2b5833ef 100644 --- a/vrct_gui/ui_managers/ColorThemeManager.py +++ b/vrct_gui/ui_managers/ColorThemeManager.py @@ -173,16 +173,22 @@ class ColorThemeManager(): # self.main.MINIMIZE_SIDEBAR_BUTTON_DISABLE_COLOR = self.DARK_900_COLOR - self.main.UPDATE_AVAILABLE_BUTTON_BG_COLOR = self.main.MAIN_BG_COLOR - self.main.UPDATE_AVAILABLE_BUTTON_HOVERED_BG_COLOR = self.DARK_850_COLOR - self.main.UPDATE_AVAILABLE_BUTTON_CLICKED_BG_COLOR = self.DARK_950_COLOR - # self.main.UPDATE_AVAILABLE_BUTTON_DISABLE_COLOR = self.DARK_900_COLOR + + self.main.TOP_BAR_BUTTON_BG_COLOR = self.main.MAIN_BG_COLOR + self.main.TOP_BAR_BUTTON_HOVERED_BG_COLOR = self.DARK_850_COLOR + self.main.TOP_BAR_BUTTON_CLICKED_BG_COLOR = self.DARK_900_COLOR + # self.main.TOP_BAR_BUTTON_DISABLE_COLOR = self.DARK_900_COLOR + + self.main.UPDATE_AVAILABLE_BUTTON_BG_COLOR = self.main.TOP_BAR_BUTTON_BG_COLOR + self.main.UPDATE_AVAILABLE_BUTTON_HOVERED_BG_COLOR = self.main.TOP_BAR_BUTTON_HOVERED_BG_COLOR + self.main.UPDATE_AVAILABLE_BUTTON_CLICKED_BG_COLOR = self.main.TOP_BAR_BUTTON_CLICKED_BG_COLOR + # self.main.UPDATE_AVAILABLE_BUTTON_DISABLE_COLOR = self.main.TOP_BAR_BUTTON_DISABLE_COLOR self.main.UPDATE_AVAILABLE_BUTTON_TEXT_COLOR = self.PRIMARY_300_COLOR - self.main.HELP_AND_INFO_BUTTON_BG_COLOR = self.main.MAIN_BG_COLOR - self.main.HELP_AND_INFO_BUTTON_HOVERED_BG_COLOR = self.DARK_850_COLOR - self.main.HELP_AND_INFO_BUTTON_CLICKED_BG_COLOR = self.DARK_950_COLOR - # self.main.HELP_AND_INFO_BUTTON_DISABLE_COLOR = self.DARK_900_COLOR + self.main.HELP_AND_INFO_BUTTON_BG_COLOR = self.main.TOP_BAR_BUTTON_BG_COLOR + self.main.HELP_AND_INFO_BUTTON_HOVERED_BG_COLOR = self.main.TOP_BAR_BUTTON_HOVERED_BG_COLOR + self.main.HELP_AND_INFO_BUTTON_CLICKED_BG_COLOR = self.main.TOP_BAR_BUTTON_CLICKED_BG_COLOR + # self.main.HELP_AND_INFO_BUTTON_DISABLE_COLOR = self.main.TOP_BAR_BUTTON_DISABLE_COLOR From c072a5a40698c1ee29505321df92b322a0cc82b0 Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Sat, 23 Sep 2023 16:09:09 +0900 Subject: [PATCH 4/5] =?UTF-8?q?[Update]=20Main=20Window:=20Update=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E3=83=9C=E3=82=BF=E3=83=B3=E3=82=92=E3=82=AF=E3=83=AA?= =?UTF-8?q?=E3=83=83=E3=82=AF=E3=81=99=E3=82=8B=E3=81=A8=E3=80=81=E3=82=AF?= =?UTF-8?q?=E3=83=A9=E3=82=A4=E3=82=A2=E3=83=B3=E3=83=88=E5=81=B4=E3=81=A7?= =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E3=81=95=E3=82=8C=E3=81=A6=E3=81=84=E3=82=8B?= =?UTF-8?q?=E3=83=87=E3=83=95=E3=82=A9=E3=83=AB=E3=83=88=E3=83=96=E3=83=A9?= =?UTF-8?q?=E3=82=A6=E3=82=B6=E3=82=92=E9=96=8B=E3=81=8F=E3=80=82=E3=83=AA?= =?UTF-8?q?=E3=83=B3=E3=82=AF=E5=85=88=E3=81=AFBooth=20VRCT=E3=83=9A?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vrct_gui/main_window/createMainWindowWidgets.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vrct_gui/main_window/createMainWindowWidgets.py b/vrct_gui/main_window/createMainWindowWidgets.py index b684d3ac..5015485b 100644 --- a/vrct_gui/main_window/createMainWindowWidgets.py +++ b/vrct_gui/main_window/createMainWindowWidgets.py @@ -4,6 +4,7 @@ from customtkinter import CTkFrame, CTkLabel, CTkFont, CTkImage from ..ui_utils import createButtonWithImage, getImagePath, bindButtonFunctionAndColor +import webbrowser def createMainWindowWidgets(vrct_gui, settings, view_variable): vrct_gui.protocol("WM_DELETE_WINDOW", vrct_gui.quitVRCT) @@ -85,7 +86,7 @@ def createMainWindowWidgets(vrct_gui, settings, view_variable): enter_color=settings.ctm.UPDATE_AVAILABLE_BUTTON_HOVERED_BG_COLOR, leave_color=settings.ctm.UPDATE_AVAILABLE_BUTTON_BG_COLOR, clicked_color=settings.ctm.UPDATE_AVAILABLE_BUTTON_CLICKED_BG_COLOR, - buttonReleasedFunction=vrct_gui.openHelpAndInfoWindow, + buttonReleasedFunction=lambda e: webbrowser.open_new_tab("https://booth.pm/ja/items/4814313"), ) From ed795cfd9fd08ba2e20ada4ed79bfe04815b87a6 Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Sat, 23 Sep 2023 17:13:41 +0900 Subject: [PATCH 5/5] =?UTF-8?q?[Update]=20Main=20Window:=20Update=E9=80=9A?= =?UTF-8?q?=E7=9F=A5UI=20=E3=83=87=E3=83=95=E3=82=A9=E3=83=AB=E3=83=88?= =?UTF-8?q?=E3=81=AF=E9=9D=9E=E8=A1=A8=E7=A4=BA=E3=81=A7=E3=80=81main.py?= =?UTF-8?q?=E5=81=B4=E3=81=A7config.UPDATE=5FFLAG=E3=82=92=E8=A6=8B?= =?UTF-8?q?=E3=81=A6=E8=A1=A8=E7=A4=BA=E3=81=99=E3=82=8B=E3=81=8B=E3=81=A9?= =?UTF-8?q?=E3=81=86=E3=81=8B=E3=81=AE=E9=96=A2=E6=95=B0=E8=BF=BD=E5=8A=A0?= =?UTF-8?q?=E3=80=82(=E5=AE=9F=E9=9A=9B=E3=81=ABconfig=E5=A4=89=E6=95=B0?= =?UTF-8?q?=E3=82=92=E8=A6=8B=E3=82=8B=E3=81=8B=E3=81=A9=E3=81=86=E3=81=8B?= =?UTF-8?q?=E3=81=AF=E5=88=A5=E6=8B=85=E5=BD=93=20misya=20=E3=81=B8?= =?UTF-8?q?=E5=BC=95=E3=81=8D=E7=B6=99=E3=81=8E)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 3 +++ view.py | 3 +++ vrct_gui/main_window/createMainWindowWidgets.py | 1 + 3 files changed, 7 insertions(+) diff --git a/main.py b/main.py index 5a35e54c..303a7671 100644 --- a/main.py +++ b/main.py @@ -668,5 +668,8 @@ view.register( }, ) +if config.UPDATE_FLAG is True: + view.showUpdateAvailableButton() + if __name__ == "__main__": view.startMainLoop() \ No newline at end of file diff --git a/view.py b/view.py index 45d0c337..174e883f 100644 --- a/view.py +++ b/view.py @@ -392,6 +392,9 @@ class View(): # self._insertSampleConversationToTextbox() + @staticmethod + def showUpdateAvailableButton(): + vrct_gui.update_available_container.grid() @staticmethod def setMainWindowAllWidgetsStatusToNormal(): diff --git a/vrct_gui/main_window/createMainWindowWidgets.py b/vrct_gui/main_window/createMainWindowWidgets.py index 5015485b..b10bdb16 100644 --- a/vrct_gui/main_window/createMainWindowWidgets.py +++ b/vrct_gui/main_window/createMainWindowWidgets.py @@ -50,6 +50,7 @@ def createMainWindowWidgets(vrct_gui, settings, view_variable): cursor="hand2", ) vrct_gui.update_available_container.grid(row=0, column=3, padx=settings.uism.UPDATE_AVAILABLE_BUTTON_PADX, pady=settings.uism.TOP_BAR_BUTTON_PADY, sticky="nse") + vrct_gui.update_available_container.grid_remove() vrct_gui.update_available_container.rowconfigure((0,2), weight=1)