/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/__init__.py

  • Committer: Jelmer Vernooij
  • Date: 2008-07-18 12:29:56 UTC
  • mfrom: (531.7.14 vis-enhancements)
  • Revision ID: jelmer@samba.org-20080718122956-27468cxu2b613ib8
Merge diff widget in viz.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/__init__.py
19
19
import os
20
20
import sys
21
21
import time
 
22
import errno
22
23
 
23
24
# gettext support
24
25
import gettext
60
61
 
61
62
def about():
62
63
    """ Display the AboutDialog. """
63
 
    from bzrlib.plugins.gtk import __version__
64
 
    from bzrlib.plugins.gtk.olive.guifiles import GLADEFILENAME
65
 
 
66
 
    # Load AboutDialog description
67
 
    dglade = gtk.glade.XML(GLADEFILENAME, 'aboutdialog')
68
 
    dialog = dglade.get_widget('aboutdialog')
69
 
 
70
 
    # Set version
 
64
    from bzrlib.plugins.gtk import __version__, icon_path
 
65
    
 
66
    iconpath = icon_path() + os.sep
 
67
    
 
68
    dialog = gtk.AboutDialog()
 
69
    dialog.set_name("Olive")
71
70
    dialog.set_version(__version__)
 
71
    dialog.set_copyright("Copyright (C) 2006 Szilveszter Farkas (Phanatic)")
 
72
    dialog.set_website("https://launchpad.net/products/olive")
 
73
    dialog.set_website_label("https://launchpad.net/products/olive")
 
74
    dialog.set_icon_from_file(iconpath+"oliveicon2.png")
 
75
    dialog.set_logo(gtk.gdk.pixbuf_new_from_file(iconpath+"oliveicon2.png"))
72
76
    dialog.set_authors([ _i18n("Lead Developer:"),
73
77
                         "Szilveszter Farkas <szilveszter.farkas@gmail.com>",
74
78
                         _i18n("Contributors:"),
238
242
            self.combobox_drive.show()
239
243
            self.gen_hard_selector()
240
244
        
 
245
        # Acceptable errors when loading files/folders in the treeviews
 
246
        self.acceptable_errors = (errno.ENOENT, errno.ELOOP)
 
247
        
241
248
        self._load_left()
242
249
 
243
250
        # Apply menu state
442
449
            # History Mode deactivated
443
450
            self.entry_history.set_sensitive(False)
444
451
            self.button_history.set_sensitive(False)
 
452
            
 
453
            # Return right window to normal view by acting like we jump to it
 
454
            self.on_button_location_jump_clicked(widget)
445
455
    
446
456
    @show_bzr_error
447
457
    def on_entry_history_revno_key_press_event(self, widget, event):
467
477
    
468
478
    def on_menuitem_add_files_activate(self, widget):
469
479
        """ Add file(s)... menu handler. """
470
 
        from add import OliveAdd
471
 
        add = OliveAdd(self.wt, self.wtpath, self.get_selected_right())
472
 
        add.display()
473
 
    
 
480
        from bzrlib.plugins.gtk.olive.add import AddDialog
 
481
        add = AddDialog(self.wt, self.wtpath, self.get_selected_right(), self.window)
 
482
        response = add.run()
 
483
        add.destroy()
 
484
        if response == gtk.RESPONSE_OK:
 
485
            self.refresh_right()
 
486
 
474
487
    def on_menuitem_branch_get_activate(self, widget):
475
488
        """ Branch/Get... menu handler. """
476
489
        from bzrlib.plugins.gtk.branch import BranchDialog
540
553
            error_dialog(_i18n('There are local changes in the branch'),
541
554
                         _i18n('Please commit or revert the changes before merging.'))
542
555
        else:
543
 
            parent_branch_path = self.wt.branch.get_parent()
544
 
            merge = MergeDialog(self.wt, self.wtpath,default_branch_path=parent_branch_path )
545
 
            merge.display()
 
556
            merge = MergeDialog(self.wt, self.wtpath, parent_branch_path, self.window)
 
557
            response = merge.run()
 
558
            merge.destroy()
 
559
            if response == gtk.RESPONSE_OK:
 
560
                self.refresh_right()
546
561
 
547
562
    @show_bzr_error
548
563
    def on_menuitem_branch_missing_revisions_activate(self, widget):
716
731
    
717
732
    def on_menuitem_file_make_directory_activate(self, widget):
718
733
        """ File/Make directory... menu handler. """
719
 
        from mkdir import OliveMkdir
720
 
        mkdir = OliveMkdir(self.wt, self.wtpath)
721
 
        mkdir.display()
 
734
        from bzrlib.plugins.gtk.olive.mkdir import MkdirDialog
 
735
        mkdir = MkdirDialog(self.wt, self.wtpath, self.window)
 
736
        response = mkdir.run()
 
737
        mkdir.destroy()
 
738
        if response == gtk.RESPONSE_OK:
 
739
            self.refresh_right()
722
740
    
723
741
    def on_menuitem_file_move_activate(self, widget):
724
742
        """ File/Move... menu handler. """
725
 
        from move import OliveMove
726
 
        move = OliveMove(self.wt, self.wtpath, self.get_selected_right())
727
 
        move.display()
 
743
        from bzrlib.plugins.gtk.olive.move import MoveDialog
 
744
        move = MoveDialog(self.wt, self.wtpath, self.get_selected_right(), self.window)
 
745
        response = move.run()
 
746
        move.destroy()
 
747
        if response == gtk.RESPONSE_OK:
 
748
            self.refresh_right()
728
749
    
729
750
    def on_menuitem_file_rename_activate(self, widget):
730
751
        """ File/Rename... menu handler. """
731
 
        from rename import OliveRename
732
 
        rename = OliveRename(self.wt, self.wtpath, self.get_selected_right())
733
 
        rename.display()
 
752
        from bzrlib.plugins.gtk.olive.rename import RenameDialog
 
753
        rename = RenameDialog(self.wt, self.wtpath, self.get_selected_right(), self.window)
 
754
        response = rename.run()
 
755
        rename.destroy()
 
756
        if response == gtk.RESPONSE_OK:
 
757
            self.refresh_right()
734
758
 
735
759
    def on_menuitem_remove_file_activate(self, widget):
736
760
        """ Remove (unversion) selected file. """
737
 
        from remove import OliveRemoveDialog
738
 
        remove = OliveRemoveDialog(self.wt, self.wtpath,
 
761
        from bzrlib.plugins.gtk.olive.remove import RemoveDialog
 
762
        remove = RemoveDialog(self.wt, self.wtpath,
739
763
                                   selected=self.get_selected_right(),
740
764
                                   parent=self.window)
741
765
        response = remove.run()
773
797
        else:
774
798
            branch = self.remote_branch
775
799
 
776
 
        window = branchwin.BranchWindow(branch, branch.last_revision(), None, parent=self.window)
 
800
        window = branchwin.BranchWindow(branch, [branch.last_revision()], None, 
 
801
                                        parent=self.window)
777
802
        window.show()
778
803
    
779
804
    def on_menuitem_view_refresh_activate(self, widget):
997
1022
            try:
998
1023
                statinfo = os.stat(self.path + os.sep + item)
999
1024
            except OSError, e:
1000
 
                if e.errno == 40:
 
1025
                if e.errno in self.acceptable_errors:
1001
1026
                    continue
1002
1027
                else:
1003
1028
                    raise
1064
1089
            try:
1065
1090
                statinfo = os.stat(self.path + os.sep + item)
1066
1091
            except OSError, e:
1067
 
                if e.errno == 40:
 
1092
                if e.errno in self.acceptable_errors:
1068
1093
                    continue
1069
1094
                else:
1070
1095
                    raise
1302
1327
                try:
1303
1328
                    statinfo = os.stat(self.path + os.sep + item)
1304
1329
                except OSError, e:
1305
 
                    if e.errno == 40:
 
1330
                    if e.errno in self.acceptable_errors:
1306
1331
                        continue
1307
1332
                    else:
1308
1333
                        raise
1371
1396
                try:
1372
1397
                    statinfo = os.stat(self.path + os.sep + item)
1373
1398
                except OSError, e:
1374
 
                    if e.errno == 40:
 
1399
                    if e.errno in self.acceptable_errors:
1375
1400
                        continue
1376
1401
                    else:
1377
1402
                        raise
1485
1510
        
1486
1511
        driveletters = []
1487
1512
        for drive in string.ascii_uppercase:
1488
 
            if win32file.GetDriveType(drive+':') == win32file.DRIVE_FIXED:
 
1513
            if win32file.GetDriveType(drive+':') == win32file.DRIVE_FIXED or\
 
1514
                win32file.GetDriveType(drive+':') == win32file.DRIVE_REMOTE:
1489
1515
                driveletters.append(drive+':')
1490
1516
        return driveletters
1491
1517