Merge pull request #1 from S0nic014/maya-based

Rebase to maya
sowwic · Mar 22, 2021 · a2ed819 · a2ed819
2 parents 507a78d + 2a7f35a
commit a2ed819
Show file tree

Hide file tree

Showing 22 changed files with 540 additions and 819 deletions.
diff --git a/.gitignore b/.gitignore
@@ -127,4 +127,7 @@ dmypy.json
 # Project
 .playblastEnv/
 .vscode/
-.design/
+.design/
+
+# User files
+config/user.json
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "qt_widgets_lib"]
+	path = qt_widgets_lib
+	url = https://github.com/S0nic014/qt_widgets_lib.git
diff --git a/config/default.json b/config/default.json
@@ -0,0 +1,11 @@
+{
+    "image.quality": 100,
+    "image.scale": 1.0,
+    "image.fpadding": 4,
+    "out.path": "",
+    "out.viewer": true,
+    "out.ornaments": true,
+    "out.remove_temp": true,
+    "out.offscreen": false,
+    "out.clear_cache": true
+}
diff --git a/dsPlayblast/__init__.py b/dsPlayblast/__init__.py
diff --git a/dsPlayblast/clientFn.py b/dsPlayblast/clientFn.py
diff --git a/dsPlayblast/ffmpegFn.py b/dsPlayblast/ffmpegFn.py
diff --git a/dsPlayblast/images/dsPlayblast.ico b/dsPlayblast/images/dsPlayblast.ico
diff --git a/dsPlayblast/loggingFn.py b/dsPlayblast/loggingFn.py
diff --git a/dsPlayblast/main.py b/dsPlayblast/main.py