Merge pull request #15 from Thomasedv/smart_wrapper

Merge new changes to master

Author: Thomasedv

GUI/YTDLGUI.ico GUI/Grabber.icoGUI/YTDLGUI.ico renamed to GUI/Grabber.ico

@@ -141,7 +141,7 @@ which are not part of the work.  For example, Corresponding Source
 includes interface definition files associated with source files for
 the work, and the source code for shared libraries and dynamically
 linked subprograms that the work is specifically designed to require,
-such as by intimate get_settings_data communication or control flow between those
+such as by intimate settings_data communication or control flow between those
 subprograms and other parts of the work.
 
   The Corresponding Source need not include anything that users

LICENSE

@@ -5,6 +5,6 @@
 from Modules.download_manager import Downloader
 from Modules.download_tab import MainTab
 from Modules.main_window import MainWindow
-from Modules.parameterTree import ParameterTree
 from Modules.parameter_tab import ParameterTab
+from Modules.parameter_tree import ParameterTree
 from Modules.text_manager import TextTab

Modules/__init__.py

@@ -6,39 +6,56 @@ class AboutTab(QWidget):
     def __init__(self, settings, parent=None):
         super(AboutTab, self).__init__(parent=parent)
 
-        self.location_btn = QPushButton('Browse')
-        # Button to check for youtube-dl updates.
-        self.update_btn = QPushButton('Update')
-        # License
+        # Indicates if license is shown.
+        self.license_shown = False
+
+        # Select folder for textfile to use as download list
+        self.location_btn = QPushButton('Browse\nTextfile')
+        self.location_btn.setMinimumHeight(30)
+
+        self.update_btn = QPushButton('Update\nYoutube-dl')
+        self.update_btn.setMinimumHeight(30)
+
         self.license_btn = QPushButton('License')
+
         # Debugging
         self.dirinfo_btn = QPushButton('Dirinfo')
-        # Reset settings, (requires restart!)
+        self.debug_info = QPushButton('Debug:\nFalse')
+        self.debug_info.setMinimumHeight(30)
+
+        # Parallel / Series toggle for youtube instances
+        self.dl_mode_btn = QPushButton(('Singular' if not settings.user_options['parallel'] else 'Parallel')
+                                       + '\nDownloads')
+        self.dl_mode_btn.setMinimumHeight(30)
+
+        # Reset settings, (requires restart)
         self.reset_btn = QPushButton('Reset\n settings')
-        # Adjust button size to match naming. (Possibly change later in some form)
         self.reset_btn.setMinimumHeight(30)
 
         # Lineedit to show path to text file. (Can be changed later to use same path naming as other elements.)
-        self.lineedit = QLineEdit()
-        self.lineedit.setReadOnly(True)  # Read only
-        self.lineedit.setText(settings.user_options['multidl_txt'])  # Path from settings.
+        self.textfile_url = QLineEdit()
+        self.textfile_url.setReadOnly(True)  # Read only
+        self.textfile_url.setText(settings.user_options['multidl_txt'])  # Path from settings.
 
-        self.label = QLabel('Textfile:')
+        self.txt_label = QLabel('Textfile:')
 
         # Textbrowser to adds some info about Grabber.
         self.textbrowser = QTextBrowser()
         self.textbrowser.setObjectName('AboutText')
         self.textbrowser.setOpenExternalLinks(True)
 
+        # Sets textbroswer content at startup
         self.set_standard_text()
-        ## Layout tab 4.
 
         self.QH = QHBoxLayout()
         self.QV = QVBoxLayout()
 
         self.QH.addWidget(self.textbrowser)
 
+        self.QV.addWidget(self.dl_mode_btn)
         self.QV.addWidget(self.update_btn)
+        self.QV.addSpacing(15)
+        self.QV.addWidget(self.debug_info)
         self.QV.addWidget(self.dirinfo_btn)
         self.QV.addWidget(self.license_btn)
         self.QV.addWidget(self.reset_btn)
@@ -48,16 +65,32 @@ def __init__(self, settings, parent=None):
         self.QH.addLayout(self.QV)
 
         self.topQH = QHBoxLayout()
-        self.topQH.addWidget(self.label)
-        self.topQH.addWidget(self.lineedit)
+        self.topQH.addWidget(self.txt_label)
+        self.topQH.addWidget(self.textfile_url)
         self.topQH.addWidget(self.location_btn)
 
         self.topQV = QVBoxLayout()
         self.topQV.addLayout(self.topQH)
         self.topQV.addLayout(self.QH)
 
+        self.license_btn.clicked.connect(self.read_license)
+
         self.setLayout(self.topQV)
 
+    def read_license(self):
+        if not self.license_shown:
+            content = self.window().file_handler.read_textfile(self.window().license_path)
+            if content is None:
+                self.parent().alert_message('Error!', 'Failed to find/read license!')
+                return
+            self.textbrowser.clear()
+            self.textbrowser.setText(content)
+            self.license_shown = True
+
+        else:
+            self.set_standard_text()
+            self.license_shown = False
+
     def set_standard_text(self):
         self.textbrowser.setText('In-development (on my free time) version of a Youtube-dl GUI. \n'
                                  'I\'m just a developer for fun.\nThis is licensed under GPL 3.\n')