Merge 31f437ff79 into 8c6d0134a8

Merge pull request #588 from KRSHH/main
Enhance UI with drag and drop, modern look using customtkinter, and improved webcam mapping
2024-09-16 04:21:42 +00:00 · 2024-09-16 12:21:39 +08:00 · 2024-09-16 01:46:40 +05:30 · 2024-09-16 01:00:03 +05:30 · 2024-09-16 00:37:34 +05:30 · 2024-09-16 00:33:49 +05:30
4 changed files with 621 additions and 316 deletions
--- a/README.md
+++ b/README.md
@ -12,7 +12,7 @@ Users of this software are expected to use this software responsibly while abidi
 ## New Features
 ### Resizable Preview Window

-Dynamically improve the performance by using the --resizable parameter
+Dynamically improve the performance by using the `--live-resizable` parameter
 ![resizable-gif](resizable.gif)

 ### Face Mapping
@ -40,7 +40,7 @@ And see the magic!
 <details>
 Here's the link without the tedious installation script below

-[Windows / Nvidia](https://1689241962432.gumroad.com/l/vccdmm) CUDA still required
+[Windows / Nvidia](https://hacksider.gumroad.com/l/vccdmm) CUDA still required
 </details>

 ## How do I install it?
--- a/modules/ui.json
+++ b/modules/ui.json
@ -1,158 +0,0 @@
-{
-  "CTk": {
-    "fg_color": ["gray95", "gray10"]
-  },
-  "CTkToplevel": {
-    "fg_color": ["gray95", "gray10"]
-  },
-  "CTkFrame": {
-    "corner_radius": 0,
-    "border_width": 0,
-    "fg_color": ["gray90", "gray13"],
-    "top_fg_color": ["gray85", "gray16"],
-    "border_color": ["gray65", "gray28"]
-  },
-  "CTkButton": {
-    "corner_radius": 0,
-    "border_width": 0,
-    "fg_color": ["#2aa666", "#1f538d"],
-    "hover_color": ["#3cb666", "#14375e"],
-    "border_color": ["#3e4a40", "#949A9F"],
-    "text_color": ["#f3faf6", "#f3faf6"],
-    "text_color_disabled": ["gray74", "gray60"]
-  },
-  "CTkLabel": {
-    "corner_radius": 0,
-    "fg_color": "transparent",
-    "text_color": ["gray14", "gray84"]
-  },
-  "CTkEntry": {
-    "corner_radius": 0,
-    "border_width": 2,
-    "fg_color": ["#F9F9FA", "#343638"],
-    "border_color": ["#979DA2", "#565B5E"],
-    "text_color": ["gray14", "gray84"],
-    "placeholder_text_color": ["gray52", "gray62"]
-  },
-  "CTkCheckbox": {
-    "corner_radius": 0,
-    "border_width": 3,
-    "fg_color": ["#2aa666", "#1f538d"],
-    "border_color": ["#3e4a40", "#949A9F"],
-    "hover_color": ["#3cb666", "#14375e"],
-    "checkmark_color": ["#f3faf6", "gray90"],
-    "text_color": ["gray14", "gray84"],
-    "text_color_disabled": ["gray60", "gray45"]
-  },
-  "CTkSwitch": {
-    "corner_radius": 1000,
-    "border_width": 3,
-    "button_length": 0,
-    "fg_color": ["#939BA2", "#4A4D50"],
-    "progress_color": ["#2aa666", "#1f538d"],
-    "button_color": ["gray36", "#D5D9DE"],
-    "button_hover_color": ["gray20", "gray100"],
-    "text_color": ["gray14", "gray84"],
-    "text_color_disabled": ["gray60", "gray45"]
-  },
-  "CTkRadiobutton": {
-    "corner_radius": 1000,
-    "border_width_checked": 6,
-    "border_width_unchecked": 3,
-    "fg_color": ["#2aa666", "#1f538d"],
-    "border_color": ["#3e4a40", "#949A9F"],
-    "hover_color": ["#3cb666", "#14375e"],
-    "text_color": ["gray14", "gray84"],
-    "text_color_disabled": ["gray60", "gray45"]
-  },
-  "CTkProgressBar": {
-    "corner_radius": 1000,
-    "border_width": 0,
-    "fg_color": ["#939BA2", "#4A4D50"],
-    "progress_color": ["#2aa666", "#1f538d"],
-    "border_color": ["gray", "gray"]
-  },
-  "CTkSlider": {
-    "corner_radius": 1000,
-    "button_corner_radius": 1000,
-    "border_width": 6,
-    "button_length": 0,
-    "fg_color": ["#939BA2", "#4A4D50"],
-    "progress_color": ["gray40", "#AAB0B5"],
-    "button_color": ["#2aa666", "#1f538d"],
-    "button_hover_color": ["#3cb666", "#14375e"]
-  },
-  "CTkOptionMenu": {
-    "corner_radius": 0,
-    "fg_color": ["#2aa666", "#1f538d"],
-    "button_color": ["#3cb666", "#14375e"],
-    "button_hover_color": ["#234567", "#1e2c40"],
-    "text_color": ["#f3faf6", "#f3faf6"],
-    "text_color_disabled": ["gray74", "gray60"]
-  },
-  "CTkComboBox": {
-    "corner_radius": 0,
-    "border_width": 2,
-    "fg_color": ["#F9F9FA", "#343638"],
-    "border_color": ["#979DA2", "#565B5E"],
-    "button_color": ["#979DA2", "#565B5E"],
-    "button_hover_color": ["#6E7174", "#7A848D"],
-    "text_color": ["gray14", "gray84"],
-    "text_color_disabled": ["gray50", "gray45"]
-  },
-  "CTkScrollbar": {
-    "corner_radius": 1000,
-    "border_spacing": 4,
-    "fg_color": "transparent",
-    "button_color": ["gray55", "gray41"],
-    "button_hover_color": ["gray40", "gray53"]
-  },
-  "CTkSegmentedButton": {
-    "corner_radius": 0,
-    "border_width": 2,
-    "fg_color": ["#979DA2", "gray29"],
-    "selected_color": ["#2aa666", "#1f538d"],
-    "selected_hover_color": ["#3cb666", "#14375e"],
-    "unselected_color": ["#979DA2", "gray29"],
-    "unselected_hover_color": ["gray70", "gray41"],
-    "text_color": ["#f3faf6", "#f3faf6"],
-    "text_color_disabled": ["gray74", "gray60"]
-  },
-  "CTkTextbox": {
-    "corner_radius": 0,
-    "border_width": 0,
-    "fg_color": ["gray100", "gray20"],
-    "border_color": ["#979DA2", "#565B5E"],
-    "text_color": ["gray14", "gray84"],
-    "scrollbar_button_color": ["gray55", "gray41"],
-    "scrollbar_button_hover_color": ["gray40", "gray53"]
-  },
-  "CTkScrollableFrame": {
-    "label_fg_color": ["gray80", "gray21"]
-  },
-  "DropdownMenu": {
-    "fg_color": ["gray90", "gray20"],
-    "hover_color": ["gray75", "gray28"],
-    "text_color": ["gray14", "gray84"]
-  },
-  "CTkFont": {
-    "macOS": {
-      "family": "Avenir",
-      "size": 18,
-      "weight": "normal"
-    },
-    "Windows": {
-      "family": "Corbel",
-      "size": 18,
-      "weight": "normal"
-    },
-    "Linux": {
-      "family": "Montserrat",
-      "size": 18,
-      "weight": "normal"
-    }
-  },
-  "URL": {
-    "text_color": ["gray74", "gray60"]
-  }
-}
--- a/modules/ui.py
+++ b/modules/ui.py
--- a/requirements.txt
+++ b/requirements.txt
@ -9,7 +9,7 @@ tk==0.1.0
 customtkinter==5.2.2
 pillow==9.5.0
 torch==2.0.1+cu118; sys_platform != 'darwin'
-torch==2.0.1; sys_platform == 'darwin'
+torch==2.2.0; sys_platform == 'darwin'
 torchvision==0.15.2+cu118; sys_platform != 'darwin'
 torchvision==0.15.2; sys_platform == 'darwin'
 onnxruntime==1.18.0; sys_platform == 'darwin' and platform_machine != 'arm64'
@ -21,3 +21,5 @@ opennsfw2==0.10.2
 protobuf==4.23.2
 tqdm==4.66.4
 gfpgan==1.3.8
+tkinterdnd2==0.4.2
+customtkinter==5.2.2
Author	SHA1	Message	Date
dependabot[bot]	043ab890d9	Merge `31f437ff79` into `8c6d0134a8`	2024-09-16 04:21:42 +00:00
Kenneth Estanislao	8c6d0134a8	Merge pull request #588 from KRSHH/main Enhance UI with drag and drop, modern look using customtkinter, and improved webcam mapping	2024-09-16 12:21:39 +08:00
K	d2f57fa4dd	Minor UI Fixes	2024-09-16 01:46:40 +05:30
K	2f2380b98d	Delete modules/ui.json	2024-09-16 01:00:03 +05:30
K	e5c29749bb	UI Redone	2024-09-16 00:37:34 +05:30
K	b505ae7b90	Add customtkinter in requirements.txt	2024-09-16 00:33:49 +05:30
CH. Krish	373134cfa1	Add tkinterdnd2 to requirements.txt	2024-09-15 23:02:25 +05:30
CH. Krish	523d80550d	Adding Drag and Drop feature to Face Mapper and Source and Target	2024-09-15 23:00:28 +05:30
Kenneth Estanislao	621c3f035e	Update README.md fixed the gumroad link	2024-09-15 19:15:02 +08:00
Vic P.	83529c8ca8	Update README.md	2024-09-15 14:57:31 +07:00
dependabot[bot]	31f437ff79	Bump torch from 2.0.1 to 2.2.0 Bumps [torch](https://github.com/pytorch/pytorch) from 2.0.1 to 2.2.0. - [Release notes](https://github.com/pytorch/pytorch/releases) - [Changelog](https://github.com/pytorch/pytorch/blob/main/RELEASE.md) - [Commits](https://github.com/pytorch/pytorch/compare/v2.0.1...v2.2.0) --- updated-dependencies: - dependency-name: torch dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2024-07-31 03:29:47 +00:00