Better handling of password authentication.

1 files changed, 9 insertions, 9 deletions

diff --git a/nephilim/connect_wg.py b/nephilim/connect_wg.py
index a04e53b..49d5a73 100644
--- a/nephilim/connect_wg.py
+++ b/nephilim/connect_wg.py
@@ -6,7 +6,6 @@ class ConnectWidget(QtGui.QWidget):
     host_txt    = None
     port_txt    = None
     pass_txt    = None
-    info_lbl    = None
     connect_btn = None
     mpclient    = None
     settings    = None
@@ -17,21 +16,25 @@ class ConnectWidget(QtGui.QWidget):
         self.settings = QtCore.QSettings()
 
         self.host_txt = QtGui.QLineEdit(self.settings.value('MPD/host', QVariant('localhost')).toString())
+        self.host_txt.setToolTip('Host')
+
         self.port_txt = QtGui.QLineEdit(self.settings.value('MPD/port', QVariant('6600')).toString())
         self.port_txt.setValidator(QtGui.QIntValidator(1, 65535, self.port_txt))
+        self.port_txt.setToolTip('Port')
+
         self.pass_txt = QtGui.QLineEdit(self.settings.value('MPD/password').toString())
         self.pass_txt.setEchoMode(QtGui.QLineEdit.Password)
-        self.info_lbl = QtGui.QLabel("connecting...")
+        self.pass_txt.setToolTip('Password')
 
         self.connect_btn = QtGui.QPushButton('Connect')
         self.connect(self.connect_btn, QtCore.SIGNAL('clicked()'), self.connect_mpd)
 
         self.setLayout(QtGui.QGridLayout())
-        self.layout().addWidget(self.info_lbl, 0, 0, 1, 2)
+        self.layout().addWidget(QtGui.QLabel('host:port:password'), 0, 0, 1, 3, QtCore.Qt.AlignHCenter)
         self.layout().addWidget(self.host_txt, 1, 0)
         self.layout().addWidget(self.port_txt, 1, 1)
-        self.layout().addWidget(self.port_txt, 2, 0)
-        self.layout().addWidget(self.connect_btn, 2, 1)
+        self.layout().addWidget(self.pass_txt, 1, 2)
+        self.layout().addWidget(self.connect_btn, 2, 0, 1, 3, QtCore.Qt.AlignHCenter)
 
         self.setWindowTitle('Connect to MPD')
         self.center()
@@ -55,12 +58,9 @@ class ConnectWidget(QtGui.QWidget):
         port  = int(self.port_txt.text()) if self.port_txt.text() else None
         passw = str(self.pass_txt.text())
 
-        self.info_lbl.setText('Trying to connect to %s' + (':%d'%port if port else ''))
-        if not self.mpclient.connect_mpd(host, port, passw):
-            self.info_lbl.setText('Connection failed')
+        self.mpclient.connect_mpd(host, port, passw)
 
     def on_connected(self):
-        self.info_lbl.setText('Connected')
         self.settings.setValue('MPD/host', QVariant(self.host_txt.text()))
         self.settings.setValue('MPD/port', QVariant(self.port_txt.text()))
         self.settings.setValue('MPD/password', QVariant(self.pass_txt.text()))