Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8, 0.8.1, and 0.8.2

synch: alternative layout

post pull operations to the right of the target URL, where just the
proxy disable button was before (same amount of horizontal space)
In the area below the URL entry, move the advanced features tab only
now it has room to expand into (after changing the in/out frame to a
vertical layout as well).

Changeset e05246b3df6a…

Parent 8837dc652838…

by Steve Borho

Changes to one file · Browse files at e05246b3df6a Showing diff from parent 8837dc652838 Diff from another changeset...

Change 1 of 5 Show Entire File hggtk/​synch.py Stacked
 
34
35
36
37
 
38
39
40
 
92
93
94
95
96
 
 
97
98
99
100
 
101
102
103
104
105
 
106
107
 
108
109
110
111
112
113
 
114
115
116
 
143
144
145
146
 
147
148
149
150
151
152
153
154
155
 
 
 
 
 
156
157
158
159
160
161
162
163
164
 
166
167
168
 
 
 
 
 
 
 
 
 
 
 
 
 
169
170
171
 
201
202
203
204
205
206
207
208
 
 
 
 
 
209
210
211
 
34
35
36
 
37
38
39
40
 
92
93
94
 
 
95
96
97
98
99
 
100
101
102
103
104
 
105
106
 
107
108
109
110
111
112
113
114
115
116
117
 
144
145
146
 
147
148
149
150
151
 
 
 
 
 
152
153
154
155
156
157
 
 
 
 
 
158
159
160
 
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
 
210
211
212
 
 
 
 
 
213
214
215
216
217
218
219
220
@@ -34,7 +34,7 @@
  self._settings = shlib.Settings('synch')   self._recent_src = self._settings.mrul('src_paths')   - self.set_default_size(610, 400) + self.set_default_size(655, 552)     self.paths = self._get_paths()   self.origchangecount = len(self.repo.changelog) @@ -92,25 +92,26 @@
  self.add(vbox)   vbox.pack_start(self.tbar, False, False, 2)   - # revision input - revbox = gtk.HBox() + # sync target info + targethbox = gtk.HBox()   lbl = gtk.Button(_('Repo:'))   lbl.unset_flags(gtk.CAN_FOCUS)   lbl.connect('clicked', self._btn_remotepath_clicked) - revbox.pack_start(lbl, False, False) + targethbox.pack_start(lbl, False, False)     lbl = gtk.Button(_('Bundle:'))   lbl.unset_flags(gtk.CAN_FOCUS)   lbl.connect('clicked', self._btn_bundlepath_clicked) - revbox.pack_start(lbl, False, False) + targethbox.pack_start(lbl, False, False)   - # revisions combo box + # revisions combo box   self.pathlist = gtk.ListStore(str, str)   self._pathbox = gtk.ComboBoxEntry(self.pathlist, 0)   self._pathtext = self._pathbox.get_child()   cell = gtk.CellRendererText()   self._pathbox.pack_end(cell, False)   self._pathbox.add_attribute(cell, 'text', 1) + targethbox.pack_start(self._pathbox, True, True)     self.fill_path_combo()   defrow = None @@ -143,22 +144,17 @@
  self._use_proxy.set_sensitive(False)     frame = gtk.Frame(_('Post pull operation')) - hbox = gtk.HBox() + ppvbox = gtk.VBox()   self.nothingradio = gtk.RadioButton(None, _('Nothing'))   self.updateradio = gtk.RadioButton(self.nothingradio, _('Update'))   self.fetchradio = gtk.RadioButton(self.nothingradio, _('Fetch'))   self.rebaseradio = gtk.RadioButton(self.nothingradio, _('Rebase')) - hbox.pack_start(self.nothingradio, True, True, 2) - hbox.pack_start(self.updateradio, True, True, 2) - hbox.pack_start(self.fetchradio, True, True, 2) - hbox.pack_start(self.rebaseradio, True, True, 2) - frame.add(hbox) + ppvbox.pack_start(self.nothingradio, True, True, 2) + ppvbox.pack_start(self.updateradio, True, True, 2) + ppvbox.pack_start(self.fetchradio, True, True, 2) + ppvbox.pack_start(self.rebaseradio, True, True, 2) + frame.add(ppvbox)   frame.set_border_width(2) - vbox.pack_start(frame, False, False, 2) - - revbox.pack_start(self._pathbox, True, True) - revbox.pack_end(self._use_proxy, False, False) - vbox.pack_start(revbox, False, False, 2)     self.expander = expander = gtk.Expander(_('Advanced Options'))   expander.set_expanded(False) @@ -166,6 +162,19 @@
  hbox = gtk.HBox()   expander.add(hbox)   + leftvbox = gtk.VBox() + leftvbox.pack_start(frame, False, False, 2) + leftvbox.pack_start(self._use_proxy, False, False, 3) + + rightvbox = gtk.VBox() + rightvbox.pack_start(targethbox, False, False, 2) + rightvbox.pack_start(expander, True, True, 2) + + tophbox = gtk.HBox() + tophbox.pack_start(rightvbox, True, True, 2) + tophbox.pack_start(leftvbox, False, False, 2) + vbox.pack_start(tophbox, False, False, 2) +   revvbox = gtk.VBox()   self._reventry = gtk.Entry()   self._cmdentry = gtk.Entry() @@ -201,11 +210,11 @@
  self._newestfirst = gtk.CheckButton(_('Show Newest First'))   self._nomerge = gtk.CheckButton(_('Show No Merges'))   - hbox = gtk.HBox() - hbox.pack_start(self._showpatch, False, False, 2) - hbox.pack_start(self._newestfirst, False, False, 2) - hbox.pack_start(self._nomerge, False, False, 2) - frame.add(hbox) + iovbox = gtk.VBox() + iovbox.pack_start(self._showpatch, False, False, 2) + iovbox.pack_start(self._newestfirst, False, False, 2) + iovbox.pack_start(self._nomerge, False, False, 2) + frame.add(iovbox)   vbox.pack_start(expander, False, False, 2)     # hg output window