Merge 99ebec28b8 into ea7bbd49fe

Revert "Merge pull request #592 from KRSHH/main"
This reverts commit 2f29d323d9.
2024-09-16 23:31:54 +07:00 · 2024-09-16 23:34:35 +08:00 · 2024-09-16 23:32:39 +08:00 · 2024-09-16 23:30:12 +08:00 · 2024-09-16 23:26:29 +08:00 · 2024-09-16 20:47:02 +05:30
10 changed files with 666 additions and 317 deletions
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@ -0,0 +1,22 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/alpine
+{
+	"name": "Alpine",
+	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+	"image": "mcr.microsoft.com/devcontainers/base:alpine-3.20"
+
+	// Features to add to the dev container. More info: https://containers.dev/features.
+	// "features": {},
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "uname -a",
+
+	// Configure tool-specific properties.
+	// "customizations": {},
+
+	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "root"
+}
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@ -0,0 +1,14 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for more information:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+# https://containers.dev/guide/dependabot
+
+version: 2
+updates:
+ - package-ecosystem: "devcontainers"
+   directory: "/"
+   schedule:
+
+
+     interval: weekly
--- 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
@ -36,6 +36,13 @@ Map the faces
 And see the magic!


+## Want to skip the installation and just run it?
+<details>
+Here's the link without the tedious installation script below
+
+[Windows / Nvidia](https://hacksider.gumroad.com/l/vccdmm) CUDA still required
+</details>
+
 ## How do I install it?


@ -350,7 +357,7 @@ If you want the latest and greatest build, or want to see some new great feature
 - [ffmpeg](https://ffmpeg.org/): for making video related operations easy
 - [deepinsight](https://github.com/deepinsight): for their [insightface](https://github.com/deepinsight/insightface) project which provided a well-made library and models. Please be reminded that the [use of the model is for non-commercial research purposes only](https://github.com/deepinsight/insightface?tab=readme-ov-file#license).
 - [havok2-htwo](https://github.com/havok2-htwo) : for sharing the code for webcam
- [GosuDRM](https://github.com/GosuDRM/nsfw-roop) : for uncensoring roop
+- [GosuDRM](https://github.com/GosuDRM) : for open version of roop
 - [pereiraroland26](https://github.com/pereiraroland26) : Multiple faces support
 - [vic4key](https://github.com/vic4key) : For supporting/contributing on this project
 - and [all developers](https://github.com/hacksider/Deep-Live-Cam/graphs/contributors) behind libraries used in this project.
--- a/modules/metadata.py
+++ b/modules/metadata.py
@ -1,3 +1,3 @@
 name = 'Deep Live Cam'
-version = '1.3.0'
+version = '1.4.0'
 edition = 'Portable'
--- a/modules/processors/frame/core.py
+++ b/modules/processors/frame/core.py
@ -1,3 +1,4 @@
+
 import sys
 import importlib
 from concurrent.futures import ThreadPoolExecutor
--- 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/readme/gumroad.png
+++ b/readme/gumroad.png
--- a/readme/gumroad2.png
+++ b/readme/gumroad2.png
--- 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
thongao1302	a892db7aab	Merge `99ebec28b8` into `ea7bbd49fe`	2024-09-16 23:31:54 +07:00
Kenneth Estanislao	ea7bbd49fe	Revert "Merge pull request #592 from KRSHH/main" This reverts commit `2f29d323d9`.	2024-09-16 23:34:35 +08:00
Kenneth Estanislao	2f29d323d9	Merge pull request #592 from KRSHH/main Better UI	2024-09-16 23:32:39 +08:00
Kenneth Estanislao	c6e00796c8	Merge pull request #588 from KRSHH/main Enhance UI with drag and drop, modern look using customtkinter, and improved webcam mapping	2024-09-16 23:30:12 +08:00
Kenneth Estanislao	2641f9e344	Merge pull request #594 from KRSHH/main UI Change	2024-09-16 23:26:29 +08:00
KRSHH	5dd621b2b0	Fixed Typo	2024-09-16 20:47:02 +05:30
KRSHH	05413cc989	Update README.md For avoiding ToS violation	2024-09-16 20:38:56 +05:30
KRSHH	c49d0e0e3c	Bug fixes	2024-09-16 20:36:28 +05:30
unknown	88e3274d96	Backk	2024-09-16 20:24:04 +05:30
Kenneth Estanislao	9bf2080ac8	Revert "Merge pull request #588 from KRSHH/main" This reverts commit `8c6d0134a8`, reversing changes made to `621c3f035e`.	2024-09-16 22:18:59 +08:00
Kenneth Estanislao	5ab00388b7	Revert "Merge pull request #592 from KRSHH/main" This reverts commit `4768488653`, reversing changes made to `8c6d0134a8`.	2024-09-16 22:18:53 +08:00
Kenneth Estanislao	4768488653	Merge pull request #592 from KRSHH/main Better UI	2024-09-16 22:10:42 +08:00
KRSHH	569c9ca25a	Resizable Root window	2024-09-16 19:13:54 +05:30
KRSHH	c9f8537a15	Switch alignment	2024-09-16 18:53:19 +05:30
KRSHH	2d99e392ff	Vertical switches	2024-09-16 18:48:05 +05:30
KRSHH	1725ba95e9	Accurate Average PC Performance GIF	2024-09-16 18:32:29 +05:30
KRSHH	abe1e67c0e	adding avg pc performance demo	2024-09-16 18:31:18 +05:30
KRSHH	2b9d10f182	Donation button, close option button	2024-09-16 16:54:49 +05:30
K	674f584895	UI Change Changes in UI	2024-09-16 13:31:20 +05:30
K	325187b513	Fix Text Font Change, Larger, Bolder	2024-09-16 11:22:38 +05:30
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
Kenneth Estanislao	d38a816b55	Update README.md	2024-09-14 02:17:34 +08:00
Kenneth Estanislao	9fccb069df	Update README.md	2024-09-14 02:15:51 +08:00
Kenneth Estanislao	1829d5650b	easy installer link	2024-09-14 02:08:33 +08:00
Kenneth Estanislao	be36016a69	Update metadata.py	2024-09-14 01:58:34 +08:00
Kenneth Estanislao	26e764c842	Create gumroad.png	2024-09-14 01:56:27 +08:00
thongao1302	99ebec28b8	Merge branch 'main' into dependabot/pip/torch-2.2.0	2024-08-05 17:28:26 +07:00
thongao1302	01a822807c	Merge branch 'main' into dependabot/pip/torch-2.2.0	2024-08-01 20:04:15 +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