Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.9, 0.9.1, and 0.9.1.1

archive: improve file extensions of NativeSaveFileDialogWrapper

Changeset fdb471e12967…

Parent dbfd49408d2d…

by Yuki KODAMA

Changes to one file · Browse files at fdb471e12967 Showing diff from parent dbfd49408d2d Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgtk/​archive.py Stacked
 
154
155
156
157
158
 
 
159
160
161
 
 
162
163
164
 
 
165
166
167
 
 
168
169
170
171
 
 
 
172
173
174
175
176
 
 
177
178
179
180
181
 
 
182
183
184
185
 
186
187
188
 
207
208
209
210
 
211
212
213
 
214
215
216
 
229
230
231
232
 
233
234
235
 
154
155
156
 
 
157
158
159
 
 
160
161
162
 
 
163
164
165
 
 
166
167
168
 
 
 
169
170
171
172
173
174
 
 
175
176
177
178
179
180
 
181
182
183
184
185
 
186
187
188
189
 
208
209
210
 
211
212
213
 
214
215
216
217
 
230
231
232
 
233
234
235
236
@@ -154,35 +154,36 @@
  def get_selected_archive_type(self):   """Return a dictionary describing the selected archive type"""   if self.tarradio.get_active(): - return {'type': 'tar', - 'filter': ((_('Tar archives'), '*.tar'),)} + return {'type': 'tar', 'ext': '.tar', + 'label': _('Tar archives')}   elif self.tbz2radio.get_active(): - return {'type': 'tbz2', - 'filter': ((_('Bzip2 tar archives'), '*.tbz2'),)} + return {'type': 'tbz2', 'ext': '.tar.bz2', + 'label': _('Bzip2 tar archives')}   elif self.tgzradio.get_active(): - return {'type': 'tgz', - 'filter': ((_('Gzip tar archives'), '*.tgz'),)} + return {'type': 'tgz', 'ext': '.tar.gz', + 'label': _('Gzip tar archives')}   elif self.uzipradio.get_active(): - return {'type': 'uzip', - 'filter': ((_('Uncompressed zip archives'), '*.uzip'),)} + return {'type': 'uzip', 'ext': '.zip', + 'label': ('Uncompressed zip archives')}   elif self.zipradio.get_active(): - return {'type': 'zip', - 'filter': ((_('Compressed zip archives'), '*.zip'),)} - return {'type': 'files', 'filter': None} + return {'type': 'zip', 'ext': '.zip', + 'label': _('Compressed zip archives')} + return {'type': 'files', 'ext': None, 'label': None}     def browse_clicked(self, button):   """Select the destination directory or file""" - archive_type = self.get_selected_archive_type() - if archive_type['type'] == 'files': + select = self.get_selected_archive_type() + if select['type'] == 'files':   response = gtklib.NativeFolderSelectDialog(   initial=self.destentry.get_text(),   title=_('Select Destination Folder')).run()   else: - filter = archive_type['filter'] + ext = '*' + select['ext'] + label = '%s (%s)' % (select['label'], ext)   response = gtklib.NativeSaveFileDialogWrapper(   InitialDir=self.destentry.get_text(),   Title=_('Select Destination File'), - Filter=filter).run() + Filter=((label, ext),)).run()     if response:   self.destentry.set_text(response) @@ -207,10 +208,10 @@
    def archive(self):   # verify input - select = self.get_selected_archive_type() + type = self.get_selected_archive_type()['type']   dest = self.destentry.get_text()   if os.path.exists(dest): - if select['type'] != 'files': + if type != 'files':   ret = gdialog.Confirm(_('Confirm Overwrite'), [], self,   _('The destination "%s" already exists!\n\n'   'Do you want to overwrite it?') % dest).run() @@ -229,7 +230,7 @@
  cmdline.append('--rev')   cmdline.append(rev)   cmdline.append('-t') - cmdline.append(select['type']) + cmdline.append(type)   cmdline.append(hglib.fromutf(dest))     def cmd_done(returncode):