Merge pull request #34 from seowings/main

GUI Improvements

setup.py

@@ -92,8 +92,8 @@
     long_description_content_type="text/markdown",
     author="Faisal Shahzad",
     author_email="[email protected]",
-    url="https://github.com/serpwings/staticwordpress",
-    download_url="https://github.com/serpwings/staticwordpress/releases/v%s.tar.gz"
+    url="https://github.com/serpwings/static-wordpress",
+    download_url="https://github.com/serpwings/static-wordpress/releases/v%s.tar.gz"
     % __version__,
     license="GPLv3+",
     keywords=[

src/staticwordpress/core/constants.py

@@ -38,7 +38,7 @@
 
 VERSION_MAJOR = 0
 VERSION_MINOR = 0
-VERSION_REVISION = 2
+VERSION_REVISION = 3
 VERISON = f"{VERSION_MAJOR}.{VERSION_MINOR}.{VERSION_REVISION}"  # -pre-alpha"
 
 SHARE_FOLDER_PATH = Path(

src/staticwordpress/gui/config.py

@@ -57,7 +57,6 @@
 
 from ..core.constants import (
     LANGUAGES,
-    HOST,
     REDIRECTS,
     USER_AGENT,
     CONFIGS,
@@ -344,20 +343,23 @@ def __init__(self):
         self.tab_robots_txt.setLayout(vbox_layout_robots_format)
         self.tabswidget_configs.addTab(self.tab_robots_txt, "Robots.txt")
 
-        dialog_button_box = QDialogButtonBox(
+        button_box_dialog = QDialogButtonBox(
             QDialogButtonBox.Ok | QDialogButtonBox.Cancel
         )
-        dialog_button_box.accepted.connect(self.accept)
-        dialog_button_box.rejected.connect(self.reject)
+        pushbutton_ok_cancel = button_box_dialog.buttons()
+        pushbutton_ok_cancel[0].setIcon(QIcon(f"{SHARE_FOLDER_PATH}/icons/ok.svg"))
+        pushbutton_ok_cancel[1].setIcon(QIcon(f"{SHARE_FOLDER_PATH}/icons/cancel.svg"))
+        button_box_dialog.accepted.connect(self.accept)
+        button_box_dialog.rejected.connect(self.reject)
 
         self.layout = QVBoxLayout(self)
         self.layout.setSpacing(3)
         self.layout.setContentsMargins(1, 3, 3, 3)
 
         self.layout.addWidget(self.tabswidget_configs)
-        self.layout.addWidget(dialog_button_box)
+        self.layout.addWidget(button_box_dialog)
         self.setLayout(self.layout)
-        self.setFixedSize(QSize(620, 480))
+        self.setFixedWidth(620)
         self.setWindowTitle("Default Configurations")
         self.setWindowIcon(QIcon(f"{SHARE_FOLDER_PATH}/icons/static-wordpress.svg"))
 

src/staticwordpress/gui/mainwindow.py

@@ -557,7 +557,7 @@ def about(self):
         msgBox.setText(
             f"Copyright {date.today().year} - SERP Wings"
             f"<br><br>{CONFIGS['APPLICATION_NAME']} Version - {VERISON}"
-            "<br><br>This work is an opensource project under GNU General Public License v3 or later (GPLv3+)"
+            "<br><br>This work is an opensource project under <br>GNU General Public License v3 or later (GPLv3+)"
             f"<br>More Information at <a href='https://{CONFIGS['ORGANIZATION_DOMAIN']}/'>{CONFIGS['ORGANIZATION_NAME']}</a>"
         )
         msgBox.setWindowIcon(QIcon(f"{SHARE_FOLDER_PATH}/icons/static-wordpress.svg"))

src/staticwordpress/gui/rawtext.py

@@ -66,15 +66,19 @@ def __init__(self, src_url: str, dest_url: str):
         form_layout_raw_text.addRow(QLabel("Search Url:"), self.lineedit_dest_url)
         form_layout_raw_text.addRow(QLabel("Replace Url:"), self.linedit_src_url)
 
-        dialog_button_box = QDialogButtonBox(
+        button_box_dialog = QDialogButtonBox(
             QDialogButtonBox.Ok | QDialogButtonBox.Cancel
         )
-        dialog_button_box.accepted.connect(self.accept)
-        dialog_button_box.rejected.connect(self.reject)
+
+        pushbutton_ok_cancel = button_box_dialog.buttons()
+        pushbutton_ok_cancel[0].setIcon(QIcon(f"{SHARE_FOLDER_PATH}/icons/ok.svg"))
+        pushbutton_ok_cancel[1].setIcon(QIcon(f"{SHARE_FOLDER_PATH}/icons/cancel.svg"))
+        button_box_dialog.accepted.connect(self.accept)
+        button_box_dialog.rejected.connect(self.reject)
 
         vertical_layout_main = QVBoxLayout()
         vertical_layout_main.addLayout(form_layout_raw_text)
-        vertical_layout_main.addWidget(dialog_button_box)
+        vertical_layout_main.addWidget(button_box_dialog)
         self.setLayout(vertical_layout_main)
         self.setMinimumWidth(400)
         self.setWindowTitle("Processing Raw Text")