/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to olive/frontend/gtk/add.py

  • Committer: Szilveszter Farkas (Phanatic)
  • Date: 2006-08-19 23:56:40 UTC
  • mto: (0.14.1 main) (93.1.1 win32.bialix)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: Szilveszter.Farkas@gmail.com-20060819235640-abdb3ecf8553b547
Fixed a bug when double-clicking a file.

2006-08-19  Szilveszter Farkas <Szilveszter.Farkas@gmail.com>

    * olive/frontend/handler.py: fixed a long existing bug: double-clicking a
      file should open it with an application (supported under Windows)

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/frontend/gtk/add.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
import os
 
17
import sys
18
18
 
19
19
try:
20
20
    import pygtk
21
21
    pygtk.require("2.0")
22
22
except:
23
23
    pass
24
 
 
25
 
import gtk
26
 
import gtk.glade
27
 
 
28
 
import bzrlib.add
29
 
import bzrlib.errors as errors
30
 
 
31
 
from bzrlib.plugins.gtk import _i18n
32
 
from bzrlib.plugins.gtk.dialog import error_dialog
33
 
from guifiles import GLADEFILENAME
34
 
 
 
24
try:
 
25
    import gtk
 
26
    import gtk.glade
 
27
except:
 
28
    sys.exit(1)
 
29
 
 
30
import olive.backend.errors as errors
 
31
import olive.backend.fileops as fileops
35
32
 
36
33
class OliveAdd:
37
34
    """ Display the Add file(s) dialog and perform the needed actions. """
38
 
    def __init__(self, wt, wtpath, selected=[]):
 
35
    def __init__(self, gladefile, comm, dialog):
39
36
        """ Initialize the Add file(s) dialog. """
40
 
        self.glade = gtk.glade.XML(GLADEFILENAME, 'window_add', 'olive-gtk')
 
37
        self.gladefile = gladefile
 
38
        self.glade = gtk.glade.XML(self.gladefile, 'window_add')
 
39
        
 
40
        # Communication object
 
41
        self.comm = comm
 
42
        # Dialog object
 
43
        self.dialog = dialog
41
44
        
42
45
        self.window = self.glade.get_widget('window_add')
43
46
        
48
51
        # Connect the signals to the handlers
49
52
        self.glade.signal_autoconnect(dic)
50
53
 
51
 
        self.wt = wt
52
 
        self.wtpath = wtpath
53
 
        self.selected = selected
54
 
 
55
54
    def display(self):
56
55
        """ Display the Add file(s) dialog. """
57
56
        self.window.show_all()
60
59
        radio_selected = self.glade.get_widget('radiobutton_add_selected')
61
60
        radio_unknown = self.glade.get_widget('radiobutton_add_unknown')
62
61
        
 
62
        directory = self.comm.get_path()
 
63
        
 
64
        self.comm.set_busy(self.window)
63
65
        if radio_selected.get_active():
64
66
            # Add only the selected file
65
 
            filename = self.selected
 
67
            filename = self.comm.get_selected_right()
66
68
            
67
69
            if filename is None:
68
 
                error_dialog(_i18n('No file was selected'),
69
 
                             _i18n('Please select a file from the list,\nor choose the other option.'))
 
70
                self.dialog.error_dialog('No file was selected',
 
71
                                         'Please select a file from the list,\nor choose the other option.')
70
72
                return
71
73
            
72
 
            fullpath = self.wt.abspath(os.path.join(self.wtpath, filename))
73
 
            
74
74
            try:
75
 
                bzrlib.add.smart_add([fullpath])
 
75
                fileops.add([directory + '/' + filename])
76
76
            except errors.NotBranchError:
77
 
                error_dialog(_i18n('Directory is not a branch'),
78
 
                             _i18n('You can perform this action only in a branch.'))
 
77
                self.dialog.error_dialog('Directory is not a branch',
 
78
                                         'You can perform this action only in a branch.')
 
79
                self.comm.set_busy(self.window, False)
79
80
                return
 
81
            except:
 
82
                raise
80
83
        elif radio_unknown.get_active():
81
84
            # Add unknown files recursively
82
 
            fullpath = self.wt.abspath(self.wtpath)
83
 
            
84
85
            try:
85
 
                bzrlib.add.smart_add([fullpath], True)
 
86
                fileops.add([directory], True)
86
87
            except errors.NotBranchError:
87
 
                error_dialog(_i18n('Directory is not a branch'),
88
 
                             _i18n('You can perform this action only in a branch.'))
 
88
                self.dialog.error_dialog('Directory is not a branch',
 
89
                                         'You can perform this action only in a branch.')
 
90
                self.comm.set_busy(self.window, False)
89
91
                return
 
92
            except:
 
93
                raise
 
94
        else:
 
95
            # This should really never happen.
 
96
            pass
90
97
        
91
98
        self.close()
 
99
        self.comm.refresh_right()
92
100
    
93
101
    def close(self, widget=None):
94
102
        self.window.destroy()