sticker-convert 2.8.0__tar.gz → 2.8.2__tar.gz

{sticker-convert-2.8.0/src/sticker_convert.egg-info → sticker-convert-2.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sticker-convert
-Version: 2.8.0
+Version: 2.8.2
 Summary: Convert (animated) stickers to/from WhatsApp, Telegram, Signal, Line, Kakao, iMessage. Written in Python.
 Author-email: laggykiller <chaudominic2@gmail.com>
 Maintainer-email: laggykiller <chaudominic2@gmail.com>
@@ -483,23 +483,24 @@ usage: sticker-convert.py [-h] [--version] [--no-confirm] [--custom-presets CUST
                           [--preset {auto,signal,telegram,telegram_emoji,whatsapp,line,kakao,imessage_small,imessage_medium,imessage_large,custom}]
                           [--steps STEPS] [--processes PROCESSES] [--fps-min FPS_MIN] [--fps-max FPS_MAX]
                           [--fps-power FPS_POWER] [--res-min RES_MIN] [--res-max RES_MAX] [--res-w-min RES_W_MIN]
-                          [--res-w-max RES_W_MAX] [--res-h-min RES_H_MIN] [--res-h-max RES_H_MAX] [--res-power RES_POWER]
-                          [--quality-min QUALITY_MIN] [--quality-max QUALITY_MAX] [--quality-power QUALITY_POWER]
-                          [--color-min COLOR_MIN] [--color-max COLOR_MAX] [--color-power COLOR_POWER]
-                          [--duration-min DURATION_MIN] [--duration-max DURATION_MAX] [--bg-color BG_COLOR]
-                          [--vid-size-max VID_SIZE_MAX] [--img-size-max IMG_SIZE_MAX] [--vid-format VID_FORMAT]
-                          [--img-format IMG_FORMAT] [--fake-vid] [--scale-filter SCALE_FILTER]
-                          [--quantize-method QUANTIZE_METHOD] [--cache-dir CACHE_DIR] [--default-emoji DEFAULT_EMOJI]
-                          [--signal-uuid SIGNAL_UUID] [--signal-password SIGNAL_PASSWORD] [--signal-get-auth]
-                          [--signal-data-dir SIGNAL_DATA_DIR] [--telegram-token TELEGRAM_TOKEN]
-                          [--telegram-userid TELEGRAM_USERID] [--kakao-auth-token KAKAO_AUTH_TOKEN] [--kakao-get-auth]
-                          [--kakao-username KAKAO_USERNAME] [--kakao-password KAKAO_PASSWORD]
-                          [--kakao-country-code KAKAO_COUNTRY_CODE] [--kakao-phone-number KAKAO_PHONE_NUMBER] [--line-get-auth]
-                          [--line-cookies LINE_COOKIES] [--save-cred SAVE_CRED]
+                          [--res-w-max RES_W_MAX] [--res-h-min RES_H_MIN] [--res-h-max RES_H_MAX]
+                          [--res-power RES_POWER] [--quality-min QUALITY_MIN] [--quality-max QUALITY_MAX]
+                          [--quality-power QUALITY_POWER] [--color-min COLOR_MIN] [--color-max COLOR_MAX]
+                          [--color-power COLOR_POWER] [--duration-min DURATION_MIN] [--duration-max DURATION_MAX]
+                          [--padding-percent PADDING_PERCENT] [--bg-color BG_COLOR] [--vid-size-max VID_SIZE_MAX]
+                          [--img-size-max IMG_SIZE_MAX] [--vid-format VID_FORMAT] [--img-format IMG_FORMAT]
+                          [--fake-vid] [--scale-filter SCALE_FILTER] [--quantize-method QUANTIZE_METHOD]
+                          [--cache-dir CACHE_DIR] [--default-emoji DEFAULT_EMOJI] [--signal-uuid SIGNAL_UUID]
+                          [--signal-password SIGNAL_PASSWORD] [--signal-get-auth] [--signal-data-dir SIGNAL_DATA_DIR]
+                          [--telegram-token TELEGRAM_TOKEN] [--telegram-userid TELEGRAM_USERID]
+                          [--kakao-auth-token KAKAO_AUTH_TOKEN] [--kakao-get-auth] [--kakao-username KAKAO_USERNAME]
+                          [--kakao-password KAKAO_PASSWORD] [--kakao-country-code KAKAO_COUNTRY_CODE]
+                          [--kakao-phone-number KAKAO_PHONE_NUMBER] [--line-get-auth] [--line-cookies LINE_COOKIES]
+                          [--save-cred SAVE_CRED]
 
 CLI for stickers-convert
 
-optional arguments:
+options:
   -h, --help            show this help message and exit
   --version             show program's version number and exit
   --no-confirm          Do not ask any questions.
@@ -585,6 +586,8 @@ Compression options:
                         Set minimum output duration in miliseconds.
   --duration-max DURATION_MAX
                         Set maximum output duration in miliseconds.
+  --padding-percent PADDING_PERCENT
+                        Set percentage of space used as padding.
   --bg-color BG_COLOR   Set custom background color.
                         Example: 00ff00 for green.
                         If this is not set, background color would be auto set to black if image is bright, or white if image is dark.

{sticker-convert-2.8.0 → sticker-convert-2.8.2}/README.md

@@ -96,23 +96,24 @@ usage: sticker-convert.py [-h] [--version] [--no-confirm] [--custom-presets CUST
                           [--preset {auto,signal,telegram,telegram_emoji,whatsapp,line,kakao,imessage_small,imessage_medium,imessage_large,custom}]
                           [--steps STEPS] [--processes PROCESSES] [--fps-min FPS_MIN] [--fps-max FPS_MAX]
                           [--fps-power FPS_POWER] [--res-min RES_MIN] [--res-max RES_MAX] [--res-w-min RES_W_MIN]
-                          [--res-w-max RES_W_MAX] [--res-h-min RES_H_MIN] [--res-h-max RES_H_MAX] [--res-power RES_POWER]
-                          [--quality-min QUALITY_MIN] [--quality-max QUALITY_MAX] [--quality-power QUALITY_POWER]
-                          [--color-min COLOR_MIN] [--color-max COLOR_MAX] [--color-power COLOR_POWER]
-                          [--duration-min DURATION_MIN] [--duration-max DURATION_MAX] [--bg-color BG_COLOR]
-                          [--vid-size-max VID_SIZE_MAX] [--img-size-max IMG_SIZE_MAX] [--vid-format VID_FORMAT]
-                          [--img-format IMG_FORMAT] [--fake-vid] [--scale-filter SCALE_FILTER]
-                          [--quantize-method QUANTIZE_METHOD] [--cache-dir CACHE_DIR] [--default-emoji DEFAULT_EMOJI]
-                          [--signal-uuid SIGNAL_UUID] [--signal-password SIGNAL_PASSWORD] [--signal-get-auth]
-                          [--signal-data-dir SIGNAL_DATA_DIR] [--telegram-token TELEGRAM_TOKEN]
-                          [--telegram-userid TELEGRAM_USERID] [--kakao-auth-token KAKAO_AUTH_TOKEN] [--kakao-get-auth]
-                          [--kakao-username KAKAO_USERNAME] [--kakao-password KAKAO_PASSWORD]
-                          [--kakao-country-code KAKAO_COUNTRY_CODE] [--kakao-phone-number KAKAO_PHONE_NUMBER] [--line-get-auth]
-                          [--line-cookies LINE_COOKIES] [--save-cred SAVE_CRED]
+                          [--res-w-max RES_W_MAX] [--res-h-min RES_H_MIN] [--res-h-max RES_H_MAX]
+                          [--res-power RES_POWER] [--quality-min QUALITY_MIN] [--quality-max QUALITY_MAX]
+                          [--quality-power QUALITY_POWER] [--color-min COLOR_MIN] [--color-max COLOR_MAX]
+                          [--color-power COLOR_POWER] [--duration-min DURATION_MIN] [--duration-max DURATION_MAX]
+                          [--padding-percent PADDING_PERCENT] [--bg-color BG_COLOR] [--vid-size-max VID_SIZE_MAX]
+                          [--img-size-max IMG_SIZE_MAX] [--vid-format VID_FORMAT] [--img-format IMG_FORMAT]
+                          [--fake-vid] [--scale-filter SCALE_FILTER] [--quantize-method QUANTIZE_METHOD]
+                          [--cache-dir CACHE_DIR] [--default-emoji DEFAULT_EMOJI] [--signal-uuid SIGNAL_UUID]
+                          [--signal-password SIGNAL_PASSWORD] [--signal-get-auth] [--signal-data-dir SIGNAL_DATA_DIR]
+                          [--telegram-token TELEGRAM_TOKEN] [--telegram-userid TELEGRAM_USERID]
+                          [--kakao-auth-token KAKAO_AUTH_TOKEN] [--kakao-get-auth] [--kakao-username KAKAO_USERNAME]
+                          [--kakao-password KAKAO_PASSWORD] [--kakao-country-code KAKAO_COUNTRY_CODE]
+                          [--kakao-phone-number KAKAO_PHONE_NUMBER] [--line-get-auth] [--line-cookies LINE_COOKIES]
+                          [--save-cred SAVE_CRED]
 
 CLI for stickers-convert
 
-optional arguments:
+options:
   -h, --help            show this help message and exit
   --version             show program's version number and exit
   --no-confirm          Do not ask any questions.
@@ -198,6 +199,8 @@ Compression options:
                         Set minimum output duration in miliseconds.
   --duration-max DURATION_MAX
                         Set maximum output duration in miliseconds.
+  --padding-percent PADDING_PERCENT
+                        Set percentage of space used as padding.
   --bg-color BG_COLOR   Set custom background color.
                         Example: 00ff00 for green.
                         If this is not set, background color would be auto set to black if image is bright, or white if image is dark.

{sticker-convert-2.8.0 → sticker-convert-2.8.2}/src/sticker_convert/cli.py

@@ -119,6 +119,7 @@ class CLI:
             "duration_max",
             "vid_size_max",
             "img_size_max",
+            "padding_percent",
         )
         flags_comp_float = ("fps_power", "res_power", "quality_power", "color_power")
         flags_comp_str = (
@@ -372,6 +373,9 @@ class CLI:
             bg_color=self.compression_presets[preset]["bg_color"]
             if args.bg_color is None
             else args.bg_color,
+            padding_percent=self.compression_presets[preset]["padding_percent"]
+            if args.padding_percent is None
+            else args.padding_percent,
             steps=self.compression_presets[preset]["steps"]
             if args.steps is None
             else args.steps,

{sticker-convert-2.8.0 → sticker-convert-2.8.2}/src/sticker_convert/converter.py

@@ -4,7 +4,6 @@ from fractions import Fraction
 from io import BytesIO
 from math import ceil, floor
 from pathlib import Path
-from queue import Queue
 from typing import TYPE_CHECKING, Any, Dict, List, Literal, Optional, Tuple, Union, cast
 
 import numpy as np
@@ -12,7 +11,7 @@ from PIL import Image
 from PIL import __version__ as PillowVersion
 
 from sticker_convert.job_option import CompOption
-from sticker_convert.utils.callback import Callback, CallbackReturn, CbQueueItemType
+from sticker_convert.utils.callback import CallbackProtocol, CallbackReturn
 from sticker_convert.utils.files.cache_store import CacheStore
 from sticker_convert.utils.media.codec_info import CodecInfo, rounding
 from sticker_convert.utils.media.format_verify import FormatVerify
@@ -120,7 +119,7 @@ class StickerConvert:
         in_f: Union[Path, Tuple[Path, bytes]],
         out_f: Path,
         opt_comp: CompOption,
-        cb: "Union[Queue[CbQueueItemType], Callback]",
+        cb: CallbackProtocol,
         #  cb_return: CallbackReturn
     ) -> None:
         self.in_f: Union[bytes, Path]
@@ -186,7 +185,7 @@ class StickerConvert:
         in_f: Union[Path, Tuple[Path, bytes]],
         out_f: Path,
         opt_comp: CompOption,
-        cb: "Union[Queue[CbQueueItemType], Callback]",
+        cb: CallbackProtocol,
         _cb_return: CallbackReturn,
     ) -> Tuple[bool, Path, Union[None, bytes, Path], int]:
         sticker = StickerConvert(in_f, out_f, opt_comp, cb)
@@ -598,12 +597,13 @@ class StickerConvert:
             if self.res_h is None:
                 self.res_h = height
 
+            scaling = 1 - (self.opt_comp.padding_percent / 100)
             if width > height:
-                width_new = self.res_w
-                height_new = height * self.res_w // width
+                width_new = int(self.res_w * scaling)
+                height_new = int(height * self.res_w // width * scaling)
             else:
-                height_new = self.res_h
-                width_new = width * self.res_h // height
+                height_new = int(self.res_h * scaling)
+                width_new = int(width * self.res_h // height * scaling)
 
             with im.resize((width_new, height_new), resample=resample) as im_resized:
                 with Image.new(

{sticker-convert-2.8.0 → sticker-convert-2.8.2}/src/sticker_convert/downloaders/download_base.py

@@ -2,13 +2,12 @@
 from __future__ import annotations
 
 from pathlib import Path
-from queue import Queue
-from typing import Any, List, Optional, Tuple, Union
+from typing import Any, List, Optional, Tuple
 
 import requests
 
 from sticker_convert.job_option import CredOption
-from sticker_convert.utils.callback import Callback, CallbackReturn, CbQueueItemType
+from sticker_convert.utils.callback import CallbackProtocol, CallbackReturn
 
 
 class DownloadBase:
@@ -17,10 +16,7 @@ class DownloadBase:
         url: str,
         out_dir: Path,
         opt_cred: Optional[CredOption],
-        cb: Union[
-            Queue[CbQueueItemType],
-            Callback,
-        ],
+        cb: CallbackProtocol,
         cb_return: CallbackReturn,
     ) -> None:
         self.url = url

{sticker-convert-2.8.0 → sticker-convert-2.8.2}/src/sticker_convert/downloaders/download_kakao.py

@@ -5,8 +5,7 @@ import json
 import zipfile
 from io import BytesIO
 from pathlib import Path
-from queue import Queue
-from typing import Any, List, Optional, Tuple, Union
+from typing import Any, List, Optional, Tuple
 from urllib.parse import urlparse
 
 import requests
@@ -15,7 +14,7 @@ from bs4.element import Tag
 
 from sticker_convert.downloaders.download_base import DownloadBase
 from sticker_convert.job_option import CredOption
-from sticker_convert.utils.callback import Callback, CallbackReturn, CbQueueItemType
+from sticker_convert.utils.callback import CallbackProtocol, CallbackReturn
 from sticker_convert.utils.files.metadata_handler import MetadataHandler
 from sticker_convert.utils.media.decrypt_kakao import DecryptKakao
 
@@ -249,7 +248,7 @@ class DownloadKakao(DownloadBase):
         url: str,
         out_dir: Path,
         opt_cred: Optional[CredOption],
-        cb: "Union[Queue[CbQueueItemType], Callback]",
+        cb: CallbackProtocol,
         cb_return: CallbackReturn,
     ) -> bool:
         downloader = DownloadKakao(url, out_dir, opt_cred, cb, cb_return)

{sticker-convert-2.8.0 → sticker-convert-2.8.2}/src/sticker_convert/downloaders/download_line.py

@@ -7,8 +7,7 @@ import string
 import zipfile
 from io import BytesIO
 from pathlib import Path
-from queue import Queue
-from typing import Any, Dict, List, Optional, Tuple, Union
+from typing import Any, Dict, List, Optional, Tuple
 from urllib import parse
 
 import requests
@@ -18,7 +17,7 @@ from PIL import Image
 from sticker_convert.downloaders.download_base import DownloadBase
 from sticker_convert.job_option import CredOption
 from sticker_convert.utils.auth.get_line_auth import GetLineAuth
-from sticker_convert.utils.callback import Callback, CallbackReturn, CbQueueItemType
+from sticker_convert.utils.callback import CallbackProtocol, CallbackReturn
 from sticker_convert.utils.files.metadata_handler import MetadataHandler
 from sticker_convert.utils.media.apple_png_normalize import ApplePngNormalize
 
@@ -466,7 +465,7 @@ class DownloadLine(DownloadBase):
         url: str,
         out_dir: Path,
         opt_cred: Optional[CredOption],
-        cb: "Union[Queue[CbQueueItemType], Callback]",
+        cb: CallbackProtocol,
         cb_return: CallbackReturn,
     ) -> bool:
         downloader = DownloadLine(url, out_dir, opt_cred, cb, cb_return)

{sticker-convert-2.8.0 → sticker-convert-2.8.2}/src/sticker_convert/downloaders/download_signal.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 from pathlib import Path
-from queue import Queue
-from typing import Dict, Optional, Union
+from typing import Dict, Optional
 
 import anyio
 from signalstickers_client import StickersClient  # type: ignore
@@ -10,7 +9,7 @@ from signalstickers_client.models import StickerPack  # type: ignore
 
 from sticker_convert.downloaders.download_base import DownloadBase
 from sticker_convert.job_option import CredOption
-from sticker_convert.utils.callback import Callback, CallbackReturn, CbQueueItemType
+from sticker_convert.utils.callback import CallbackProtocol, CallbackReturn
 from sticker_convert.utils.files.metadata_handler import MetadataHandler
 from sticker_convert.utils.media.codec_info import CodecInfo
 
@@ -86,7 +85,7 @@ class DownloadSignal(DownloadBase):
         url: str,
         out_dir: Path,
         opt_cred: Optional[CredOption],
-        cb: "Union[Queue[CbQueueItemType], Callback]",
+        cb: CallbackProtocol,
         cb_return: CallbackReturn,
     ) -> bool:
         downloader = DownloadSignal(url, out_dir, opt_cred, cb, cb_return)

{sticker-convert-2.8.0 → sticker-convert-2.8.2}/src/sticker_convert/downloaders/download_telegram.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 from pathlib import Path
-from queue import Queue
 from typing import Dict, Optional, Union
 from urllib.parse import urlparse
 
@@ -11,7 +10,7 @@ from telegram.ext import AIORateLimiter, ApplicationBuilder
 
 from sticker_convert.downloaders.download_base import DownloadBase
 from sticker_convert.job_option import CredOption
-from sticker_convert.utils.callback import Callback, CallbackReturn, CbQueueItemType
+from sticker_convert.utils.callback import CallbackProtocol, CallbackReturn
 from sticker_convert.utils.files.metadata_handler import MetadataHandler
 
 
@@ -43,7 +42,7 @@ class DownloadTelegram(DownloadBase):
         application = (  # type: ignore
             ApplicationBuilder()
             .token(self.token)
-            .rate_limiter(AIORateLimiter())
+            .rate_limiter(AIORateLimiter(max_retries=3))
             .connect_timeout(timeout)
             .pool_timeout(timeout)
             .read_timeout(timeout)
@@ -124,7 +123,7 @@ class DownloadTelegram(DownloadBase):
         url: str,
         out_dir: Path,
         opt_cred: Optional[CredOption],
-        cb: "Union[Queue[CbQueueItemType], Callback]",
+        cb: CallbackProtocol,
         cb_return: CallbackReturn,
     ) -> bool:
         downloader = DownloadTelegram(url, out_dir, opt_cred, cb, cb_return)

{sticker-convert-2.8.0 → sticker-convert-2.8.2}/src/sticker_convert/gui.py

@@ -125,6 +125,7 @@ class GUI(Window):
         self.duration_min_var = IntVar(self)
         self.duration_max_var = IntVar(self)
         self.duration_disable_var = BooleanVar()
+        self.padding_percent_var = IntVar(self)
         self.img_size_max_var = IntVar(self)
         self.vid_size_max_var = IntVar(self)
         self.size_disable_var = BooleanVar()
@@ -519,6 +520,7 @@ class GUI(Window):
             if not self.duration_disable_var.get()
             else None,
             bg_color=self.bg_color_var.get(),
+            padding_percent=self.padding_percent_var.get(),
             steps=self.steps_var.get(),
             fake_vid=self.fake_vid_var.get(),
             scale_filter=self.scale_filter_var.get(),
@@ -642,10 +644,10 @@ class GUI(Window):
 
     def cb_bar(
         self,
-        *args: Any,
         set_progress_mode: Optional[str] = None,
         steps: int = 0,
         update_bar: int = 0,
+        *args: Any,
         **kwargs: Any,
     ) -> None:
         self.progress_frame.update_progress_bar(

{sticker-convert-2.8.0 → sticker-convert-2.8.2}/src/sticker_convert/gui_components/windows/advanced_compression_window.py

@@ -227,6 +227,16 @@ class AdvancedCompressionWindow(BaseWindow):
         )
         self.color_power_entry.bind("<Button-3><ButtonRelease-3>", RightClicker)
 
+        self.padding_percent_help_btn = self.add_help_btn(
+            self.gui.help["comp"]["padding_percent"]
+        )
+        self.padding_percent_lbl1 = Label(self.frame_advcomp, text="Padding")
+        self.padding_percent_lbl2 = Label(self.frame_advcomp, text="0-100%")
+        self.padding_percent_entry = Entry(
+            self.frame_advcomp, textvariable=self.gui.padding_percent_var, width=8
+        )
+        self.padding_percent_entry.bind("<Button-3><ButtonRelease-3>", RightClicker)
+
         self.fake_vid_help_btn = self.add_help_btn(self.gui.help["comp"]["fake_vid"])
         self.fake_vid_lbl = Label(
             self.frame_advcomp, text="Convert (faking) image to video"
@@ -297,113 +307,119 @@ class AdvancedCompressionWindow(BaseWindow):
         self.ph_im = ImageTk.PhotoImage(self.im)
         self.default_emoji_dsp = Label(self.frame_advcomp, image=self.ph_im)
 
-        self.fps_help_btn.grid(column=0, row=2, sticky="w", padx=3, pady=3)
-        self.fps_lbl.grid(column=1, row=2, sticky="w", padx=3, pady=3)
-        self.fps_min_lbl.grid(column=2, row=2, sticky="w", padx=3, pady=3)
-        self.fps_min_entry.grid(column=3, row=2, sticky="nes", padx=3, pady=3)
-        self.fps_max_lbl.grid(column=4, row=2, sticky="w", padx=3, pady=3)
-        self.fps_max_entry.grid(column=5, row=2, sticky="nes", padx=3, pady=3)
-        self.fps_disable_cbox.grid(column=6, row=2, sticky="nes", padx=3, pady=3)
-
-        self.res_w_help_btn.grid(column=0, row=3, sticky="w", padx=3, pady=3)
-        self.res_w_lbl.grid(column=1, row=3, sticky="w", padx=3, pady=3)
-        self.res_w_min_lbl.grid(column=2, row=3, sticky="w", padx=3, pady=3)
-        self.res_w_min_entry.grid(column=3, row=3, sticky="nes", padx=3, pady=3)
-        self.res_w_max_lbl.grid(column=4, row=3, sticky="w", padx=3, pady=3)
-        self.res_w_max_entry.grid(column=5, row=3, sticky="nes", padx=3, pady=3)
-        self.res_w_disable_cbox.grid(column=6, row=3, sticky="nes", padx=3, pady=3)
-
-        self.res_h_help_btn.grid(column=0, row=4, sticky="w", padx=3, pady=3)
-        self.res_h_lbl.grid(column=1, row=4, sticky="w", padx=3, pady=3)
-        self.res_h_min_lbl.grid(column=2, row=4, sticky="w", padx=3, pady=3)
-        self.res_h_min_entry.grid(column=3, row=4, sticky="nes", padx=3, pady=3)
-        self.res_h_max_lbl.grid(column=4, row=4, sticky="w", padx=3, pady=3)
-        self.res_h_max_entry.grid(column=5, row=4, sticky="nes", padx=3, pady=3)
-        self.res_h_disable_cbox.grid(column=6, row=4, sticky="nes", padx=3, pady=3)
-
-        self.quality_help_btn.grid(column=0, row=5, sticky="w", padx=3, pady=3)
-        self.quality_lbl.grid(column=1, row=5, sticky="w", padx=3, pady=3)
-        self.quality_min_lbl.grid(column=2, row=5, sticky="w", padx=3, pady=3)
-        self.quality_min_entry.grid(column=3, row=5, sticky="nes", padx=3, pady=3)
-        self.quality_max_lbl.grid(column=4, row=5, sticky="w", padx=3, pady=3)
-        self.quality_max_entry.grid(column=5, row=5, sticky="nes", padx=3, pady=3)
-        self.quality_disable_cbox.grid(column=6, row=5, sticky="nes", padx=3, pady=3)
-
-        self.color_help_btn.grid(column=0, row=6, sticky="w", padx=3, pady=3)
-        self.color_lbl.grid(column=1, row=6, sticky="w", padx=3, pady=3)
-        self.color_min_lbl.grid(column=2, row=6, sticky="w", padx=3, pady=3)
-        self.color_min_entry.grid(column=3, row=6, sticky="nes", padx=3, pady=3)
-        self.color_max_lbl.grid(column=4, row=6, sticky="w", padx=3, pady=3)
-        self.color_max_entry.grid(column=5, row=6, sticky="nes", padx=3, pady=3)
-        self.color_disable_cbox.grid(column=6, row=6, sticky="nes", padx=3, pady=3)
-
-        self.duration_help_btn.grid(column=0, row=7, sticky="w", padx=3, pady=3)
-        self.duration_lbl.grid(column=1, row=7, sticky="w", padx=3, pady=3)
-        self.duration_min_lbl.grid(column=2, row=7, sticky="w", padx=3, pady=3)
-        self.duration_min_entry.grid(column=3, row=7, sticky="nes", padx=3, pady=3)
-        self.duration_max_lbl.grid(column=4, row=7, sticky="w", padx=3, pady=3)
-        self.duration_max_entry.grid(column=5, row=7, sticky="nes", padx=3, pady=3)
-        self.duration_disable_cbox.grid(column=6, row=7, sticky="nes", padx=3, pady=3)
-
-        self.size_help_btn.grid(column=0, row=8, sticky="w", padx=3, pady=3)
-        self.size_lbl.grid(column=1, row=8, sticky="w", padx=3, pady=3)
-        self.img_size_max_lbl.grid(column=2, row=8, sticky="w", padx=3, pady=3)
-        self.img_size_max_entry.grid(column=3, row=8, sticky="nes", padx=3, pady=3)
-        self.vid_size_max_lbl.grid(column=4, row=8, sticky="w", padx=3, pady=3)
-        self.vid_size_max_entry.grid(column=5, row=8, sticky="nes", padx=3, pady=3)
-        self.size_disable_cbox.grid(column=6, row=8, sticky="nes", padx=3, pady=3)
-
-        self.format_help_btn.grid(column=0, row=9, sticky="w", padx=3, pady=3)
-        self.format_lbl.grid(column=1, row=9, sticky="w", padx=3, pady=3)
-        self.img_format_lbl.grid(column=2, row=9, sticky="w", padx=3, pady=3)
-        self.img_format_entry.grid(column=3, row=9, sticky="nes", padx=3, pady=3)
-        self.vid_format_lbl.grid(column=4, row=9, sticky="w", padx=3, pady=3)
-        self.vid_format_entry.grid(column=5, row=9, sticky="nes", padx=3, pady=3)
-
-        self.power_help_btn1.grid(column=0, row=10, sticky="w", padx=3, pady=3)
-        self.power_lbl1.grid(column=1, row=10, sticky="w", padx=3, pady=3)
-        self.fps_power_lbl.grid(column=2, row=10, sticky="w", padx=3, pady=3)
-        self.fps_power_entry.grid(column=3, row=10, sticky="w", padx=3, pady=3)
-        self.res_power_lbl.grid(column=4, row=10, sticky="w", padx=3, pady=3)
-        self.res_power_entry.grid(column=5, row=10, sticky="w", padx=3, pady=3)
-
-        self.power_help_btn2.grid(column=0, row=11, sticky="w", padx=3, pady=3)
-        self.power_lbl2.grid(column=1, row=11, sticky="w", padx=3, pady=3)
-        self.quality_power_lbl.grid(column=2, row=11, sticky="w", padx=3, pady=3)
-        self.quality_power_entry.grid(column=3, row=11, sticky="w", padx=3, pady=3)
-        self.color_power_lbl.grid(column=4, row=11, sticky="w", padx=3, pady=3)
-        self.color_power_entry.grid(column=5, row=11, sticky="w", padx=3, pady=3)
-
-        self.fake_vid_help_btn.grid(column=0, row=12, sticky="w", padx=3, pady=3)
-        self.fake_vid_lbl.grid(column=1, row=12, sticky="w", padx=3, pady=3)
-        self.fake_vid_cbox.grid(column=6, row=12, sticky="nes", padx=3, pady=3)
-
-        self.bg_color_help_btn.grid(column=0, row=13, sticky="w", padx=3, pady=3)
-        self.bg_color_lbl.grid(column=1, row=13, sticky="w", padx=3, pady=3)
-        self.bg_color_entry.grid(column=5, row=13, sticky="w", padx=3, pady=3)
-        self.bg_color_btn.grid(column=6, row=13, sticky="nes", padx=3, pady=3)
-
-        self.scale_filter_help_btn.grid(column=0, row=14, sticky="w", padx=3, pady=3)
-        self.scale_filter_lbl.grid(column=1, row=14, sticky="w", padx=3, pady=3)
+        r = 0
+        self.fps_help_btn.grid(column=0, row=r, sticky="w", padx=3, pady=3)
+        self.fps_lbl.grid(column=1, row=r, sticky="w", padx=3, pady=3)
+        self.fps_min_lbl.grid(column=2, row=r, sticky="w", padx=3, pady=3)
+        self.fps_min_entry.grid(column=3, row=r, sticky="nes", padx=3, pady=3)
+        self.fps_max_lbl.grid(column=4, row=r, sticky="w", padx=3, pady=3)
+        self.fps_max_entry.grid(column=5, row=r, sticky="nes", padx=3, pady=3)
+        self.fps_disable_cbox.grid(column=6, row=r, sticky="nes", padx=3, pady=3)
+        r += 1
+        self.res_w_help_btn.grid(column=0, row=r, sticky="w", padx=3, pady=3)
+        self.res_w_lbl.grid(column=1, row=r, sticky="w", padx=3, pady=3)
+        self.res_w_min_lbl.grid(column=2, row=r, sticky="w", padx=3, pady=3)
+        self.res_w_min_entry.grid(column=3, row=r, sticky="nes", padx=3, pady=3)
+        self.res_w_max_lbl.grid(column=4, row=r, sticky="w", padx=3, pady=3)
+        self.res_w_max_entry.grid(column=5, row=r, sticky="nes", padx=3, pady=3)
+        self.res_w_disable_cbox.grid(column=6, row=r, sticky="nes", padx=3, pady=3)
+        r += 1
+        self.res_h_help_btn.grid(column=0, row=r, sticky="w", padx=3, pady=3)
+        self.res_h_lbl.grid(column=1, row=r, sticky="w", padx=3, pady=3)
+        self.res_h_min_lbl.grid(column=2, row=r, sticky="w", padx=3, pady=3)
+        self.res_h_min_entry.grid(column=3, row=r, sticky="nes", padx=3, pady=3)
+        self.res_h_max_lbl.grid(column=4, row=r, sticky="w", padx=3, pady=3)
+        self.res_h_max_entry.grid(column=5, row=r, sticky="nes", padx=3, pady=3)
+        self.res_h_disable_cbox.grid(column=6, row=r, sticky="nes", padx=3, pady=3)
+        r += 1
+        self.quality_help_btn.grid(column=0, row=r, sticky="w", padx=3, pady=3)
+        self.quality_lbl.grid(column=1, row=r, sticky="w", padx=3, pady=3)
+        self.quality_min_lbl.grid(column=2, row=r, sticky="w", padx=3, pady=3)
+        self.quality_min_entry.grid(column=3, row=r, sticky="nes", padx=3, pady=3)
+        self.quality_max_lbl.grid(column=4, row=r, sticky="w", padx=3, pady=3)
+        self.quality_max_entry.grid(column=5, row=r, sticky="nes", padx=3, pady=3)
+        self.quality_disable_cbox.grid(column=6, row=r, sticky="nes", padx=3, pady=3)
+        r += 1
+        self.color_help_btn.grid(column=0, row=r, sticky="w", padx=3, pady=3)
+        self.color_lbl.grid(column=1, row=r, sticky="w", padx=3, pady=3)
+        self.color_min_lbl.grid(column=2, row=r, sticky="w", padx=3, pady=3)
+        self.color_min_entry.grid(column=3, row=r, sticky="nes", padx=3, pady=3)
+        self.color_max_lbl.grid(column=4, row=r, sticky="w", padx=3, pady=3)
+        self.color_max_entry.grid(column=5, row=r, sticky="nes", padx=3, pady=3)
+        self.color_disable_cbox.grid(column=6, row=r, sticky="nes", padx=3, pady=3)
+        r += 1
+        self.duration_help_btn.grid(column=0, row=r, sticky="w", padx=3, pady=3)
+        self.duration_lbl.grid(column=1, row=r, sticky="w", padx=3, pady=3)
+        self.duration_min_lbl.grid(column=2, row=r, sticky="w", padx=3, pady=3)
+        self.duration_min_entry.grid(column=3, row=r, sticky="nes", padx=3, pady=3)
+        self.duration_max_lbl.grid(column=4, row=r, sticky="w", padx=3, pady=3)
+        self.duration_max_entry.grid(column=5, row=r, sticky="nes", padx=3, pady=3)
+        self.duration_disable_cbox.grid(column=6, row=r, sticky="nes", padx=3, pady=3)
+        r += 1
+        self.size_help_btn.grid(column=0, row=r, sticky="w", padx=3, pady=3)
+        self.size_lbl.grid(column=1, row=r, sticky="w", padx=3, pady=3)
+        self.img_size_max_lbl.grid(column=2, row=r, sticky="w", padx=3, pady=3)
+        self.img_size_max_entry.grid(column=3, row=r, sticky="nes", padx=3, pady=3)
+        self.vid_size_max_lbl.grid(column=4, row=r, sticky="w", padx=3, pady=3)
+        self.vid_size_max_entry.grid(column=5, row=r, sticky="nes", padx=3, pady=3)
+        self.size_disable_cbox.grid(column=6, row=r, sticky="nes", padx=3, pady=3)
+        r += 1
+        self.format_help_btn.grid(column=0, row=r, sticky="w", padx=3, pady=3)
+        self.format_lbl.grid(column=1, row=r, sticky="w", padx=3, pady=3)
+        self.img_format_lbl.grid(column=2, row=r, sticky="w", padx=3, pady=3)
+        self.img_format_entry.grid(column=3, row=r, sticky="nes", padx=3, pady=3)
+        self.vid_format_lbl.grid(column=4, row=r, sticky="w", padx=3, pady=3)
+        self.vid_format_entry.grid(column=5, row=r, sticky="nes", padx=3, pady=3)
+        r += 1
+        self.power_help_btn1.grid(column=0, row=r, sticky="w", padx=3, pady=3)
+        self.power_lbl1.grid(column=1, row=r, sticky="w", padx=3, pady=3)
+        self.fps_power_lbl.grid(column=2, row=r, sticky="w", padx=3, pady=3)
+        self.fps_power_entry.grid(column=3, row=r, sticky="w", padx=3, pady=3)
+        self.res_power_lbl.grid(column=4, row=r, sticky="w", padx=3, pady=3)
+        self.res_power_entry.grid(column=5, row=r, sticky="w", padx=3, pady=3)
+        r += 1
+        self.power_help_btn2.grid(column=0, row=r, sticky="w", padx=3, pady=3)
+        self.power_lbl2.grid(column=1, row=r, sticky="w", padx=3, pady=3)
+        self.quality_power_lbl.grid(column=2, row=r, sticky="w", padx=3, pady=3)
+        self.quality_power_entry.grid(column=3, row=r, sticky="w", padx=3, pady=3)
+        self.color_power_lbl.grid(column=4, row=r, sticky="w", padx=3, pady=3)
+        self.color_power_entry.grid(column=5, row=r, sticky="w", padx=3, pady=3)
+        r += 1
+        self.padding_percent_help_btn.grid(column=0, row=r, sticky="w", padx=3, pady=3)
+        self.padding_percent_lbl1.grid(column=1, row=r, sticky="w", padx=3, pady=3)
+        self.padding_percent_lbl2.grid(column=2, row=r, sticky="w", padx=3, pady=3)
+        self.padding_percent_entry.grid(column=3, row=r, sticky="w", padx=3, pady=3)
+        r += 1
+        self.fake_vid_help_btn.grid(column=0, row=r, sticky="w", padx=3, pady=3)
+        self.fake_vid_lbl.grid(column=1, row=r, sticky="w", padx=3, pady=3)
+        self.fake_vid_cbox.grid(column=6, row=r, sticky="nes", padx=3, pady=3)
+        r += 1
+        self.bg_color_help_btn.grid(column=0, row=r, sticky="w", padx=3, pady=3)
+        self.bg_color_lbl.grid(column=1, row=r, sticky="w", padx=3, pady=3)
+        self.bg_color_entry.grid(column=5, row=r, sticky="w", padx=3, pady=3)
+        self.bg_color_btn.grid(column=6, row=r, sticky="nes", padx=3, pady=3)
+        r += 1
+        self.scale_filter_help_btn.grid(column=0, row=r, sticky="w", padx=3, pady=3)
+        self.scale_filter_lbl.grid(column=1, row=r, sticky="w", padx=3, pady=3)
         self.scale_filter_opt.grid(
-            column=2, row=14, columnspan=4, sticky="nes", padx=3, pady=3
+            column=2, row=r, columnspan=4, sticky="nes", padx=3, pady=3
         )
-
-        self.quantize_method_help_btn.grid(column=0, row=15, sticky="w", padx=3, pady=3)
-        self.quantize_method_lbl.grid(column=1, row=15, sticky="w", padx=3, pady=3)
+        r += 1
+        self.quantize_method_help_btn.grid(column=0, row=r, sticky="w", padx=3, pady=3)
+        self.quantize_method_lbl.grid(column=1, row=r, sticky="w", padx=3, pady=3)
         self.quantize_method_opt.grid(
-            column=2, row=15, columnspan=4, sticky="nes", padx=3, pady=3
+            column=2, row=r, columnspan=4, sticky="nes", padx=3, pady=3
         )
-
-        self.cache_dir_help_btn.grid(column=0, row=16, sticky="w", padx=3, pady=3)
-        self.cache_dir_lbl.grid(column=1, row=16, sticky="w", padx=3, pady=3)
+        r += 1
+        self.cache_dir_help_btn.grid(column=0, row=r, sticky="w", padx=3, pady=3)
+        self.cache_dir_lbl.grid(column=1, row=r, sticky="w", padx=3, pady=3)
         self.cache_dir_entry.grid(
-            column=2, row=16, columnspan=4, sticky="nes", padx=3, pady=3
+            column=2, row=r, columnspan=4, sticky="nes", padx=3, pady=3
         )
-
-        self.default_emoji_help_btn.grid(column=0, row=17, sticky="w", padx=3, pady=3)
-        self.default_emoji_lbl.grid(column=1, row=17, sticky="w", padx=3, pady=3)
-        self.default_emoji_dsp.grid(column=6, row=17, sticky="nes", padx=3, pady=3)
+        r += 1
+        self.default_emoji_help_btn.grid(column=0, row=r, sticky="w", padx=3, pady=3)
+        self.default_emoji_lbl.grid(column=1, row=r, sticky="w", padx=3, pady=3)
+        self.default_emoji_dsp.grid(column=6, row=r, sticky="nes", padx=3, pady=3)
 
         # https://stackoverflow.com/questions/43731784/tkinter-canvas-scrollbar-with-grid
         # Create a frame for the canvas with non-zero row&column weights