Fix: pyLoad GUI

module/config/gui_default.xml

@@ -1,13 +1,39 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <root>
     <connections>
-        <connection default="True" type="local" id="33965310e19b4a869112c43b39a16440">
+        <connection default="False" type="local" id="33965310e19b4a869112c43b39a16440">
             <name>Local</name>
         </connection>
+        <connection default="False" type="internal" id="0e61deb8671b4421aa0d6bda07da5cb9">
+            <name>Internal Server</name>
+        </connection>
     </connections>
     <mainWindow>
         <state></state>
         <geometry></geometry>
+        <geometryUnmaximized></geometryUnmaximized>
+        <geometryOther></geometryOther>
+        <visibilitySpeedLimit></visibilitySpeedLimit>
+        <visibilityMaxParallelDownloads></visibilityMaxParallelDownloads>
+        <stateQueue></stateQueue>
+        <stateCollector></stateCollector>
+        <stateAccounts></stateAccounts>
+        <statePackageDock></statePackageDock>
+        <stateLinkDock></stateLinkDock>
+        <optionsNotifications></optionsNotifications>
+        <optionsLogging></optionsLogging>
+        <optionsClickNLoadForwarder></optionsClickNLoadForwarder>
+        <optionsAutomaticReloading></optionsAutomaticReloading>
+        <optionsCaptcha></optionsCaptcha>
+        <optionsIconTheme></optionsIconTheme>
+        <optionsFonts></optionsFonts>
+        <optionsColorFix></optionsColorFix>
+        <optionsTray></optionsTray>
+        <optionsWhatsThis></optionsWhatsThis>
+        <optionsOther></optionsOther>
+        <menuPlugins></menuPlugins>
+        <lastAddContainerDir></lastAddContainerDir>
     </mainWindow>
     <language>en</language>
+    <pyqtVersion></pyqtVersion>
 </root>

module/gui/AboutBox.py

@@ -0,0 +1,145 @@
+# -*- coding: utf-8 -*-
+"""
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 3 of the License,
+    or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+    See the GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, see <http://www.gnu.org/licenses/>.
+"""
+
+from module.gui.PyQtVersion import USE_PYQT5
+if USE_PYQT5:
+    from PyQt5.QtCore import Qt
+    from PyQt5.QtGui import QFont, QIcon, QPixmap
+    from PyQt5.QtWidgets import QApplication, QDialog, QDialogButtonBox, QHBoxLayout, QLabel, QPushButton, QVBoxLayout
+else:
+    from PyQt4.QtCore import Qt
+    from PyQt4.QtGui import QApplication, QDialog, QDialogButtonBox, QFont, QHBoxLayout, QIcon, QLabel, QPixmap, QPushButton, QVBoxLayout
+
+import logging, os
+from os.path import join
+
+from module.gui.Tools import WtDialogButtonBox
+
+class AboutBox(QDialog):
+    """
+        about-box
+    """
+
+    def __init__(self, parent):
+        QDialog.__init__(self, parent)
+        self.log = logging.getLogger("guilog")
+
+        self.setAttribute(Qt.WA_DeleteOnClose, True)
+        self.setWindowFlags(self.windowFlags() & ~Qt.WindowContextHelpButtonHint)
+        self.setWindowTitle(_("About pyLoad Client"))
+        self.setWindowIcon(QIcon(join(pypath, "icons", "logo.png")))
+
+        self.logo = QLabel()
+        self.logo.setAlignment(Qt.AlignTop)
+        pix = QPixmap(join(pypath, "icons", "logo-gui.png"))
+        self.logo.setPixmap(pix)
+        self.text1 = QLabel()
+        self.text1.setAlignment(Qt.AlignTop)
+        text1font = QFont(self.text1.font())
+        text1fontSize = text1font.pointSize()
+        if text1fontSize != -1:
+            text1font.setPointSize(text1fontSize + 2)
+        text1font.setBold(True)
+        self.text1.setFont(text1font)
+        self.text2 = QLabel()
+        self.text2.setAlignment(Qt.AlignTop)
+        self.text3 = QLabel()
+        self.text3.setAlignment(Qt.AlignTop)
+        self.text3.setTextFormat(Qt.PlainText)
+
+        vboxText = QVBoxLayout()
+        vboxText.setContentsMargins(0, 0, 0, 0)
+        vboxText.setSpacing(0)
+        vboxText.addWidget(self.text1)
+        vboxText.addWidget(self.text2)
+        vboxText.addSpacing(20)
+        vboxText.addWidget(self.text3)
+        vboxText.addStretch(1)
+
+        hbox = QHBoxLayout()
+        hbox.addWidget(self.logo)
+        hbox.addSpacing(20)
+        hbox.addLayout(vboxText)
+        hbox.addSpacing(20)
+        hbox.addStretch(1)
+
+        self.buttons = WtDialogButtonBox(Qt.Horizontal, self)
+        self.buttons.hideWhatsThisButton()
+        self.okBtn = self.buttons.addButton(QDialogButtonBox.Ok)
+        self.buttons.button(QDialogButtonBox.Ok).setText(_("OK"))
+        self.copyBtn = QPushButton(_("Copy to Clipboard"))
+        self.buttons.addButton(self.copyBtn, QDialogButtonBox.ActionRole)
+
+        vbox = QVBoxLayout()
+        vbox.addLayout(hbox)
+        vbox.addSpacing(5)
+        vbox.addStretch(1)
+        vbox.addLayout(self.buttons.layout())
+        self.setLayout(vbox)
+
+        self.okBtn.clicked.connect(self.accept)
+        self.copyBtn.clicked.connect(self.slotCopyToClipboard)
+
+    def slotCopyToClipboard(self):
+        txt = self.text3.text()
+        clipboard = QApplication.clipboard()
+        clipboard.setText(txt)
+
+    def exec_(self, version, internalversion):
+        import platform
+        import struct
+        if USE_PYQT5:
+            from PyQt5.QtCore import QT_VERSION_STR
+        else:
+            from PyQt4.QtCore import QT_VERSION_STR
+        txt1 = _("pyLoad Client") + " v" + version
+        self.text1.setText(txt1)
+        txt2 = "2008-2016 the pyLoad Team"
+        self.text2.setText(txt2)
+        txt3  = "Version: " + version
+        txt3 += "\nInternal version: " + internalversion
+        txt3 += "\n\nPlatform: " + platform.platform()
+        if os.name == "nt":
+            if "PROGRAMFILES(X86)" in os.environ:
+                txt3 += " (64bit)"
+            else:
+                txt3 += " (32bit)"
+        txt3 += "\nPython version: " + platform.python_version() + " (%dbit)" % (struct.calcsize("P") * 8)
+        txt3 += "\nQt version: " + QT_VERSION_STR
+        try:
+            if USE_PYQT5:
+                from PyQt5.pyqtconfig import Configuration
+            else:
+                from PyQt4.pyqtconfig import Configuration
+            cfg = Configuration()
+            sipver = cfg.sip_version_str
+            pyqtver = cfg.pyqt_version_str
+        except Exception:
+            if USE_PYQT5:
+                from PyQt5.Qt import PYQT_VERSION_STR
+            else:
+                from PyQt4.Qt import PYQT_VERSION_STR
+            from sip import SIP_VERSION_STR
+            sipver = SIP_VERSION_STR
+            pyqtver = PYQT_VERSION_STR
+        txt3 += "\nPyQt version: " + pyqtver
+        txt3 += "\nSIP version: " + sipver
+        self.text3.setText(txt3)
+        self.okBtn.setFocus(Qt.OtherFocusReason)
+        self.adjustSize()
+        self.setFixedSize(self.width(), self.height())
+        return QDialog.exec_(self)
+

module/gui/AccountEdit.py

@@ -12,93 +12,123 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, see <http://www.gnu.org/licenses/>.
-    
+
     @author: mkaay
 """
 
-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from module.gui.PyQtVersion import USE_PYQT5
+if USE_PYQT5:
+    from PyQt5.QtCore import pyqtSignal, Qt
+    from PyQt5.QtGui import QIcon
+    from PyQt5.QtWidgets import QCheckBox, QComboBox, QDialog, QDialogButtonBox, QGridLayout, QLabel, QLineEdit
+else:
+    from PyQt4.QtCore import pyqtSignal, Qt
+    from PyQt4.QtGui import QCheckBox, QComboBox, QDialog, QDialogButtonBox, QGridLayout, QIcon, QLabel, QLineEdit
 
+import logging
 from os.path import join
 
-class AccountEdit(QWidget):
+from module.gui.Tools import WtDialogButtonBox
+
+class AccountEdit(QDialog):
     """
         account editor widget
     """
-
-    def __init__(self):
-        QMainWindow.__init__(self)
+    accountEditSaveSGL = pyqtSignal(object)
+
+    def __init__(self, parent):
+        QDialog.__init__(self, parent)
+        self.log = logging.getLogger("guilog")
+
+        self.setWindowFlags(self.windowFlags() & ~Qt.WindowContextHelpButtonHint)
+        self.setWindowIcon(QIcon(join(pypath, "icons", "logo.png")))
 
-        self.setWindowTitle(_("Edit account"))
-        self.setWindowIcon(QIcon(join(pypath, "icons","logo.png")))
-
         self.setLayout(QGridLayout())
         l = self.layout()
-        
+
         typeLabel = QLabel(_("Type"))
         loginLabel = QLabel(_("Login"))
-        passwordLabel = QLabel(_("New password"))
-        changePw = QCheckBox()
-        changePw.setChecked(False)
-        self.changePw = changePw
-        password = QLineEdit()
-        password.setEnabled(False)
-        password.setEchoMode(QLineEdit.Password)
-        self.password = password
-        login = QLineEdit()
-        self.login = login
-        acctype = QComboBox()
-        self.acctype = acctype
-
-        save = QPushButton(_("Save"))
-
-        self.connect(changePw, SIGNAL("toggled(bool)"), password, SLOT("setEnabled(bool)"))
-
-        l.addWidget(save, 3, 0, 1, 3)
-        l.addWidget(acctype, 0, 1, 1, 2)
-        l.addWidget(login, 1, 1, 1, 2)
-        l.addWidget(password, 2, 2)
-        l.addWidget(changePw, 2, 1)
-        l.addWidget(passwordLabel, 2, 0)
+        self.passwordLabel = QLabel()
+        self.changePw = QCheckBox()
+        self.changePw.setChecked(False)
+        self.password = QLineEdit()
+        self.password.setEnabled(False)
+        self.password.setEchoMode(QLineEdit.Password)
+        self.login = QLineEdit()
+        self.acctype = QComboBox()
+
+        self.buttons = WtDialogButtonBox(Qt.Horizontal)
+        self.buttons.hideWhatsThisButton()
+        self.save = self.buttons.addButton(QDialogButtonBox.Save)
+        self.save.setDefault(False)
+        self.save.setAutoDefault(False)
+        self.cancel = self.buttons.addButton(QDialogButtonBox.Cancel)
+        self.cancel.setDefault(True)
+        self.cancel.setAutoDefault(True)
+        self.buttons.button(QDialogButtonBox.Save).setText(_("Save"))
+        self.buttons.button(QDialogButtonBox.Cancel).setText(_("Cancel"))
+
+        self.changePw.toggled[bool].connect(self.password.setEnabled)
+
+        l.setRowMinimumHeight(3, 7)
+        l.addLayout(self.buttons.layout(), 4, 0, 1, 3)
+        l.addWidget(self.acctype, 0, 1, 1, 2)
+        l.addWidget(self.login, 1, 1, 1, 2)
+        l.addWidget(self.password, 2, 2)
+        l.addWidget(self.changePw, 2, 1)
+        l.addWidget(self.passwordLabel, 2, 0)
         l.addWidget(loginLabel, 1, 0)
         l.addWidget(typeLabel, 0, 0)
-
-        self.connect(save, SIGNAL("clicked()"), self.slotSave)
-
+
+        self.setMinimumWidth(280)
+        self.adjustSize()
+        self.setFixedHeight(self.height())
+
+        self.save.clicked.connect(self.slotSave)
+        self.cancel.clicked.connect(self.reject)
+
     def slotSave(self):
         """
             save entered data
         """
-        data = {"login": str(self.login.text()), "acctype": str(self.acctype.currentText()), "password": False}
+        data = {"login": unicode(self.login.text()), "acctype": unicode(self.acctype.currentText()), "password": None}
         if self.changePw.isChecked():
-            data["password"] = str(self.password.text())
-        self.emit(SIGNAL("done"), data)
-    
+            data["password"] = unicode(self.password.text())
+        self.accountEditSaveSGL.emit(data)
+
     @staticmethod
-    def newAccount(types):
+    def newAccount(parent, types):
         """
             create empty editor instance
         """
-        w = AccountEdit()
-        w.setWindowTitle(_("Create account"))
-
+        w = AccountEdit(parent)
+        w.setWindowTitle(_("Create Account"))
+        w.passwordLabel.setText(_("Password"))
+
         w.changePw.setChecked(True)
         w.password.setEnabled(True)
-
         w.acctype.addItems(types)
-
+        w.acctype.setFocus(Qt.OtherFocusReason)
+        w.adjustSize()
         return w
-    
+
     @staticmethod
-    def editAccount(types, base):
+    def editAccount(parent, types, base):
         """
             create editor instance with given data
         """
-        w = AccountEdit()
-
+        w = AccountEdit(parent)
+        w.setWindowTitle(_("Edit Account"))
+        w.passwordLabel.setText(_("New Password"))
+
+        w.changePw.setChecked(True)
         w.acctype.addItems(types)
-        w.acctype.setCurrentIndex(types.index(base["type"]))
-
-        w.login.setText(base["login"])
-
+        i = w.acctype.findText(base.type)
+        w.acctype.setCurrentIndex(i)
+        w.acctype.setEnabled(False)
+
+        w.login.setText(base.login)
+        w.login.setEnabled(False)
+        w.password.setFocus(Qt.OtherFocusReason)
+        w.adjustSize()
         return w