Mercurial > hg > easyhg
comparison easyhg2.py @ 428:a47eac9c7fea
Small tidy to login dialog
author | Chris Cannam |
---|---|
date | Thu, 23 Jun 2011 21:04:25 +0100 |
parents | 8edf76b57bd9 |
children | e57de4e97056 |
comparison
equal
deleted
inserted
replaced
427:8edf76b57bd9 | 428:a47eac9c7fea |
---|---|
113 | 113 |
114 dialog = QtGui.QDialog() | 114 dialog = QtGui.QDialog() |
115 layout = QtGui.QGridLayout() | 115 layout = QtGui.QGridLayout() |
116 dialog.setLayout(layout) | 116 dialog.setLayout(layout) |
117 | 117 |
118 layout.addWidget(QtGui.QLabel(_('Please supply your user name and password for\n%s:') % uri), 0, 0, 1, 2) | 118 layout.addWidget(QtGui.QLabel(_('<h3>Login required</h3><p>Please provide your user name and password for the repository at<br><code>%s:</code>') % uri), 0, 0, 1, 2) |
119 | 119 |
120 userfield = QtGui.QLineEdit() | 120 userfield = QtGui.QLineEdit() |
121 if user: | 121 if user: |
122 userfield.setText(user) | 122 userfield.setText(user) |
123 layout.addWidget(QtGui.QLabel(_('User:')), 1, 0) | 123 layout.addWidget(QtGui.QLabel(_('User:')), 1, 0) |
124 layout.addWidget(userfield, 1, 1) | 124 layout.addWidget(userfield, 1, 1) |
125 | 125 |
126 passfield = QtGui.QLineEdit() | 126 passfield = QtGui.QLineEdit() |
127 passfield.setEchoMode(QtGui.QLineEdit.Password) | 127 passfield.setEchoMode(QtGui.QLineEdit.Password) |
128 if passwd: | 128 if passwd: |
129 userfield.setText(passwd) | 129 passfield.setText(passwd) |
130 layout.addWidget(QtGui.QLabel(_('Password:')), 2, 0) | 130 layout.addWidget(QtGui.QLabel(_('Password:')), 2, 0) |
131 layout.addWidget(passfield, 2, 1) | 131 layout.addWidget(passfield, 2, 1) |
132 | 132 |
133 bb = QtGui.QDialogButtonBox() | 133 bb = QtGui.QDialogButtonBox() |
134 ok = bb.addButton(bb.Ok) | 134 ok = bb.addButton(bb.Ok) |
138 ok.setDefault(True) | 138 ok.setDefault(True) |
139 bb.connect(ok, Qt.SIGNAL("clicked()"), dialog, Qt.SLOT("accept()")) | 139 bb.connect(ok, Qt.SIGNAL("clicked()"), dialog, Qt.SLOT("accept()")) |
140 bb.connect(cancel, Qt.SIGNAL("clicked()"), dialog, Qt.SLOT("reject()")) | 140 bb.connect(cancel, Qt.SIGNAL("clicked()"), dialog, Qt.SLOT("reject()")) |
141 layout.addWidget(bb, 3, 0, 1, 2) | 141 layout.addWidget(bb, 3, 0, 1, 2) |
142 | 142 |
143 dialog.setWindowTitle(_('EasyMercurial: Password')) | 143 dialog.setWindowTitle(_('EasyMercurial: Login')) |
144 dialog.show() | 144 dialog.show() |
145 | |
146 if not user: | |
147 userfield.setFocus(True) | |
148 elif not passwd: | |
149 passfield.setFocus(True) | |
150 | |
145 dialog.raise_() | 151 dialog.raise_() |
146 ok = dialog.exec_() | 152 ok = dialog.exec_() |
147 if ok: | 153 if ok: |
148 self.ui.write('Dialog accepted\n') | 154 self.ui.write('Dialog accepted\n') |
149 user = userfield.text() | 155 user = userfield.text() |
150 passwd = passfield.text() | 156 passwd = passfield.text() |
151 if passwd and keyring_key != '' and not from_keyring: | 157 if passwd and keyring_key != '' and not from_keyring: |
152 keyring_key = '%s@@%s' % (uri, user) | 158 keyring_key = '%s@@%s' % (uri, user) |
153 keyring.set_password('Mercurial', keyring_key, passwd) | 159 # keyring.set_password('Mercurial', keyring_key, passwd) |
154 self.add_password(realm, authuri, user, passwd) | 160 self.add_password(realm, authuri, user, passwd) |
155 else: | 161 else: |
156 raise util.Abort(_('password entry cancelled')) | 162 raise util.Abort(_('password entry cancelled')) |
157 return (user, passwd) | 163 return (user, passwd) |
158 | 164 |