Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0, 2.0.1, and 2.0.2

stable sync: tweak "Current URL"

- all widgets on one line
- use icons for secure and save buttons (no text)
- hide secure button if scheme != https

TODO: find a better icon for the secure button (ideally: a padlock)

Changeset 35e27b5924eb

Parent 8b8b3abff139

by Adrian Buehlmann

Changes to one file · Browse files at 35e27b5924eb Showing diff from parent 8b8b3abff139 Diff from another changeset...

 
148
149
150
 
 
151
152
153
 
157
158
159
 
 
 
 
 
 
 
 
 
 
 
 
160
161
162
 
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
 
 
203
204
205
 
366
367
368
369
 
370
371
372
 
148
149
150
151
152
153
154
155
 
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
 
197
198
199
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
200
201
202
203
204
 
365
366
367
 
368
369
370
371
@@ -148,6 +148,8 @@
  tb.addSeparator()   tb.addWidget(self.urllabel)   + style = QApplication.style() +   urlbox = QGroupBox(_('Current URL'))   self.layout().addWidget(urlbox)   vbox = QVBoxLayout() @@ -157,6 +159,18 @@
  hbox = QHBoxLayout()   hbox.setSpacing(4)   vbox.addLayout(hbox) + + self.schemecombo = QComboBox() + for s in _schemes: + self.schemecombo.addItem(s) + self.schemecombo.currentIndexChanged.connect(self.refreshUrl) + hbox.addWidget(self.schemecombo) + + self.securebutton = QPushButton(style.standardIcon(QStyle.SP_MessageBoxWarning), '') + self.securebutton.setToolTip( + _('Manage HTTPS connection security and user authentication')) + hbox.addWidget(self.securebutton) +   self.hostentry = QLineEdit()   self.hostentry.setToolTip(_('Hostname'))   self.hostentry.setAcceptDrops(False) @@ -183,23 +197,8 @@
  self.pathentry.textChanged.connect(self.refreshUrl)   hbox.addWidget(self.pathentry, 4)   - hbox = QHBoxLayout() - hbox.setSpacing(4) - vbox.addLayout(hbox) - - self.schemecombo = QComboBox() - for s in _schemes: - self.schemecombo.addItem(s) - self.schemecombo.currentIndexChanged.connect(self.refreshUrl) - hbox.addWidget(self.schemecombo) - self.securebutton = QPushButton(_('Security')) - self.securebutton.setToolTip( - _('Manage HTTPS connection security and user authentication')) - hbox.addWidget(self.securebutton) - self.savebutton = QPushButton(_('Save')) - self.savebutton.setToolTip( - _('Save current URL under an alias')) - hbox.addStretch(1) + self.savebutton = QPushButton(style.standardIcon(QStyle.SP_DialogSaveButton), '') + self.savebutton.setToolTip(_('Save current URL under an alias'))   hbox.addWidget(self.savebutton)     hbox = QHBoxLayout() @@ -366,7 +365,7 @@
  schemeIndex = self.schemecombo.currentIndex()   for w in self.HostAndPortWidgets:   w.setHidden(schemeIndex == 0) - self.securebutton.setEnabled(schemeIndex == 3) + self.securebutton.setHidden(schemeIndex != 3)     def currentUrl(self, hidepw):   scheme = _schemes[self.schemecombo.currentIndex()]