← Back to branch summary

~vexo/mirage/mirage

« back to all changes in this revision

Viewing changes to mirage.py

  • Committer: fredricj
  • Date: 2012-10-27 21:44:05 UTC
  • Revision ID: svn-v4:c8e92e14-2b13-0410-9bd1-9f109af9afc5:trunk:373
No need for the filename entry in the rename dialog to be saved in self

Show diffs side-by-side

added added

removed removed

Lines of Context:
mirage.py
2855
2855
                        if self.slideshow_mode:
2856
2856
                                self.toggle_slideshow(None)
2857
2857
                        rename_dialog = gtk.Dialog(_('Rename Image'), self.window, gtk.DIALOG_MODAL)
2858
 
                        self.rename_txt = gtk.Entry()
 
2858
                        rename_txt = gtk.Entry()
2859
2859
                        filename = os.path.basename(self.currimg.name)
2860
 
                        self.rename_txt.set_text(filename)
2861
 
                        self.rename_txt.set_activates_default(True)
 
2860
                        rename_txt.set_text(filename)
 
2861
                        rename_txt.set_activates_default(True)
2862
2862
                        cancelbutton = rename_dialog.add_button(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL)
2863
2863
                        renamebutton = rename_dialog.add_button(_("_Rename"), gtk.RESPONSE_ACCEPT)
2864
2864
                        renameimage = gtk.Image()
2878
2878
                        vbox_stuff.pack_start(gtk.Label(), False, False, 0)
2879
2879
                        vbox_stuff.pack_start(instructions, False, False, 0)
2880
2880
                        vbox_stuff.pack_start(gtk.Label(), False, False, 0)
2881
 
                        vbox_stuff.pack_start(self.rename_txt, True, True, 0)
 
2881
                        vbox_stuff.pack_start(rename_txt, True, True, 0)
2882
2882
                        vbox_stuff.pack_start(gtk.Label(), False, False, 0)
2883
2883
                        hbox.pack_start(vbox_stuff, True, True, 10)
2884
2884
                        rename_dialog.vbox.pack_start(hbox, False, False, 0)
2886
2886
                        rename_dialog.set_default_response(gtk.RESPONSE_ACCEPT)
2887
2887
                        rename_dialog.set_size_request(300, -1)
2888
2888
                        rename_dialog.vbox.show_all()
2889
 
                        rename_dialog.connect('show', self.select_rename_text)
2890
 
                        rename_dialog.connect('response', self.on_rename_dialog_response)
 
2889
                        rename_dialog.connect('show', self.select_rename_text, rename_txt)
 
2890
                        rename_dialog.connect('response', self.on_rename_dialog_response,rename_txt)
2891
2891
                        response = rename_dialog.run()
2892
2892
                        rename_dialog.destroy()
2893
2893
                        if temp_slideshow_mode:
2894
2894
                                self.toggle_slideshow(None)
2895
2895
 
2896
 
        def select_rename_text(self, widget):
 
2896
        def select_rename_text(self, widget,rename_entry):
2897
2897
                filename = os.path.basename(self.currimg.name)
2898
2898
                fileext = os.path.splitext(os.path.basename(self.currimg.name))[1]
2899
 
                self.rename_txt.select_region(0, len(filename) - len(fileext))
 
2899
                rename_entry.select_region(0, len(filename) - len(fileext))
2900
2900
                
2901
 
        def on_rename_dialog_response(self, dialog, response, data=None):
 
2901
        def on_rename_dialog_response(self, dialog, response, rename_entry):
2902
2902
                if response == gtk.RESPONSE_ACCEPT:
2903
2903
                        try:
2904
 
                                new_filename = os.path.join(os.path.dirname(self.currimg.name), self.rename_txt.get_text().decode('utf-8'))
 
2904
                                new_filename = os.path.join(os.path.dirname(self.currimg.name), rename_entry.get_text().decode('utf-8'))
2905
2905
                                if os.path.exists(new_filename):
2906
2906
                                        exists_dialog = gtk.MessageDialog(self.window, gtk.DIALOG_MODAL, gtk.MESSAGE_WARNING, gtk.BUTTONS_OK_CANCEL, _('Overwrite existing file %s?') % new_filename)
2907
2907
                                        exists_dialog.set_title(_("File exists"))