Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

sync: add details button, reshuffle layout

I'm not much happier with the new layout, but this is an
improvement over the previous layout. This widget perhaps
needs a toolbar.

Changeset 5a590fa8a136…

Parent 2577c0d76628…

by Steve Borho

Changes to one file · Browse files at 5a590fa8a136 Showing diff from parent 2577c0d76628 Diff from another changeset...

Change 1 of 5 Show Entire File tortoisehg/​hgqt/​sync.py Stacked
 
21
22
23
 
24
25
26
 
47
48
49
 
 
50
51
52
53
54
 
 
 
 
 
 
 
 
 
 
 
55
56
57
 
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
 
75
76
77
 
78
79
80
 
90
91
92
 
 
 
 
 
93
94
95
96
97
98
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
99
100
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
101
102
103
104
105
106
107
 
108
109
110
 
143
144
145
 
146
147
148
149
150
 
 
 
 
 
 
 
151
152
153
 
193
194
195
 
 
 
 
 
 
196
197
198
 
21
22
23
24
25
26
27
 
48
49
50
51
52
53
54
55
56
 
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
 
 
 
 
 
 
 
 
 
 
 
78
79
80
81
82
83
84
85
 
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
 
154
155
156
157
 
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
 
248
249
250
251
252
253
254
255
256
257
258
259
@@ -21,6 +21,7 @@
   # TODO  # Write keyring help, connect to help button +# outgoingNodes should go to thgrepo and trigger repo signal    _schemes = ['local', 'ssh', 'http', 'https']   @@ -47,34 +48,38 @@
  self.curpw = None   self.updateInProgress = False   + self.repo.configChanged.connect(self.configChanged) +   if not embedded:   self.setWindowTitle(_('TortoiseHg Sync'))   self.resize(850, 550)   - self.repo.configChanged.connect(self.configChanged) + toph = QHBoxLayout() + toph.setContentsMargins(0, 0, 0, 0) + layout.addLayout(toph) + + urlframe = QFrame() + urlframe.setFrameStyle(QFrame.StyledPanel|QFrame.Raised) + urlvbox = QVBoxLayout() + urlvbox.setContentsMargins(0, 0, 0, 0) + urlvbox.setSpacing(4) + urlframe.setLayout(urlvbox) + toph.addWidget(urlframe, 1)     hbox = QHBoxLayout()   hbox.setContentsMargins(0, 0, 0, 0) + hbox.setSpacing(4)   self.savebutton = QPushButton(_('Save'))   hbox.addWidget(self.savebutton)   hbox.addWidget(QLabel(_('URL:')))   self.urlentry = QLineEdit()   self.urlentry.setReadOnly(True)   hbox.addWidget(self.urlentry) - self.inbutton = QPushButton(_('Incoming')) - hbox.addWidget(self.inbutton) - self.pullbutton = QPushButton(_('Pull')) - hbox.addWidget(self.pullbutton) - self.outbutton = QPushButton(_('Outgoing')) - hbox.addWidget(self.outbutton) - self.pushbutton = QPushButton(_('Push')) - hbox.addWidget(self.pushbutton) - self.emailbutton = QPushButton(_('Email')) - hbox.addWidget(self.emailbutton) - layout.addLayout(hbox) + urlvbox.addLayout(hbox)     hbox = QHBoxLayout()   hbox.setContentsMargins(0, 0, 0, 0) + hbox.setSpacing(4)   self.schemecombo = QComboBox()   for s in _schemes:   self.schemecombo.addItem(s) @@ -90,21 +95,63 @@
  self.portentry.setFixedWidth(8 * fontm.width('9'))   self.portentry.textChanged.connect(self.refreshUrl)   hbox.addWidget(self.portentry) + urlvbox.addLayout(hbox) + + hbox = QHBoxLayout() + hbox.setContentsMargins(0, 0, 0, 0) + hbox.setSpacing(4)   hbox.addWidget(QLabel(_('Path:')))   self.pathentry = QLineEdit()   self.pathentry.textChanged.connect(self.refreshUrl)   hbox.addWidget(self.pathentry, 1)   self.authbutton = QPushButton(_('Authentication'))   hbox.addWidget(self.authbutton) + urlvbox.addLayout(hbox) + + buttonframe = QFrame() + buttonframe.setFrameStyle(QFrame.StyledPanel|QFrame.Raised) + buttonvbox = QVBoxLayout() + buttonvbox.setContentsMargins(0, 0, 0, 0) + buttonvbox.setSpacing(4) + buttonframe.setLayout(buttonvbox) + toph.addWidget(buttonframe) + + hbox = QHBoxLayout() + hbox.setContentsMargins(0, 0, 0, 0) + hbox.setSpacing(4) + self.inbutton = QPushButton(_('Incoming')) + hbox.addWidget(self.inbutton) + self.pullbutton = QPushButton(_('Pull')) + hbox.addWidget(self.pullbutton) + buttonvbox.addLayout(hbox) + + hbox = QHBoxLayout() + hbox.setContentsMargins(0, 0, 0, 0) + hbox.setSpacing(4)   self.postpullbutton = QPushButton()   hbox.addWidget(self.postpullbutton) + self.detailsbutton = QPushButton(_('Details')) + hbox.addWidget(self.detailsbutton) + buttonvbox.addLayout(hbox) + + hbox = QHBoxLayout() + hbox.setContentsMargins(0, 0, 0, 0) + hbox.setSpacing(4) + self.outbutton = QPushButton(_('Outgoing')) + hbox.addWidget(self.outbutton) + self.pushbutton = QPushButton(_('Push')) + hbox.addWidget(self.pushbutton) + self.emailbutton = QPushButton(_('Email')) + hbox.addWidget(self.emailbutton) + buttonvbox.addLayout(hbox) +   if 'perfarce' in self.repo.extensions():   self.p4pbutton = QPushButton(_('p4pending'))   self.p4pbutton.clicked.connect(self.p4pending)   hbox.addWidget(self.p4pbutton)   else:   self.p4pbutton = None - layout.addLayout(hbox) +     hbox = QHBoxLayout()   hbox.setContentsMargins(0, 0, 0, 0) @@ -143,11 +190,19 @@
  self.pushbutton.clicked.connect(self.pushclicked)   self.emailbutton.clicked.connect(self.emailclicked)   self.postpullbutton.clicked.connect(self.postpullclicked) + self.detailsbutton.pressed.connect(self.details)     self.opbuttons = (self.inbutton, self.pullbutton,   self.outbutton, self.pushbutton,   self.emailbutton, self.p4pbutton)   + self.forcepush = False + self.newbranch = False + self.forcepull = False + self.torev = None + self.tobranch = None + self.remotecmd = None +   cmd = cmdui.Widget(not embedded, self)   cmd.commandStarted.connect(self.commandStarted)   cmd.commandFinished.connect(self.commandFinished) @@ -193,6 +248,12 @@
  'Repository is reporting its config files have changed'   self.reload()   + def details(self): + pass + #dlg = DetailsDialog(self.opts, self.userhist, self) + #if dlg.exec_() == QDialog.Accepted: + # self.opts.update(dlg.outopts) +   def reload(self):   # Refresh configured paths   self.paths = {}